pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

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



Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Aug 19 13:15:38 UTC 2025

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

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

Convert to cmake/build.mk


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 \
    pkgsrc/geography/opencpn-plugin-weather_routing/Makefile
cvs rdiff -u -r1.13 -r1.14 \
    pkgsrc/geography/opencpn-plugin-weather_routing/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/geography/opencpn-plugin-weather_routing/patches/patch-cmake_PluginConfigure.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-weather_routing/Makefile
diff -u pkgsrc/geography/opencpn-plugin-weather_routing/Makefile:1.40 pkgsrc/geography/opencpn-plugin-weather_routing/Makefile:1.41
--- pkgsrc/geography/opencpn-plugin-weather_routing/Makefile:1.40       Thu Apr 24 14:14:09 2025
+++ pkgsrc/geography/opencpn-plugin-weather_routing/Makefile    Tue Aug 19 13:15:38 2025
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2025/04/24 14:14:09 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.41 2025/08/19 13:15:38 wiz Exp $
 
 VERSION=       20180827
 DISTNAME=      weather_routing_pi-${VERSION}
@@ -17,10 +16,10 @@ LICENSE=    gnu-gpl-v3
 
 USE_LANGUAGES=         c c++
 USE_TOOLS=             gettext
-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 \
@@ -40,7 +39,7 @@ SUBST_FILES.isnan=    src/BoatDialog.cpp \
 SUBST_SED.isnan=       -e s,wxIsNaN,std::isnan,g
 
 
-.include "../../devel/cmake/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
 .include "../../x11/wxGTK30/buildlink3.mk"
 .include "../../textproc/tinyxml/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/geography/opencpn-plugin-weather_routing/distinfo
diff -u pkgsrc/geography/opencpn-plugin-weather_routing/distinfo:1.13 pkgsrc/geography/opencpn-plugin-weather_routing/distinfo:1.14
--- pkgsrc/geography/opencpn-plugin-weather_routing/distinfo:1.13       Tue Oct 26 10:45:12 2021
+++ pkgsrc/geography/opencpn-plugin-weather_routing/distinfo    Tue Aug 19 13:15:38 2025
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.13 2021/10/26 10:45:12 nia Exp $
+$NetBSD: distinfo,v 1.14 2025/08/19 13:15:38 wiz Exp $
 
 BLAKE2s (weather_routing_pi-20180827-44695011d39c390784220589b9bd25932b73af3e.tar.gz) = 8c2356dfcfa3c8af490651420e7fa9f13f43e3c8a17b8903660b71bc80d64013
 SHA512 (weather_routing_pi-20180827-44695011d39c390784220589b9bd25932b73af3e.tar.gz) = 
d69c065b55f9aa8308fc77e199562c4308fd295e6a71b60d2811b09dede1e636aeff16281610258269597117a29b99622346cb08e74f83077be5680d5cfb77c3
 Size (weather_routing_pi-20180827-44695011d39c390784220589b9bd25932b73af3e.tar.gz) = 921177 bytes
-SHA1 (patch-cmake_PluginConfigure.cmake) = 5f0b145d34c064870090eaa598b5474020eb887d
+SHA1 (patch-cmake_PluginConfigure.cmake) = cd8f0bc1a742b450d5f96c85f9b44f4568727857
 SHA1 (patch-src_RouteMapOverlay.cpp) = 4ab2ad49eba7540dfe6bc43c100c5942bb40c5a2

Index: pkgsrc/geography/opencpn-plugin-weather_routing/patches/patch-cmake_PluginConfigure.cmake
diff -u pkgsrc/geography/opencpn-plugin-weather_routing/patches/patch-cmake_PluginConfigure.cmake:1.2 pkgsrc/geography/opencpn-plugin-weather_routing/patches/patch-cmake_PluginConfigure.cmake:1.3
--- pkgsrc/geography/opencpn-plugin-weather_routing/patches/patch-cmake_PluginConfigure.cmake:1.2       Thu Aug 24 13:01:33 2017
+++ pkgsrc/geography/opencpn-plugin-weather_routing/patches/patch-cmake_PluginConfigure.cmake   Tue Aug 19 13:15:38 2025
@@ -1,9 +1,26 @@
-$NetBSD: patch-cmake_PluginConfigure.cmake,v 1.2 2017/08/24 13:01:33 bouyer Exp $
+$NetBSD: patch-cmake_PluginConfigure.cmake,v 1.3 2025/08/19 13:15:38 wiz Exp $
+
+Fix build with cmake 4.
+
 Do not overwrite CMAKE_SHARED_LINKER_FLAGS
 
---- cmake/PluginConfigure.cmake.orig   2017-04-01 02:46:48.000000000 +0200
-+++ cmake/PluginConfigure.cmake        2017-08-24 11:54:54.830898473 +0200
-@@ -44,9 +44,9 @@
+--- cmake/PluginConfigure.cmake.orig   2018-06-21 21:28:17.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)
+@@ -40,9 +33,9 @@ IF(NOT MSVC)
   ENDIF(PROFILING)
  
   IF(NOT APPLE)



Home | Main Index | Thread Index | Old Index