From nobody Wed Jan 24 01:24:59 2024 X-Original-To: dev-commits-ports-all@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 4TKR8W5449z5759w; Wed, 24 Jan 2024 01:24: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 4TKR8W4Xd8z49ZN; Wed, 24 Jan 2024 01:24:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706059499; 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=QfnbPVKntwfCK6VSmrYzSW29EkOP93HHTAYWCTRN6tI=; b=a7jhDjLFTuMqSiQG69K4AAincugoFLjAqvRT+TJ6KpRFFZn7i5WRYEnQ1Hcb9lOusLVeFz UoadOcb7E+7iz03NCVePxOMHWuExqnYBVNrl/uLWf8S0zsVHqoJpNRawVHVW4jGTt7L5NG kY2RIhlQKQ4fe0hxVcv8Fq6rrpP6jHUvogi+LrfjMdHpL4DSjsOGI984yGmUCYDIXfmHag 3f5f5ZwtwDSmGcGVqEKx52TlkaCUirlOZ3cmx2rDYcjFQLnA5WEloaM6pl4l0/vcJLGgfF paScRjB2ZgSCXvQaStqmNLfolQIg5J3UzsruHQG5UhznMhCSCVjGKWeTIeHnjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706059499; 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=QfnbPVKntwfCK6VSmrYzSW29EkOP93HHTAYWCTRN6tI=; b=BIVEFiIxsf3EI1k8TkugfktB0pL3Q/D/T9zzTII2F5FkkC6ZuNKR1c7HbvwNqQS1E5ppp/ eD3hJ/fGMuHteY9BKhOGs+DjciHIyLSyYJXOm7a3YsO4l2+FqtmFKD4FpP1ypZUyC4UZA8 NJsineh7OHYtOFtsCvnkyXts4SUcu/D/TpIL0WzyGYRrlYEbIYafIuXWqRiwsDOdAO2c0L zd3pjpcUeVuzBXyd3wPKw4MWUp/ppc0xd2d5LlA0MqtATirSFMembOwHZeNn4o1dgEYpGp Euqd94y2N8Az7yKn41hCUgsSJKHMvYgYUP9JnJXfWbzhwpNnjOWhFTXBHSH0Xg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706059499; a=rsa-sha256; cv=none; b=hfP/3QH9IGBeACSubOC3DawNIReaeis7STmZW6Dlbtp2wVuDSaJFZy7q3WhbjHzy8Ui2e2 ABYHSIyatfeLWUCeLBKkLfZcT+4+Xp504Cp4g1zoF8Xv47tzpat2L+GuQndbylBgheyKFK VVab+/zROHNPL39WSy3G0ZJ653f/N4fjOnEx6hEvPbowKfojOgHoZF/ane86wVi4QNI4q0 1g6c5no8/4NgSILWbElYVDe32sPpHAcW1i9lYMCXe9VNIJD0zRjfpbq87out0YwST9XJA2 t9IziAlumNaJKznLdSMoaBTm+5m46tYXvYggBdtwjtYnoAeOfwPWFfMkXN3R/g== 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 4TKR8W3TpCzv6T; Wed, 24 Jan 2024 01:24:59 +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 40O1OxTl052439; Wed, 24 Jan 2024 01:24:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40O1OxE2052436; Wed, 24 Jan 2024 01:24:59 GMT (envelope-from git) Date: Wed, 24 Jan 2024 01:24:59 GMT Message-Id: <202401240124.40O1OxE2052436@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jose Alonso Cardenas Marquez Subject: git: 43926676d5f1 - main - sysutils/bareos-server: Fix pkg-plist List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: acm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 43926676d5f136ccfbfd9031c4b3cf57daca6ede Auto-Submitted: auto-generated The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=43926676d5f136ccfbfd9031c4b3cf57daca6ede commit 43926676d5f136ccfbfd9031c4b3cf57daca6ede Author: Jose Alonso Cardenas Marquez AuthorDate: 2024-01-24 01:19:00 +0000 Commit: Jose Alonso Cardenas Marquez CommitDate: 2024-01-24 01:24:44 +0000 sysutils/bareos-server: Fix pkg-plist - Remove obsolete option entries - Other minor modifications - Bump PORTREVISION PR: 276543 Reported by: tomas at_ ciernik.sk --- sysutils/bareos-server/Makefile | 16 +--------------- sysutils/bareos-server/pkg-plist | 41 +++++++++++++++++----------------------- 2 files changed, 18 insertions(+), 39 deletions(-) diff --git a/sysutils/bareos-server/Makefile b/sysutils/bareos-server/Makefile index 11feeafb9f78..8103633ccf65 100644 --- a/sysutils/bareos-server/Makefile +++ b/sysutils/bareos-server/Makefile @@ -1,7 +1,7 @@ PORTNAME= bareos DISTVERSIONPREFIX= Release/ DISTVERSION= 23.0.1 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= sysutils PKGNAMEPREFIX?= # PKGNAMESUFFIX?= -server @@ -166,16 +166,8 @@ CMAKE_ARGS+= -Dbuild-dird=ON \ # Server default database MTX_RUN_DEPENDS= ${LOCALBASE}/sbin/mtx:misc/mtx -MYSQL_VARS= DBTYPE=mysql -MYSQL_SUB_LIST= REQ_MYSQL=mysql REQ_PGSQL="" PGSQL_CMAKE_ON= -Dpostgresql=ON PGSQL_USES= pgsql -PGSQL_VARS= DBTYPE=postgresql -PGSQL_SUB_LIST= REQ_MYSQL="" REQ_PGSQL=postgresql -SQLITE3_VARS= DBTYPE=sqlite3 - -PLIST_SUB+= DBTYPE=${DBTYPE} - .endif .if defined(WITH_CLIENT_ONLY) @@ -227,10 +219,4 @@ post-install: .include "${MASTERDIR}/Makefile.common" .endif # -client and -server are defined -.include - -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) -USES+= llvm:max=15 -.endif - .include diff --git a/sysutils/bareos-server/pkg-plist b/sysutils/bareos-server/pkg-plist index 6e0a87161b03..fa172534f55e 100644 --- a/sysutils/bareos-server/pkg-plist +++ b/sysutils/bareos-server/pkg-plist @@ -12,14 +12,12 @@ bin/bwild @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/WindowsAllDrives.conf.sample %%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-gfapi.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-ldap.conf.sample -@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-ovirt.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupCatalog.conf.sample %%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupGFAPI.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreFiles.conf.sample %%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreGFAPI.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/backup-bareos-fd.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/backup-ldap.conf.sample -@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/backup-ovirt.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/restore-ldap.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/jobdefs/DefaultJob.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/messages/Daemon.conf.sample @@ -47,7 +45,6 @@ bin/bwild @sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/storage/bareos-sd.conf.sample %%MTX%%@sample(,bareos,640) %%ETCDIR%%/mtx-changer.conf.sample etc/logrotate.d/bareos-dir -lib/bareos/backends/libbareoscats-%%DBTYPE%%.so lib/bareos/backends/libbareossd-fifo.so lib/bareos/backends/libbareossd-file.so %%GFAPI%%lib/bareos/backends/libbareossd-gfapi.so @@ -70,23 +67,23 @@ lib/bareos/scripts/bareos-ctl-sd lib/bareos/scripts/bareos-explorer lib/bareos/scripts/bareos-glusterfind-wrapper lib/bareos/scripts/create_bareos_database -%%PGSQL%%lib/bareos/scripts/ddl/creates/%%DBTYPE%%.sql -%%PGSQL%%lib/bareos/scripts/ddl/drops/%%DBTYPE%%.sql -%%PGSQL%%lib/bareos/scripts/ddl/grants/%%DBTYPE%%-change_owner.dbconfig-template.sql -%%PGSQL%%lib/bareos/scripts/ddl/grants/%%DBTYPE%%-readonly.sql -%%PGSQL%%lib/bareos/scripts/ddl/grants/%%DBTYPE%%.sql -lib/bareos/scripts/ddl/updates/%%DBTYPE%%.10_11.sql -lib/bareos/scripts/ddl/updates/%%DBTYPE%%.11_12.sql -lib/bareos/scripts/ddl/updates/%%DBTYPE%%.12_14.sql -lib/bareos/scripts/ddl/updates/%%DBTYPE%%.14_2001.sql -lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2001_2002.sql -lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2002_2003.sql -lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2003_2004.sql -lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2004_2171.sql -lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2171_2192.sql -lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2192_2210.sql -lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2210_2230.sql -%%PGSQL%%lib/bareos/scripts/ddl/updates/%%DBTYPE%%.bee.1017_2004.sql +%%PGSQL%%lib/bareos/scripts/ddl/creates/postgresql.sql +%%PGSQL%%lib/bareos/scripts/ddl/drops/postgresql.sql +%%PGSQL%%lib/bareos/scripts/ddl/grants/postgresql-change_owner.dbconfig-template.sql +%%PGSQL%%lib/bareos/scripts/ddl/grants/postgresql-readonly.sql +%%PGSQL%%lib/bareos/scripts/ddl/grants/postgresql.sql +lib/bareos/scripts/ddl/updates/postgresql.10_11.sql +lib/bareos/scripts/ddl/updates/postgresql.11_12.sql +lib/bareos/scripts/ddl/updates/postgresql.12_14.sql +lib/bareos/scripts/ddl/updates/postgresql.14_2001.sql +lib/bareos/scripts/ddl/updates/postgresql.2001_2002.sql +lib/bareos/scripts/ddl/updates/postgresql.2002_2003.sql +lib/bareos/scripts/ddl/updates/postgresql.2003_2004.sql +lib/bareos/scripts/ddl/updates/postgresql.2004_2171.sql +lib/bareos/scripts/ddl/updates/postgresql.2171_2192.sql +lib/bareos/scripts/ddl/updates/postgresql.2192_2210.sql +lib/bareos/scripts/ddl/updates/postgresql.2210_2230.sql +%%PGSQL%%lib/bareos/scripts/ddl/updates/postgresql.bee.1017_2004.sql lib/bareos/scripts/ddl/versions.map lib/bareos/scripts/delete_catalog_backup lib/bareos/scripts/disk-changer @@ -95,13 +92,9 @@ lib/bareos/scripts/drop_bareos_tables lib/bareos/scripts/grant_bareos_privileges lib/bareos/scripts/make_bareos_tables lib/bareos/scripts/make_catalog_backup -lib/bareos/scripts/make_catalog_backup.pl lib/bareos/scripts/mtx-changer lib/bareos/scripts/query.sql lib/bareos/scripts/update_bareos_tables -lib/libbareoscats.so -lib/libbareoscats.so.23 -lib/libbareoscats.so.%%LIB_VERSION%% %%NDMP%%lib/libbareosndmp.so %%NDMP%%lib/libbareosndmp.so.23 %%NDMP%%lib/libbareosndmp.so.%%LIB_VERSION%%