Move bacula-server-devel into bacula-server, now that 2.0.0

has been released.
Split the documentation into a new port, sysutils/bacula-docs.

You must run the database upgrade script after upgrading to Bacula 2.0.0
Many new features here. See http://www.bacula.org/?page=presskits for
an overview, and ReleaseNotes for full details.

PR:		ports/107535
Submitted by:	Dan Langille (maintainer)

10 files changed, 136 insertions, 74 deletions

diff --git a/sysutils/bacula-server/files/bacula-dir.in b/sysutils/bacula-server/files/bacula-dir.in
index 5bfa0eeb10e2..5739a308b77a 100644
--- a/sysutils/bacula-server/files/bacula-dir.in
+++ b/sysutils/bacula-server/files/bacula-dir.in
@@ -19,10 +19,11 @@
 name="bacula_dir"
 rcvar=${name}_enable
 command=%%PREFIX%%/sbin/bacula-dir
-pidfile="${bacula_dir_pidfile}"
 
 load_rc_config $name
 
+pidfile="${bacula_dir_pidfile}"
+
 : ${bacula_dir_enable="NO"}
 : ${bacula_dir_flags=" -u bacula -g bacula -v -c %%PREFIX%%/etc/bacula-dir.conf"}
 : ${bacula_dir_pidfile="/var/run/bacula-dir.9101.pid"}
diff --git a/sysutils/bacula-server/files/bacula-fd.in b/sysutils/bacula-server/files/bacula-fd.in
index 5cf5fcf38f0f..b6539219b683 100644
--- a/sysutils/bacula-server/files/bacula-fd.in
+++ b/sysutils/bacula-server/files/bacula-fd.in
@@ -19,10 +19,11 @@
 name="bacula_fd"
 rcvar=${name}_enable
 command=/usr/local/sbin/bacula-fd
-pidfile="${bacula_fd_pidfile}"
 
 load_rc_config $name
 
+pidfile="${bacula_fd_pidfile}"
+
 : ${bacula_fd_enable="NO"}
 : ${bacula_fd_flags=" -u root -g wheel -v -c /usr/local/etc/bacula-fd.conf"}
 : ${bacula_fd_pidfile="/var/run/bacula-fd.9102.pid"}
diff --git a/sysutils/bacula-server/files/bacula-sd.in b/sysutils/bacula-server/files/bacula-sd.in
index e851f6212c7d..ac78f5ce889a 100644
--- a/sysutils/bacula-server/files/bacula-sd.in
+++ b/sysutils/bacula-server/files/bacula-sd.in
@@ -19,12 +19,13 @@
 name="bacula_sd"
 rcvar=`set_rcvar`
 command=/usr/local/sbin/bacula-sd
-pidfile="${bacula_sd_pidfile}"
 
 load_rc_config $name
 
+pidfile="${bacula_sd_pidfile}"
+
 : ${bacula_sd_enable="NO"}
-: ${bacula_sd_flags=" -u bacula -g operator -v -c /usr/local/etc/bacula-sd.conf"}
+: ${bacula_sd_flags=" -u bacula -g bacula -v -c /usr/local/etc/bacula-sd.conf"}
 : ${bacula_sd_pidfile="/var/run/bacula-sd.9103.pid"}
 
 run_rc_command "$1"
