Wed Aug 19 12:30:04 2020 UTC ()
geography/gpsd: Reapply Makefile commit

This logically belongs with the update to 3.21, but the Makefile part
ended up on the branch.


(gdt)
diff -r1.49 -r1.50 pkgsrc/geography/gpsd/Makefile
cvs diff -r1.49 -r1.50 pkgsrc/geography/gpsd/Makefile (expand / switch to unified diff)

--- pkgsrc/geography/gpsd/Makefile 2020/08/17 20:18:53 1.49
+++ pkgsrc/geography/gpsd/Makefile 2020/08/19 12:30:04 1.50
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.49 2020/08/17 20:18:53 leot Exp $ 1# $NetBSD: Makefile,v 1.50 2020/08/19 12:30:04 gdt Exp $
2 2
3DISTNAME= gpsd-3.20 3DISTNAME= gpsd-3.21
4PKGREVISION= 3 
5CATEGORIES= geography 4CATEGORIES= geography
6MASTER_SITES= http://download-mirror.savannah.gnu.org/releases/gpsd/ 5MASTER_SITES= http://download-mirror.savannah.gnu.org/releases/gpsd/
7# will probably switch to https://gitlab.com/gpsd/gpsd/releases 6# will probably switch to https://gitlab.com/gpsd/gpsd/releases
8 7
9MAINTAINER= gdt@NetBSD.org 8MAINTAINER= gdt@NetBSD.org
10HOMEPAGE= https://gpsd.io/ 9HOMEPAGE= https://gpsd.io/
11COMMENT= GPS information daemon 10COMMENT= GPS information daemon
12 11
13LICENSE= modified-bsd 12LICENSE= modified-bsd
14 13
15PY_PATCHPLIST= yes 14PY_PATCHPLIST= yes
16 15
17USE_TOOLS+= pkg-config gmake 16USE_TOOLS+= pkg-config gmake
@@ -25,61 +24,65 @@ NO_CONFIGURE= yes @@ -25,61 +24,65 @@ NO_CONFIGURE= yes
25FAKE_NCURSES= yes 24FAKE_NCURSES= yes
26# gpsd uses syncok. Insist on an implementation that provides it. 25# gpsd uses syncok. Insist on an implementation that provides it.
27USE_CURSES= syncok 26USE_CURSES= syncok
28 27
29# Documentation depends 28# Documentation depends
30BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt 29BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
31 30
32# \todo Decide if buildlink3 is more appropriate. 31# \todo Decide if buildlink3 is more appropriate.
33DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3 32DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
34DEPENDS+= ${PYPKGPREFIX}-serial-[0-9]*:../../comms/py-serial 33DEPENDS+= ${PYPKGPREFIX}-serial-[0-9]*:../../comms/py-serial
35 34
36CFLAGS.SunOS= -DLOG_PERROR=0 35CFLAGS.SunOS= -DLOG_PERROR=0
37 36
38# Configure phase arguments: 37## Configure phase arguments:
39SCONS_ARGS+= leapfetch=no # Do not use the net at build time. 38# Do not use the net at build time.
40SCONS_ARGS+= target_python=${PYTHONBIN} # Use our python, not "python". 39SCONS_ARGS+= leapfetch=no
 40# Use the python chosen by pkgsrc, not "/usr/bin/env python"
 41SCONS_ARGS+= python_shebang=${PYTHONBIN}
 42SCONS_ARGS+= target_python=${PYTHONBIN}
 43# Put docs in standard pkgsrc location
 44SCONS_ARGS+= docdir=share/doc/gpsd
