CVS commit: pkgsrc/geography/opencpn-plugin-debugger

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Aug 19 12:39:06 UTC 2025

Modified Files:
        pkgsrc/geography/opencpn-plugin-debugger: Makefile distinfo
        pkgsrc/geography/opencpn-plugin-debugger/patches:
            patch-cmake_PluginConfigure.cmake
Added Files:
        pkgsrc/geography/opencpn-plugin-debugger/patches:
            patch-cmake_PluginPackage.cmake

Log Message:
opencpn-plugin-debugger: fix build with cmake 4


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/geography/opencpn-plugin-debugger/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/geography/opencpn-plugin-debugger/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/geography/opencpn-plugin-debugger/patches/patch-cmake_PluginConfigure.cmake
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/geography/opencpn-plugin-debugger/patches/patch-cmake_PluginPackage.cmake

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

Modified files:

Index: pkgsrc/geography/opencpn-plugin-debugger/Makefile
diff -u pkgsrc/geography/opencpn-plugin-debugger/Makefile:1.31 pkgsrc/geography/opencpn-plugin-debugger/Makefile:1.32
--- pkgsrc/geography/opencpn-plugin-debugger/Makefile:1.31      Thu Apr 24 14:14:08 2025
+++ pkgsrc/geography/opencpn-plugin-debugger/Makefile   Tue Aug 19 12:39:06 2025
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.31 2025/04/24 14:14:08 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.32 2025/08/19 12:39:06 wiz Exp $
 
 VERSION=       20170414
-PKGREVISION=   25
 DISTNAME=      ocpndebugger_pi-${VERSION}
 PKGNAME=       opencpn-plugin-debugger-${VERSION}
+PKGREVISION=   25
 CATEGORIES=    geography
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=nohal/}
 GITHUB_PROJECT=        ocpndebugger_pi
@@ -19,7 +18,8 @@ USE_LANGUAGES=                c c++
 USE_CMAKE=             yes
 
 CMAKE_CONFIGURE_ARGS+= -DPREFIX:PATH=${PREFIX} -DPREFIX_PLUGINS:PATH=${PREFIX}/lib/opencpn
-CMAKE_MODULE_PATH_OVERRIDE = \
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+CMAKE_MODULE_PATH_OVERRIDE= \
                cmake/PluginConfigure.cmake \
                cmake/PluginInstall.cmake \
                cmake/PluginLocalization.cmake \

Index: pkgsrc/geography/opencpn-plugin-debugger/distinfo
diff -u pkgsrc/geography/opencpn-plugin-debugger/distinfo:1.6 pkgsrc/geography/opencpn-plugin-debugger/distinfo:1.7
--- pkgsrc/geography/opencpn-plugin-debugger/distinfo:1.6       Tue Oct 26 10:45:12 2021
+++ pkgsrc/geography/opencpn-plugin-debugger/distinfo   Tue Aug 19 12:39:06 2025
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 10:45:12 nia Exp $
+$NetBSD: distinfo,v 1.7 2025/08/19 12:39:06 wiz Exp $
 
 BLAKE2s (ocpndebugger_pi-20170414-f2cea39ffcbf61c84e2d6066b155d866eaebff0f.tar.gz) = ecfd9ac85f258181ee8d81485d005216fbeb549c717be27c3d5d6ad44d4b04a6
 SHA512 (ocpndebugger_pi-20170414-f2cea39ffcbf61c84e2d6066b155d866eaebff0f.tar.gz) = 
007f8c8c3c9334d9e71a2a471744fb7f5db5e67fe6f16440b4fb0134688c946f914505b2b11b5e4cbcb85defb00dd972f9ea7b5610042e8f946930d2a7f1326f
 Size (ocpndebugger_pi-20170414-f2cea39ffcbf61c84e2d6066b155d866eaebff0f.tar.gz) = 124761 bytes
