Date: Tue, 13 Apr 2021 22:37:27 GMT From: Adriaan de Groot <adridg@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: c6536d48e794 - main - sysutils/bareos-server: fix fs_violations Message-ID: <202104132237.13DMbRMH066177@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=c6536d48e794413ada1a7d7b7ca026a7201a89ee commit c6536d48e794413ada1a7d7b7ca026a7201a89ee Author: Adriaan de Groot <adridg@FreeBSD.org> AuthorDate: 2021-04-13 22:26:11 +0000 Commit: Adriaan de Groot <adridg@FreeBSD.org> CommitDate: 2021-04-13 22:37:22 +0000 sysutils/bareos-server: fix fs_violations This is the same fix as for 18 and 19, but upstream reformatted the CMake code **again**. --- sysutils/bareos-server/Makefile | 2 +- ...e_cmake_bareos-symlink-default-db-backend.cmake | 36 ++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/sysutils/bareos-server/Makefile b/sysutils/bareos-server/Makefile index 7fe3f76277cf..10342df51ca9 100644 --- a/sysutils/bareos-server/Makefile +++ b/sysutils/bareos-server/Makefile @@ -1,7 +1,7 @@ PORTNAME= bareos DISTVERSIONPREFIX= Release/ DISTVERSION= 20.0.0 -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES?= sysutils PKGNAMEPREFIX?= # PKGNAMESUFFIX?= -server diff --git a/sysutils/bareos-server/files/patch-core_cmake_bareos-symlink-default-db-backend.cmake b/sysutils/bareos-server/files/patch-core_cmake_bareos-symlink-default-db-backend.cmake new file mode 100644 index 000000000000..bf079968d9d4 --- /dev/null +++ b/sysutils/bareos-server/files/patch-core_cmake_bareos-symlink-default-db-backend.cmake @@ -0,0 +1,36 @@ +--- 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,13 +16,31 @@ + # 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 + )
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104132237.13DMbRMH066177>