From nobody Mon Jan 13 17:00:50 2025 X-Original-To: dev-commits-ports-all@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 4YWz6W0Vmpz5kX4B; Mon, 13 Jan 2025 17:00:51 +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 4YWz6V5fjzz49dy; Mon, 13 Jan 2025 17:00:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736787650; 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=77medop7TUzc5/HQrfruthW3XiEOfEWCl1xbUPg6Zv0=; b=qZzA50/k6hzBE+F+jsjRV0/eg+DXS9LW/oBBKPItHFmN5drdycU9NXv8p7Pem6GC18wJGy tDxJe9z5NxnWyhwqltfKCfgGy4//EJ8ZjZknFzoKaXcZqdqK9cvz7djeQFDDT+vdu237LZ +pHGhgwnIRZIxMajFKyvMdrujIjU3yWqEPQUMlE6KFhDu1tdNHBz1yWZCcNbTMWY+woOgV 9fYVlxw08ZfwfQoEzuEH/zthLjkshN+xU2QwD5tsj3Ub4R1tZk4XR5k3j3jpUMgAc8T5hU /vfAU6oFlD7XTSvdfMvH72YLFvIJjlWk8QgQ4nrRVfQZ2Cz2iwv6nXBYwAsAWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736787650; 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=77medop7TUzc5/HQrfruthW3XiEOfEWCl1xbUPg6Zv0=; b=BPq1YQAD9xGT90boUV6+MgypvlVYNRWB90elLaV+XQf6MpZVprojQrYUMABuqGgvPPGhbH Q5BIJuaSJ+NhTgHwFBvtgN54x0KI16cI79D8IpBQR6Os8cfPZ3DR2Q1uDYIqml8Dj9h0dJ HpnnSFV/WPO7/Efw1StQhLG67BqDNucrNgCv0T1S3P7xcUG62K7IKCAuBkLgdt7T6hrE7C T1fMhxPGuiyWVxsoOVEdM5iJVx6mwQsum7sRagvmxLecenL06MQ4g9h3f9E8dhN6ErdNKr czkce3ZMjzM3oHhv7wz6Xd+l1momrmvPjFNQ5yHO1uaGDr4OTr/DTLIvb5IT4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736787650; a=rsa-sha256; cv=none; b=B/1as4wditrukfbUxXg3qVlIfM3bO3cocbVfk+sDPZgyWRq4sIjcO2rzGEBE5KmRugn0gB 8JH9RW6JJjjUEOs0KCPXzcaEuWBgmNnFrE+10qVsTkC+CPTE6K6VyU6wwamCS3b1rojICp M9Mlo7H5tmY2JX/rUlL1MkrV45ugggVqoRY489UhW5MBaogPJXgxb6/gx0M1MraAtnirvP QnhPR1IwwCApKoxfjxeiq2BFYpMOh79TugbhoaW5uOuxdghNZixRemfg3PFcGRZDDCt+7r T74oXuKMQQTgPtQFZHo4Omv2DBw4JSx4JXn/+ixiK9mkHEPyCVG/oSkiI9N5lg== 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 4YWz6V5F20zg03; Mon, 13 Jan 2025 17:00:50 +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 50DH0op7069082; Mon, 13 Jan 2025 17:00:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50DH0oMb069065; Mon, 13 Jan 2025 17:00:50 GMT (envelope-from git) Date: Mon, 13 Jan 2025 17:00:50 GMT Message-Id: <202501131700.50DH0oMb069065@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 542b6000bec9 - main - net/freerdp3: Pull in a patch from upstream fixing CMake files' installation dir List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 542b6000bec92176867d1512591b25646cd000e8 Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=542b6000bec92176867d1512591b25646cd000e8 commit 542b6000bec92176867d1512591b25646cd000e8 Author: Gleb Popov AuthorDate: 2025-01-13 16:59:28 +0000 Commit: Gleb Popov 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