From nobody Tue Aug 22 20:01:46 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 4RVgGg0R82z4qN85; Tue, 22 Aug 2023 20:01:47 +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 4RVgGf6j8Tz3fdc; Tue, 22 Aug 2023 20:01:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692734506; 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=/2wsRjw1hrZ7W4jCfChQIU5jKLR2D4RO1V2S494VGng=; b=OIne28k4OMKC6MnqUZd9hF+XZa0KJPLDQdkgLuuBfsHKQeIkLhz362fo4o38qA/pFpRXLp jcD3Anim0gvSEk1Mj/zbyFabV+wQqavw69pjCrHQ4jbl32T3JyWopVQyaXp2gpEn/gHmvq SoATRbiNoimbOW/z/GVMuhNCSHFH86sN24VRWw71Jd+YlCd9CxW6lWUe9CxBkPmX8MTkt6 IxHgWojTLS0nud24lu15Io4nT0dRO1ZfewaLIomEpu6EkK8CDQlZz62OOXinx+eukG/Ao0 dzUzql7Y2YGAiDZIl81kfm679D3aNCL/pMHNSYmcv18HVAX/kIuZVBwZGptXzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692734506; 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=/2wsRjw1hrZ7W4jCfChQIU5jKLR2D4RO1V2S494VGng=; b=yoCoElyTPSZvQMTEJA6ob9PjkqXb6DAgp7FqRY7lD3HDBk9ENGkRs6Nu3H6vx3PCqqct1t M/vumTAP3XZL6oP/v/oSDFzsJILTj7pvYO5x87hByNj3xNirpTMd/bOTEc2DjKigW0NTNl LfSI5Qga5R6c/WodOnNInO95LhuGihOLaART2iwIdc/nrTJ+f5omMXWbVOqrGsvZi+Cfbg zvajSvg3mWiqClzdzI1oXirhmvvY4fq9KimYzOQ+BnHvWQ6lxnU/xxOiBTs/rjvT8Ox/YI dlN6FSeLpXje386N0H8SJFvRoOxgszkgUxHkbbPGx+WPWd7U+bvdTsPESVSEBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692734506; a=rsa-sha256; cv=none; b=ZdZa9zLbAtS6rqzjFHO+4JtpjvBC1Rp1bWUPvuH/5Ooo9F3d9LCTv1hnRZgFAA43OmLuPW cRjWY4vF6aBst7MiAK3kPUlhA3dBAPhp4loOslfYBkIsG7rCpMi7ENxM4k0huSwKD/r0/U kUWJC6fMYQHp0RNHnUVALorCa0h//STVw3xZchWYzbabloKqdYGXmr+6TSZQ5nNJ5br5rs yheBAg5LNvvpAuen7l65/5h/B7Sn/T9fkI56ZmwbA/9a8QM5cjJ7HQFzU4NrtiZnqdXEVN zCSpEOwXNumU+B7Z6sFgc3A1/+xJwQ28PZ/Ab+utVrWhMdY+Z0vTHxzTdhPQAw== 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 4RVgGf5nH2z2Qx; Tue, 22 Aug 2023 20:01:46 +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 37MK1kjC083127; Tue, 22 Aug 2023 20:01:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37MK1k4c083124; Tue, 22 Aug 2023 20:01:46 GMT (envelope-from git) Date: Tue, 22 Aug 2023 20:01:46 GMT Message-Id: <202308222001.37MK1k4c083124@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: 9a1289a8b3d2 - main - sysutils/bacula*-server: set rc.d REQUIRES 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: 9a1289a8b3d2d0c8a0e1fc3c8937332b2136cf58 Auto-Submitted: auto-generated The branch main has been updated by dvl: URL: https://cgit.FreeBSD.org/ports/commit/?id=9a1289a8b3d2d0c8a0e1fc3c8937332b2136cf58 commit 9a1289a8b3d2d0c8a0e1fc3c8937332b2136cf58 Author: Dan Langille AuthorDate: 2023-08-22 19:49:16 +0000 Commit: Dan Langille 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