CVS commit: pkgsrc/net/freeDiameter

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Aug 20 06:43:28 UTC 2025

Modified Files:
        pkgsrc/net/freeDiameter: Makefile distinfo
Added Files:
        pkgsrc/net/freeDiameter/patches: patch-libfdcore_CMakeLists.txt
            patch-libfdproto_CMakeLists.txt

Log Message:
freeDiameter: fix build with cmake 4


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 pkgsrc/net/freeDiameter/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/net/freeDiameter/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/freeDiameter/patches/patch-libfdcore_CMakeLists.txt \
    pkgsrc/net/freeDiameter/patches/patch-libfdproto_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/freeDiameter/Makefile
diff -u pkgsrc/net/freeDiameter/Makefile:1.46 pkgsrc/net/freeDiameter/Makefile:1.47
--- pkgsrc/net/freeDiameter/Makefile:1.46       Thu Apr 17 21:51:52 2025
+++ pkgsrc/net/freeDiameter/Makefile    Wed Aug 20 06:43:28 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2025/04/17 21:51:52 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2025/08/20 06:43:28 wiz Exp $
 
 DISTNAME=      1.5.0
 PKGNAME=       freeDiameter-${DISTNAME}
@@ -13,11 +13,13 @@ COMMENT=    Open source Diameter protocol i
 LICENSE=       modified-bsd
 
 WRKSRC=                ${WRKDIR}/${PKGNAME_NOREV}
-USE_CMAKE=     yes
-CMAKE_CONFIGURE_ARGS+= -DDISABLE_SCTP:BOOL=ON
 USE_LANGUAGES= c c++
 USE_TOOLS+=    bison flex pkg-config
-FLEX_REQD=     2.5.35
+FLEX_REQD+=    2.5.35
+
+CMAKE_CONFIGURE_ARGS+= -DDISABLE_SCTP:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+CMAKE_CONFIGURE_ARGS+= -Wno-dev
 
 LDFLAGS.SunOS+=        -lsocket -lnsl
 
@@ -34,8 +36,8 @@ post-install:
        cd ${WRKSRC}/doc/single_host && ${INSTALL_DATA} *.* \
                ${DESTDIR}${PREFIX}/share/examples/freeDiameter/single_host
 
+.include "../../devel/cmake/build.mk"
 .include "../../devel/libidn/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/freeDiameter/distinfo
diff -u pkgsrc/net/freeDiameter/distinfo:1.14 pkgsrc/net/freeDiameter/distinfo:1.15
--- pkgsrc/net/freeDiameter/distinfo:1.14       Tue Oct 26 11:05:36 2021
+++ pkgsrc/net/freeDiameter/distinfo    Wed Aug 20 06:43:28 2025
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.14 2021/10/26 11:05:36 nia Exp $
+$NetBSD: distinfo,v 1.15 2025/08/20 06:43:28 wiz Exp $
 
 BLAKE2s (freeDiameter/1.5.0.tar.gz) = fe127b36783f58ce25c808b7343358e2bbca3796203d443179983568dcff7a08
 SHA512 (freeDiameter/1.5.0.tar.gz) = 21350a22ca3538da598c162ac493bd2b42199bfe2bdcac4203924ce0b5cdcd78ec6437dc41fea451f29f64e764bbbff18c21294b9ccb6ac8465768b5a850ef29
 Size (freeDiameter/1.5.0.tar.gz) = 1010247 bytes
+SHA1 (patch-libfdcore_CMakeLists.txt) = c2196972cc35554246597055c7a886f6f342e5aa
+SHA1 (patch-libfdproto_CMakeLists.txt) = 1543d99c3af7fef8863b1a81136bf5056ffd95ad

Added files:

Index: pkgsrc/net/freeDiameter/patches/patch-libfdcore_CMakeLists.txt
diff -u /dev/null pkgsrc/net/freeDiameter/patches/patch-libfdcore_CMakeLists.txt:1.1
--- /dev/null   Wed Aug 20 06:43:28 2025
+++ pkgsrc/net/freeDiameter/patches/patch-libfdcore_CMakeLists.txt      Wed Aug 20 06:43:28 2025
@@ -0,0 +1,19 @@
+$NetBSD: patch-libfdcore_CMakeLists.txt,v 1.1 2025/08/20 06:43:28 wiz Exp $
+
+Fix build with cmake 4.
+
+--- libfdcore/CMakeLists.txt.orig      2025-08-20 06:41:37.964800184 +0000
++++ libfdcore/CMakeLists.txt
+@@ -1,12 +1,6 @@
+ # The subproject name
+ Project("freeDiameter core library" C)
+ 
+-# Configuration for newer cmake
+-cmake_policy(VERSION 2.6)
+-if (POLICY CMP0022)
+-      cmake_policy(SET CMP0022 OLD)
+-endif (POLICY CMP0022)
+-
+ # Configuration parser
+ BISON_FILE(fdd.y)
+ FLEX_FILE(fdd.l)
Index: pkgsrc/net/freeDiameter/patches/patch-libfdproto_CMakeLists.txt
diff -u /dev/null pkgsrc/net/freeDiameter/patches/patch-libfdproto_CMakeLists.txt:1.1
--- /dev/null   Wed Aug 20 06:43:28 2025
+++ pkgsrc/net/freeDiameter/patches/patch-libfdproto_CMakeLists.txt     Wed Aug 20 06:43:28 2025
@@ -0,0 +1,19 @@
+$NetBSD: patch-libfdproto_CMakeLists.txt,v 1.1 2025/08/20 06:43:28 wiz Exp $
+
+Fix build with cmake 4.
+
+--- libfdproto/CMakeLists.txt.orig     2025-08-20 06:41:28.483436291 +0000
++++ libfdproto/CMakeLists.txt
+@@ -1,12 +1,6 @@
+ # Name of the subproject
+ Project("libfdproto" C)
+ 
+-# Configuration for newer cmake
+-cmake_policy(VERSION 2.6)
+-if (POLICY CMP0022)
+-      cmake_policy(SET CMP0022 OLD)
+-endif (POLICY CMP0022)
+-
+ # List of source files for the library
+ SET(LFDPROTO_SRC
+       fdproto-internal.h