Date: Tue, 22 Aug 2023 20:01:46 GMT From: Dan Langille <dvl@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 9a1289a8b3d2 - main - sysutils/bacula*-server: set rc.d REQUIRES Message-ID: <202308222001.37MK1k4c083124@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by dvl: URL: https://cgit.FreeBSD.org/ports/commit/?id=9a1289a8b3d2d0c8a0e1fc3c8937332b2136cf58 commit 9a1289a8b3d2d0c8a0e1fc3c8937332b2136cf58 Author: Dan Langille <dvl@FreeBSD.org> AuthorDate: 2023-08-22 19:49:16 +0000 Commit: Dan Langille <dvl@FreeBSD.org> CommitDate: 2023-08-22 20:01:44 +0000 sysutils/bacula*-server: set rc.d REQUIRES Correctly set the REQUIRES for bacula-dir to one of: * mysql * postgresql This setting was lost sometime after bacula5-server While here, remove a space within files/bacula-dir.in so the resulting REQUIRES contains only one space. PR: 273296 --- sysutils/bacula11-server/Makefile | 5 ++++- sysutils/bacula11-server/files/bacula-dir.in | 2 +- sysutils/bacula13-server/Makefile | 5 ++++- sysutils/bacula13-server/files/bacula-dir.in | 2 +- sysutils/bacula9-server/Makefile | 6 ++++-- sysutils/bacula9-server/files/bacula-dir.in | 2 +- 6 files changed, 15 insertions(+), 7 deletions(-) diff --git a/sysutils/bacula11-server/Makefile b/sysutils/bacula11-server/Makefile index 80c5cd1f34c6..eb021b119fee 100644 --- a/sysutils/bacula11-server/Makefile +++ b/sysutils/bacula11-server/Makefile @@ -1,5 +1,6 @@ PORTNAME= bacula PORTVERSION= 11.0.6 +PORTREVISION= 1 CATEGORIES?= sysutils MASTER_SITES= SF/bacula/bacula/${PORTVERSION} PKGNAMEPREFIX?= # @@ -91,7 +92,7 @@ BACULA_DIR?= /var/db/bacula PLIST_SUB+= BACULA_DIR=${BACULA_DIR} -SUB_LIST= BACULA_USER=${BACULA_USER} \ +SUB_LIST+= BACULA_USER=${BACULA_USER} \ BACULA_GROUP=${BACULA_GROUP} \ BACULA_UID=${BACULA_UID} \ BACULA_GID=${BACULA_GID} \ @@ -114,10 +115,12 @@ CONFFILES= sd dir MYSQL_CONFIGURE_ON= --with-mysql=yes MYSQL_USES= mysql +MYSQL_SUB_LIST+= REQ_MYSQL=mysql REQ_PGSQL="" SQLITE3_CONFIGURE_ON= --with-sqlite3=yes SQLITE3_USES= sqlite:3 PGSQL_CONFIGURE_ON= --with-postgresql=yes PGSQL_USES= pgsql +PGSQL_SUB_LIST+= REQ_MYSQL="" REQ_PGSQL=postgresql MTX_RUN_DEPENDS= ${LOCALBASE}/sbin/mtx:misc/mtx diff --git a/sysutils/bacula11-server/files/bacula-dir.in b/sysutils/bacula11-server/files/bacula-dir.in index 1825c924306e..2bcafa911680 100644 --- a/sysutils/bacula11-server/files/bacula-dir.in +++ b/sysutils/bacula11-server/files/bacula-dir.in @@ -1,7 +1,7 @@ #!/bin/sh # PROVIDE: bacula_dir -# REQUIRE: DAEMON %%REQ_MYSQL%% %%REQ_PGSQL%% +# 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/bacula13-server/Makefile b/sysutils/bacula13-server/Makefile index 7094f78eee9f..ee35fcee148b 100644 --- a/sysutils/bacula13-server/Makefile +++ b/sysutils/bacula13-server/Makefile @@ -1,5 +1,6 @@ PORTNAME= bacula DISTVERSION= 13.0.1 +PORTREVISION= 1 CATEGORIES?= sysutils MASTER_SITES= SF/bacula/bacula/${PORTVERSION} PKGNAMEPREFIX?= # @@ -91,7 +92,7 @@ BACULA_DIR?= /var/db/bacula PLIST_SUB+= BACULA_DIR=${BACULA_DIR} -SUB_LIST= BACULA_USER=${BACULA_USER} \ +SUB_LIST+= BACULA_USER=${BACULA_USER} \ BACULA_GROUP=${BACULA_GROUP} \ BACULA_UID=${BACULA_UID} \ BACULA_GID=${BACULA_GID} \ @@ -114,10 +115,12 @@ CONFFILES= sd dir MYSQL_CONFIGURE_ON= --with-mysql=yes MYSQL_USES= mysql +MYSQL_SUB_LIST+= REQ_MYSQL=mysql REQ_PGSQL="" SQLITE3_CONFIGURE_ON= --with-sqlite3=yes SQLITE3_USES= sqlite:3 PGSQL_CONFIGURE_ON= --with-postgresql=yes PGSQL_USES= pgsql +PGSQL_SUB_LIST+= REQ_MYSQL="" REQ_PGSQL=postgresql MTX_RUN_DEPENDS= ${LOCALBASE}/sbin/mtx:misc/mtx diff --git a/sysutils/bacula13-server/files/bacula-dir.in b/sysutils/bacula13-server/files/bacula-dir.in index 1825c924306e..2bcafa911680 100644 --- a/sysutils/bacula13-server/files/bacula-dir.in +++ b/sysutils/bacula13-server/files/bacula-dir.in @@ -1,7 +1,7 @@ #!/bin/sh # PROVIDE: bacula_dir -# REQUIRE: DAEMON %%REQ_MYSQL%% %%REQ_PGSQL%% +# 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/bacula9-server/Makefile b/sysutils/bacula9-server/Makefile index e18d8d17856d..98414ba497b5 100644 --- a/sysutils/bacula9-server/Makefile +++ b/sysutils/bacula9-server/Makefile @@ -1,6 +1,6 @@ PORTNAME= bacula PORTVERSION= 9.6.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES?= sysutils MASTER_SITES= SF/bacula/bacula/${PORTVERSION} PKGNAMEPREFIX?= # @@ -92,7 +92,7 @@ BACULA_DIR?= /var/db/bacula PLIST_SUB+= BACULA_DIR=${BACULA_DIR} -SUB_LIST= BACULA_USER=${BACULA_USER} \ +SUB_LIST+= BACULA_USER=${BACULA_USER} \ BACULA_GROUP=${BACULA_GROUP} \ BACULA_UID=${BACULA_UID} \ BACULA_GID=${BACULA_GID} \ @@ -115,10 +115,12 @@ CONFFILES= sd dir MYSQL_CONFIGURE_ON= --with-mysql=yes MYSQL_USES= mysql +MYSQL_SUB_LIST+= REQ_MYSQL=mysql REQ_PGSQL="" SQLITE3_CONFIGURE_ON= --with-sqlite3=yes SQLITE3_USES= sqlite:3 PGSQL_CONFIGURE_ON= --with-postgresql=yes PGSQL_USES= pgsql +PGSQL_SUB_LIST+= REQ_MYSQL="" REQ_PGSQL=postgresql MTX_RUN_DEPENDS= ${LOCALBASE}/sbin/mtx:misc/mtx diff --git a/sysutils/bacula9-server/files/bacula-dir.in b/sysutils/bacula9-server/files/bacula-dir.in index 1825c924306e..2bcafa911680 100644 --- a/sysutils/bacula9-server/files/bacula-dir.in +++ b/sysutils/bacula9-server/files/bacula-dir.in @@ -1,7 +1,7 @@ #!/bin/sh # PROVIDE: bacula_dir -# REQUIRE: DAEMON %%REQ_MYSQL%% %%REQ_PGSQL%% +# REQUIRE: DAEMON %%REQ_MYSQL%%%%REQ_PGSQL%% # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf.local or /etc/rc.conf
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308222001.37MK1k4c083124>