geography/gpsd: Update to 3.22

3.22: 2020-01-08
  Added client/gpscsv to convert gpsd JSON to csv.
  Added client/gpsplot to dynamically plot gpsd JSON.
  Added client/gpssubframe to decode gpsd SUBFRAME JSON.
  Added nSat and uSat to SKY JSON.  Old clients can not read new SKY.
  Move stuff from source root into clients/, include/, gpsmon/ and libgps/.
  Move stuff from source root into gpsd/.
  Move class ubx out of ubxtool and into gps/ubx.py.
  Build all targets in gpsd-$VERSION/, not in tree.
  NMEA 4.11 support for $GI (IRNSS) and $GZ (QZSS).

4 files changed, 29 insertions, 24 deletions

diff --git a/geography/gpsd/DESCR b/geography/gpsd/DESCR
index 5df8eb10487..7c6bceebb24 100644
--- a/geography/gpsd/DESCR
+++ b/geography/gpsd/DESCR
@@ -1,10 +1,10 @@
-Gpsd is a user land daemon acting as a liason between a gps or
-Loran-C receiver and clients. The receiver is expected to generate
-position information as NMEA-0183 sentences, or Rockwell binary format,
-although that can be changed.
+Gpsd is a daemon acting as a liason between a GPS (GNSS) receiver or
+Loran-C receiver and clients.  The receiver is expected to generate
+position information as NMEA-0183 sentences or in any of a number of
+vendor-specific binary formats.
 
 Gpsd listens on port 2947 for clients requesting position, time,
 velocity or altitude information.
 
-Gpsd can take information from the gps and translate it into
+Gpsd can take information from the receiver and translate it into
 something easier to understand for clients.
diff --git a/geography/gpsd/Makefile b/geography/gpsd/Makefile
index 6966ebfe44b..1735a9234f3 100644
--- a/geography/gpsd/Makefile
+++ b/geography/gpsd/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.53 2020/12/04 20:45:21 nia Exp $
+# $NetBSD: Makefile,v 1.54 2021/01/09 19:42:42 gdt Exp $
 
-DISTNAME=	gpsd-3.21
-PKGREVISION=	1
+DISTNAME=	gpsd-3.22
 CATEGORIES=	geography
 MASTER_SITES=	http://download-mirror.savannah.gnu.org/releases/gpsd/
 # will probably switch to https://gitlab.com/gpsd/gpsd/releases
diff --git a/geography/gpsd/PLIST b/geography/gpsd/PLIST
index 61940e41a77..40f302c1680 100644
--- a/geography/gpsd/PLIST
+++ b/geography/gpsd/PLIST
@@ -1,15 +1,18 @@
-@comment $NetBSD: PLIST,v 1.14 2020/08/18 17:37:48 gdt Exp $
+@comment $NetBSD: PLIST,v 1.15 2021/01/09 19:42:42 gdt Exp $
 bin/cgps
 bin/gegps
 bin/gps2udp
 bin/gpscat
+bin/gpscsv
 bin/gpsctl
 bin/gpsdecode
 bin/gpsfake
 bin/gpsmon
 bin/gpspipe
+bin/gpsplot
 bin/gpsprof
 bin/gpsrinex
+bin/gpssubframe
 bin/gpxlogger
 bin/lcdgps
 bin/ntpshmmon
@@ -20,11 +23,11 @@ bin/zerk
 include/gps.h
 include/libgpsmm.h
 lib/libgps.so
-lib/libgps.so.27
-lib/libgps.so.27.0.0
+lib/libgps.so.28
+lib/libgps.so.28.0.0
 lib/libgpsdpacket.so
-lib/libgpsdpacket.so.27
-lib/libgpsdpacket.so.27.0.0
+lib/libgpsdpacket.so.28
+lib/libgpsdpacket.so.28.0.0
 lib/pkgconfig/libgps.pc
 ${PYSITELIB}/gps-${PKGVERSION}.egg-info
 ${PYSITELIB}/gps/__init__.py
@@ -35,19 +38,23 @@ ${PYSITELIB}/gps/fake.py
 ${PYSITELIB}/gps/gps.py
 ${PYSITELIB}/gps/misc.py
 ${PYSITELIB}/gps/packet.py
+${PYSITELIB}/gps/ubx.py
 ${PYSITELIB}/gps/watch_options.py
 man/man1/cgps.1
 man/man1/gegps.1
 man/man1/gps.1
 man/man1/gps2udp.1
 man/man1/gpscat.1
+man/man1/gpscsv.1
 man/man1/gpsctl.1
 man/man1/gpsdecode.1
 man/man1/gpsfake.1
 man/man1/gpsmon.1
 man/man1/gpspipe.1
+man/man1/gpsplot.1
 man/man1/gpsprof.1
 man/man1/gpsrinex.1
+man/man1/gpssubframe.1
 man/man1/gpxlogger.1
 man/man1/lcdgps.1
 man/man1/ntpshmmon.1
@@ -59,16 +66,15 @@ man/man3/libQgpsmm.3
 man/man3/libgps.3
 man/man3/libgpsmm.3
 man/man5/gpsd_json.5
-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/doc/gpsd/AUTHORS
+share/doc/gpsd/COPYING
+share/doc/gpsd/NEWS
+share/doc/gpsd/README.adoc
+share/doc/gpsd/build.adoc
 share/gpsd/icons/gpsd-logo.png
diff --git a/geography/gpsd/distinfo b/geography/gpsd/distinfo
index 235f5e9586c..c7c690d1cd6 100644
--- a/geography/gpsd/distinfo
+++ b/geography/gpsd/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.26 2020/08/18 17:37:48 gdt Exp $
+$NetBSD: distinfo,v 1.27 2021/01/09 19:42:42 gdt Exp $
 
-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
+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