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.

1 files changed, 20 insertions, 17 deletions

diff --git a/geography/gpsd/Makefile b/geography/gpsd/Makefile
index f15b8e75290..792446189c7 100644
--- a/geography/gpsd/Makefile
+++ b/geography/gpsd/Makefile
@@ -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]*:../../comms/py-serial
 
 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"