CVS commit: pkgsrc/geography/gpsbabel

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

Module Name:    pkgsrc
Committed By:   gdt
Date:           Tue Aug 30 23:47:05 UTC 2022

Modified Files:
        pkgsrc/geography/gpsbabel: Makefile distinfo
Added Files:
        pkgsrc/geography/gpsbabel/patches: patch-GPSBabel.pro patch-libusb.pri
Removed Files:
        pkgsrc/geography/gpsbabel/patches: patch-ad patch-configure
            patch-configure.ac

Log Message:
geography/gpsbabel: Update to 1.8.0

packaging changes:

  - switch to github for distfile
  - switch from configure to qmake
  - depend on libusb1 and zlib (and add pkg-config as a tool)
  - drop patches to configure
  - add patches to fix portability issues in qmake support

upstream changes (No NEWS provided, but skimming git log):

  - drop autoconf
  - retire some formats
  - Update standards to c++17, Qt >= 5.12, MSVC >= 2017
  - lots of bugfixes and minor improvements


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 pkgsrc/geography/gpsbabel/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/geography/gpsbabel/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/geography/gpsbabel/patches/patch-GPSBabel.pro \
    pkgsrc/geography/gpsbabel/patches/patch-libusb.pri
cvs rdiff -u -r1.6 -r0 pkgsrc/geography/gpsbabel/patches/patch-ad
cvs rdiff -u -r1.2 -r0 pkgsrc/geography/gpsbabel/patches/patch-configure
cvs rdiff -u -r1.1 -r0 pkgsrc/geography/gpsbabel/patches/patch-configure.ac

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

Modified files:

Index: pkgsrc/geography/gpsbabel/Makefile
diff -u pkgsrc/geography/gpsbabel/Makefile:1.42 pkgsrc/geography/gpsbabel/Makefile:1.43
--- pkgsrc/geography/gpsbabel/Makefile:1.42     Sat Jul  2 16:53:21 2022
+++ pkgsrc/geography/gpsbabel/Makefile  Tue Aug 30 23:47:05 2022
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.42 2022/07/02 16:53:21 ryoon Exp $
+# $NetBSD: Makefile,v 1.43 2022/08/30 23:47:05 gdt Exp $
 #
 
-DISTNAME=      gpsbabel-1.6.0
-PKGREVISION=   18
+GITHUB_PROJECT=        gpsbabel
+VERSION=       1.8.0
+GH_VERSION=    1_8_0
+GITHUB_TAG=    refs/tags/gpsbabel_${GH_VERSION}
+DISTNAME=      gpsbabel_${GH_VERSION}
+PKGNAME=       gpsbabel-${VERSION}
 CATEGORIES=    geography
-MASTER_SITES=  ${MASTER_SITE_BACKUP}
-# Download from official site apparently only via interactive form,
-# but code is gnu-gpl-v2 so hosted elsewhere.
-# older versions were at
-# MASTER_SITES+=       http://archlinux-stuff.googlecode.com/files/
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=GPSBabel/}
 
 MAINTAINER=    gdt%NetBSD.org@localhost
 HOMEPAGE=      https://www.gpsbabel.org/
@@ -16,29 +16,24 @@ HOMEPAGE=   https://www.gpsbabel.org/
 COMMENT=       Utility to convert and fetch GPS related data
 LICENSE=       gnu-gpl-v2
 
-USE_LANGUAGES= c c++11
-USE_TOOLS=     gmake
+WRKSRC=                ${WRKDIR}/${GITHUB_PROJECT}-${DISTNAME}
 
-TEST_TARGET=   check
+USE_LANGUAGES+=        c c++11
+USE_TOOLS+=    pkg-config
+QMAKE=         ${QTDIR}/bin/qmake
+QMAKE_ARGS+=   WITH_LIBUSB=no
+QMAKE_ARGS+=   WITH_LIBUSB=pkgconfig
+QMAKE_ARGS+=   WITH_ZLIB=pkgconfig
+
+do-configure:
+       cd ${WRKSRC} && ${QMAKE} ${QMAKE_ARGS} GPSBabel.pro
+
+INSTALLATION_DIRS+=    bin
+do-install:
+       ${INSTALL} ${WRKSRC}/gpsbabel ${DESTDIR}${PREFIX}/bin
 
-# \todo Upstream recommends trying qmake.
-GNU_CONFIGURE= yes
-
-CONFIGURE_ENV+=        QMAKE=${QTDIR}/bin/qmake
-CONFIGURE_ENV+=        LUPDATE=${QTDIR}/bin/lupdate
-CONFIGURE_ENV+=        LRELEASE=${QTDIR}/bin/lrelease
-
-# \todo This seems like a bug; explain why.
-LIBS.Darwin+=  -lexpat
-
-# \todo Figure out stdarg warnings for code that looks correct.
-# util.cc: In function 'int xasprintf(char**, const char*, ...)':
-# util.cc:233:22: warning: second parameter of 'va_start' not last named argument [-Wvarargs]
-#    va_start(args, fmt);
-#                       ^
-
-# gpsbabel 1.6.0 really does need libusb 0.1, and uses usb_interrupt_read
-.include "../../mk/libusb.buildlink3.mk"
+.include "../../devel/libusb1/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../x11/qt5-qttools/buildlink3.mk"

