Date: Mon, 13 Jan 2025 17:00:50 GMT From: Gleb Popov <arrowd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 542b6000bec9 - main - net/freerdp3: Pull in a patch from upstream fixing CMake files' installation dir Message-ID: <202501131700.50DH0oMb069065@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=542b6000bec92176867d1512591b25646cd000e8 commit 542b6000bec92176867d1512591b25646cd000e8 Author: Gleb Popov <arrowd@FreeBSD.org> AuthorDate: 2025-01-13 16:59:28 +0000 Commit: Gleb Popov <arrowd@FreeBSD.org> CommitDate: 2025-01-13 17:00:32 +0000 net/freerdp3: Pull in a patch from upstream fixing CMake files' installation dir This allows other ports to correctly locate freerdp libraries via CMake Approved by: vvd --- net/freerdp3/Makefile | 1 + .../patch-cmake_SetFreeRDPCMakeInstallDir.cmake | 13 +++++++++ net/freerdp3/pkg-plist | 32 +++++++++++----------- 3 files changed, 30 insertions(+), 16 deletions(-) diff --git a/net/freerdp3/Makefile b/net/freerdp3/Makefile index d2459933703c..5c15cd73a957 100644 --- a/net/freerdp3/Makefile +++ b/net/freerdp3/Makefile @@ -1,5 +1,6 @@ PORTNAME= freerdp DISTVERSION= 3.10.2 +PORTREVISION= 1 CATEGORIES= net comms MASTER_SITES= https://pub.freerdp.com/releases/ \ https://github.com/FreeRDP/FreeRDP/releases/download/${DISTVERSION}/ diff --git a/net/freerdp3/files/patch-cmake_SetFreeRDPCMakeInstallDir.cmake b/net/freerdp3/files/patch-cmake_SetFreeRDPCMakeInstallDir.cmake new file mode 100644 index 000000000000..a82d8577a18c --- /dev/null +++ b/net/freerdp3/files/patch-cmake_SetFreeRDPCMakeInstallDir.cmake @@ -0,0 +1,13 @@ +https://github.com/FreeRDP/FreeRDP/pull/11073 + +--- cmake/SetFreeRDPCMakeInstallDir.cmake.orig 2024-12-16 13:22:36 UTC ++++ cmake/SetFreeRDPCMakeInstallDir.cmake +@@ -1,7 +1,3 @@ function(SetFreeRDPCMakeInstallDir SETVAR subdir) + function(SetFreeRDPCMakeInstallDir SETVAR subdir) +- if(FREEBSD) +- set(${SETVAR} "${CMAKE_INSTALL_DATAROOTDIR}/cmake/Modules/${subdir}" PARENT_SCOPE) +- else() +- set(${SETVAR} "${CMAKE_INSTALL_LIBDIR}/cmake/${subdir}" PARENT_SCOPE) +- endif() ++ set(${SETVAR} "${CMAKE_INSTALL_LIBDIR}/cmake/${subdir}" PARENT_SCOPE) + endfunction() diff --git a/net/freerdp3/pkg-plist b/net/freerdp3/pkg-plist index af0f5030d5c5..a55526126572 100644 --- a/net/freerdp3/pkg-plist +++ b/net/freerdp3/pkg-plist @@ -277,22 +277,22 @@ libdata/pkgconfig/winpr%%MAJORVERSION%%.pc %%SDL%%share/applications/sdl-freerdp%%MAJORVERSION%%.desktop %%X11%%share/applications/xfreerdp%%MAJORVERSION%%-file.desktop %%X11%%share/applications/xfreerdp%%MAJORVERSION%%.desktop -share/cmake/Modules/FreeRDP-Client%%MAJORVERSION%%/FreeRDP-ClientConfig.cmake -share/cmake/Modules/FreeRDP-Client%%MAJORVERSION%%/FreeRDP-ClientConfigVersion.cmake -share/cmake/Modules/FreeRDP-Client%%MAJORVERSION%%/FreeRDP-ClientTargets-%%CMAKE_BUILD_TYPE%%.cmake -share/cmake/Modules/FreeRDP-Client%%MAJORVERSION%%/FreeRDP-ClientTargets.cmake -share/cmake/Modules/FreeRDP%%MAJORVERSION%%/FreeRDPConfig.cmake -share/cmake/Modules/FreeRDP%%MAJORVERSION%%/FreeRDPConfigVersion.cmake -share/cmake/Modules/FreeRDP%%MAJORVERSION%%/FreeRDPTargets-%%CMAKE_BUILD_TYPE%%.cmake -share/cmake/Modules/FreeRDP%%MAJORVERSION%%/FreeRDPTargets.cmake -share/cmake/Modules/WinPR%%MAJORVERSION%%/WinPRConfig.cmake -share/cmake/Modules/WinPR%%MAJORVERSION%%/WinPRConfigVersion.cmake -share/cmake/Modules/WinPR%%MAJORVERSION%%/WinPRTargets-%%CMAKE_BUILD_TYPE%%.cmake -share/cmake/Modules/WinPR%%MAJORVERSION%%/WinPRTargets.cmake -share/cmake/Modules/WinPR-tools%%MAJORVERSION%%/WinPR-toolsConfig.cmake -share/cmake/Modules/WinPR-tools%%MAJORVERSION%%/WinPR-toolsConfigVersion.cmake -share/cmake/Modules/WinPR-tools%%MAJORVERSION%%/WinPR-toolsTargets-%%CMAKE_BUILD_TYPE%%.cmake -share/cmake/Modules/WinPR-tools%%MAJORVERSION%%/WinPR-toolsTargets.cmake +lib/cmake/FreeRDP-Client%%MAJORVERSION%%/FreeRDP-ClientConfig.cmake +lib/cmake/FreeRDP-Client%%MAJORVERSION%%/FreeRDP-ClientConfigVersion.cmake +lib/cmake/FreeRDP-Client%%MAJORVERSION%%/FreeRDP-ClientTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/FreeRDP-Client%%MAJORVERSION%%/FreeRDP-ClientTargets.cmake +lib/cmake/FreeRDP%%MAJORVERSION%%/FreeRDPConfig.cmake +lib/cmake/FreeRDP%%MAJORVERSION%%/FreeRDPConfigVersion.cmake +lib/cmake/FreeRDP%%MAJORVERSION%%/FreeRDPTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/FreeRDP%%MAJORVERSION%%/FreeRDPTargets.cmake +lib/cmake/WinPR%%MAJORVERSION%%/WinPRConfig.cmake +lib/cmake/WinPR%%MAJORVERSION%%/WinPRConfigVersion.cmake +lib/cmake/WinPR%%MAJORVERSION%%/WinPRTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/WinPR%%MAJORVERSION%%/WinPRTargets.cmake +lib/cmake/WinPR-tools%%MAJORVERSION%%/WinPR-toolsConfig.cmake +lib/cmake/WinPR-tools%%MAJORVERSION%%/WinPR-toolsConfigVersion.cmake +lib/cmake/WinPR-tools%%MAJORVERSION%%/WinPR-toolsTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/WinPR-tools%%MAJORVERSION%%/WinPR-toolsTargets.cmake share/icons/hicolor/scalable/apps/FreeRDP.svg %%SDL%%%%MANPAGES%%share/man/man1/sdl-freerdp%%MAJORVERSION%%.1.gz %%MANPAGES%%share/man/man1/winpr-hash%%MAJORVERSION%%.1.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202501131700.50DH0oMb069065>