Tue Aug 18 17:48:01 2020 UTC ()
geography/gpsd: Revert errant commit to branch


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

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