Date: Wed, 1 Jan 2025 08:06:58 GMT From: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: a1628f2061e7 - main - sysutils/bareos-*: Fix pkg-plist Message-ID: <202501010806.50186wZe000422@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=a1628f2061e72c26bcf15786128ca52a67e21562 commit a1628f2061e72c26bcf15786128ca52a67e21562 Author: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> AuthorDate: 2025-01-01 08:03:45 +0000 Commit: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> CommitDate: 2025-01-01 08:03:45 +0000 sysutils/bareos-*: Fix pkg-plist - Fix build with ccache [1] PR: 283660 Reported by: Vadim Belman <vrurg _at__ lflat.org> [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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202501010806.50186wZe000422>