From nobody Wed Jan 01 08:06:58 2025 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 4YNMr30d46z5jY1J; Wed, 01 Jan 2025 08:06: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YNMr306L5z4YMW; Wed, 1 Jan 2025 08:06:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735718819; 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=gf4pbArCoil8zjBABhzVFi1gXa9zH8jQjGRixebW4sE=; b=UECjoiOqlwEOYvHIubHsJCvO+Z89o5eQg97d/E07x8janHQrTg2pVAo/xppcrvvtDNrf9Y ozu9AuZ8qoJP6ht86JOb1JHN6bpyaINpPMG3x0ReV/Hc2hbbZaTfx4yCoaV1vNT1yw8G4Z ywOW5t055gqmikWSbfTAzqWM2VdfFENxjZLcA5ZBngoi4gxQxamUBUpzVSyulAUd9FdP1E grJ9g35CghK80W0iukXvFf4XZaNKEvvN9PiNpmzlOwclg3fz1fwUJbbvVkmUSTPfuFzxXz nIkmkX5KC5fHdJddyn+TF28/ODnxSshxkBDTeU5yvmVwGPvwK2iqQegqj5c1Ow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735718819; 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=gf4pbArCoil8zjBABhzVFi1gXa9zH8jQjGRixebW4sE=; b=fnv6Wkow+ilUOqartDxGN/B/r99g/WlYwTmW0f5cPHFQJOs8zj47+HntNlCjgMIPHc0wCU ybtrSA0qKy7tj2dk+IiyIvVXnQMDq2/kbv2CvHHBM8rhr1M+wYsJ7fwKPEs6ITRD5f7lSS eYgLKphvmDG5cgUhyyrMue3Q19P1CdA6KbAarmmbVTNT+4i+lfXYdxRcz1OQdgZrLNOLpH ev07HLxrnIlLOG7furLr0uVlpu8/zHJxdJFfLb/1Bd3Udngt9alt8ggfcAM3pg+60BS7bS OpJzzrVrvtQhRvLT11KUQPhkeiODvXTNTvgkpRQB7MOT5xshzDL8YYJETpe69A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735718819; a=rsa-sha256; cv=none; b=c9/lIhzd4SClG3k+XRxGAc1K3XTW7Nzyv0ajgJL+LX0t+8pjK+rHdS1NqM9Oyab82zCN2D I+BC4Yyrp2lcKQSeNI10xGmQTbrd3HayT4ESP6OU5rXe6TF/ErsS37dkviOcytdotYyBmT 72ZWdlZj0mpaYWqwhp2BDbA8b6ER4dDpzxy9mKavFBzEznDHQVolKFLqX4NA525RNJpMfL se0JxnjmZQHxrm3QI3G95CqEkXmwLxy6XYwvkQ1gOZl5KHBi715f9tvTri68kEmnQ0NSk7 cz8OgHoB+VAMgan8EI/eo1dvucctqKAun37ObtvTIIKprqArlDELQU4i410sNg== 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 4YNMr26j9KzGSY; Wed, 1 Jan 2025 08:06:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50186w0M000425; Wed, 1 Jan 2025 08:06:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50186wZe000422; Wed, 1 Jan 2025 08:06:58 GMT (envelope-from git) Date: Wed, 1 Jan 2025 08:06:58 GMT Message-Id: <202501010806.50186wZe000422@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: a1628f2061e7 - main - sysutils/bareos-*: 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-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: a1628f2061e72c26bcf15786128ca52a67e21562 Auto-Submitted: auto-generated The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=a1628f2061e72c26bcf15786128ca52a67e21562 commit a1628f2061e72c26bcf15786128ca52a67e21562 Author: Jose Alonso Cardenas Marquez AuthorDate: 2025-01-01 08:03:45 +0000 Commit: Jose Alonso Cardenas Marquez CommitDate: 2025-01-01 08:03:45 +0000 sysutils/bareos-*: Fix pkg-plist - Fix build with ccache [1] PR: 283660 Reported by: Vadim Belman [1] --- sysutils/bareos-client/Makefile | 3 +++ sysutils/bareos-server/Makefile | 2 -- sysutils/bareos-server/files/patch-CMakeLists.txt | 8 +++----- sysutils/bareos-server/files/patch-cmake_BareosCcache.cmake | 12 ++++++++++++ sysutils/bareos-server/pkg-plist | 4 +--- 5 files changed, 19 insertions(+), 10 deletions(-) diff --git a/sysutils/bareos-client/Makefile b/sysutils/bareos-client/Makefile index d14ed9c74edb..e324c3a0e1c2 100644 --- a/sysutils/bareos-client/Makefile +++ b/sysutils/bareos-client/Makefile @@ -1,4 +1,7 @@ PORTNAME= bareos + +PORTREVISION= 1 + PKGNAMESUFFIX= -client COMMENT= Backup archiving recovery open sourced (client) diff --git a/sysutils/bareos-server/Makefile b/sysutils/bareos-server/Makefile index 49cef11b92d8..ab601295ce45 100644 --- a/sysutils/bareos-server/Makefile +++ b/sysutils/bareos-server/Makefile @@ -192,8 +192,6 @@ MP1+= bsmtp.1 bregex.1 bwild.1 bareos-tray-monitor.1 MAKE_ENV+= MAN8="${MP8}" MAN1="${MP1}" post-patch: - @${REINPLACE_CMD} '136,141d' ${WRKSRC}/CMakeLists.txt - @${REINPLACE_CMD} '202d' ${WRKSRC}/CMakeLists.txt .if ${PKGNAMESUFFIX} == "-server" @${REINPLACE_CMD} '51d' ${WRKSRC}/core/src/plugins/CMakeLists.txt .endif diff --git a/sysutils/bareos-server/files/patch-CMakeLists.txt b/sysutils/bareos-server/files/patch-CMakeLists.txt index ecd8676b7841..4404b90a2c50 100644 --- a/sysutils/bareos-server/files/patch-CMakeLists.txt +++ b/sysutils/bareos-server/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2024-12-22 22:53:59.736189000 -0800 -+++ CMakeLists.txt 2024-12-22 22:54:34.147041000 -0800 -@@ -202,12 +202,10 @@ +--- CMakeLists.txt 2024-12-16 09:10:50.000000000 -0800 ++++ CMakeLists.txt 2024-12-31 23:52:42.840766000 -0800 +@@ -202,11 +202,8 @@ if(ENABLE_WEBUI) add_subdirectory(webui) endif() @@ -12,7 +12,5 @@ + if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows") + add_subdirectory(contrib) endif() -+ add_subdirectory(systemtests) endif() - if(docs diff --git a/sysutils/bareos-server/files/patch-cmake_BareosCcache.cmake b/sysutils/bareos-server/files/patch-cmake_BareosCcache.cmake new file mode 100644 index 000000000000..d8b63ec3265e --- /dev/null +++ b/sysutils/bareos-server/files/patch-cmake_BareosCcache.cmake @@ -0,0 +1,12 @@ +--- cmake/BareosCcache.cmake 2024-12-31 23:51:38.882883000 -0800 ++++ cmake/BareosCcache.cmake 2024-12-31 23:51:48.133339000 -0800 +@@ -20,9 +20,6 @@ + find_program(CCACHE_PROGRAM ccache) + if(CCACHE_PROGRAM) + set(CCACHE_CMDLINE "${CCACHE_PROGRAM}") +- list(APPEND CCACHE_CMDLINE "base_dir=${CMAKE_SOURCE_DIR}") +- list(APPEND CCACHE_CMDLINE "hash_dir=true") +- list(APPEND CCACHE_CMDLINE "namespace=bareos") + set(CMAKE_C_COMPILER_LAUNCHER "${CCACHE_CMDLINE}") + set(CMAKE_CXX_COMPILER_LAUNCHER "${CCACHE_CMDLINE}") + endif() diff --git a/sysutils/bareos-server/pkg-plist b/sysutils/bareos-server/pkg-plist index 2d4c5de8c4bc..2af76717ff46 100644 --- a/sysutils/bareos-server/pkg-plist +++ b/sysutils/bareos-server/pkg-plist @@ -11,14 +11,11 @@ bin/bwild @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/SelfTest.conf.sample @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/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/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 @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/messages/Standard.conf.sample @@ -118,6 +115,7 @@ share/man/man1/bwild.1.gz share/man/man8/bareos-dbcheck.8.gz share/man/man8/bareos-dir.8.gz share/man/man8/bareos-sd.8.gz +share/man/man8/bareos.8.gz share/man/man8/bcopy.8.gz share/man/man8/bextract.8.gz share/man/man8/bls.8.gz