CVS commit: pkgsrc/geography/merkaartor

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Wed Sep 18 14:01:30 UTC 2024

Modified Files:
        pkgsrc/geography/merkaartor: Makefile PLIST distinfo

Log Message:
geogrpahy/merkaator: Update to 0.20.0

packaging changes:
  - switch to cmake, because upstream dropped qmake
  - complete rototill of dependencies
  - WalkingPapers plugin is gone, and seems rolled into base not plugin
    (if you use it, please feel to test and send me fixes if needed)

upstream NEWS:

v0.20.0
    * ADD: Implemented OAuth2 authentication.
    * ADD: AppImage builds.
    * FIX: Fixed CI builds.
    * FIX: libproxy and libgps external library handling by build system.
    * FIX: CMake unity builds.
    * FIX: Windows localization.
    * DEL: Removed some dead code, qmake build config.


To generate a diff of this commit:
cvs rdiff -u -r1.132 -r1.133 pkgsrc/geography/merkaartor/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/geography/merkaartor/PLIST
cvs rdiff -u -r1.17 -r1.18 pkgsrc/geography/merkaartor/distinfo

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

Modified files:

Index: pkgsrc/geography/merkaartor/Makefile
diff -u pkgsrc/geography/merkaartor/Makefile:1.132 pkgsrc/geography/merkaartor/Makefile:1.133
--- pkgsrc/geography/merkaartor/Makefile:1.132  Sun Sep  1 14:56:34 2024
+++ pkgsrc/geography/merkaartor/Makefile        Wed Sep 18 14:01:30 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.132 2024/09/01 14:56:34 gdt Exp $
+# $NetBSD: Makefile,v 1.133 2024/09/18 14:01:30 gdt Exp $
 
-DISTNAME=      merkaartor-0.19.0
-PKGREVISION=   23
+DISTNAME=      merkaartor-0.20.0
 CATEGORIES=    geography
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=openstreetmap/}
 GITHUB_PROJECT=        merkaartor
@@ -12,41 +11,46 @@ HOMEPAGE=   http://www.merkaartor.be/
 COMMENT=       OpenStreetMap mapping program
 LICENSE=       gnu-gpl-v2
 
-USE_LANGUAGES=         c c++11
-# gcc 5 complains about -Wno-register.  Require new enough rather than patching.
-GCC_REQD+=             6
-USE_LIBTOOL=           yes
-QMAKE=                 ${QTDIR}/bin/qmake
-CONFIGURE_ARGS=                PREFIX=${PREFIX} NODEBUG=1 RELEASE=1
-
-INSTALL_ENV+=  INSTALL_ROOT=${DESTDIR}
-
-do-configure:
-       cd ${WRKSRC} && \
-               ${QTDIR}/bin/lrelease src/src.pro
-       cd ${WRKSRC} && \
-               ${QMAKE} ${CONFIGURE_ARGS} Merkaartor.pro && \
-               ${MAKE} qmake
+USE_LANGUAGES=         c c++
+# Not documented, but in CMakeLists.txt.
+USE_CC_FEATURES+=      c+17
+
+USE_TOOLS+=    pkg-config
+
+.include "../../devel/cmake/build.mk"
+
+CMAKE_CONFIGURE_ARGS+= -DGPSD=ON
+
+# Dependencies, generally in the order they are searched for, or
+# ordered following pkgsrc conventions.
+
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+# qt5 fragments not searched for but used during the build.
+.include "../../x11/qt5-qtnetworkauth/buildlink3.mk"
+.include "../../x11/qt5-qtsvg/buildlink3.mk"
+# qt5 fragments not searched for and apparently not used, but were
+# listed in earlier versions of the package.  Left as hints for future
+# debugging.
+#.include "../../x11/qt5-qttools/buildlink3.mk"
+#.include "../../x11/qt5-qtconnectivity/buildlink3.mk"
+#.include "../../x11/qt5-qtdeclarative/buildlink3.mk"
+#.include "../../x11/qt5-qtimageformats/buildlink3.mk"
+#.include "../../x11/qt5-qtquickcontrols/buildlink3.mk"
+#.include "../../x11/qt5-qtserialport/buildlink3.mk"
+#.include "../../x11/qt5-qtwebkit/buildlink3.mk"
+#.include "../../x11/qt5-qtxmlpatterns/buildlink3.mk"
 
