CVS commit: pkgsrc/net/freerdp2

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Mon Aug 15 20:05:12 UTC 2022

Modified Files:
        pkgsrc/net/freerdp2: Makefile distinfo
        pkgsrc/net/freerdp2/patches: patch-CMakeLists.txt

Log Message:
freerdp2: try to fix epoll detection


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/net/freerdp2/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/freerdp2/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/freerdp2/patches/patch-CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/freerdp2/Makefile
diff -u pkgsrc/net/freerdp2/Makefile:1.28 pkgsrc/net/freerdp2/Makefile:1.29
--- pkgsrc/net/freerdp2/Makefile:1.28   Thu Aug 11 05:09:09 2022
+++ pkgsrc/net/freerdp2/Makefile        Mon Aug 15 20:05:12 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2022/08/11 05:09:09 gutteridge Exp $
+# $NetBSD: Makefile,v 1.29 2022/08/15 20:05:12 tnn Exp $
 
 DISTNAME=      freerdp-2.3.2
 PKGNAME=       ${DISTNAME:S/freerdp-/freerdp2-/1}
@@ -56,7 +56,7 @@ post-install:
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .if defined(OPSYS_HAS_KQUEUE)
-CFLAGS+=       -I${BUILDLINK_DIR}/include/libepoll-shim
+CFLAGS+=       -I${BUILDLINK_PREFIX.libepoll-shim}/include/libepoll-shim
 .include "../../devel/libepoll-shim/buildlink3.mk"
 .endif
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/freerdp2/distinfo
diff -u pkgsrc/net/freerdp2/distinfo:1.10 pkgsrc/net/freerdp2/distinfo:1.11
--- pkgsrc/net/freerdp2/distinfo:1.10   Sat Aug  6 08:02:27 2022
+++ pkgsrc/net/freerdp2/distinfo        Mon Aug 15 20:05:12 2022
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.10 2022/08/06 08:02:27 nia Exp $
+$NetBSD: distinfo,v 1.11 2022/08/15 20:05:12 tnn Exp $
 
 BLAKE2s (freerdp-2.3.2.tar.gz) = b17b6a3127b36e4c8837f7542cf91e26c7828d55975dc7aab420f532e4e1fe93
 SHA512 (freerdp-2.3.2.tar.gz) = b8502d34c73113a42bf2dc240431967829064d68f507cc42ff06432a784213eee4a2c001b174f1b970545aec75b3caf21ba5f4ee1ca8c07c7ef834131413204b
 Size (freerdp-2.3.2.tar.gz) = 7284490 bytes
-SHA1 (patch-CMakeLists.txt) = b836a6f13ca3ae654fd9c96aec43c01df237ad53
+SHA1 (patch-CMakeLists.txt) = 1451870eee9dee3fed9b4166da6345de678d4848
 SHA1 (patch-channels_rdpdr_client_rdpdr__main.c) = 4358d4cd4b9293a27f3edafb94e7759e133ecd5f
 SHA1 (patch-client_Wayland_wlf__input.c) = c79c7359ce538021e09ffbec9e61a9acc63d24af
 SHA1 (patch-client_Wayland_wlfreerdp.c) = c20ac99842d3ae0fda2a1b43807e65efd5121487

Index: pkgsrc/net/freerdp2/patches/patch-CMakeLists.txt
diff -u pkgsrc/net/freerdp2/patches/patch-CMakeLists.txt:1.1 pkgsrc/net/freerdp2/patches/patch-CMakeLists.txt:1.2
--- pkgsrc/net/freerdp2/patches/patch-CMakeLists.txt:1.1        Sat Aug  6 08:02:27 2022
+++ pkgsrc/net/freerdp2/patches/patch-CMakeLists.txt    Mon Aug 15 20:05:12 2022
@@ -1,18 +1,9 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2022/08/06 08:02:27 nia Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2022/08/15 20:05:12 tnn Exp $
 
 Find epoll-shim using pkg-config on all BSDs.
 
 --- CMakeLists.txt.orig        2021-03-15 12:29:35.000000000 +0000
 +++ CMakeLists.txt
-@@ -39,7 +39,7 @@ set(CMAKE_COLOR_MAKEFILE ON)
- set(CMAKE_POSITION_INDEPENDENT_CODE ON)
- 
- # Include our extra modules
--set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/)
-+set (CMAKE_MODULE_PATH "/encrypt/src/pkgsrc/net/freerdp2/work/.buildlink/cmake-Modules" ${CMAKE_SOURCE_DIR}/cmake/)
- 
- if((CMAKE_SYSTEM_NAME MATCHES "WindowsStore") AND (CMAKE_SYSTEM_VERSION MATCHES "10.0"))
-       set(UWP 1)
 @@ -205,6 +205,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "BSD")
        if(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
                set(OPENBSD TRUE)