CVS commit: pkgsrc/emulators/dynamips

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Jul 17 16:42:13 UTC 2026

Modified Files:
        pkgsrc/emulators/dynamips: Makefile distinfo
Added Files:
        pkgsrc/emulators/dynamips/patches: patch-cmake_dependencies.cmake

Log Message:
dynamips: update to 0.2.24.

Fix build with cmake 4.4.0.

What's New since v0.2.24
========================

* Fix memory leaks


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/emulators/dynamips/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/emulators/dynamips/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/emulators/dynamips/patches/patch-cmake_dependencies.cmake

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

Modified files:

Index: pkgsrc/emulators/dynamips/Makefile
diff -u pkgsrc/emulators/dynamips/Makefile:1.15 pkgsrc/emulators/dynamips/Makefile:1.16
--- pkgsrc/emulators/dynamips/Makefile:1.15     Wed Aug 20 11:34:55 2025
+++ pkgsrc/emulators/dynamips/Makefile  Fri Jul 17 16:42:13 2026
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2025/08/20 11:34:55 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2026/07/17 16:42:13 wiz Exp $
 
-DISTNAME=      dynamips-0.2.23
+DISTNAME=      dynamips-0.2.24
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=GNS3/}
 GITHUB_PROJECT=        dynamips
@@ -11,17 +11,13 @@ HOMEPAGE=   https://github.com/GNS3/dynami
 COMMENT=       Cisco 3600 and 7200 MIPS emulator
 LICENSE=       gnu-gpl-v2
 
-USE_TOOLS+=    gmake
-USE_CMAKE=     yes
-
-CMAKE_CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5
-
 SUBST_CLASSES+=                libelf
 SUBST_STAGE.libelf=    pre-configure
 SUBST_FILES.libelf=    common/dynamips.h common/rom2c.c
 SUBST_SED.libelf=      -e 's,<libelf.h>,<libelf/libelf.h>,'
 SUBST_MESSAGE.libelf=  Fix libelf header file path
 
+.include "../../devel/cmake/build.mk"
 .include "../../devel/libelf/buildlink3.mk"
 .include "../../devel/libuuid/buildlink3.mk"
 .include "../../net/libpcap/buildlink3.mk"

Index: pkgsrc/emulators/dynamips/distinfo
diff -u pkgsrc/emulators/dynamips/distinfo:1.14 pkgsrc/emulators/dynamips/distinfo:1.15
--- pkgsrc/emulators/dynamips/distinfo:1.14     Wed Oct 16 01:49:38 2024
+++ pkgsrc/emulators/dynamips/distinfo  Fri Jul 17 16:42:13 2026
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.14 2024/10/16 01:49:38 markd Exp $
+$NetBSD: distinfo,v 1.15 2026/07/17 16:42:13 wiz Exp $
 
-BLAKE2s (dynamips-0.2.23.tar.gz) = e5235e93c28f8282e169563eebd2849f4a78c6f1dced4dbfd4a6df616f9da73c
-SHA512 (dynamips-0.2.23.tar.gz) = b68af39cd66f10555d860437f55e63887aefdb5a949bacacf3a308cc0c4eaaab3bb9a496c5ac32fd19d3920bada807bff2af8eb66b01d8d735419fec5d134746
-Size (dynamips-0.2.23.tar.gz) = 835736 bytes
+BLAKE2s (dynamips-0.2.24.tar.gz) = 2171c81d45cb95f097545a8fe3ce811d5157638cccd273f0472d17e4dce57d32
+SHA512 (dynamips-0.2.24.tar.gz) = 960a748a43373512c64035a6fd79e24a171c490d31e55c23fd931d30dcd08fbee5e288050cdfbd36e6ca574b02fd3f4f6ed3a1e557d5053b79df4a6cd48112d2
+Size (dynamips-0.2.24.tar.gz) = 845465 bytes
+SHA1 (patch-cmake_dependencies.cmake) = 7d2fe023ce87f4684e1cda030f1eef8145f891b3

