From nobody Tue Aug 22 22:57:58 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RVl9z0F9rz4qZlb; Tue, 22 Aug 2023 22:57:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RVl9y6rfPz4VP6; Tue, 22 Aug 2023 22:57:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692745079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p/KeV5No6e8L0abbqy9kK6gMwdUbeA/o88roUN5GZXc=; b=f2OjAJqXmmReEoRD6qa1GP2uSsg7N01k7hVsJXEUGC3lZFLe/O2I0Wni4zT8IyRsBQyl0V TKyqGRERybSkr9k1a5qeb79sJ2WHmp4ybVV0Ul8u9bkSjAAjRMLNCuVgplC+uoZeuPqjul zwPk6psITZaFPZiK7wGoEan9uLM8RyrTf8RztY5B9QCjnqAhYCgRuHfbOY3usZuRn/1FUg yyd6cCkZvReBwkurWzSkRHx0Vgi1fJrPA/wtxTTGjCL3oc2Hu86qmC6w3QzWsMwkG87Fg8 E106BgVzGsYHYNI9cdFPezD9nHPSCXHb0TmplSxi3mbnLdwKHEzkb400e2B62A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692745079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p/KeV5No6e8L0abbqy9kK6gMwdUbeA/o88roUN5GZXc=; b=yTI+lizAjEG5mAQ3R3VJ9sS8h68LM8by7EjArPAtF4TSVqoMpbUvmNKESDmwOH7dFB3bVD pdGl+YoU+9Xkr3dzgolmYSXe4MHQBY/nDjzB0PbcPJL0q/xGlsV7sR9zG4EpQ/sjCMdhZv ruSbKo00AIOz9yxkcgK1+VMtqaQCPQyPm0hCg0TpA2rHysxBUcU5evSFKp+g2/pUgfC9M/ nqaBVQWcLmajMIsbXVfoj/Ze/kcdwFaSesCku5SsxBxBMTmZ9FYMr2v8Ybw+Kjge+u/FFV 1MCXSylImlRVtA7jhSBt3cWyXv8yGFEHTRBFFDMm8EyeUJpmGkfR1aADWrL6Xg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692745079; a=rsa-sha256; cv=none; b=OClKUATroVhw466sJU5iTWHfxkAuPmTlcOwdwetLB9C7XVrZ3vTUSzQnNohxv87Kh4nxEY 0LDkDrplm0YdapQhtN6aHCdUGHb3GIfBMj41gJ+nYUyL8Mr9rWM1aT97HzchoEh886WHwm 8iwmU2bJL7tClqSlZxeGPVCdwre2LdIqkNlB6z/hw5PHIlReSHbA9u1o/H92PzpOt0xusw WxmLU3uxYw2CdugzFt+qeQzp0VS+zT9LLHvNob4lt4IfztTpucNlQaNpN/6l2bSWq+Ux4V uJa08PCLw4y1ueTnX0dSZl6R8vbMG/44hAuU8xl6HkpYnXNRnNMIMIF/7UxnDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RVl9y5f3Cz6dh; Tue, 22 Aug 2023 22:57:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37MMvwVN066058; Tue, 22 Aug 2023 22:57:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37MMvwp2066055; Tue, 22 Aug 2023 22:57:58 GMT (envelope-from git) Date: Tue, 22 Aug 2023 22:57:58 GMT Message-Id: <202308222257.37MMvwp2066055@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dan Langille Subject: git: 287a7ddd9b69 - main - sysutils/bacula*-server: rc.d corrections List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dvl X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 287a7ddd9b6935b8eb93775b6940eb8060e2ea31 Auto-Submitted: auto-generated The branch main has been updated by dvl: URL: https://cgit.FreeBSD.org/ports/commit/?id=287a7ddd9b6935b8eb93775b6940eb8060e2ea31 commit 287a7ddd9b6935b8eb93775b6940eb8060e2ea31 Author: Dan Langille AuthorDate: 2023-08-22 22:51:59 +0000 Commit: Dan Langille 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