Date: Tue, 22 Aug 2023 22:57:58 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: 287a7ddd9b69 - main - sysutils/bacula*-server: rc.d corrections Message-ID: <202308222257.37MMvwp2066055@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=287a7ddd9b6935b8eb93775b6940eb8060e2ea31 commit 287a7ddd9b6935b8eb93775b6940eb8060e2ea31 Author: Dan Langille <dvl@FreeBSD.org> AuthorDate: 2023-08-22 22:51:59 +0000 Commit: Dan Langille <dvl@FreeBSD.org> CommitDate: 2023-08-22 22:57:55 +0000 sysutils/bacula*-server: rc.d corrections When both MySQL and PostgreSQL are selected, make sure the rc.d script is correct. Further more, I must reverse my clever idea to "remove a space within files/bacula-dir.in". Next time, I should notice the PR contains a patch for the problem I'm fixing. PR: 273296 --- sysutils/bacula11-server/Makefile | 8 +++++--- sysutils/bacula11-server/files/bacula-dir.in | 2 +- sysutils/bacula13-server/Makefile | 8 +++++--- sysutils/bacula13-server/files/bacula-dir.in | 2 +- sysutils/bacula9-server/Makefile | 8 +++++--- sysutils/bacula9-server/files/bacula-dir.in | 2 +- 6 files changed, 18 insertions(+), 12 deletions(-) diff --git a/sysutils/bacula11-server/Makefile b/sysutils/bacula11-server/Makefile index eb021b119fee..5c7477f91d59 100644 --- a/sysutils/bacula11-server/Makefile +++ b/sysutils/bacula11-server/Makefile @@ -1,6 +1,6 @@ PORTNAME= bacula PORTVERSION= 11.0.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES?= sysutils MASTER_SITES= SF/bacula/bacula/${PORTVERSION} PKGNAMEPREFIX?= # @@ -115,12 +115,14 @@ CONFFILES= sd dir MYSQL_CONFIGURE_ON= --with-mysql=yes MYSQL_USES= mysql -MYSQL_SUB_LIST+= REQ_MYSQL=mysql REQ_PGSQL="" +MYSQL_SUB_LIST= REQ_MYSQL=mysql +MYSQL_SUB_LIST_OFF= REQ_MYSQL="" 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 +PGSQL_SUB_LIST= REQ_PGSQL=postgresql +PGSQL_SUB_LIST_OFF= REQ_PGSQL="" 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 2bcafa911680..1825c924306e 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 ee35fcee148b..4c35f797c0da 100644 --- a/sysutils/bacula13-server/Makefile +++ b/sysutils/bacula13-server/Makefile @@ -1,6 +1,6 @@ PORTNAME= bacula DISTVERSION= 13.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES?= sysutils MASTER_SITES= SF/bacula/bacula/${PORTVERSION} PKGNAMEPREFIX?= # @@ -115,12 +115,14 @@ CONFFILES= sd dir MYSQL_CONFIGURE_ON= --with-mysql=yes MYSQL_USES= mysql -MYSQL_SUB_LIST+= REQ_MYSQL=mysql REQ_PGSQL="" +MYSQL_SUB_LIST= REQ_MYSQL=mysql +MYSQL_SUB_LIST_OFF= REQ_MYSQL="" 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 +PGSQL_SUB_LIST= REQ_PGSQL=postgresql +PGSQL_SUB_LIST_OFF= REQ_PGSQL="" 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 2bcafa911680..1825c924306e 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 98414ba497b5..a76bf3a76332 100644 --- a/sysutils/bacula9-server/Makefile +++ b/sysutils/bacula9-server/Makefile @@ -1,6 +1,6 @@ PORTNAME= bacula PORTVERSION= 9.6.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES?= sysutils MASTER_SITES= SF/bacula/bacula/${PORTVERSION} PKGNAMEPREFIX?= # @@ -115,12 +115,14 @@ CONFFILES= sd dir MYSQL_CONFIGURE_ON= --with-mysql=yes MYSQL_USES= mysql -MYSQL_SUB_LIST+= REQ_MYSQL=mysql REQ_PGSQL="" +MYSQL_SUB_LIST= REQ_MYSQL=mysql +MYSQL_SUB_LIST_OFF= REQ_MYSQL="" 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 +PGSQL_SUB_LIST= REQ_PGSQL=postgresql +PGSQL_SUB_LIST_OFF= REQ_PGSQL="" 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 2bcafa911680..1825c924306e 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?202308222257.37MMvwp2066055>