diff --git a/sysutils/bacula-server/files/patch-configure b/sysutils/bacula-server/files/patch-configure
deleted file mode 100644
index f370488bbc48..000000000000
--- a/sysutils/bacula-server/files/patch-configure
+++ /dev/null
@@ -1,21 +0,0 @@
-*** configure.org	Sun Mar  6 16:46:54 2005
---- configure	Sun Mar  6 16:49:20 2005
-***************
-*** 29490,29497 ****
-  	DISTVER=`uname -a |awk '{print $3}'`
-  	VER=`echo $DISTVER | cut -c 1`
-  	if test x$VER = x4 ; then
-! 	   PTHREAD_LIB="-pthread"
-! 	   CFLAGS="${CFLAGS} -pthread"
-  	fi
-  	lld="qd"
-  	llu="qu"
---- 21037,21044 ----
-  	DISTVER=`uname -a |awk '{print $3}'`
-  	VER=`echo $DISTVER | cut -c 1`
-  	if test x$VER = x4 ; then
-! 	   PTHREAD_LIB="${PTHREAD_LIBS}"
-! 	   CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
-  	fi
-  	lld="qd"
-  	llu="qu"
diff --git a/sysutils/bacula-server/files/patch-scripts-Makefile.in b/sysutils/bacula-server/files/patch-scripts-Makefile.in
index eeb841f253db..d05246bbbcd7 100644
--- a/sysutils/bacula-server/files/patch-scripts-Makefile.in
+++ b/sysutils/bacula-server/files/patch-scripts-Makefile.in
@@ -1,33 +1,11 @@
---- scripts/Makefile.in.orig	Sat Mar 25 10:37:41 2006
-+++ scripts/Makefile.in	Thu Mar 30 13:01:21 2006
-@@ -33,14 +33,6 @@
+--- 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
--	$(INSTALL_SCRIPT) bacula-ctl-dir $(DESTDIR)$(scriptdir)/bacula-ctl-dir
--	$(INSTALL_SCRIPT) bacula-ctl-fd $(DESTDIR)$(scriptdir)/bacula-ctl-fd
--	$(INSTALL_SCRIPT) bacula-ctl-sd $(DESTDIR)$(scriptdir)/bacula-ctl-sd
- 	@if  test -f ${DESTDIR}${scriptdir}/mtx-changer; then \
- 	   echo "  ==> Saving existing mtx-changer to mtx-changer.old"; \
- 	   $(MV) -f ${DESTDIR}${scriptdir}/mtx-changer ${DESTDIR}${scriptdir}/mtx-changer.old; \
-@@ -56,14 +48,7 @@
- 	   $(MV) -f ${DESTDIR}${scriptdir}/dvd-handler ${DESTDIR}${scriptdir}/dvd-handler.old; \
- 	fi
- 	$(INSTALL_SCRIPT) dvd-handler $(DESTDIR)$(scriptdir)/dvd-handler
--	$(INSTALL_DATA)   btraceback.gdb $(DESTDIR)$(scriptdir)/btraceback.gdb
--	$(INSTALL_DATA)   btraceback.dbx $(DESTDIR)$(scriptdir)/btraceback.dbx
--	chmod 0644 $(DESTDIR)$(scriptdir)/btraceback.gdb \
--		   $(DESTDIR)$(scriptdir)/btraceback.dbx
--	$(INSTALL_SCRIPT) btraceback $(DESTDIR)$(sbindir)/btraceback
--	gzip <bacula.man >bacula.8.gz
--	$(INSTALL_DATA)   bacula.8.gz $(DESTDIR)$(mandir)/bacula.8.gz
--	@rm -f bacula.8.gz
-+	$(INSTALL_DATA)   bacula.man $(DESTDIR)$(mandir)/bacula.8
- 
- 
- uninstall:
+ 	$(INSTALL_SCRIPT) bconsole $(DESTDIR)$(scriptdir)/bconsole
+ 	$(INSTALL_SCRIPT) gconsole $(DESTDIR)$(scriptdir)/gconsole
+ 	$(INSTALL_SCRIPT) bacula $(DESTDIR)$(scriptdir)/bacula
diff --git a/sysutils/bacula-server/files/pkg-deinstall.client.in b/sysutils/bacula-server/files/pkg-deinstall.client.in
index cadbda56ab93..206ec9efca6b 100644
--- a/sysutils/bacula-server/files/pkg-deinstall.client.in
+++ b/sysutils/bacula-server/files/pkg-deinstall.client.in
@@ -20,5 +20,12 @@ case "$2" in
 	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
diff --git a/sysutils/bacula-server/files/pkg-install.client.in b/sysutils/bacula-server/files/pkg-install.client.in
index 7dc31b47c8b8..656acca83733 100644
--- a/sysutils/bacula-server/files/pkg-install.client.in
+++ b/sysutils/bacula-server/files/pkg-install.client.in
@@ -15,3 +15,29 @@ bacula-sd       9103/tcp   #Bacula storage daemon
 # 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
