- Rename rc.d scripts, removing "z-". It's not more needed since we are using

  correct REQUIRE: tag

Approved by:	maintainer

5 files changed, 9 insertions, 7 deletions

diff --git a/sysutils/bacula-client-devel/Makefile b/sysutils/bacula-client-devel/Makefile
index 48039fae7548..7e72ab789c25 100644
--- a/sysutils/bacula-client-devel/Makefile
+++ b/sysutils/bacula-client-devel/Makefile
@@ -15,6 +15,6 @@ COMMENT=	The network backup solution (client) - DEVELOPMENT Version
 PLIST=		${PKGDIR}/pkg-plist.client
 
 WITH_CLIENT_ONLY=	yes
-USE_RC_SUBR=   z-bacula-fd.sh
+USE_RC_SUBR=   bacula-fd.sh
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/bacula-server-devel/Makefile b/sysutils/bacula-server-devel/Makefile
index 36459ffa7dea..4f5d0485a622 100644
--- a/sysutils/bacula-server-devel/Makefile
+++ b/sysutils/bacula-server-devel/Makefile
@@ -19,7 +19,7 @@ CONFLICTS=	bacula-server-[0-9]* bacula-client-[0-9]*
 
 UNIQUENAME?=${PORTNAME}${PKGNAMESUFFIX}
 
-USE_RC_SUBR?=	z-bacula-dir.sh z-bacula-sd.sh
+USE_RC_SUBR?=	bacula-dir.sh bacula-sd.sh
 
 # The user/group IDs below are registered, see
 # http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/book.html#DADS-UID
@@ -133,10 +133,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-devel/files/z-bacula-dir.sh.in b/sysutils/bacula-server-devel/files/bacula-dir.sh.in
index 360153ea6b70..6212cf2f157a 100644
--- a/sysutils/bacula-server-devel/files/z-bacula-dir.sh.in
+++ b/sysutils/bacula-server-devel/files/bacula-dir.sh.in
@@ -1,9 +1,9 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: /tmp/pcvs/ports/sysutils/bacula-server-devel/files/Attic/bacula-dir.sh.in,v 1.1 2006-04-01 23:06:24 garga Exp $
 #
 # 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
@@ -24,7 +24,7 @@ pidfile="${bacula_dir_pidfile}"
 load_rc_config $name
 
 : ${bacula_dir_enable="NO"}
-: ${bacula_dir_flags=" -u bacula -g bacula -v -c %%PREFIX%%/etc/bacula-dir.conf"}
+: ${bacula_dir_flags=" -u bacula -g operator -v -c %%PREFIX%%/etc/bacula-dir.conf"}
 : ${bacula_dir_pidfile="/var/run/bacula-dir.9101.pid"}
 
 run_rc_command "$1"
diff --git a/sysutils/bacula-server-devel/files/z-bacula-fd.sh.in b/sysutils/bacula-server-devel/files/bacula-fd.sh.in
index 5cf5fcf38f0f..845dd93fce4e 100644
--- a/sysutils/bacula-server-devel/files/z-bacula-fd.sh.in
+++ b/sysutils/bacula-server-devel/files/bacula-fd.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: /tmp/pcvs/ports/sysutils/bacula-server-devel/files/Attic/bacula-fd.sh.in,v 1.1 2006-04-01 23:06:24 garga Exp $
 #
 # PROVIDE: utility
 # REQUIRE: DAEMON
diff --git a/sysutils/bacula-server-devel/files/z-bacula-sd.sh.in b/sysutils/bacula-server-devel/files/bacula-sd.sh.in
index fc98f30f4f38..37d1f14ab5f0 100644
--- a/sysutils/bacula-server-devel/files/z-bacula-sd.sh.in
+++ b/sysutils/bacula-server-devel/files/bacula-sd.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: /tmp/pcvs/ports/sysutils/bacula-server-devel/files/Attic/bacula-sd.sh.in,v 1.1 2006-04-01 23:06:24 garga Exp $
 #
 # PROVIDE: utility
 # REQUIRE: DAEMON