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

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

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

Modified Files:
        pkgsrc/geography/gpsd [pkgsrc-2020Q2]: Makefile

Log Message:
geography/gpsd: Revert errant commit to branch


To generate a diff of this commit:
cvs rdiff -u -r1.48.4.1 -r1.48.4.2 pkgsrc/geography/gpsd/Makefile

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.4.1 pkgsrc/geography/gpsd/Makefile:1.48.4.2
--- pkgsrc/geography/gpsd/Makefile:1.48.4.1     Tue Aug 18 17:37:48 2020
+++ pkgsrc/geography/gpsd/Makefile      Tue Aug 18 17:48:01 2020
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.48.4.1 2020/08/18 17:37:48 gdt Exp $
+# $NetBSD: Makefile,v 1.48.4.2 2020/08/18 17:48:01 gdt Exp $
 
-DISTNAME=      gpsd-3.21
+DISTNAME=      gpsd-3.20
+PKGREVISION=   2
 CATEGORIES=    geography
 MASTER_SITES=  http://download-mirror.savannah.gnu.org/releases/gpsd/
 # will probably switch to https://gitlab.com/gpsd/gpsd/releases
@@ -34,21 +35,22 @@ DEPENDS+=   ${PYPKGPREFIX}-serial-[0-9]*:.
 
 CFLAGS.SunOS=  -DLOG_PERROR=0
 
-## 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
+# 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".
 
 SUBST_CLASSES+=                pyenv
-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_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_SED.pyenv=       -e 's,/usr/bin/env python.*$$,${PYTHONBIN},'
 
 # \todo: Determine if CC/CXX are needed (e.g, when using other than gcc).
@@ -68,11 +70,6 @@ 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"