CVS commit: pkgsrc/math/sundials

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Aug 19 14:03:02 UTC 2025

Modified Files:
        pkgsrc/math/sundials: Makefile buildlink3.mk distinfo
Added Files:
        pkgsrc/math/sundials/patches: patch-CMakeLists.txt
            patch-config_SundialsPOSIXTimers.cmake

Log Message:
sundials: fix build with cmake 4

Convert to cmake/build.mk


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/math/sundials/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/math/sundials/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/math/sundials/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/math/sundials/patches/patch-CMakeLists.txt \
    pkgsrc/math/sundials/patches/patch-config_SundialsPOSIXTimers.cmake

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

Modified files:

Index: pkgsrc/math/sundials/Makefile
diff -u pkgsrc/math/sundials/Makefile:1.7 pkgsrc/math/sundials/Makefile:1.8
--- pkgsrc/math/sundials/Makefile:1.7   Sun Aug 25 06:19:01 2024
+++ pkgsrc/math/sundials/Makefile       Tue Aug 19 14:03:02 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2024/08/25 06:19:01 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2025/08/19 14:03:02 wiz Exp $
 
 DISTNAME=      sundials-4.1.0
 PKGREVISION=   2
@@ -11,22 +11,17 @@ COMMENT=    Suite of nonlinear and differen
 LICENSE=       modified-bsd
 
 PYTHON_FOR_BUILD_ONLY= yes
-USE_CMAKE=             yes
-WRKSRC=                        ${WRKDIR}/${DISTNAME}/build
 
-CMAKE_ARG_PATH=        ..
 CMAKE_CONFIGURE_ARGS+= -DEXAMPLES_INSTALL_PATH=${PREFIX}/share/examples/sundials
 
 INSTALLATION_DIRS+=    share/doc/${PKGBASE}
 
-post-extract:
-       ${MKDIR} ${WRKSRC}
-
 post-install:
        ${MV} ${DESTDIR}${PREFIX}/include/sundials/LICENSE \
                ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
-       ${INSTALL_DATA} ${WRKSRC}/../README.md ${WRKSRC}/../doc/*/* \
+       ${INSTALL_DATA} ${WRKSRC}/README.md ${WRKSRC}/doc/*/* \
                ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 
+.include "../../devel/cmake/build.mk"
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/math/sundials/buildlink3.mk
diff -u pkgsrc/math/sundials/buildlink3.mk:1.2 pkgsrc/math/sundials/buildlink3.mk:1.3
--- pkgsrc/math/sundials/buildlink3.mk:1.2      Mon Aug 14 05:24:50 2023
+++ pkgsrc/math/sundials/buildlink3.mk  Tue Aug 19 14:03:02 2025
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2023/08/14 05:24:50 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2025/08/19 14:03:02 wiz Exp $
 
 BUILDLINK_TREE+=       sundials
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        sundials
 SUNDIALS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.sundials+=       sundials>=3.1.1
-BUILDLINK_ABI_DEPENDS.sundials?=               sundials>=4.1.0nb2
+BUILDLINK_ABI_DEPENDS.sundials?=       sundials>=4.1.0nb2
 BUILDLINK_PKGSRCDIR.sundials?=         ../../math/sundials
 .endif # SUNDIALS_BUILDLINK3_MK
 

Index: pkgsrc/math/sundials/distinfo
diff -u pkgsrc/math/sundials/distinfo:1.4 pkgsrc/math/sundials/distinfo:1.5
--- pkgsrc/math/sundials/distinfo:1.4   Tue Oct 26 10:56:08 2021
+++ pkgsrc/math/sundials/distinfo       Tue Aug 19 14:03:02 2025
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 10:56:08 nia Exp $
+$NetBSD: distinfo,v 1.5 2025/08/19 14:03:02 wiz Exp $
 
 BLAKE2s (sundials-4.1.0.tar.gz) = 048ce8e4e7317c97f9c51b415ec6b9617ebaa7654a838f0bb1b20a9990f4d85d
 SHA512 (sundials-4.1.0.tar.gz) = 1922dca3f0b8869098670aede802e48abec39607c96304e4efd9b03d195b16920175846fce10641aeebc48c216bda73c8691139dce57ffa7731a6bc8194b81b0
 Size (sundials-4.1.0.tar.gz) = 17221960 bytes
+SHA1 (patch-CMakeLists.txt) = 4066ac87544324910843310472bcffaa38207931
+SHA1 (patch-config_SundialsPOSIXTimers.cmake) = 3e366f9f981077229ec6e15a2d4337d48d3225dc

Added files:

Index: pkgsrc/math/sundials/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/math/sundials/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Tue Aug 19 14:03:02 2025
+++ pkgsrc/math/sundials/patches/patch-CMakeLists.txt   Tue Aug 19 14:03:02 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2025/08/19 14:03:02 wiz Exp $
+
+Fix build with cmake 4.
+
+--- CMakeLists.txt.orig        2025-08-19 14:00:09.391420434 +0000
++++ CMakeLists.txt
+@@ -20,7 +20,7 @@
+ # ---------------------------------------------------------------
+ 
+ # Require a fairly recent cmake version
+-cmake_minimum_required(VERSION 3.1.3)
++cmake_minimum_required(VERSION 3.5)
+ 
+ # Libraries linked via full path no longer produce linker search paths
+ # Allows examples to build
Index: pkgsrc/math/sundials/patches/patch-config_SundialsPOSIXTimers.cmake
diff -u /dev/null pkgsrc/math/sundials/patches/patch-config_SundialsPOSIXTimers.cmake:1.1
--- /dev/null   Tue Aug 19 14:03:02 2025
+++ pkgsrc/math/sundials/patches/patch-config_SundialsPOSIXTimers.cmake Tue Aug 19 14:03:02 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-config_SundialsPOSIXTimers.cmake,v 1.1 2025/08/19 14:03:02 wiz Exp $
+
+Fix build with cmake 4.
+
+--- config/SundialsPOSIXTimers.cmake.orig      2025-08-19 14:00:46.204784736 +0000
++++ config/SundialsPOSIXTimers.cmake
+@@ -43,7 +43,7 @@ if(SUNDIALS_POSIX_TIMERS)
+ 
+     # Create a CMakeLists.txt file which will generate the test executable
+     file(WRITE ${POSIXTest_DIR}/CMakeLists.txt
+-      "CMAKE_MINIMUM_REQUIRED(VERSION 3.0.2)\n"
++      "CMAKE_MINIMUM_REQUIRED(VERSION 3.5)\n"
+       "PROJECT(posixtimerstest C)\n"
+       "SET(CMAKE_VERBOSE_MAKEFILE ON)\n"
+       "SET(CMAKE_C_COMPILER \"${CMAKE_C_COMPILER}\")\n"