svn commit: r566125 - in head/sysutils: bareos18-server bareos18-server/files bareos19-server bareos19-server/files

[Jose Alonso Cardenas Marquez]

Author: acm
Date: Sat Feb 20 00:28:57 2021
New Revision: 566125
URL: https://svnweb.freebsd.org/changeset/ports/566125

Log:
  - Fix build on 13/14
  
  PR:		252917
  Submitted by:	Trond.Endrestol  _at_  ximalas.info
  Reported by:	pkg-fallout

Modified:
  head/sysutils/bareos18-server/Makefile
  head/sysutils/bareos18-server/files/patch-core-src-stored_CMakeLists.txt
  head/sysutils/bareos19-server/Makefile
  head/sysutils/bareos19-server/files/patch-core-src-stored_CMakeLists.txt

Modified: head/sysutils/bareos18-server/Makefile
==============================================================================
--- head/sysutils/bareos18-server/Makefile	Fri Feb 19 23:53:21 2021	(r566124)
+++ head/sysutils/bareos18-server/Makefile	Sat Feb 20 00:28:57 2021	(r566125)
@@ -3,7 +3,7 @@
 PORTNAME=	bareos
 DISTVERSIONPREFIX=	Release/
 DISTVERSION=	18.2.10
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	sysutils
 PKGNAMEPREFIX?=	#
 PKGNAMESUFFIX?=	18-server

Modified: head/sysutils/bareos18-server/files/patch-core-src-stored_CMakeLists.txt
==============================================================================
--- head/sysutils/bareos18-server/files/patch-core-src-stored_CMakeLists.txt	Fri Feb 19 23:53:21 2021	(r566124)
+++ head/sysutils/bareos18-server/files/patch-core-src-stored_CMakeLists.txt	Sat Feb 20 00:28:57 2021	(r566125)
@@ -1,6 +1,6 @@
---- core/src/stored/CMakeLists.txt	2019-12-12 12:04:14.000000000 -0500
-+++ core/src/stored/CMakeLists.txt	2019-12-28 17:19:55.461762000 -0500
-@@ -193,6 +193,8 @@
+--- core/src/stored/CMakeLists.txt	2020-12-11 10:27:01.000000000 -0500
++++ core/src/stored/CMakeLists.txt	2021-02-19 18:05:23.992747000 -0500
+@@ -193,26 +193,34 @@
  target_link_libraries(bareos-sd
     stored_objects
     ${BAREOS_SD_LIBRARIES}
@@ -9,7 +9,11 @@
     )
  
  add_executable(bls ${BLSSRCS})
-@@ -203,6 +205,8 @@
+ target_link_libraries(bls
+    bareos bareossd bareosfind 
++   ${PTHREAD_LIBRARIES}
+    )
+ 
  add_executable(bextract ${BEXTRACTSRS})
  target_link_libraries(bextract
     bareossd bareosfind bareos 
@@ -18,7 +22,11 @@
      )
  
  add_executable(bscan ${BSCANSRCS})
-@@ -213,6 +217,8 @@
+ target_link_libraries(bscan
+    bareos bareossd bareosfind bareossql bareoscats
++   ${PTHREAD_LIBRARIES}
+     )
+ 
  add_executable(btape ${BTAPESRCS})
  target_link_libraries(btape
     bareossd bareos 
@@ -27,7 +35,7 @@
      )
  
  add_executable(bcopy ${BCOPYSRCS})
-@@ -220,6 +226,8 @@
+@@ -220,6 +228,8 @@
  
  target_link_libraries(bcopy
     bareossd bareos 
@@ -36,7 +44,7 @@
      )
  
  INSTALL(TARGETS bareossd DESTINATION ${libdir})
-@@ -232,7 +240,7 @@
+@@ -232,7 +242,7 @@
  install(CODE "set(SRC_DIR \"${PROJECT_SOURCE_DIR}\")")
  install(SCRIPT ${PROJECT_SOURCE_DIR}/cmake/install-stored-configfiles.cmake)
  

Modified: head/sysutils/bareos19-server/Makefile
==============================================================================
--- head/sysutils/bareos19-server/Makefile	Fri Feb 19 23:53:21 2021	(r566124)
+++ head/sysutils/bareos19-server/Makefile	Sat Feb 20 00:28:57 2021	(r566125)
@@ -3,7 +3,7 @@
 PORTNAME=	bareos
 DISTVERSIONPREFIX=	Release/
 DISTVERSION=	19.2.9
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	sysutils
 PKGNAMEPREFIX?=	#
 PKGNAMESUFFIX?=	19-server

Modified: head/sysutils/bareos19-server/files/patch-core-src-stored_CMakeLists.txt
==============================================================================
--- head/sysutils/bareos19-server/files/patch-core-src-stored_CMakeLists.txt	Fri Feb 19 23:53:21 2021	(r566124)
+++ head/sysutils/bareos19-server/files/patch-core-src-stored_CMakeLists.txt	Sat Feb 20 00:28:57 2021	(r566125)
@@ -1,5 +1,5 @@
---- core/src/stored/CMakeLists.txt	2020-01-31 11:21:18.000000000 -0500
-+++ core/src/stored/CMakeLists.txt	2020-01-31 16:11:45.064779000 -0500
+--- core/src/stored/CMakeLists.txt	2020-12-11 08:44:43.000000000 -0500
++++ core/src/stored/CMakeLists.txt	2021-02-19 17:45:53.384978000 -0500
 @@ -213,23 +213,23 @@
    list(APPEND BAREOS_SD_LIBRARIES comctl32)
  endif()
@@ -8,14 +8,16 @@
 +target_link_libraries(bareos-sd stored_objects ${BAREOS_SD_LIBRARIES} ${JANSSON_LIBRARIES} ${PTHREAD_LIBRARIES})
  
  add_executable(bls ${BLSSRCS})
- target_link_libraries(bls bareos bareossd bareosfind)
+-target_link_libraries(bls bareos bareossd bareosfind)
++target_link_libraries(bls bareos bareossd bareosfind ${PTHREAD_LIBRARIES})
  
  add_executable(bextract ${BEXTRACTSRS})
 -target_link_libraries(bextract bareossd bareosfind bareos)
 +target_link_libraries(bextract bareossd bareosfind bareos ${JANSSON_LIBRARIES} ${PTHREAD_LIBRARIES})
  
  add_executable(bscan ${BSCANSRCS})
- target_link_libraries(bscan bareos bareossd bareosfind bareossql bareoscats)
+-target_link_libraries(bscan bareos bareossd bareosfind bareossql bareoscats)
++target_link_libraries(bscan bareos bareossd bareosfind bareossql bareoscats ${PTHREAD_LIBRARIES})
  
  add_executable(btape ${BTAPESRCS})
 -target_link_libraries(btape bareossd bareos)