-.include "../../archivers/quazip/buildlink3.mk"
-.include "../../devel/boost-headers/buildlink3.mk"
 .include "../../geography/gdal-lib/buildlink3.mk"
-.include "../../geography/gpsd/buildlink3.mk"
 .include "../../geography/proj/buildlink3.mk"
 .include "../../graphics/exiv2/buildlink3.mk"
-.include "../../graphics/tiff/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../textproc/libxslt/buildlink3.mk"
-.include "../../x11/qt5-qtbase/buildlink3.mk"
-.include "../../x11/qt5-qttools/buildlink3.mk"
-.include "../../x11/qt5-qtxmlpatterns/buildlink3.mk"
-.include "../../x11/qt5-qtsvg/buildlink3.mk"
-.include "../../x11/qt5-qtimageformats/buildlink3.mk"
-.include "../../x11/qt5-qtwebkit/buildlink3.mk"
-.include "../../x11/qt5-qtconnectivity/buildlink3.mk"
-.include "../../x11/qt5-qtquickcontrols/buildlink3.mk"
-.include "../../x11/qt5-qtdeclarative/buildlink3.mk"
-.include "../../x11/qt5-qtserialport/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../devel/protobuf-c/buildlink3.mk"
+
+# Due to GPSD=ON.
+.include "../../geography/gpsd/buildlink3.mk"
+
+# Standard pkgsrc.
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/geography/merkaartor/PLIST
diff -u pkgsrc/geography/merkaartor/PLIST:1.8 pkgsrc/geography/merkaartor/PLIST:1.9
--- pkgsrc/geography/merkaartor/PLIST:1.8       Sun Nov 20 16:39:06 2022
+++ pkgsrc/geography/merkaartor/PLIST   Wed Sep 18 14:01:30 2024
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.8 2022/11/20 16:39:06 gdt Exp $
+@comment $NetBSD: PLIST,v 1.9 2024/09/18 14:01:30 gdt Exp $
 bin/merkaartor
 lib/merkaartor/plugins/background/libMGdalBackgroundPlugin.so
 lib/merkaartor/plugins/background/libMGeoTiffBackgroundPlugin.so
 lib/merkaartor/plugins/background/libMMsBingMapBackgroundPlugin.so
-lib/merkaartor/plugins/background/libMWalkingPapersBackgroundPlugin.so
 share/applications/org.merkaartor.merkaartor.desktop
 share/icons/hicolor/128x128/apps/merkaartor.png
 share/icons/hicolor/16x16/apps/merkaartor.png

Index: pkgsrc/geography/merkaartor/distinfo
diff -u pkgsrc/geography/merkaartor/distinfo:1.17 pkgsrc/geography/merkaartor/distinfo:1.18
--- pkgsrc/geography/merkaartor/distinfo:1.17   Sun Nov 20 16:39:06 2022
+++ pkgsrc/geography/merkaartor/distinfo        Wed Sep 18 14:01:30 2024
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.17 2022/11/20 16:39:06 gdt Exp $
+$NetBSD: distinfo,v 1.18 2024/09/18 14:01:30 gdt Exp $
 
-BLAKE2s (merkaartor-0.19.0.tar.gz) = 0a0ff2676b16b71cde97812096b3515a0fa49162da7248ab9154cd88bfd42e6a
-SHA512 (merkaartor-0.19.0.tar.gz) = 2e832ba14fd89861a4ae2940d281c801d039e09aaf30ada996ac508e084a29d033f8ac3d3e4711c78d1f36df84ab133bd0a901e0e8fa72efa098001724940a6d
-Size (merkaartor-0.19.0.tar.gz) = 5665947 bytes
+BLAKE2s (merkaartor-0.20.0.tar.gz) = 93eb83946bd7905346dc733c8dc54b7a83ed3329d2cb9a21b135ca9f773e3a5e
+SHA512 (merkaartor-0.20.0.tar.gz) = db64c3053618a0bed7984223c9aa8e4175fdf7db2dd70bf3c6ec021b46fae1d095c513c3e151086baf07446c7cf81c49923a2e43e79963d956d29643d7f93910
+Size (merkaartor-0.20.0.tar.gz) = 5592116 bytes