Index: pkgsrc/geography/gpsbabel/distinfo
diff -u pkgsrc/geography/gpsbabel/distinfo:1.14 pkgsrc/geography/gpsbabel/distinfo:1.15
--- pkgsrc/geography/gpsbabel/distinfo:1.14     Tue Oct 26 10:45:10 2021
+++ pkgsrc/geography/gpsbabel/distinfo  Tue Aug 30 23:47:05 2022
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.14 2021/10/26 10:45:10 nia Exp $
+$NetBSD: distinfo,v 1.15 2022/08/30 23:47:05 gdt Exp $
 
-BLAKE2s (gpsbabel-1.6.0.tar.gz) = 384a9739bbb62e56728991eb61fb8fe087602c8e8de39e7fe590547d079b104f
-SHA512 (gpsbabel-1.6.0.tar.gz) = 369bf34aab957a88aeeb657fceb897cbe5e00e6c915760f9b278d9581d98c57084ff6ad65281a18dd7a24bec463335d5e0969c62aeddfbd05d0c5ab05fef6999
-Size (gpsbabel-1.6.0.tar.gz) = 14101201 bytes
-SHA1 (patch-ad) = a2712225fc3cb70bfdf6ce90e4197cf2ce7e27e0
+BLAKE2s (gpsbabel_1_8_0.tar.gz) = 7d61335aa50c77d61d4dd418758dfc771cd2d8285945a56489c016948a997940
+SHA512 (gpsbabel_1_8_0.tar.gz) = 93137586cf887e185d96f06f59be4456cf9bae976979b9e5caad6ae8017c148d4c4c0fc182e8bd4c8547c3ed040c46f74e6f3cfb5f7b566d54fbc7fd767e27e4
+Size (gpsbabel_1_8_0.tar.gz) = 15104689 bytes
+SHA1 (patch-GPSBabel.pro) = 5693c3cdec033cf2a1bd02f5f4ec177445548df0
 SHA1 (patch-af) = 8bb5d9392ae682fd098578ef7a25ad84683f68c6
-SHA1 (patch-configure) = 76c4b79c26712492e2f4b060fe70d5661415f42f
-SHA1 (patch-configure.ac) = 1269690568490dbb91cf25ad87dd3fb53b3ee3c1
+SHA1 (patch-libusb.pri) = 48ca6d57c45265e1ccb94c42080bf2bf990987a5

Added files:

Index: pkgsrc/geography/gpsbabel/patches/patch-GPSBabel.pro
diff -u /dev/null pkgsrc/geography/gpsbabel/patches/patch-GPSBabel.pro:1.1
--- /dev/null   Tue Aug 30 23:47:05 2022
+++ pkgsrc/geography/gpsbabel/patches/patch-GPSBabel.pro        Tue Aug 30 23:47:05 2022
@@ -0,0 +1,26 @@
+$NetBSD: patch-GPSBabel.pro,v 1.1 2022/08/30 23:47:05 gdt Exp $
+
+Add netbsd as a unix-like system.
+
+Not yet sent upstream.
+
+--- GPSBabel.pro.orig  2022-01-19 21:08:42.000000000 +0000
++++ GPSBabel.pro
+@@ -281,7 +281,7 @@ HEADERS += $$FILTER_HEADERS
+ 
+ CONFIG(release, debug|release): DEFINES *= NDEBUG
+ 
+-macx|linux|openbsd {
++macx|linux|netbsd|openbsd {
+   if (equals(MAKEFILE_GENERATOR, XCODE)) {
+     # "Configure tests are not supported with the XCODE Makefile generator"
+     # assume we have the following headers
+@@ -354,7 +354,7 @@ QMAKE_EXTRA_TARGETS += check-vtesto
+ QMAKE_CLEAN += $${OUT_PWD}/testo.d/*.vglog
+ 
+ # build the compilation data base used by clang tools including clang-tidy.
+-macx|linux|openbsd{
++macx|linux|netbsd|openbsd{
+   compile_command_database.target = compile_commands.json
+   compile_command_database.commands = $(MAKE) clean; bear $(MAKE)
+   QMAKE_EXTRA_TARGETS += compile_command_database
Index: pkgsrc/geography/gpsbabel/patches/patch-libusb.pri
diff -u /dev/null pkgsrc/geography/gpsbabel/patches/patch-libusb.pri:1.1
--- /dev/null   Tue Aug 30 23:47:05 2022
+++ pkgsrc/geography/gpsbabel/patches/patch-libusb.pri  Tue Aug 30 23:47:05 2022
@@ -0,0 +1,14 @@
+$NetBSD: patch-libusb.pri,v 1.1 2022/08/30 23:47:05 gdt Exp $
+
+Add NetBSD as a platform where libusb can be found by pkgconfig.  (One
+wonders why it isn't allowed on any platform, since it presumably
+fails if libusb is requested but not found.)
+
+--- libusb.pri.orig    2022-01-19 21:08:42.000000000 +0000
++++ libusb.pri
+@@ -1,4 +1,4 @@
+-macx|linux|openbsd {
++macx|linux|netbsd|openbsd {
+   !defined(WITH_LIBUSB, var) {
+     macx: WITH_LIBUSB = included
+     linux|openbsd: WITH_LIBUSB = system