git: 94b44b66bdc7 - main - net/freerdp: Pull in a patch from upstream fixing CMake files' installation dir
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 06 Feb 2025 00:21:08 UTC
The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=94b44b66bdc7254a5520347a8f7849392990e838 commit 94b44b66bdc7254a5520347a8f7849392990e838 Author: Vladimir Druzenko <vvd@FreeBSD.org> AuthorDate: 2025-02-06 00:16:52 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2025-02-06 00:16:52 +0000 net/freerdp: Pull in a patch from upstream fixing CMake files' installation dir This allows other ports to correctly locate freerdp libraries via CMake. For example fix configure error for net/krdc with option FREERDP. --- net/freerdp/Makefile | 2 +- .../patch-cmake_SetFreeRDPCMakeInstallDir.cmake | 11 ++++++++ net/freerdp/pkg-plist | 32 +++++++++++----------- 3 files changed, 28 insertions(+), 17 deletions(-) diff --git a/net/freerdp/Makefile b/net/freerdp/Makefile index 97d33c278b92..df17b55d0df4 100644 --- a/net/freerdp/Makefile +++ b/net/freerdp/Makefile @@ -1,6 +1,6 @@ PORTNAME= freerdp DISTVERSION= 2.11.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net comms MASTER_SITES= https://pub.freerdp.com/releases/ \ https://github.com/FreeRDP/FreeRDP/releases/download/${DISTVERSION}/ diff --git a/net/freerdp/files/patch-cmake_SetFreeRDPCMakeInstallDir.cmake b/net/freerdp/files/patch-cmake_SetFreeRDPCMakeInstallDir.cmake new file mode 100644 index 000000000000..cc59de037647 --- /dev/null +++ b/net/freerdp/files/patch-cmake_SetFreeRDPCMakeInstallDir.cmake @@ -0,0 +1,11 @@ +--- cmake/SetFreeRDPCMakeInstallDir.cmake.orig 2024-04-22 09:26:59 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/freerdp/pkg-plist b/net/freerdp/pkg-plist index 4fc8b242b671..3074439c16b3 100644 --- a/net/freerdp/pkg-plist +++ b/net/freerdp/pkg-plist @@ -223,6 +223,22 @@ include/winpr%%MAJORVERSION%%/winpr/wlog.h include/winpr%%MAJORVERSION%%/winpr/wnd.h include/winpr%%MAJORVERSION%%/winpr/wtsapi.h include/winpr%%MAJORVERSION%%/winpr/wtypes.h +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 +%%WAYLAND%%lib/cmake/uwac0/uwac-%%CMAKE_BUILD_TYPE%%.cmake +%%WAYLAND%%lib/cmake/uwac0/uwac.cmake +%%WAYLAND%%lib/cmake/uwac0/uwacConfig.cmake +%%WAYLAND%%lib/cmake/uwac0/uwacConfigVersion.cmake lib/libfreerdp-client%%MAJORVERSION%%.so lib/libfreerdp-client%%MAJORVERSION%%.so.%%MAJORVERSION%% lib/libfreerdp-client%%MAJORVERSION%%.so.%%PATCHVERSION%% @@ -248,19 +264,3 @@ libdata/pkgconfig/winpr%%MAJORVERSION%%.pc %%WAYLAND%%%%MANPAGES%%share/man/man1/wlfreerdp.1.gz %%X11%%%%MANPAGES%%share/man/man1/xfreerdp.1.gz %%MANPAGES%%share/man/man7/wlog.7.gz -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 -%%WAYLAND%%share/cmake/Modules/uwac0/uwac-%%CMAKE_BUILD_TYPE%%.cmake -%%WAYLAND%%share/cmake/Modules/uwac0/uwac.cmake -%%WAYLAND%%share/cmake/Modules/uwac0/uwacConfig.cmake -%%WAYLAND%%share/cmake/Modules/uwac0/uwacConfigVersion.cmake