CVS commit: pkgsrc/geography/gpsbabel

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

Module Name:    pkgsrc
Committed By:   gdt
Date:           Fri Aug 30 19:21:46 UTC 2024

Modified Files:
        pkgsrc/geography/gpsbabel: Makefile distinfo
        pkgsrc/geography/gpsbabel/patches: patch-af
Removed Files:
        pkgsrc/geography/gpsbabel/patches: patch-GPSBabel.pro patch-libusb.pri

Log Message:
geography/gpsbabel: Update to 1.9.0

packaging changes:
  - drop patches to old build system
  - switch to cmake
  - keep do-install:, because this project's CMakeStuff doesn't
    actually install (proving once again that cmake is better than
    autoconf, for those who are keeping score!)

upstream changes are hard to find, but notably
  - deprecate many protocols
  - make cmake the only build system

packages and runs on NetBSD 10 amd64


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 pkgsrc/geography/gpsbabel/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/geography/gpsbabel/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/geography/gpsbabel/patches/patch-GPSBabel.pro \
    pkgsrc/geography/gpsbabel/patches/patch-libusb.pri
cvs rdiff -u -r1.6 -r1.7 pkgsrc/geography/gpsbabel/patches/patch-af

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.56 pkgsrc/geography/gpsbabel/Makefile:1.57
--- pkgsrc/geography/gpsbabel/Makefile:1.56     Wed May 29 16:32:46 2024
+++ pkgsrc/geography/gpsbabel/Makefile  Fri Aug 30 19:21:46 2024
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.56 2024/05/29 16:32:46 adam Exp $
+# $NetBSD: Makefile,v 1.57 2024/08/30 19:21:46 gdt Exp $
 #
 
 GITHUB_PROJECT=        gpsbabel
-VERSION=       1.8.0
-GH_VERSION=    1_8_0
+VERSION=       1.9.0
+GH_VERSION=    1_9_0
 GITHUB_TAG=    refs/tags/gpsbabel_${GH_VERSION}
 DISTNAME=      gpsbabel_${GH_VERSION}
 PKGNAME=       gpsbabel-${VERSION}
-PKGREVISION=   13
 CATEGORIES=    geography
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=GPSBabel/}
 
@@ -19,23 +18,22 @@ LICENSE=    gnu-gpl-v2
 
 WRKSRC=                ${WRKDIR}/${GITHUB_PROJECT}-${DISTNAME}
 
-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
+USE_LANGUAGES+=                c c++
+USE_CXX_FEATURES+=     c++11
+USE_TOOLS+=            pkg-config
 
 INSTALLATION_DIRS+=    bin
 do-install:
-       ${INSTALL} ${WRKSRC}/gpsbabel ${DESTDIR}${PREFIX}/bin
+       ${INSTALL} ${WRKSRC}/${CMAKE_BUILD_DIR}/gpsbabel ${DESTDIR}${PREFIX}/bin
+
+.include "../../devel/cmake/build.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-qtserialport/buildlink3.mk"
 .include "../../x11/qt5-qttools/buildlink3.mk"
+.include "../../x11/qt5-qtwebengine/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/geography/gpsbabel/distinfo
diff -u pkgsrc/geography/gpsbabel/distinfo:1.15 pkgsrc/geography/gpsbabel/distinfo:1.16
--- pkgsrc/geography/gpsbabel/distinfo:1.15     Tue Aug 30 23:47:05 2022
+++ pkgsrc/geography/gpsbabel/distinfo  Fri Aug 30 19:21:46 2024
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.15 2022/08/30 23:47:05 gdt Exp $
+$NetBSD: distinfo,v 1.16 2024/08/30 19:21:46 gdt Exp $
 
-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-libusb.pri) = 48ca6d57c45265e1ccb94c42080bf2bf990987a5
+BLAKE2s (gpsbabel_1_9_0.tar.gz) = ad41672c9f488070f97f0b98b3c76a5ebf61387c33832407c3a84cb27bb97afb
+SHA512 (gpsbabel_1_9_0.tar.gz) = e8591aef8015470471ff7ff6a75ab4a71a584f8de2ac00f3957d06ee76145bf1f53c26a12b8d963f1b96ce09270f54fbd5e96c80eccbeb8466ff94a75b72972d
+Size (gpsbabel_1_9_0.tar.gz) = 14514572 bytes
+SHA1 (patch-af) = 219a90ed7c84f2c828c911ad30d7ef215d26ed45

Index: pkgsrc/geography/gpsbabel/patches/patch-af
diff -u pkgsrc/geography/gpsbabel/patches/patch-af:1.6 pkgsrc/geography/gpsbabel/patches/patch-af:1.7
--- pkgsrc/geography/gpsbabel/patches/patch-af:1.6      Thu May  2 19:01:17 2019
+++ pkgsrc/geography/gpsbabel/patches/patch-af  Fri Aug 30 19:21:46 2024
@@ -1,11 +1,11 @@
-$NetBSD: patch-af,v 1.6 2019/05/02 19:01:17 gdt Exp $
+$NetBSD: patch-af,v 1.7 2024/08/30 19:21:46 gdt Exp $
 
 From Giles Lean, who places it in the public domain.  Workarounds for
 problems with buggy USB serial adapators.  Not applied by upstream
 2009-02-21 because it's too dangerous to work around problems without
 understanding them.
 
---- jeeps/gpsread.cc.orig      2019-04-14 02:32:25.000000000 +0000
+--- jeeps/gpsread.cc.orig      2023-09-30 16:51:46.000000000 +0000
 +++ jeeps/gpsread.cc
 @@ -95,6 +95,37 @@ int32 GPS_Serial_Packet_Read(gpsdevh* fd
        GPS_Diag("%02x ", u);
@@ -51,12 +51,12 @@ understanding them.
  
 +    dle_missed:
        if (len == 1) {
-         (*packet).type = u;
+         packet->type = u;
          ++len;
 @@ -127,6 +159,20 @@ int32 GPS_Serial_Packet_Read(gpsdevh* fd
        if (u == ETX)
          if (isDLE) {
-           if (p - (*packet).data - 2 != (*packet).n) {
+           if (p - packet->data - 2 != packet->n) {
 +          /*
 +           * When used with a buggy Prolific USB-serial converter the
 +           * calling sequence GPS_A000() -> GPS_Get_Ack() sometimes