sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-04-28 01:26:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

sysutils/bareos-*: Fix pkg-plist

Browse source 
- Fix build with ccache [1]

PR:		283660
Reported by:	Vadim Belman <vrurg _at__ lflat.org> [1]
This commit is contained in:
Jose Alonso Cardenas Marquez 2025-01-01 00:03:45 -08:00
parent eda5eaff66
commit a1628f2061
No known key found for this signature in database
GPG key ID: 335B9246BA5E30F4
5 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sysutils/bareos-client/Makefile
View file

@ -1,4 +1,7 @@
PORTNAME= bareos PORTNAME= bareos
PORTREVISION= 1
PKGNAMESUFFIX= -client PKGNAMESUFFIX= -client
COMMENT= Backup archiving recovery open sourced (client) COMMENT= Backup archiving recovery open sourced (client)

2
sysutils/bareos-server/Makefile
View file

@ -192,8 +192,6 @@ MP1+= bsmtp.1 bregex.1 bwild.1 bareos-tray-monitor.1
MAKE_ENV+= MAN8="${MP8}" MAN1="${MP1}" MAKE_ENV+= MAN8="${MP8}" MAN1="${MP1}"
post-patch: post-patch:
@${REINPLACE_CMD} '136,141d' ${WRKSRC}/CMakeLists.txt
@${REINPLACE_CMD} '202d' ${WRKSRC}/CMakeLists.txt
.if ${PKGNAMESUFFIX} == "-server" .if ${PKGNAMESUFFIX} == "-server"
@${REINPLACE_CMD} '51d' ${WRKSRC}/core/src/plugins/CMakeLists.txt @${REINPLACE_CMD} '51d' ${WRKSRC}/core/src/plugins/CMakeLists.txt
.endif .endif

8
sysutils/bareos-server/files/patch-CMakeLists.txt
View file

@ -1,6 +1,6 @@
--- CMakeLists.txt.orig 2024-12-22 22:53:59.736189000 -0800 --- CMakeLists.txt 2024-12-16 09:10:50.000000000 -0800
+++ CMakeLists.txt 2024-12-22 22:54:34.147041000 -0800 +++ CMakeLists.txt 2024-12-31 23:52:42.840766000 -0800
@@ -202,12 +202,10 @@ @@ -202,11 +202,8 @@
if(ENABLE_WEBUI) if(ENABLE_WEBUI)
add_subdirectory(webui) add_subdirectory(webui)
endif() endif()
@ -12,7 +12,5 @@
+ if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows") + if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+ add_subdirectory(contrib) + add_subdirectory(contrib)
endif() endif()
+ add_subdirectory(systemtests)
endif() endif()
if(docs

12
sysutils/bareos-server/files/patch-cmake_BareosCcache.cmake Normal file
View file

@ -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()

4
sysutils/bareos-server/pkg-plist
View file

@ -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/SelfTest.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/WindowsAllDrives.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 %%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 @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupCatalog.conf.sample
%%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupGFAPI.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 @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreFiles.conf.sample
%%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreGFAPI.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-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/jobdefs/DefaultJob.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/messages/Daemon.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/messages/Daemon.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/messages/Standard.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-dbcheck.8.gz
share/man/man8/bareos-dir.8.gz share/man/man8/bareos-dir.8.gz
share/man/man8/bareos-sd.8.gz share/man/man8/bareos-sd.8.gz
share/man/man8/bareos.8.gz
share/man/man8/bcopy.8.gz share/man/man8/bcopy.8.gz
share/man/man8/bextract.8.gz share/man/man8/bextract.8.gz
share/man/man8/bls.8.gz share/man/man8/bls.8.gz