- Fix RC scripts (so pidfile is properly defined)

PR:		ports/132286
Submitted by:	Oliver Lehmann <oliver@freebsd.org>
Approved by:	Dan Langille <dan@langille.org> (maintainer)

4 files changed, 7 insertions, 9 deletions

diff --git a/sysutils/bacula-server-devel/Makefile b/sysutils/bacula-server-devel/Makefile
index 55cfba0acbb..4d1b18297b5 100644
--- a/sysutils/bacula-server-devel/Makefile
+++ b/sysutils/bacula-server-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bacula
 DISTVERSION=	2.5.42-b2
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	bacula
diff --git a/sysutils/bacula-server-devel/files/bacula-dir.in b/sysutils/bacula-server-devel/files/bacula-dir.in
index 5739a308b77..af3c16b2d2c 100644
--- a/sysutils/bacula-server-devel/files/bacula-dir.in
+++ b/sysutils/bacula-server-devel/files/bacula-dir.in
@@ -2,7 +2,7 @@
 #
 # $FreeBSD$
 #
-# PROVIDE: utility
+# PROVIDE: bacula_dir
 # REQUIRE: DAEMON %%REQ_MYSQL%% %%REQ_PGSQL%%
 # KEYWORD: shutdown
 #
@@ -22,10 +22,9 @@ command=%%PREFIX%%/sbin/bacula-dir
 
 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"}
+pidfile="${bacula_dir_pidfile}"
 
 run_rc_command "$1"
diff --git a/sysutils/bacula-server-devel/files/bacula-fd.in b/sysutils/bacula-server-devel/files/bacula-fd.in
index e974c8b4322..a830d827b8a 100644
--- a/sysutils/bacula-server-devel/files/bacula-fd.in
+++ b/sysutils/bacula-server-devel/files/bacula-fd.in
@@ -2,7 +2,7 @@
 #
 # $FreeBSD$
 #
-# PROVIDE: utility
+# PROVIDE: bacula_dir
 # REQUIRE: DAEMON
 # KEYWORD: shutdown
 #
@@ -22,10 +22,9 @@ command=%%PREFIX%%/sbin/bacula-fd
 
 load_rc_config $name
 
-pidfile="${bacula_fd_pidfile}"
-
 : ${bacula_fd_enable="NO"}
 : ${bacula_fd_flags=" -u root -g wheel -v -c %%PREFIX%%/etc/bacula-fd.conf"}
 : ${bacula_fd_pidfile="/var/run/bacula-fd.9102.pid"}
+pidfile="${bacula_fd_pidfile}"
 
 run_rc_command "$1"
diff --git a/sysutils/bacula-server-devel/files/bacula-sd.in b/sysutils/bacula-server-devel/files/bacula-sd.in
index 3288a3e1088..fffc15e6b48 100644
--- a/sysutils/bacula-server-devel/files/bacula-sd.in
+++ b/sysutils/bacula-server-devel/files/bacula-sd.in
@@ -2,7 +2,7 @@
 #
 # $FreeBSD$
 #
-# PROVIDE: utility
+# PROVIDE: bacula_dir
 # REQUIRE: DAEMON
 # KEYWORD: shutdown
 #
@@ -22,10 +22,9 @@ command=%%PREFIX%%/sbin/bacula-sd
 
 load_rc_config $name
 
-pidfile="${bacula_sd_pidfile}"
-
 : ${bacula_sd_enable="NO"}
 : ${bacula_sd_flags=" -u bacula -g bacula -v -c %%PREFIX%%/etc/bacula-sd.conf"}
 : ${bacula_sd_pidfile="/var/run/bacula-sd.9103.pid"}
+pidfile="${bacula_sd_pidfile}"
 
 run_rc_command "$1"