diff options
| author | gdt <gdt@pkgsrc.org> | 2020-08-19 12:30:04 +0000 |
|---|---|---|
| committer | gdt <gdt@pkgsrc.org> | 2020-08-19 12:30:04 +0000 |
| commit | 27dbcee21b450959e41d183a89cf9c260c124a4f (patch) | |
| tree | c036d038d8a0708919fceaa7fe1cd86cc59d61b9 | |
| parent | e03c653c984bb1a83106898895d9b3632458ec87 (diff) | |
| download | pkgsrc-27dbcee21b450959e41d183a89cf9c260c124a4f.tar.gz | |
geography/gpsd: Reapply Makefile commit
This logically belongs with the update to 3.21, but the Makefile part
ended up on the branch.
| -rw-r--r-- | geography/gpsd/Makefile | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/geography/gpsd/Makefile b/geography/gpsd/Makefile index 74b1048e417..24d149e145e 100644 --- a/geography/gpsd/Makefile +++ b/geography/gpsd/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.49 2020/08/17 20:18:53 leot Exp $ +# $NetBSD: Makefile,v 1.50 2020/08/19 12:30:04 gdt Exp $ -DISTNAME= gpsd-3.20 -PKGREVISION= 3 +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" |