From nobody Thu Feb 06 00:21:08 2025 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YpHnx3RW9z5mfs9; Thu, 06 Feb 2025 00:21:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YpHnx15nqz4NMB; Thu, 06 Feb 2025 00:21:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738801269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Iv0r21GqDNXyJRqXHMrpRNLrN9PDGl3nWhIFll2um48=; b=cj9H9wKzmNekMeYd49trwHapeI06K6pQckdzgtjx4fCQbTyUKTNM44qu89fR41wvwZ8O6U scEEzBrg8TepTJGvbc9M7SfH/Yar3lItuGywxtqhPu4x8QCMWWcaBoAZuBv8umr/3hvDeY GFXCTyqM568guVxAaS+ARoXc08zvDN2eRDcXEW82KqNFgolEy9z5Zn7hoacCGPNqU+668l 4yEwYM78yyMNchVExAFXPXKGKq8XhPx7RdVbYamIujw/871Pc3x82oAlUjethO5W7E1eX6 4IQQP76ZjmzCXIvb+NM1EHKGBm6qhIR0uH9ZPZHxIbtoEjmo7vJmvF6po2xNpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738801269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Iv0r21GqDNXyJRqXHMrpRNLrN9PDGl3nWhIFll2um48=; b=mrcxUvnhYrtEm/gDTc07APCRsheYbN3E09+yaJcIiI6qGObI/MtlYeb444oxLTcqalx49Y pG0Hjjt7wNyMwAqHiQ84+jBHnkbFPbmhLgbm31AZITV1LxqR8Eu97O27cwiM2bfKM1NjKK ERnJbHpmdZ88PRnZNlSY2unMUGghaKuBIuK52CCTp9t3vcKXPwj2jijMSyXHYLCRMdbvev 7+7FgMzI7XPmM4snh6DeFTQXEgWMDmC9IECFTwZU14mnT4nACrn8dcV6Tjl1D/ILOSRfbQ DPeHtApzbmdEJ3MWTty4N6nYfFaPb9aPF7DoBu4XlsesgueI/2xgB768mfibwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738801269; a=rsa-sha256; cv=none; b=aA2Y1HBitOJ+F3zf7A3mEqC4F2rBLvOkqIMgo4VHZD4B2YoEnNceN3NPE2xJq3h7rEfVf8 w6lkJ8OyTVWqWSWOksnsQ8UTmOpYXsHClEtkrlTvC8V8X5uDHjtFMHCJ+O8dnI/Dk+u0g8 E2oUP8km+nfEKRvktLFEIy2fXIEW1ozRDmLhKHN+3XYmQ9kGLlCduyozvFh4TkJNaGxgDf GhgT8VuCEw7VGQsooC2VhTcz4QdLl980Cgr7rWOi0f80R9YCXAY6EOzAoqFotZt78Cedo6 7nqtcyQScypOXpAfvAvReRMZHpXgIDiHQvfSPtqjGVwzuLXAl/5Lp5gYLv+haQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YpHnx0Rw4zKr; Thu, 06 Feb 2025 00:21:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5160L8Is090462; Thu, 6 Feb 2025 00:21:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5160L8Se090459; Thu, 6 Feb 2025 00:21:08 GMT (envelope-from git) Date: Thu, 6 Feb 2025 00:21:08 GMT Message-Id: <202502060021.5160L8Se090459@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 94b44b66bdc7 - main - net/freerdp: Pull in a patch from upstream fixing CMake files' installation dir List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 94b44b66bdc7254a5520347a8f7849392990e838 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=94b44b66bdc7254a5520347a8f7849392990e838 commit 94b44b66bdc7254a5520347a8f7849392990e838 Author: Vladimir Druzenko AuthorDate: 2025-02-06 00:16:52 +0000 Commit: Vladimir Druzenko 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