-SHA1 (patch-cmake_PluginConfigure.cmake) = c7d16c96d4fb0a95d421cda029795a0c20323f4c
+SHA1 (patch-cmake_PluginConfigure.cmake) = 82387a35ff19b713f1e4c63a39955d7510fdd31d
+SHA1 (patch-cmake_PluginPackage.cmake) = e29d973f1cc076b54e731370095e1989c1526382
 SHA1 (patch-src_ocpndebugger_pi.cpp) = 9b37f7773e3f0cbde2fc10465e71972413ebc474

Index: pkgsrc/geography/opencpn-plugin-debugger/patches/patch-cmake_PluginConfigure.cmake
diff -u pkgsrc/geography/opencpn-plugin-debugger/patches/patch-cmake_PluginConfigure.cmake:1.2 pkgsrc/geography/opencpn-plugin-debugger/patches/patch-cmake_PluginConfigure.cmake:1.3
--- pkgsrc/geography/opencpn-plugin-debugger/patches/patch-cmake_PluginConfigure.cmake:1.2      Thu Aug 24 13:01:32 2017
+++ pkgsrc/geography/opencpn-plugin-debugger/patches/patch-cmake_PluginConfigure.cmake  Tue Aug 19 12:39:06 2025
@@ -1,9 +1,26 @@
-$NetBSD: patch-cmake_PluginConfigure.cmake,v 1.2 2017/08/24 13:01:32 bouyer Exp $
+$NetBSD: patch-cmake_PluginConfigure.cmake,v 1.3 2025/08/19 12:39:06 wiz Exp $
+
+Fix build with cmake 4.
+
 Do not overwrite CMAKE_SHARED_LINKER_FLAGS
 
---- cmake/PluginConfigure.cmake.orig   2016-07-16 16:24:09.000000000 +0200
-+++ cmake/PluginConfigure.cmake        2017-08-24 11:41:35.216982638 +0200
-@@ -35,9 +35,9 @@
+--- cmake/PluginConfigure.cmake.orig   2016-07-16 14:24:09.000000000 +0000
++++ cmake/PluginConfigure.cmake
+@@ -6,13 +6,6 @@
+ 
+ SET(PLUGIN_SOURCE_DIR .)
+ 
+-# This should be 2.8.0 to have FindGTK2 module
+-IF (COMMAND cmake_policy)
+-  CMAKE_POLICY(SET CMP0003 OLD)
+-  CMAKE_POLICY(SET CMP0005 OLD)
+-  CMAKE_POLICY(SET CMP0011 OLD)
+-ENDIF (COMMAND cmake_policy)
+-
+ MESSAGE (STATUS "*** Staging to build ${PACKAGE_NAME} ***")
+ 
+ configure_file(cmake/version.h.in ${PROJECT_SOURCE_DIR}/src/version.h)
+@@ -35,9 +28,9 @@ IF(NOT MSVC)
   ENDIF(PROFILING)
  
   IF(NOT APPLE)

Added files:

Index: pkgsrc/geography/opencpn-plugin-debugger/patches/patch-cmake_PluginPackage.cmake
diff -u /dev/null pkgsrc/geography/opencpn-plugin-debugger/patches/patch-cmake_PluginPackage.cmake:1.1
--- /dev/null   Tue Aug 19 12:39:07 2025
+++ pkgsrc/geography/opencpn-plugin-debugger/patches/patch-cmake_PluginPackage.cmake    Tue Aug 19 12:39:06 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-cmake_PluginPackage.cmake,v 1.1 2025/08/19 12:39:06 wiz Exp $
+
+Fix build with cmake 4.
+
+--- cmake/PluginPackage.cmake.orig     2025-08-19 12:36:29.956649995 +0000
++++ cmake/PluginPackage.cmake
+@@ -6,9 +6,6 @@
+ 
+ # build a CPack driven installer package
+ #include (InstallRequiredSystemLibraries)
+-IF (COMMAND cmake_policy)
+-  CMAKE_POLICY(SET CMP0002 OLD)
+-ENDIF (COMMAND cmake_policy)
+ 
+ SET(CPACK_PACKAGE_NAME "${PACKAGE_NAME}")
+ SET(CPACK_PACKAGE_VENDOR "opencpn.org")