rendered paste bodyIndex: Makefile
===================================================================
RCS file: /home/pcvs/ports/sysutils/bacula-server-devel/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile 5 Oct 2006 19:08:27 -0000 1.6
+++ Makefile 5 Oct 2006 19:47:02 -0000
@@ -162,16 +162,8 @@
.if defined(WITH_CLIENT_ONLY)
MAN8=bacula-fd.8 bconsole.8
.else
-MAN8=bacula-dir.8 bacula-sd.8 bacula.8 bcopy.8 bextract.8 bls.8 bscan.8 btape.8 dbcheck.8
-MAN1=bsmtp.1
-.endif
-
-.if defined(WITH_GNOMECONSOLE)
- MAN1+=bacula-console-gnome.1
-.endif
-
-.if defined(WITH_WXCONSOLE)
- MAN1+=bacula-wxconsole.1
+MAN8=bacula.8 bacula-dir.8 bacula-sd.8 bcopy.8 bextract.8 bls.8 bscan.8 btape.8 btraceback.8 dbcheck.8
+MAN1=bsmtp.1 bacula-console-gnome.1 bacula-tray-monitor.1 bacula-wxconsole.1
.endif
pre-everything::
@@ -224,11 +216,9 @@
${ECHO_CMD} "${BACULA_DIR} already exists"; \
fi
-.if !defined(WITH_CLIENT_ONLY)
# Extend /etc/services and install UID/GID
@ ${SETENV} PKG_PREFIX=${PREFIX} \
${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
-.endif
post-install:
.if defined(MAN8)
Index: pkg-deinstall.client
===================================================================
RCS file: /home/pcvs/ports/sysutils/bacula-server-devel/pkg-deinstall.client,v
retrieving revision 1.1
diff -u -r1.1 pkg-deinstall.client
--- pkg-deinstall.client 15 Mar 2006 10:22:09 -0000 1.1
+++ pkg-deinstall.client 5 Oct 2006 19:47:02 -0000
@@ -20,5 +20,12 @@
if [ -d ${BACULA_DIR} ]; then
echo "Check if ${BACULA_DIR} is empty and delete it to permanently remove the bacula port"
fi
+
+ # Note how to delete UID/GID
+ USER=bacula
+ GROUP=${USER}
+ if pw groupshow "${USER}" 2>/dev/null 1>&2; then
+ echo "To delete Bacula group permanently, use 'pw groupdel ${GROUP}'"
+ fi
;;
esac
Index: pkg-install.client
===================================================================
RCS file: /home/pcvs/ports/sysutils/bacula-server-devel/pkg-install.client,v
retrieving revision 1.1
diff -u -r1.1 pkg-install.client
--- pkg-install.client 15 Mar 2006 10:22:09 -0000 1.1
+++ pkg-install.client 5 Oct 2006 19:47:02 -0000
@@ -15,3 +15,29 @@
# Bacule port end" >> /etc/services
fi
+case $2 in
+PRE-INSTALL)
+ # Install UID/GID
+ USER=bacula
+ GROUP=${USER}
+ UID=910
+ GID=${UID}
+
+ if [ ! -d ${BACULA_DIR} ]; then
+ mkdir -p ${BACULA_DIR}
+ fi
+
+ if pw group show "${GROUP}" 2>/dev/null; then
+ echo "You already have a group \"${GROUP}\", so I will use it."
+ else
+ if pw groupadd ${GROUP} -g ${GID}; then
+ echo "Added group \"${GROUP}\"."
+ else
+ echo "Adding group \"${GROUP}\" failed..."
+ exit 1
+ fi
+ fi
+
+ chgrp -R ${GROUP} ${BACULA_DIR}
+ ;;
+esac
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/sysutils/bacula-server-devel/pkg-plist,v
retrieving revision 1.4
diff -u -r1.4 pkg-plist
--- pkg-plist 9 Sep 2006 20:17:39 -0000 1.4
+++ pkg-plist 5 Oct 2006 19:47:02 -0000
@@ -35,8 +35,6 @@
%%DATADIR%%/make_%%DBTYPE%%_tables
%%DATADIR%%/mtx-changer
%%DATADIR%%/query.sql
-%%DATADIR%%/startmysql
-%%DATADIR%%/stopmysql
%%DATADIR%%/update_bacula_tables
%%DATADIR%%/update_%%DBTYPE%%_tables
Index: files/patch-scripts-Makefile.in
===================================================================
RCS file: files/patch-scripts-Makefile.in
diff -N files/patch-scripts-Makefile.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-scripts-Makefile.in 5 Oct 2006 20:44:32 -0000
@@ -0,0 +1,11 @@
++--- scripts/Makefile.in.orig Tue Sep 12 12:03:08 2006
+++++ scripts/Makefile.in Tue Sep 12 12:03:08 2006
++@@ -33,8 +33,6 @@
++ $(MKDIR) $(DESTDIR)$(mandir)
++
++ install: installdirs
++- $(INSTALL_SCRIPT) startmysql $(DESTDIR)$(scriptdir)/startmysql
++- $(INSTALL_SCRIPT) stopmysql $(DESTDIR)$(scriptdir)/stopmysql
++ $(INSTALL_SCRIPT) bconsole $(DESTDIR)$(scriptdir)/bconsole
++ $(INSTALL_SCRIPT) gconsole $(DESTDIR)$(scriptdir)/gconsole
++ $(INSTALL_SCRIPT) bacula $(DESTDIR)$(scriptdir)/bacula