7 files changed, 34 insertions, 11 deletions

diff --git a/UPDATING b/UPDATING
index f29d64ded20d..fb5efd625f45 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,27 @@ You should get into the habit of checking this file for changes each
 time you update your ports collection, before attempting any port
 upgrades.
 
+20060407:
+  AFFECTS: users of sysutils/bacula*
+  AUTHOR: dan@langille.org
+
+  bacula-server now installs two rc.d scripts, one for the Director
+  and one for the Storage Daemon. To enable the Director at boot time,
+  set the following in /etc/rc.conf[.local]:
+
+  bacula_dir_enable="YES"
+
+  To enable the Storage Daemon, set the following in rc.conf(5):
+
+  bacula_sd_enable="YES"
+
+  Similarly, bacula-client also installs a rcNG script. To enable
+  the File Daemon at boot time, set the following in rc.conf(5):
+
+  bacula_fd_enable="YES"
+
+  The old z-bacula.sh script in PREFIX/etc/rc.d should be removed.
+
 20060403:
   AFFECTS: users of databases/db*
   AUTHOR: swhetzel@gmail.com
diff --git a/sysutils/bacula-client/Makefile b/sysutils/bacula-client/Makefile
index c2de0fc02ba5..baf49115c1dc 100644
--- a/sysutils/bacula-client/Makefile
+++ b/sysutils/bacula-client/Makefile
@@ -9,6 +9,6 @@ COMMENT=	The network backup solution (client)
 PLIST=		${PKGDIR}/pkg-plist.client
 
 WITH_CLIENT_ONLY=	yes
-USE_RC_SUBR=	z-bacula-fd.sh
+USE_RC_SUBR=	bacula-fd
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/bacula-server/Makefile b/sysutils/bacula-server/Makefile
index da3ef2e1fa72..1b75f3feed79 100644
--- a/sysutils/bacula-server/Makefile
+++ b/sysutils/bacula-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bacula
-DISTVERSION=	1.38.6
+DISTVERSION=	1.38.7
 #PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -20,7 +20,7 @@ CONFLICTS=	bacula-server-devel-[0-9]* bacula-client-devel-[0-9]*
 
 UNIQUENAME?=${PORTNAME}${PKGNAMESUFFIX}
 
-USE_RC_SUBR?=	z-bacula-dir.sh z-bacula-sd.sh
+USE_RC_SUBR?=	bacula-dir bacula-sd
 
 # The user/group IDs below are registered, see
 # http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/book.html#DADS-UID
@@ -134,10 +134,12 @@ CONFFILES=		sd dir
 CONFIGURE_ARGS+=	--with-mysql=yes
 USE_MYSQL=		yes
 DBTYPE=			mysql
+SUB_LIST+=		REQ_MYSQL=mysql REQ_PGSQL=""
 .elif defined(WITH_POSTGRESQL)
 USE_PGSQL=		yes
 CONFIGURE_ARGS+=	--with-postgresql=yes
 DBTYPE=			postgresql
+SUB_LIST+=		REQ_MYSQL="" REQ_PGSQL=postgresql
 .elif defined(WITH_SQLITE3)
 CONFIGURE_ARGS+=	--with-sqlite3=yes
 LIB_DEPENDS+=		sqlite3:${PORTSDIR}/databases/sqlite3
diff --git a/sysutils/bacula-server/distinfo b/sysutils/bacula-server/distinfo
index 2bb36364adf3..67286b80cacd 100644
--- a/sysutils/bacula-server/distinfo
+++ b/sysutils/bacula-server/distinfo
@@ -1,6 +1,6 @@
-MD5 (bacula-1.38.6.tar.gz) = 219382ae85671c8ff13f375b6d9aa079
-SHA256 (bacula-1.38.6.tar.gz) = e671f3ff20c97e8392908920ae9ca38f814359c5b85b89625d43df9ad7349ed3
-SIZE (bacula-1.38.6.tar.gz) = 1952827
-MD5 (bacula-docs-1.38.6.tar.gz) = 1d62608a1a0d2fa7776277f80fa29c61
-SHA256 (bacula-docs-1.38.6.tar.gz) = 18d536368898a6dc74f8e782396dbe7b5d08e1724d7e26a2a4bb61a6795cf01a
-SIZE (bacula-docs-1.38.6.tar.gz) = 22696381
+MD5 (bacula-1.38.7.tar.gz) = 6273f45bfbcddd66e179bc6cb7e28ad1
+SHA256 (bacula-1.38.7.tar.gz) = 3f64449a863893ae42454acd57c4771af871fab4df8767c13b021d65b538aad3
+SIZE (bacula-1.38.7.tar.gz) = 1955052
+MD5 (bacula-docs-1.38.7.tar.gz) = da29daa9027c402f5d6b55a4c7982fdb
+SHA256 (bacula-docs-1.38.7.tar.gz) = 05a8db623a9950318646ac261715023d7b86d36b416287302e7fe00f8bd479f1
+SIZE (bacula-docs-1.38.7.tar.gz) = 22701695
diff --git a/sysutils/bacula-server/files/z-bacula-dir.sh.in b/sysutils/bacula-server/files/bacula-dir.in
index 360153ea6b70..5bfa0eeb10e2 100644
--- a/sysutils/bacula-server/files/z-bacula-dir.sh.in
+++ b/sysutils/bacula-server/files/bacula-dir.in
@@ -3,7 +3,7 @@
 # $FreeBSD$
 #
 # PROVIDE: utility
-# REQUIRE: DAEMON
+# REQUIRE: DAEMON %%REQ_MYSQL%% %%REQ_PGSQL%%
 # KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf.local or /etc/rc.conf
diff --git a/sysutils/bacula-server/files/z-bacula-fd.sh.in b/sysutils/bacula-server/files/bacula-fd.in
index 5cf5fcf38f0f..5cf5fcf38f0f 100644
--- a/sysutils/bacula-server/files/z-bacula-fd.sh.in
+++ b/sysutils/bacula-server/files/bacula-fd.in
diff --git a/sysutils/bacula-server/files/z-bacula-sd.sh.in b/sysutils/bacula-server/files/bacula-sd.in
index fc98f30f4f38..e851f6212c7d 100644
--- a/sysutils/bacula-server/files/z-bacula-sd.sh.in
+++ b/sysutils/bacula-server/files/bacula-sd.in
@@ -24,7 +24,7 @@ pidfile="${bacula_sd_pidfile}"
 load_rc_config $name
 
 : ${bacula_sd_enable="NO"}
-: ${bacula_sd_flags=" -u bacula -g bacula -v -c /usr/local/etc/bacula-sd.conf"}
+: ${bacula_sd_flags=" -u bacula -g operator -v -c /usr/local/etc/bacula-sd.conf"}
 : ${bacula_sd_pidfile="/var/run/bacula-sd.9103.pid"}
 
 run_rc_command "$1"