Added files:

Index: pkgsrc/emulators/dynamips/patches/patch-cmake_dependencies.cmake
diff -u /dev/null pkgsrc/emulators/dynamips/patches/patch-cmake_dependencies.cmake:1.1
--- /dev/null   Fri Jul 17 16:42:13 2026
+++ pkgsrc/emulators/dynamips/patches/patch-cmake_dependencies.cmake    Fri Jul 17 16:42:13 2026
@@ -0,0 +1,53 @@
+$NetBSD: patch-cmake_dependencies.cmake,v 1.1 2026/07/17 16:42:13 wiz Exp $
+
+cmake 4.4.0 compatibility
+https://github.com/GNS3/dynamips/issues/312
+
+--- cmake/dependencies.cmake.orig      2026-04-18 11:11:19.000000000 +0000
++++ cmake/dependencies.cmake
+@@ -35,15 +35,15 @@ endif ( NOT CMAKE_COMPILER_IS_GNUCC AND NOT CMAKE_COMP
+       )
+ endif ( NOT CMAKE_COMPILER_IS_GNUCC AND NOT CMAKE_COMPILER_IS_CLANG AND NOT ANY_COMPILER )
+ 
+-set ( DYNAMIPS_FLAGS -Wall -O2 -fomit-frame-pointer )
++set ( DYNAMIPS_FLAGS "-Wall -O2 -fomit-frame-pointer" )
+ set ( DYNAMIPS_DEFINITIONS )
+ set ( DYNAMIPS_INCLUDES )
+ set ( DYNAMIPS_LIBRARIES ${CMAKE_DL_LIBS} )
+ if ( CYGWIN )
+-   list ( APPEND DYNAMIPS_FLAGS -static -static-libgcc )
++   string ( APPEND DYNAMIPS_FLAGS "-static -static-libgcc" )
+ endif ( CYGWIN )
+ macro ( set_cmake_required )
+-   set ( CMAKE_REQUIRED_FLAGS       ${DYNAMIPS_FLAGS} )
++   set ( CMAKE_REQUIRED_FLAGS       "${DYNAMIPS_FLAGS}" )
+    set ( CMAKE_REQUIRED_DEFINITIONS ${DYNAMIPS_DEFINITIONS} )
+    set ( CMAKE_REQUIRED_INCLUDES    ${DYNAMIPS_INCLUDES} )
+    set ( CMAKE_REQUIRED_LIBRARIES   ${DYNAMIPS_LIBRARIES} )
+@@ -62,7 +62,7 @@ set_cmake_required ()
+ #endif
+ " )
+ set_cmake_required ()
+-list ( INSERT CMAKE_REQUIRED_FLAGS 0 -m64 )
++string (APPEND CMAKE_REQUIRED_FLAGS "0 -m64" )
+ check_c_source_compiles ( "${_code}" ARCH_AMD64 )
+ set ( _code "
+ #if defined(__i386) || defined(__i386__) || defined(_M_IX86)
+@@ -72,7 +72,7 @@ set_cmake_required ()
+ #endif
+ " )
+ set_cmake_required ()
+-list ( INSERT CMAKE_REQUIRED_FLAGS 0 -m32 )
++string (APPEND CMAKE_REQUIRED_FLAGS "0 -m32" )
+ check_c_source_compiles ( "${_code}" ARCH_X86 )
+ set ( _code "
+ #if defined(__powerpc) || defined(__powerpc__) || defined(_M_PPC) || defined(_ARCH_PPC)
+@@ -82,7 +82,7 @@ set_cmake_required ()
+ #endif
+ " )
+ set_cmake_required ()
+-list ( INSERT CMAKE_REQUIRED_FLAGS 0 -m32 )
++string (APPEND CMAKE_REQUIRED_FLAGS "0 -m32" )
+ check_c_source_compiles ( "${_code}" ARCH_PPC32 )
+ if ( ARCH_AMD64 )
+    set ( _default "amd64" )