CVS commit: pkgsrc/geography/gpsd

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

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sat Aug  7 23:22:48 UTC 2021

Modified Files:
        pkgsrc/geography/gpsd: Makefile PLIST distinfo
        pkgsrc/geography/gpsd/patches: patch-SConscript

Log Message:
gpsd: Update to 3.23

packaging changes: Clean up scons arg scheme, and ensure that scons is
always called with the same args (other than the action).

3.23: 2020-08-06
  doc/*xml all moved into www/internals.adoc
  Convert all DocBook (.xml) to AsciiDoctor (.adoc)
  Remove all XSL remnants.
  gpsplot: speedup, add new options.
  driver_ubx.c: Add decode for UBX-NAV-STATUS
  gps/ubx.py: Improve decode for UBX-NAV-STATUS
  cgps: Add popup help, interactive options.
  Reorganize and split the man pages.
  Small updates for u-blox M8 and M10
  Deprecated mtk3331 and ashtech build options.  Use nmea0183 instead.
  gpssnmp: Move from contrib/ to clients, add manpage
  Add www/gpsd-client-example-code.adoc
  Add gpsdebuginfo script and man page.
  ubxtool: Add BeiDou, Galileo, GLONASS, QZSS, and partial SBAS subframe decodes
  Max serial port speed raised to 921,600.
  SUBFRAME JSON now includes new fields to support multiple constellations.
  gpsd: Add some ADR and UDR message partial decodes.
  ubxtool: Add some ADR and UDR message polls and decodes.
  Remove COMPASS_ENABLE.  Always compile attitude code.
  contrib/webgps.py: use argparse, arguments -V, --version, --no-html-head.
  Add readonly flag to DEVICE JSON.
  Control messages to gpsd now return JSON, instead of, sometimes, OK or ERROR.
  gpsfake uses "# Date: yyyy-mm-dd" to set initial time.
  Don't compute wrong GPS rollover after 2021-10-23.
  Bump libgps to version 29.


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 pkgsrc/geography/gpsd/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/geography/gpsd/PLIST
cvs rdiff -u -r1.28 -r1.29 pkgsrc/geography/gpsd/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/geography/gpsd/patches/patch-SConscript

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.55 pkgsrc/geography/gpsd/Makefile:1.56
--- pkgsrc/geography/gpsd/Makefile:1.55 Sun Jan 17 15:55:34 2021
+++ pkgsrc/geography/gpsd/Makefile      Sat Aug  7 23:22:48 2021
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.55 2021/01/17 15:55:34 gdt Exp $
+# $NetBSD: Makefile,v 1.56 2021/08/07 23:22:48 gdt Exp $
 
-DISTNAME=      gpsd-3.22
+DISTNAME=      gpsd-3.23
 CATEGORIES=    geography
 MASTER_SITES=  http://download-mirror.savannah.gnu.org/releases/gpsd/
 # will probably switch to https://gitlab.com/gpsd/gpsd/releases
@@ -25,24 +25,24 @@ FAKE_NCURSES=       yes
 # gpsd uses syncok.  Insist on an implementation that provides it.
 USE_CURSES=    syncok
 
-# Documentation depends
-BUILD_DEPENDS+=        libxslt-[0-9]*:../../textproc/libxslt
-BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
-
-# \todo Decide if buildlink3 is more appropriate.
 DEPENDS+=      ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
 DEPENDS+=      ${PYPKGPREFIX}-serial-[0-9]*:../../comms/py-serial
 
 CFLAGS.SunOS=  -DLOG_PERROR=0
 
-## Configure phase arguments:
-# Do not use the net at build time.
-SCONS_ARGS+=   leapfetch=no
+## scons arguments
+SCONS_ARGS+=   prefix=${PREFIX}
+SCONS_ARGS+=   mandir=${PKGMANDIR}
+SCONS_ARGS+=   docdir=share/doc/gpsd
 # 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
+# Require man pages (the build suceeeds and skips them w/o asciidoctor).
+SCONS_ARGS+=   manbuild=yes
+# Do not use the net at build time.
+SCONS_ARGS+=   leapfetch=no
+# scons is hard to understand, so enable debugging always
+SCONS_ARGS+=   --debug=explain,prepare
 
 SUBST_CLASSES+=                pyenv
 SUBST_MESSAGE.pyenv=   Fixing Python path in test script
@@ -57,22 +57,24 @@ SUBST_SED.pyenv=    -e 's,/usr/bin/env pyth
 do-build:
        cd ${WRKSRC} && \
        ${SETENV} ${MAKE_ENV} ${SCONSBIN} \
-       prefix=${PREFIX} mandir=${PREFIX}/${PKGMANDIR} \
        ${SCONS_ARGS} \
        -j${MAKE_JOBS:U1}
 
 do-install:
        cd ${WRKSRC} && \
-       ${SETENV} ${MAKE_ENV} ${INSTALL_ENV} ${SCONSBIN} install
+       ${SETENV} ${MAKE_ENV} ${INSTALL_ENV} ${SCONSBIN} \
+       ${SCONS_ARGS} \
+       install
 
 do-test:
        cd ${WRKSRC} && \
-       ${SETENV} ${MAKE_ENV} ${INSTALL_ENV} ${SCONSBIN} check
+       ${SETENV} ${MAKE_ENV} ${INSTALL_ENV} ${SCONSBIN} \
+       ${SCONS_ARGS} \
+       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 Consider not including this and using the pre-built man pages.
+.include "../../lang/ruby/rubyversion.mk"
+BUILD_DEPENDS+=        ${RUBY_PKGPREFIX}-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.15 pkgsrc/geography/gpsd/PLIST:1.16
--- pkgsrc/geography/gpsd/PLIST:1.15    Sat Jan  9 19:42:42 2021
+++ pkgsrc/geography/gpsd/PLIST Sat Aug  7 23:22:48 2021
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.15 2021/01/09 19:42:42 gdt Exp $
+@comment $NetBSD: PLIST,v 1.16 2021/08/07 23:22:48 gdt Exp $
 bin/cgps
 bin/gegps
 bin/gps2udp
 bin/gpscat
 bin/gpscsv
 bin/gpsctl
+bin/gpsdebuginfo
 bin/gpsdecode
 bin/gpsfake
 bin/gpsmon
@@ -12,6 +13,7 @@ bin/gpspipe
 bin/gpsplot
 bin/gpsprof
 bin/gpsrinex
+bin/gpssnmp
 bin/gpssubframe
 bin/gpxlogger
 bin/lcdgps
@@ -22,12 +24,12 @@ bin/xgpsspeed
 bin/zerk
 include/gps.h
 include/libgpsmm.h
-lib/libgps.so
-lib/libgps.so.28
-lib/libgps.so.28.0.0
-lib/libgpsdpacket.so
-lib/libgpsdpacket.so.28
-lib/libgpsdpacket.so.28.0.0
+lib/libgps.${RUBY_DLEXT}
+lib/libgps.so.29
+lib/libgps.so.29.0.0
+lib/libgpsdpacket.${RUBY_DLEXT}
+lib/libgpsdpacket.so.29
+lib/libgpsdpacket.so.29.0.0
 lib/pkgconfig/libgps.pc
 ${PYSITELIB}/gps-${PKGVERSION}.egg-info
 ${PYSITELIB}/gps/__init__.py
@@ -47,6 +49,7 @@ man/man1/gps2udp.1
 man/man1/gpscat.1
 man/man1/gpscsv.1
 man/man1/gpsctl.1
+man/man1/gpsdebuginfo.1
 man/man1/gpsdecode.1
 man/man1/gpsfake.1
 man/man1/gpsmon.1
@@ -54,6 +57,7 @@ man/man1/gpspipe.1
 man/man1/gpsplot.1
 man/man1/gpsprof.1
 man/man1/gpsrinex.1
+man/man1/gpssnmp.1
 man/man1/gpssubframe.1
 man/man1/gpxlogger.1
 man/man1/lcdgps.1
@@ -76,5 +80,7 @@ share/doc/gpsd/AUTHORS
 share/doc/gpsd/COPYING
 share/doc/gpsd/NEWS
 share/doc/gpsd/README.adoc
+share/doc/gpsd/SUPPORT.adoc
 share/doc/gpsd/build.adoc
+share/doc/gpsd/example1.c.txt
 share/gpsd/icons/gpsd-logo.png

Index: pkgsrc/geography/gpsd/distinfo
diff -u pkgsrc/geography/gpsd/distinfo:1.28 pkgsrc/geography/gpsd/distinfo:1.29
--- pkgsrc/geography/gpsd/distinfo:1.28 Tue Mar 23 10:49:44 2021
+++ pkgsrc/geography/gpsd/distinfo      Sat Aug  7 23:22:48 2021
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.28 2021/03/23 10:49:44 jperkin Exp $
+$NetBSD: distinfo,v 1.29 2021/08/07 23:22:48 gdt Exp $
 
-SHA1 (gpsd-3.22.tar.gz) = 7e83fe4c1e978728cb9f35c2d7f5b234a707c82e
-RMD160 (gpsd-3.22.tar.gz) = 916829bad167ef8313ea348cfaac71201ab77cc1
-SHA512 (gpsd-3.22.tar.gz) = 4ed08e92b17f8f1bcef6be66f7bb232994d419d1638af0d435a5b03800dcde070accdecb707ea27cceebd333ab597fd0b3a77f405542b488626cb4f1efbe856b
-Size (gpsd-3.22.tar.gz) = 4758761 bytes
-SHA1 (patch-SConscript) = 9bd9491038a9ec4d805e2e540ab5b83e0c08d56f
+SHA1 (gpsd-3.23.tar.gz) = 46fbc05944fbb55632cdb16ca211d32a0be3a189
+RMD160 (gpsd-3.23.tar.gz) = b0047925a21c859f4a2e65ca1712a0c78f9e2cfc
+SHA512 (gpsd-3.23.tar.gz) = 967cc9801271418023630df02b457b76108968992151f6e80b569e99b856bd79cc3d0369d2088f3bc609b2ab22b29dba87639bf466bf262ab80b2b3f04055f8b
+Size (gpsd-3.23.tar.gz) = 4893363 bytes
+SHA1 (patch-SConscript) = d26f5fcdea8ad78da06ea85b7d35a6eb01fff434

Index: pkgsrc/geography/gpsd/patches/patch-SConscript
diff -u pkgsrc/geography/gpsd/patches/patch-SConscript:1.1 pkgsrc/geography/gpsd/patches/patch-SConscript:1.2
--- pkgsrc/geography/gpsd/patches/patch-SConscript:1.1  Tue Mar 23 10:49:44 2021
+++ pkgsrc/geography/gpsd/patches/patch-SConscript      Sat Aug  7 23:22:48 2021
@@ -1,12 +1,12 @@
-$NetBSD: patch-SConscript,v 1.1 2021/03/23 10:49:44 jperkin Exp $
+$NetBSD: patch-SConscript,v 1.2 2021/08/07 23:22:48 gdt Exp $
 
 gpspipe requires libgpsd for serial.c cfmakeraw() compat.
 
---- SConscript.orig    2021-01-09 02:35:30.000000000 +0000
+--- SConscript.orig    2021-07-31 00:09:29.000000000 +0000
 +++ SConscript
-@@ -1975,7 +1975,7 @@ gpsdctl = env.Program('clients/gpsdctl',
-                       LIBS=[libgps_static],
-                       parse_flags=gpsflags)
+@@ -1901,7 +1901,7 @@ gpsmon = env.Program('gpsmon/gpsmon', gp
+                      LIBS=[libgpsd_static, libgps_static],
+                      parse_flags=gpsdflags + gpsflags + ncurseslibs)
  gpspipe = env.Program('clients/gpspipe', ['clients/gpspipe.c'],
 -                      LIBS=[libgps_static],
 +                      LIBS=[libgpsd_static, libgps_static],