git: 8f5117806420 - main - sysutils/bareos-*: update to 20.0.2

[Jose Alonso Cardenas Marquez]

The branch main has been updated by acm:

URL: https://cgit.FreeBSD.org/ports/commit/?id=8f5117806420c722fd614b845ee5ece5a803635f

commit 8f5117806420c722fd614b845ee5ece5a803635f
Author:     Jose Alonso Cardenas Marquez <acm at FreeBSD.org>
AuthorDate: 2021-07-10 03:01:41 +0000
Commit:     Jose Alonso Cardenas Marquez <acm at FreeBSD.org>
CommitDate: 2021-07-10 03:01:41 +0000

    sysutils/bareos-*: update to 20.0.2
---
 sysutils/bareos-server/Makefile                    |  5 +-
 sysutils/bareos-server/distinfo                    |  6 +-
 .../patch-core-cmake_BareosFindAllLibraries.cmake  | 71 +++++++++++++---------
 3 files changed, 49 insertions(+), 33 deletions(-)

diff --git a/sysutils/bareos-server/Makefile b/sysutils/bareos-server/Makefile
index 77f41f1f89b5..44c165c5721d 100644
--- a/sysutils/bareos-server/Makefile
+++ b/sysutils/bareos-server/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	bareos
 DISTVERSIONPREFIX=	Release/
-DISTVERSION=	20.0.0
-PORTREVISION?=	3
+DISTVERSION=	20.0.2
+PORTREVISION?=	0
 CATEGORIES?=	sysutils
 PKGNAMEPREFIX?=	#
 PKGNAMESUFFIX?=	-server
@@ -208,6 +208,7 @@ MAKE_ENV+=	MAN8="${MP8}" MAN1="${MP1}"
 post-patch:
 	@${REINPLACE_CMD}  '76,79d' ${WRKSRC}/CMakeLists.txt
 .if ${PKGNAMESUFFIX} == "-server"
+	@${REINPLACE_CMD}  '45d' ${WRKSRC}/core/src/CMakeLists.txt
 	@${REINPLACE_CMD}  '51d' ${WRKSRC}/core/src/plugins/CMakeLists.txt
 .endif
 
diff --git a/sysutils/bareos-server/distinfo b/sysutils/bareos-server/distinfo
index cb4c03d02b24..430e06f6d812 100644
--- a/sysutils/bareos-server/distinfo
+++ b/sysutils/bareos-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1608160006
-SHA256 (bareos-bareos-Release-20.0.0_GH0.tar.gz) = c66914a19dbd75c214f559b55830ab8bf468d02f50fd85694fe190153fd5695d
-SIZE (bareos-bareos-Release-20.0.0_GH0.tar.gz) = 13325939
+TIMESTAMP = 1625882023
+SHA256 (bareos-bareos-Release-20.0.2_GH0.tar.gz) = 993ae3a58c27ef0388ec867562f131cd471d44c5dfd152e65bfd87a4770cfeaa
+SIZE (bareos-bareos-Release-20.0.2_GH0.tar.gz) = 13333946
diff --git a/sysutils/bareos-server/files/patch-core-cmake_BareosFindAllLibraries.cmake b/sysutils/bareos-server/files/patch-core-cmake_BareosFindAllLibraries.cmake
index ee5398a6018d..2106acc618aa 100644
--- a/sysutils/bareos-server/files/patch-core-cmake_BareosFindAllLibraries.cmake
+++ b/sysutils/bareos-server/files/patch-core-cmake_BareosFindAllLibraries.cmake
@@ -1,6 +1,6 @@
---- core/cmake/BareosFindAllLibraries.cmake	2020-12-16 02:46:16.000000000 -0500
-+++ core/cmake/BareosFindAllLibraries.cmake	2020-12-27 00:31:34.725219000 -0500
-@@ -37,46 +37,30 @@
+--- core/cmake/BareosFindAllLibraries.cmake	2021-06-10 10:37:18.000000000 -0500
++++ core/cmake/BareosFindAllLibraries.cmake	2021-07-09 21:07:45.799522000 -0500
+@@ -37,55 +37,39 @@
    set(Python3_FOUND 0)
  
  else()
@@ -9,18 +9,27 @@
 +  if(python)
 +    find_package(Python3 COMPONENTS Interpreter Development)
  
+-  set(Python3_VERSION_MAJOR
+-      ${Python3_VERSION_MAJOR}
+-      PARENT_SCOPE
+-  )
+-
+-  set(Python3_VERSION_MINOR
+-      ${Python3_VERSION_MINOR}
+-      PARENT_SCOPE
+-  )
+-
 -  if(${Python2_FOUND} OR ${Python3_FOUND})
 -    set(HAVE_PYTHON 1)
 -  endif()
-+    if(${Python3_FOUND})
-+      set(HAVE_PYTHON 1)
-+    endif()
- 
+-
 -  if(${Python2_FOUND})
 -    set(PYTHON_EXECUTABLE
 -        ${Python2_EXECUTABLE}
--        PARENT_SCOPE
--    )
++    set(Python3_VERSION_MAJOR
++        ${Python3_VERSION_MAJOR}
+         PARENT_SCOPE
+     )
 -    set(Python2_EXECUTABLE
 -        ${Python2_EXECUTABLE}
 -        PARENT_SCOPE
@@ -31,6 +40,30 @@
 -      OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/py2settings.cmake
 -    )
 -    include(${CMAKE_CURRENT_BINARY_DIR}/py2settings.cmake)
+-  endif()
+ 
+-  if(${Python3_FOUND})
+-    set(PYTHON_EXECUTABLE
+-        ${Python3_EXECUTABLE}
++    set(Python3_VERSION_MINOR
++        ${Python3_VERSION_MINOR}
+         PARENT_SCOPE
+     )
+-    set(Python3_EXECUTABLE
+-        ${Python3_EXECUTABLE}
+-        PARENT_SCOPE
+-    )
+-    execute_process(
+-      COMMAND ${Python3_EXECUTABLE}
+-              ${CMAKE_CURRENT_SOURCE_DIR}/cmake/get_python_compile_settings.py
+-      OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/py3settings.cmake
+-    )
+-    include(${CMAKE_CURRENT_BINARY_DIR}/py3settings.cmake)
++
++    if(${Python3_FOUND})
++      set(HAVE_PYTHON 1)
++    endif()
++
 +    if(${Python3_FOUND})
 +      set(PYTHON_EXECUTABLE
 +          ${Python3_EXECUTABLE}
@@ -48,27 +81,9 @@
 +      include(${CMAKE_CURRENT_BINARY_DIR}/py3settings.cmake)
 +    endif()
    endif()
--
--  if(${Python3_FOUND})
--    set(PYTHON_EXECUTABLE
--        ${Python3_EXECUTABLE}
--        PARENT_SCOPE
--    )
--    set(Python3_EXECUTABLE
--        ${Python3_EXECUTABLE}
--        PARENT_SCOPE
--    )
--    execute_process(
--      COMMAND ${Python3_EXECUTABLE}
--              ${CMAKE_CURRENT_SOURCE_DIR}/cmake/get_python_compile_settings.py
--      OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/py3settings.cmake
--    )
--    include(${CMAKE_CURRENT_BINARY_DIR}/py3settings.cmake)
--  endif()
  endif()
  
- if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
-@@ -154,12 +138,18 @@
+@@ -164,12 +148,18 @@
  endif()
  
  bareosfindlibraryandheaders("jansson" "jansson.h" "")