CVS commit: [pkgsrc-2020Q2, trunk] pkgsrc/geography/gpsd

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

Module Name:    pkgsrc
Committed By:   gdt
Date:           Tue Aug 18 17:37:48 UTC 2020

Modified Files:
        pkgsrc/geography/gpsd: PLIST PLIST.Linux distinfo
        pkgsrc/geography/gpsd [pkgsrc-2020Q2]: Makefile

Log Message:
geography/gpsd: Update to 3.21

Upstream NEWS:

3.21: 2020-08-04
  Create python programs from .in files to allow macro substitution.
  Finally clean .sconsign*.dblite with "scons -c"
  Remove revision.h.  Move REVISION into gpsd_config.h
  Change asciidoc to asciidoctor, and revise documents to match.
  library version bumped to 27
  Add leap_seconds to gps_data_t
  Add/change many rtcm2 structs in gps.h
  Add/change many rtcm3 structs in gps.h
  Maindenhead now 8 chars.
  Add icondir and sharedir install options
  Install basic doc in sharedir
  Move gps_data_t->status to gps_fix_t.status for better fix merging
  The gps python module is now Pure Python + FFI.  FFI only for packet.py
  User should manually delete any old packet*so.
  Add wspeedt, wspeedr, wanglem, wanglet, wangler to  gps_fix_t
  Add "-p CONFIG", "-p STATUS", "-t" and "-tt" options to ubxtool.
  Add python_shebang option to scons config.
  gpsrinex has long options and many new options.
  Added long options to gpsd.
  Remove unused FORCE_GLOBAL_ENABLE
  Remove config option reconfigure, replace with -p, --passive runtime option.
  Remove config option controlsend (RECONFIGURE_ENABLE)
  Add config option rundir=XX.  Default set to /run, or /var/run as required.
  Fixes for Python 2.6 up to 3.9.


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.48.4.1 pkgsrc/geography/gpsd/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/geography/gpsd/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/geography/gpsd/PLIST.Linux
cvs rdiff -u -r1.25 -r1.26 pkgsrc/geography/gpsd/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/gpsd/Makefile
diff -u pkgsrc/geography/gpsd/Makefile:1.48 pkgsrc/geography/gpsd/Makefile:1.48.4.1
--- pkgsrc/geography/gpsd/Makefile:1.48 Tue Mar 10 22:10:01 2020
+++ pkgsrc/geography/gpsd/Makefile      Tue Aug 18 17:37:48 2020
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.48 2020/03/10 22:10:01 wiz Exp $
+# $NetBSD: Makefile,v 1.48.4.1 2020/08/18 17:37:48 gdt Exp $
 
-DISTNAME=      gpsd-3.20
-PKGREVISION=   2
+DISTNAME=      gpsd-3.21
 CATEGORIES=    geography
 MASTER_SITES=  http://download-mirror.savannah.gnu.org/releases/gpsd/
 # will probably switch to https://gitlab.com/gpsd/gpsd/releases
@@ -35,22 +34,21 @@ DEPENDS+=   ${PYPKGPREFIX}-serial-[0-9]*:.
 
 CFLAGS.SunOS=  -DLOG_PERROR=0
 
-# Configure phase arguments:
-SCONS_ARGS+=   leapfetch=no            # Do not use the net at build time.
-SCONS_ARGS+=   target_python=${PYTHONBIN}      # Use our python, not "python".
+## Configure phase arguments:
+# Do not use the net at build time.
+SCONS_ARGS+=   leapfetch=no
+# Use the python chosen by pkgsrc, not "/usr/bin/env python"
+SCONS_ARGS+=   python_shebang=${PYTHONBIN}
+SCONS_ARGS+=   target_python=${PYTHONBIN}
+# Put docs in standard pkgsrc location
+SCONS_ARGS+=   docdir=share/doc/gpsd
 
 SUBST_CLASSES+=                pyenv
-SUBST_MESSAGE.pyenv=   Fixing path in Python scripts
-SUBST_STAGE.pyenv=     pre-build       # We don't configure :-(
-SUBST_FILES.pyenv+=    gegps
-SUBST_FILES.pyenv+=    gpscat
-SUBST_FILES.pyenv+=    gpsfake
-SUBST_FILES.pyenv+=    gpsprof
-SUBST_FILES.pyenv+=    ubxtool
-SUBST_FILES.pyenv+=    xgps
-SUBST_FILES.pyenv+=    xgpsspeed
-SUBST_FILES.pyenv+=    zerk
-SUBST_FILES.pyenv+=    test_misc.py
+SUBST_MESSAGE.pyenv=   Fixing Python path in test script
+# We would choose post-configure, but gpsd's build system blurs
+# configure and build.
+SUBST_STAGE.pyenv=     pre-build
+SUBST_FILES.pyenv+=    tests/test_misc.py
 SUBST_SED.pyenv=       -e 's,/usr/bin/env python.*$$,${PYTHONBIN},'
 
 # \todo: Determine if CC/CXX are needed (e.g, when using other than gcc).
@@ -70,6 +68,11 @@ do-test:
        cd ${WRKSRC} && \
        ${SETENV} ${INSTALL_ENV} ${SCONSBIN} check
 