diff --git a/sysutils/bacula-server/files/pkg-message.client.in b/sysutils/bacula-server/files/pkg-message.client.in
new file mode 100644
index 000000000000..bb9c496d6b13
--- /dev/null
+++ b/sysutils/bacula-server/files/pkg-message.client.in
@@ -0,0 +1,23 @@
+################################################################################
+
+NOTE:
+Sample files are installed in ${PREFIX}/etc:
+bconsole.conf.sample, bacula-barcodes.sample, bacula-fd.conf.sample
+
+  Please read this file:
+
+	%%DOCSDIR%%/ReleaseNotes
+
+  as installed by docs port for the upgrade procedure.
+
+IMPORTANT UPGRADE NOTES:
+
+- A database upgrade is required.
+- Your Director and SD must be simultaneously upgraded.
+- The "Accept Any Volume" directive has been removed.
+
+- Lots of new features
+
+Read the ReleaseNotes for further information.
+
+################################################################################
diff --git a/sysutils/bacula-server/files/pkg-message.in b/sysutils/bacula-server/files/pkg-message.in
deleted file mode 100644
index d5136f5ec426..000000000000
--- a/sysutils/bacula-server/files/pkg-message.in
+++ /dev/null
@@ -1,20 +0,0 @@
-################################################################################
-  Please read this file:
-
-	%%DOCSDIR%%/ReleaseNotes
-
-  for the upgrade procedure!
-
-  IF YOU IGNORE THIS you may !! LOSE DATA !!
-
-  WARNING: That file also contains important information regarding
-  Windows FD, blackslashes in FileSets, and Scratch Pools.
-
-  For USB support read the manual. It may be necessary
-  to configure/compile a new kernel.
-
-  Please note that bacula-server no longer installs the client
-  and that the documentation can be optionally installed with the
-  client port (sysutils/bacula-client).
-
-################################################################################
diff --git a/sysutils/bacula-server/files/pkg-message.server.in b/sysutils/bacula-server/files/pkg-message.server.in
new file mode 100644
index 000000000000..cf7423856926
--- /dev/null
+++ b/sysutils/bacula-server/files/pkg-message.server.in
@@ -0,0 +1,66 @@
+################################################################################
+NOTE:
+
+An auto-changer manipulation script based on FreeBSDs
+chio command is included and installed at
+
+  ${PREFIX}/sbin/chio-bacula
+
+Please have a look at it if you want to use an
+autochanger. You have to configure the usage in
+
+  ${PREFIX}/etc/bacula-dir.conf
+
+Take care of correct permissions for changer and
+tape device (e.g. /dev/ch0 and /dev/n[r]sa0) i.e.
+they must be accessible by user bacula.
+
+Due to lack of some features in the FreeBSD tape driver
+implementation you MUST add some OS dependent options to
+the bacula-sd.conf file:
+
+  Hardware End of Medium = no;
+  Backward Space Record  = no;
+  Backward Space File    = no;
+
+With 2 filemarks at EOT (see man mt):
+  Fast Forward Space File = no;
+  BSF at EOM = yes;
+  TWO EOF    = yes;
+
+With 1 filemarks at EOT (see man mt):
+  Fast Forward Space File = yes;
+  BSF at EOM = no;
+  TWO EOF   = no;
+
+NOTE: YOU CAN SWITCH EOT model ONLY when starting
+      from scratch with EMPTY tapes.
+
+It is also important that all the scripts accessed
+by RunBeforeJob and RunAfterJob will be executed by
+the user bacula.  Check your permissions.
+
+For USB support read the bacula manual. It could be necessary
+to configure/compile a new kernel.
+
+Look at ${PREFIX}/share/bacula/update_bacula_tables for
+database update procedure. Details can be found in the
+ReleaseNotes
+
+  Please read this file:
+
+	%%DOCSDIR%%/ReleaseNotes
+
+  as installed by docs port for the upgrade procedure.
+
+IMPORTANT UPGRADE NOTES FOR THIS RELEASE:
+
+- A database upgrade is required.
+- Your Director and SD must be simultaneously upgraded.
+- The "Accept Any Volume" directive has been removed.
+
+- Lots of new features
+
+Read the ReleaseNotes for further information.
+
+################################################################################