git: 6d3410eea852 - main - sysutils/bareos-*: update to 21.1.4
Date: Mon, 31 Oct 2022 22:13:31 UTC
The branch main has been updated by acm:
URL: https://cgit.FreeBSD.org/ports/commit/?id=6d3410eea852caa12e26be3fb2df2cc613a9ff11
commit 6d3410eea852caa12e26be3fb2df2cc613a9ff11
Author: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
AuthorDate: 2022-10-31 22:12:39 +0000
Commit: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
CommitDate: 2022-10-31 22:12:39 +0000
sysutils/bareos-*: update to 21.1.4
ChangeLog at: https://github.com/bareos/bareos/blob/Release/21.1.4/CHANGELOG.md
---
sysutils/bareos-server/Makefile | 6 +-
sysutils/bareos-server/distinfo | 6 +-
.../patch-core-cmake_BareosFindAllLibraries.cmake | 90 +---------------------
sysutils/bareos-traymonitor/Makefile | 2 +-
www/bareos-webui/Makefile | 2 +-
www/bareos-webui/distinfo | 6 +-
6 files changed, 14 insertions(+), 98 deletions(-)
diff --git a/sysutils/bareos-server/Makefile b/sysutils/bareos-server/Makefile
index 3169247de1dd..b337c01882d6 100644
--- a/sysutils/bareos-server/Makefile
+++ b/sysutils/bareos-server/Makefile
@@ -1,6 +1,6 @@
PORTNAME= bareos
DISTVERSIONPREFIX= Release/
-DISTVERSION= 21.1.3
+DISTVERSION= 21.1.4
PORTREVISION?= 0
CATEGORIES?= sysutils
PKGNAMEPREFIX?= #
@@ -74,8 +74,8 @@ SCSICRYPTO_CMAKE_OFF= -Dscsi-crypto=OFF
.if ${PKGNAMESUFFIX} == "-client" || ${PKGNAMESUFFIX} == "-server" #Till end of the file
PYTHON_USES= python
-PYTHON_CMAKE_ON= -Dpython=ON
-PYTHON_CMAKE_OFF= -Dpython=OFF
+PYTHON_CMAKE_ON= -DENABLE_PYTHON=ON
+PYTHON_CMAKE_OFF= -DENABLE_PYTHON=OFF
PYTHON_PLUGIN= yes
.if !defined(WITH_CLIENT_ONLY)
diff --git a/sysutils/bareos-server/distinfo b/sysutils/bareos-server/distinfo
index 12ce9bd74752..b62e16c5e22d 100644
--- a/sysutils/bareos-server/distinfo
+++ b/sysutils/bareos-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1653200782
-SHA256 (bareos-bareos-Release-21.1.3_GH0.tar.gz) = 3fc1241981f095c5e3db4e7476cdb273633b630820b1e1eff792b2c4d99b3d11
-SIZE (bareos-bareos-Release-21.1.3_GH0.tar.gz) = 11639758
+TIMESTAMP = 1667251095
+SHA256 (bareos-bareos-Release-21.1.4_GH0.tar.gz) = ed898221182f2dbca712d0e85715cb5f9dd9d2c78f0e20eb7a13ae35d08701bb
+SIZE (bareos-bareos-Release-21.1.4_GH0.tar.gz) = 11647699
diff --git a/sysutils/bareos-server/files/patch-core-cmake_BareosFindAllLibraries.cmake b/sysutils/bareos-server/files/patch-core-cmake_BareosFindAllLibraries.cmake
index f15a4678c330..e3ff7074a02f 100644
--- a/sysutils/bareos-server/files/patch-core-cmake_BareosFindAllLibraries.cmake
+++ b/sysutils/bareos-server/files/patch-core-cmake_BareosFindAllLibraries.cmake
@@ -1,90 +1,6 @@
---- core/cmake/BareosFindAllLibraries.cmake 2021-12-21 06:00:49.000000000 -0500
-+++ core/cmake/BareosFindAllLibraries.cmake 2021-12-22 00:16:58.093078000 -0500
-@@ -42,56 +42,39 @@
- set(Python3_FOUND 0)
-
- else()
-- find_package(Python2 COMPONENTS Interpreter Development)
-- find_package(Python3 COMPONENTS Interpreter Development)
-+ 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(${Python2_FOUND})
-- set(PYTHON_EXECUTABLE
-- ${Python2_EXECUTABLE}
-+ set(Python3_VERSION_MAJOR
-+ ${Python3_VERSION_MAJOR}
- PARENT_SCOPE
- )
-- set(Python2_EXECUTABLE
-- ${Python2_EXECUTABLE}
-- PARENT_SCOPE
-- )
-- execute_process(
-- COMMAND ${Python2_EXECUTABLE}
-- ${CMAKE_CURRENT_SOURCE_DIR}/cmake/get_python_compile_settings.py
-- OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/py2settings.cmake
-- )
-- include(${CMAKE_CURRENT_BINARY_DIR}/py2settings.cmake)
-- set(Python2_CCSHARED ${Python2_CC_FLAGS} -Wno-register)
-- 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}
-+ 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()
- endif()
-
-@@ -169,12 +152,18 @@
+--- core/cmake/BareosFindAllLibraries.cmake 2022-08-05 04:40:11.000000000 -0500
++++ core/cmake/BareosFindAllLibraries.cmake 2022-10-31 16:28:14.422391000 -0500
+@@ -175,12 +175,18 @@
)
endif()
diff --git a/sysutils/bareos-traymonitor/Makefile b/sysutils/bareos-traymonitor/Makefile
index 7f18df2180b0..c7cc4e25b317 100644
--- a/sysutils/bareos-traymonitor/Makefile
+++ b/sysutils/bareos-traymonitor/Makefile
@@ -1,5 +1,5 @@
PORTNAME= bareos
-PORTREVISION= 1
+PORTREVISION= 0
PKGNAMESUFFIX= -traymonitor
COMMENT= Backup archiving recovery open sourced (traymonitor)
diff --git a/www/bareos-webui/Makefile b/www/bareos-webui/Makefile
index 1aff77dab6f9..3eb0014a61bb 100644
--- a/www/bareos-webui/Makefile
+++ b/www/bareos-webui/Makefile
@@ -1,6 +1,6 @@
PORTNAME= bareos
DISTVERSIONPREFIX= Release/
-DISTVERSION= 21.1.3
+DISTVERSION= 21.1.4
CATEGORIES?= www sysutils
PKGNAMESUFFIX= -webui
diff --git a/www/bareos-webui/distinfo b/www/bareos-webui/distinfo
index 8ffc5a7973f3..5607b68d699a 100644
--- a/www/bareos-webui/distinfo
+++ b/www/bareos-webui/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1653201609
-SHA256 (bareos-bareos-Release-21.1.3_GH0.tar.gz) = 3fc1241981f095c5e3db4e7476cdb273633b630820b1e1eff792b2c4d99b3d11
-SIZE (bareos-bareos-Release-21.1.3_GH0.tar.gz) = 11639758
+TIMESTAMP = 1667253078
+SHA256 (bareos-bareos-Release-21.1.4_GH0.tar.gz) = ed898221182f2dbca712d0e85715cb5f9dd9d2c78f0e20eb7a13ae35d08701bb
+SIZE (bareos-bareos-Release-21.1.4_GH0.tar.gz) = 11647699