sysutils/bacula*-{client,server}: fix rc script names

The filenames now comply with the rc scripting recommendations and
service jails options.

Users may have to update any personal scripts they have which depend
upon those rc.d script names. See UPDATING for 20240705

PR:		280137

UPDATING

@@ -5,6 +5,23 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20240705:
+  AFFECTS: sysutils/bacula*-{client,server}
+  AUTHOR: netchildFreeBSD.org
+
+  The start scripts of bacula have been renamed to bacula_fd, bacula_dir and
+  bacula_sd for improved compatibility with other parts of the
+  system. The automatic start at boot (rc.conf variable settings) is
+  not affected, but if you have some other automatism you may want to
+  change
+    ".../etc/rc.d/bacula-fd"  to ".../etc/rc.d/bacula_fd"
+    ".../etc/rc.d/bacula-dir" to ".../etc/rc.d/bacula_dir"
+    ".../etc/rc.d/bacula-sd"  to ".../etc/rc.d/bacula_sd"
+  or
+    "service bacula-fd ..."  to "service bacula_fd ..."
+    "service bacula-dir ..." to "service bacula_dir ..."
+    "service bacula-sd ..."  to "service bacula_sd ..."
+
 20240704:
   AFFECTS: net/xrdp and x11-drivers/xorgxrdp
   AUTHOR: meta@FreeBSD.org

sysutils/bacula11-client/Makefile

@@ -4,7 +4,7 @@ PKGNAMESUFFIX=	11-client
 COMMENT=	Network backup solution (client)
 
 WITH_CLIENT_ONLY=yes
-USE_RC_SUBR=	bacula-fd
+USE_RC_SUBR=	bacula_fd
 
 PLIST=		${PKGDIR}/pkg-plist.client
 MASTERDIR=	${.CURDIR}/../../sysutils/bacula11-server

sysutils/bacula11-server/Makefile

@@ -1,6 +1,6 @@
 PORTNAME=	bacula
 PORTVERSION=	11.0.6
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES?=	sysutils
 MASTER_SITES=	SF/bacula/bacula/${PORTVERSION}
 PKGNAMEPREFIX?=	#
@@ -51,7 +51,7 @@ OPTIONS_SUB=		yes
 
 .if !defined(WITH_CLIENT_ONLY)
 LIB_DEPENDS+=	libbac-${PORTVERSION}.so:sysutils/bacula11-client
-USE_RC_SUBR?=	bacula-dir bacula-sd
+USE_RC_SUBR?=	bacula_dir bacula_sd
 .endif
 
 .if defined(WITH_CLIENT_ONLY)

sysutils/bacula11-server/files/bacula_dir.in

@@ -23,6 +23,7 @@ load_rc_config $name
 : ${bacula_dir_enable="NO"}
 : ${bacula_dir_flags=" -u bacula -g bacula -v -c %%PREFIX%%/etc/bacula/bacula-dir.conf"}
 : ${bacula_dir_pidfile="/var/run/bacula-dir.9101.pid"}
+: ${bacula_dir_svcj_options:="net_basic"}
 
 pidfile="${bacula_dir_pidfile}"
 

sysutils/bacula11-server/files/bacula_fd.in

@@ -23,6 +23,7 @@ load_rc_config $name
 : ${bacula_fd_enable="NO"}
 : ${bacula_fd_flags=" -u root -g wheel -v -c %%PREFIX%%/etc/bacula/bacula-fd.conf"}
 : ${bacula_fd_pidfile="/var/run/bacula-fd.9102.pid"}
+: ${bacula_fd_svcj_options:="net_basic"}
 
 pidfile="${bacula_fd_pidfile}"
 

sysutils/bacula11-server/files/bacula_sd.in

@@ -23,6 +23,7 @@ load_rc_config $name
 : ${bacula_sd_enable="NO"}
 : ${bacula_sd_flags=" -u bacula -g bacula -v -c %%PREFIX%%/etc/bacula/bacula-sd.conf"}
 : ${bacula_sd_pidfile="/var/run/bacula-sd.9103.pid"}
