mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-19 00:13:33 +00:00
sysutils/bareos-*: update to 21.1.4
ChangeLog at: https://github.com/bareos/bareos/blob/Release/21.1.4/CHANGELOG.md
This commit is contained in:
Jose Alonso Cardenas Marquez
parent
41f5de4572
commit
6d3410eea8
@ -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)
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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()
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
PORTNAME= bareos
|
||||
PORTREVISION= 1
|
||||
PORTREVISION= 0
|
||||
PKGNAMESUFFIX= -traymonitor
|
||||
|
||||
COMMENT= Backup archiving recovery open sourced (traymonitor)
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
PORTNAME= bareos
|
||||
DISTVERSIONPREFIX= Release/
|
||||
DISTVERSION= 21.1.3
|
||||
DISTVERSION= 21.1.4
|
||||
CATEGORIES?= www sysutils
|
||||
PKGNAMESUFFIX= -webui
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user