git: 343a3e98dbd9 - main - sysutils/bareos19-server: fix fs_violations

[Adriaan de Groot]

The branch main has been updated by adridg:

URL: https://cgit.FreeBSD.org/ports/commit/?id=343a3e98dbd930830529a0b83d2cabda118a5047

commit 343a3e98dbd930830529a0b83d2cabda118a5047
Author:     Adriaan de Groot <adridg at FreeBSD.org>
AuthorDate: 2021-04-13 22:15:43 +0000
Commit:     Adriaan de Groot <adridg at FreeBSD.org>
CommitDate: 2021-04-13 22:37:22 +0000

    sysutils/bareos19-server: fix fs_violations
    
    This is basically the same as the fix for bareos18-server,
    although the upstream CMake code has been slightly
    reformatted. Don't symlink in /usr/local/lib, do it
    in ${DESTDIR}${libdir}, relatively, and fix the .so
    versioning while here.
---
 sysutils/bareos19-server/Makefile                  |  2 +-
 ...e_cmake_bareos-symlink-default-db-backend.cmake | 38 ++++++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/sysutils/bareos19-server/Makefile b/sysutils/bareos19-server/Makefile
index 5290e32d1ec3..503c5df84c4c 100644
--- a/sysutils/bareos19-server/Makefile
+++ b/sysutils/bareos19-server/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	bareos
 DISTVERSIONPREFIX=	Release/
 DISTVERSION=	19.2.9
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	sysutils
 PKGNAMEPREFIX?=	#
 PKGNAMESUFFIX?=	19-server
diff --git a/sysutils/bareos19-server/files/patch-core_cmake_bareos-symlink-default-db-backend.cmake b/sysutils/bareos19-server/files/patch-core_cmake_bareos-symlink-default-db-backend.cmake
new file mode 100644
index 000000000000..11bfbd7af603
--- /dev/null
+++ b/sysutils/bareos19-server/files/patch-core_cmake_bareos-symlink-default-db-backend.cmake
@@ -0,0 +1,38 @@
+--- core/cmake/bareos-symlink-default-db-backend.cmake.orig	2020-12-11 13:44:43 UTC
++++ core/cmake/bareos-symlink-default-db-backend.cmake
+@@ -16,15 +16,33 @@
+ #   along with this program; if not, write to the Free Software
+ #   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ #   02110-1301, USA.
++
++# The ${libdir} and ${backenddir} are absolute, so figure out
++# a relative path (${backenddir} lives under ${libdir}) instead.
++# Make the link relative, placing the libbareoscats.so in ${libdir}.
++# Within this script, VERSION is set to BAREOS_NUMERIC_VERSION (see
++# core/src/cats/CMakeLists.txt).
+ message(
+   STATUS
+     "${CMAKE_COMMAND} -E create_symlink ${libdir}/libbareoscats${CMAKE_SHARED_LIBRARY_SUFFIX} ${backenddir}/libbareoscats-${default_db_backend}${CMAKE_SHARED_LIBRARY_SUFFIX}"
+ )
++file(
++  RELATIVE_PATH 
++    _rel 
++    ${libdir} 
++    ${backenddir}/libbareoscats-${default_db_backend}${CMAKE_SHARED_LIBRARY_SUFFIX}
++)
++message(
++  STATUS 
++    ".. actually ${_rel} in $ENV{DESTDIR} v ${VERSION}"
++)
++
+ execute_process(
+   COMMAND
+     ${CMAKE_COMMAND}
+     -E
+     create_symlink
+-    ${backenddir}/libbareoscats-${default_db_backend}${CMAKE_SHARED_LIBRARY_SUFFIX}
+-    ${libdir}/libbareoscats${CMAKE_SHARED_LIBRARY_SUFFIX}.${BAREOS_NUMERIC_VERSION}
++    ${_rel}
++    libbareoscats${CMAKE_SHARED_LIBRARY_SUFFIX}.${VERSION}
++    WORKING_DIRECTORY $ENV{DESTDIR}${libdir} COMMAND_ECHO STDOUT
+ )