+: ${bacula_sd_svcj_options:="net_basic"}
 
 pidfile="${bacula_sd_pidfile}"
 

sysutils/bacula13-client/Makefile

@@ -4,7 +4,7 @@ PKGNAMESUFFIX=	13-client
 COMMENT=	Network backup solution (client)
 
 WITH_CLIENT_ONLY=yes
-USE_RC_SUBR=	bacula-fd
+USE_RC_SUBR=	bacula_fd
 
 PLIST=		${PKGDIR}/pkg-plist.client
 MASTERDIR=	${.CURDIR}/../../sysutils/bacula13-server

sysutils/bacula13-server/Makefile

@@ -1,6 +1,6 @@
 PORTNAME=	bacula
 DISTVERSION=	13.0.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES?=	sysutils
 MASTER_SITES=	SF/bacula/bacula/${PORTVERSION}
 PKGNAMEPREFIX?=	#
@@ -48,7 +48,7 @@ OPTIONS_SUB=		yes
 
 .if !defined(WITH_CLIENT_ONLY)
 LIB_DEPENDS+=	libbac-${PORTVERSION}.so:sysutils/bacula13-client
-USE_RC_SUBR?=	bacula-dir bacula-sd
+USE_RC_SUBR?=	bacula_dir bacula_sd
 .endif
 
 .if defined(WITH_CLIENT_ONLY)

sysutils/bacula13-server/files/bacula_dir.in

@@ -23,6 +23,7 @@ load_rc_config $name
 : ${bacula_dir_enable="NO"}
 : ${bacula_dir_flags=" -u bacula -g bacula -v -c %%PREFIX%%/etc/bacula/bacula-dir.conf"}
 : ${bacula_dir_pidfile="/var/run/bacula-dir.9101.pid"}
+: ${bacula_dir_svcj_options:="net_basic"}
 
 pidfile="${bacula_dir_pidfile}"
 

sysutils/bacula13-server/files/bacula_fd.in

@@ -23,6 +23,7 @@ load_rc_config $name
 : ${bacula_fd_enable="NO"}
 : ${bacula_fd_flags=" -u root -g wheel -v -c %%PREFIX%%/etc/bacula/bacula-fd.conf"}
 : ${bacula_fd_pidfile="/var/run/bacula-fd.9102.pid"}
+: ${bacula_fd_svcj_options:="net_basic"}
 
 pidfile="${bacula_fd_pidfile}"
 

sysutils/bacula13-server/files/bacula_sd.in

@@ -23,6 +23,7 @@ load_rc_config $name
 : ${bacula_sd_enable="NO"}
 : ${bacula_sd_flags=" -u bacula -g bacula -v -c %%PREFIX%%/etc/bacula/bacula-sd.conf"}
 : ${bacula_sd_pidfile="/var/run/bacula-sd.9103.pid"}
+: ${bacula_sd_svcj_options:="net_basic"}
 
 pidfile="${bacula_sd_pidfile}"
 

sysutils/bacula15-client/Makefile

@@ -4,7 +4,7 @@ PKGNAMESUFFIX=	15-client
 COMMENT=	Network backup solution (client)
 
 WITH_CLIENT_ONLY=yes
-USE_RC_SUBR=	bacula-fd
+USE_RC_SUBR=	bacula_fd
 
 PLIST=		${PKGDIR}/pkg-plist.client
 MASTERDIR=	${.CURDIR}/../../sysutils/bacula15-server

sysutils/bacula15-server/Makefile

@@ -1,6 +1,6 @@
 PORTNAME=	bacula
 DISTVERSION=	15.0.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES?=	sysutils
 MASTER_SITES=	SF/bacula/bacula/${DISTVERSION}
 PKGNAMEPREFIX?=	#
@@ -50,7 +50,7 @@ OPTIONS_SUB=	yes
 
 .if !defined(WITH_CLIENT_ONLY)
 LIB_DEPENDS+=	libbac-${LIB_VERSION}.so:sysutils/bacula15-client
