5 files changed, 24 insertions, 4 deletions

diff --git a/sysutils/bareos-server/Makefile b/sysutils/bareos-server/Makefile
index c83ff0b1efbc..060af656f49e 100644
--- a/sysutils/bareos-server/Makefile
+++ b/sysutils/bareos-server/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	bareos
 DISTVERSIONPREFIX=	Release/
 DISTVERSION=	21.0.0
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	sysutils
 PKGNAMEPREFIX?=	#
 PKGNAMESUFFIX?=	-server
diff --git a/sysutils/bareos-server/files/bareos-dir.in b/sysutils/bareos-server/files/bareos-dir.in
index 86b62370cbb7..22272cf86231 100644
--- a/sysutils/bareos-server/files/bareos-dir.in
+++ b/sysutils/bareos-server/files/bareos-dir.in
@@ -26,7 +26,7 @@ load_rc_config $name
 : ${bareos_dir_pidfile="/var/run/bareos/bareos-dir.9101.pid"}
 
 command=%%PREFIX%%/sbin/bareos-dir
-command_args="-c ${bareos_dir_config}"
+command_args="-c ${bareos_dir_config} -p ${bareos_dir_pidfile}"
 pidfile="${bareos_dir_pidfile}"
 bconsole_command=/usr/local/bin/bconsole
 start_precmd="bareos_start_precmd"
diff --git a/sysutils/bareos-server/files/bareos-fd.in b/sysutils/bareos-server/files/bareos-fd.in
index 54647786b12c..8d57c3c858bc 100644
--- a/sysutils/bareos-server/files/bareos-fd.in
+++ b/sysutils/bareos-server/files/bareos-fd.in
@@ -26,7 +26,7 @@ load_rc_config $name
 : ${bareos_fd_pidfile="/var/run/bareos/bareos-fd.9102.pid"}
 
 command=%%PREFIX%%/sbin/bareos-fd
-command_args="-c ${bareos_fd_config}"
+command_args="-c ${bareos_fd_config} -p ${bareos_fd_pidfile}"
 pidfile="${bareos_fd_pidfile}"
 start_precmd="bareos_start_precmd"
 
diff --git a/sysutils/bareos-server/files/bareos-sd.in b/sysutils/bareos-server/files/bareos-sd.in
index a5efe78e80f7..529cf55140c0 100644
--- a/sysutils/bareos-server/files/bareos-sd.in
+++ b/sysutils/bareos-server/files/bareos-sd.in
@@ -26,7 +26,7 @@ load_rc_config $name
 : ${bareos_sd_pidfile="/var/run/bareos/bareos-sd.9103.pid"}
 
 command=%%PREFIX%%/sbin/bareos-sd
-command_args="-c ${bareos_sd_config}"
+command_args="-c ${bareos_sd_config} -p ${bareos_sd_pidfile}"
 pidfile="${bareos_sd_pidfile}"
 start_precmd="bareos_start_precmd"
 
diff --git a/sysutils/bareos-server/files/patch-core-src-stored_CMakelists.txt b/sysutils/bareos-server/files/patch-core-src-stored_CMakelists.txt
new file mode 100644
index 000000000000..64ee102c21f5
--- /dev/null
+++ b/sysutils/bareos-server/files/patch-core-src-stored_CMakelists.txt
@@ -0,0 +1,20 @@
+--- core/src/stored/CMakeLists.txt	2021-12-21 06:00:49.000000000 -0500
++++ core/src/stored/CMakeLists.txt	2022-03-04 20:56:52.809609000 -0500
+@@ -219,7 +219,7 @@
+ add_executable(bareos-sd stored.cc)
+ 
+ target_link_libraries(
+-  bareos-sd PRIVATE stored_objects bareos bareossd bareosfind Threads::Threads
++  bareos-sd PRIVATE stored_objects bareos bareossd bareosfind Threads::Threads ${JANSSON_LIBRARIES}
+ )
+ 
+ if(HAVE_WIN32)
+@@ -228,7 +228,7 @@
+ endif()
+ if(HAVE_NDMP)
+   target_link_libraries(stored_objects PRIVATE bareosndmp)
+-  target_link_libraries(bareos-sd PRIVATE bareosndmp)
++  target_link_libraries(bareos-sd PRIVATE bareosndmp ${JANSSON_LIBRARIES})
+ endif()
+ 
+ add_executable(bls ${BLSSRCS})