41 45
42SUBST_CLASSES+= pyenv 46SUBST_CLASSES+= pyenv
43SUBST_MESSAGE.pyenv= Fixing path in Python scripts 47SUBST_MESSAGE.pyenv= Fixing Python path in test script
44SUBST_STAGE.pyenv= pre-build # We don't configure :-( 48# We would choose post-configure, but gpsd's build system blurs
45SUBST_FILES.pyenv+= gegps 49# configure and build.
46SUBST_FILES.pyenv+= gpscat 50SUBST_STAGE.pyenv= pre-build
47SUBST_FILES.pyenv+= gpsfake 51SUBST_FILES.pyenv+= tests/test_misc.py
48SUBST_FILES.pyenv+= gpsprof 
49SUBST_FILES.pyenv+= ubxtool 
50SUBST_FILES.pyenv+= xgps 
51SUBST_FILES.pyenv+= xgpsspeed 
52SUBST_FILES.pyenv+= zerk 
53SUBST_FILES.pyenv+= test_misc.py 
54SUBST_SED.pyenv= -e 's,/usr/bin/env python.*$$,${PYTHONBIN},' 52SUBST_SED.pyenv= -e 's,/usr/bin/env python.*$$,${PYTHONBIN},'
55 53
56# \todo: Determine if CC/CXX are needed (e.g, when using other than gcc). 54# \todo: Determine if CC/CXX are needed (e.g, when using other than gcc).
57# CC=${CC:Q} CXX=${CXX:Q} 55# CC=${CC:Q} CXX=${CXX:Q}
58do-build: 56do-build:
59 cd ${WRKSRC} && \ 57 cd ${WRKSRC} && \
60 ${SETENV} ${MAKE_ENV} ${SCONSBIN} \ 58 ${SETENV} ${MAKE_ENV} ${SCONSBIN} \
61 prefix=${PREFIX} mandir=${PREFIX}/${PKGMANDIR} \ 59 prefix=${PREFIX} mandir=${PREFIX}/${PKGMANDIR} \
62 ${SCONS_ARGS} \ 60 ${SCONS_ARGS} \
63 -j${MAKE_JOBS:U1} 61 -j${MAKE_JOBS:U1}
64 62
65do-install: 63do-install:
66 cd ${WRKSRC} && \ 64 cd ${WRKSRC} && \
67 ${SETENV} ${INSTALL_ENV} ${SCONSBIN} install 65 ${SETENV} ${INSTALL_ENV} ${SCONSBIN} install
68 66
69do-test: 67do-test:
70 cd ${WRKSRC} && \ 68 cd ${WRKSRC} && \
71 ${SETENV} ${INSTALL_ENV} ${SCONSBIN} check 69 ${SETENV} ${INSTALL_ENV} ${SCONSBIN} check
72 70
 71# Upstream does not document the minimum version; hope this is ok.
 72# \todo Pick a ruby version dynamically.
 73# Probably, this is not actually a build dependency for releases.
 74# BUILD_DEPENDS+= ruby26-asciidoctor>=2.0.0:../../textproc/ruby-asciidoctor
 75
73# \todo Change to TOOLS or BUILD_DEPENDS after scons support is improved. 76# \todo Change to TOOLS or BUILD_DEPENDS after scons support is improved.
74.include "../../devel/scons/buildlink3.mk" 77.include "../../devel/scons/buildlink3.mk"
75 78
76.include "../../devel/libusb1/buildlink3.mk" 79.include "../../devel/libusb1/buildlink3.mk"
77.include "../../graphics/py-cairo/buildlink3.mk" 80.include "../../graphics/py-cairo/buildlink3.mk"
78.include "../../lang/python/extension.mk" 81.include "../../lang/python/extension.mk"
79.include "../../x11/gtk3/buildlink3.mk" 82.include "../../x11/gtk3/buildlink3.mk"
80# \todo Resolve mk/curses not invoking ncurses builtin processing. 83# \todo Resolve mk/curses not invoking ncurses builtin processing.
81# For now, include the ncurses package directly. 84# For now, include the ncurses package directly.
82.include "../../devel/ncurses/buildlink3.mk" 85.include "../../devel/ncurses/buildlink3.mk"
83#.include "../../mk/curses.buildlink3.mk" 86#.include "../../mk/curses.buildlink3.mk"
84.include "../../mk/pthread.buildlink3.mk" 87.include "../../mk/pthread.buildlink3.mk"
85.include "../../mk/bsd.pkg.mk" 88.include "../../mk/bsd.pkg.mk"