-USE_RC_SUBR?=	bacula-dir bacula-sd
+USE_RC_SUBR?=	bacula_dir bacula_sd
 .endif
 
 .if defined(WITH_CLIENT_ONLY)

sysutils/bacula15-server/files/bacula_dir.in

@@ -23,6 +23,7 @@ load_rc_config $name
 : ${bacula_dir_enable="NO"}
 : ${bacula_dir_flags=" -u bacula -g bacula -v -c %%PREFIX%%/etc/bacula/bacula-dir.conf"}
 : ${bacula_dir_pidfile="/var/run/bacula-dir.9101.pid"}
+: ${bacula_dir_svcj_options:="net_basic"}
 
 pidfile="${bacula_dir_pidfile}"
 

sysutils/bacula15-server/files/bacula_fd.in

@@ -23,6 +23,7 @@ load_rc_config $name
 : ${bacula_fd_enable="NO"}
 : ${bacula_fd_flags=" -u root -g wheel -v -c %%PREFIX%%/etc/bacula/bacula-fd.conf"}
 : ${bacula_fd_pidfile="/var/run/bacula-fd.9102.pid"}
+: ${bacula_fd_svcj_options:="net_basic"}
 
 pidfile="${bacula_fd_pidfile}"
 

sysutils/bacula15-server/files/bacula_sd.in

@@ -23,6 +23,7 @@ load_rc_config $name
 : ${bacula_sd_enable="NO"}
 : ${bacula_sd_flags=" -u bacula -g bacula -v -c %%PREFIX%%/etc/bacula/bacula-sd.conf"}
 : ${bacula_sd_pidfile="/var/run/bacula-sd.9103.pid"}
+: ${bacula_sd_svcj_options:="net_basic"}
 
 pidfile="${bacula_sd_pidfile}"
 

sysutils/bacula9-client/Makefile

@@ -7,7 +7,7 @@ BROKEN_aarch64=		Fails to link: missing sbrk
 BROKEN_riscv64=		Fails to link: missing sbrk
 
 WITH_CLIENT_ONLY=yes
-USE_RC_SUBR=	bacula-fd
+USE_RC_SUBR=	bacula_fd
 
 PLIST=		${PKGDIR}/pkg-plist.client
 MASTERDIR=	${.CURDIR}/../../sysutils/bacula9-server

sysutils/bacula9-server/Makefile

@@ -50,7 +50,7 @@ OPTIONS_SUB=		yes
 
 .if !defined(WITH_CLIENT_ONLY)
 LIB_DEPENDS+=	libbac-${PORTVERSION}.so:sysutils/bacula9-client
-USE_RC_SUBR?=	bacula-dir bacula-sd
+USE_RC_SUBR?=	bacula_dir bacula_sd
 .endif
 
 .if defined(WITH_CLIENT_ONLY)

sysutils/bacula9-server/files/bacula_dir.in

@@ -23,6 +23,7 @@ load_rc_config $name
 : ${bacula_dir_enable="NO"}
 : ${bacula_dir_flags=" -u bacula -g bacula -v -c %%PREFIX%%/etc/bacula/bacula-dir.conf"}
 : ${bacula_dir_pidfile="/var/run/bacula-dir.9101.pid"}
+: ${bacula_dir_svcj_options:="net_basic"}
 
 pidfile="${bacula_dir_pidfile}"
 

sysutils/bacula9-server/files/bacula_fd.in

@@ -23,6 +23,7 @@ load_rc_config $name
 : ${bacula_fd_enable="NO"}
 : ${bacula_fd_flags=" -u root -g wheel -v -c %%PREFIX%%/etc/bacula/bacula-fd.conf"}
 : ${bacula_fd_pidfile="/var/run/bacula-fd.9102.pid"}
+: ${bacula_fd_svcj_options:="net_basic"}
 
 pidfile="${bacula_fd_pidfile}"