+# Upstream does not document the minimum version; hope this is ok.
+# \todo Pick a ruby version dynamically.
+# Probably, this is not actually a build dependency for releases.
+# BUILD_DEPENDS+=      ruby26-asciidoctor>=2.0.0:../../textproc/ruby-asciidoctor
+
 # \todo Change to TOOLS or BUILD_DEPENDS after scons support is improved.
 .include "../../devel/scons/buildlink3.mk"
 

Index: pkgsrc/geography/gpsd/PLIST
diff -u pkgsrc/geography/gpsd/PLIST:1.13 pkgsrc/geography/gpsd/PLIST:1.14
--- pkgsrc/geography/gpsd/PLIST:1.13    Fri Jan 17 17:08:01 2020
+++ pkgsrc/geography/gpsd/PLIST Tue Aug 18 17:37:48 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2020/01/17 17:08:01 gdt Exp $
+@comment $NetBSD: PLIST,v 1.14 2020/08/18 17:37:48 gdt Exp $
 bin/cgps
 bin/gegps
 bin/gps2udp
@@ -20,8 +20,11 @@ bin/zerk
 include/gps.h
 include/libgpsmm.h
 lib/libgps.so
-lib/libgps.so.25
-lib/libgps.so.25.0.0
+lib/libgps.so.27
+lib/libgps.so.27.0.0
+lib/libgpsdpacket.so
+lib/libgpsdpacket.so.27
+lib/libgpsdpacket.so.27.0.0
 lib/pkgconfig/libgps.pc
 ${PYSITELIB}/gps-${PKGVERSION}.egg-info
 ${PYSITELIB}/gps/__init__.py
@@ -31,7 +34,7 @@ ${PYSITELIB}/gps/clienthelpers.py
 ${PYSITELIB}/gps/fake.py
 ${PYSITELIB}/gps/gps.py
 ${PYSITELIB}/gps/misc.py
-${PYSITELIB}/gps/packet.so
+${PYSITELIB}/gps/packet.py
 ${PYSITELIB}/gps/watch_options.py
 man/man1/cgps.1
 man/man1/gegps.1
@@ -60,5 +63,12 @@ man/man5/srec.5
 man/man8/gpsd.8
 man/man8/gpsdctl.8
 man/man8/gpsinit.8
+man/man8/ppscheck.8
 sbin/gpsd
 sbin/gpsdctl
+share/gpsd/doc/AUTHORS
+share/gpsd/doc/COPYING
+share/gpsd/doc/NEWS
+share/gpsd/doc/README.adoc
+share/gpsd/doc/build.adoc
+share/gpsd/icons/gpsd-logo.png

Index: pkgsrc/geography/gpsd/PLIST.Linux
diff -u pkgsrc/geography/gpsd/PLIST.Linux:1.1 pkgsrc/geography/gpsd/PLIST.Linux:1.2
--- pkgsrc/geography/gpsd/PLIST.Linux:1.1       Sun Mar 15 23:06:03 2020
+++ pkgsrc/geography/gpsd/PLIST.Linux   Tue Aug 18 17:37:48 2020
@@ -1,3 +1,2 @@
-@comment $NetBSD: PLIST.Linux,v 1.1 2020/03/15 23:06:03 tnn Exp $
+@comment $NetBSD: PLIST.Linux,v 1.2 2020/08/18 17:37:48 gdt Exp $
 bin/ppscheck
-man/man8/ppscheck.8

Index: pkgsrc/geography/gpsd/distinfo
diff -u pkgsrc/geography/gpsd/distinfo:1.25 pkgsrc/geography/gpsd/distinfo:1.26
--- pkgsrc/geography/gpsd/distinfo:1.25 Fri Jan 17 17:08:01 2020
+++ pkgsrc/geography/gpsd/distinfo      Tue Aug 18 17:37:48 2020
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.25 2020/01/17 17:08:01 gdt Exp $
+$NetBSD: distinfo,v 1.26 2020/08/18 17:37:48 gdt Exp $
 
-SHA1 (gpsd-3.20.tar.gz) = f5fa7cafd28bcebdaa99ffb365db9429530ebbec
-RMD160 (gpsd-3.20.tar.gz) = a87ed286b4a42092de54986889f0253990163d7e
-SHA512 (gpsd-3.20.tar.gz) = 557ef5e5f3b511da4fc441f4bb2e0cd2e23c2981e8b3ce2999973767a04fde070d3ec6f14af60d0e471320078e9f4d1144e5796e7927975ecfbd55fc97f470a9
-Size (gpsd-3.20.tar.gz) = 3600835 bytes
+SHA1 (gpsd-3.21.tar.gz) = f32d7b18c7be98c4a1385af789b61be55a64c433
+RMD160 (gpsd-3.21.tar.gz) = 3c521009854e2ae19bcd4f7fb0f0c33c334bcbc5
+SHA512 (gpsd-3.21.tar.gz) = 7fbff3698a44ef24ce4631f1d0c5192b70c2e47f28e61372d8d0c437a6b4aeee459b08dcd69d9dc02bbda7b56949fd01ac57460fb922b5f807455f4ab3e91f2d
+Size (gpsd-3.21.tar.gz) = 3984157 bytes