gpsd: Mostly remediate scons

[Greg Troxel <gdt%lexort.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Tue Apr 30 18:36:44 2019 -0400
Changeset:	bcfebff8459676050a32a4d627057de94c28fcd2

Modified Files:
	gpsd/Makefile
	gpsd/PLIST
	gpsd/distinfo
Added Files:
	gpsd/patches/patch-SConstruct

Log Message:
gpsd: Mostly remediate scons

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=bcfebff8459676050a32a4d627057de94c28fcd2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 gpsd/Makefile                 | 42 +++++++++++++++---------------------------
 gpsd/PLIST                    | 14 +++++++++++++-
 gpsd/distinfo                 |  1 +
 gpsd/patches/patch-SConstruct | 12 ++++++++++++
 4 files changed, 41 insertions(+), 28 deletions(-)

diffs:
diff --git a/gpsd/Makefile b/gpsd/Makefile
index 49d3147230..f2df18927c 100644
--- a/gpsd/Makefile
+++ b/gpsd/Makefile
@@ -11,58 +11,46 @@ COMMENT=	GPS information daemon
 LICENSE=	modified-bsd
 
 PY_PATCHPLIST=	yes
-#PYTHON_VERSIONS_INCOMPATIBLE=	36 37 # not yet ported as of 2.96
 
 USE_TOOLS+=	pkg-config gmake
 USE_LIBTOOL=	yes
 USE_LANGUAGES=	c99 c++
 
+# \todo Separate upstream's build into configure and build.
 NO_CONFIGURE=	yes
 
-
+# \todo Check if this is necessary.
 # gpsd looks for ncurses but not curses. (Not yet filed upstream.)
 FAKE_NCURSES=	yes
-
 # gpsd uses syncok
 USE_CURSES=	syncok
 
-# \todo Add a USE_TOOLS entry for scons.  SCONSBIN is open-coded
-# because using the bl3 depends on a python that is incompatible with
-# gpsd's python version, and we are using a tool, not buildlinking.
-#BUILD_DEPENDS+=		py*-scons-[0-9]*:../../devel/scons
-#SCONSBIN=		${PREFIX}/bin/scons
-
-# \todo In theory this is not necessary.
+# \todo Check if this is necessary.
 BUILD_DEPENDS+=	xmlto-[0-9]*:../../textproc/xmlto
 
 CFLAGS.SunOS=	-DLOG_PERROR=0
 
-# \todo Resolve options
-# nmea2000 = False (default True): NMEA2000/CAN support
-# rtcm104v2 = False (default True): rtcm104v2 support
-# pps = False (default True): PPS time syncing support
-# dbus_export = False (default True): enable DBUS export support
-# libgpsmm = False (default True): build C++ bindings
-# qt?
-
-# \todo: Separate configure phase
-
-WRAPPER_DEBUG=	yes
+# Configure phase arguments:
+SCONS_ARGS+=	leapfetch=no		# Do not use the net at build time.
 
+# \todo: Determine if CC/CXX are needed here.
+#	CC=${CC:Q} CXX=${CXX:Q}
 do-build:
 	cd ${WRKSRC} && \
 	${SETENV} ${MAKE_ENV} ${SCONSBIN} \
+	prefix=${PREFIX} mandir=${PREFIX}/man \
+	${SCONS_ARGS} \
 	-j${MAKE_JOBS:U1}
-#	CC=${CC:Q} CXX=${CXX:Q} \
 
 do-install:
-	cd ${WRKSRC} && ./install.sh ${DESTDIR}${PREFIX}
-
-#INSTALLATION_DIRS=	sbin
+	cd ${WRKSRC} && \
+	${SETENV} ${INSTALL_ENV} ${SCONSBIN} install
 
-#TEST_TARGET=	check
+do-test:
+	cd ${WRKSRC} && \
+	${SETENV} ${INSTALL_ENV} ${SCONSBIN} check
 
-PYTHON_FOR_BUILD_ONLY?=	yes
+# \todo Change to TOOLS or BUILD_DEPENDS after scons is improved.
 .include "../../devel/scons/buildlink3.mk"
 
 .include "../../devel/libusb1/buildlink3.mk"
diff --git a/gpsd/PLIST b/gpsd/PLIST
index c19e8b0351..2893fca749 100644
--- a/gpsd/PLIST
+++ b/gpsd/PLIST
@@ -1,5 +1,6 @@
 @comment $NetBSD: PLIST,v 1.10 2011/03/23 16:08:34 gdt Exp $
 bin/cgps
+bin/gps2udp
 bin/gpscat
 bin/gpsctl
 bin/gpsdecode
@@ -9,12 +10,12 @@ bin/gpspipe
 bin/gpsprof
 bin/gpxlogger
 bin/lcdgps
+bin/ntpshmmon
 bin/xgps
 bin/xgpsspeed
 include/gps.h
 include/gpsd.h
 include/libgpsmm.h
-lib/libgps.la
 lib/libgpsd.la
 lib/pkgconfig/libgps.pc
 lib/pkgconfig/libgpsd.pc
@@ -34,7 +35,9 @@ ${PYSITELIB}/gpscap.py
 ${PYSITELIB}/gpscap.pyc
 ${PYSITELIB}/gpscap.pyo
 man/man1/cgps.1
+man/man1/gegps.1
 man/man1/gps.1
+man/man1/gps2udp.1
 man/man1/gpscat.1
 man/man1/gpsctl.1
 man/man1/gpsdecode.1
@@ -42,12 +45,21 @@ man/man1/gpsfake.1
 man/man1/gpsmon.1
 man/man1/gpspipe.1
 man/man1/gpsprof.1
+man/man1/gpxlogger.1
 man/man1/lcdgps.1
+man/man1/ntpshmmon.1
+man/man1/ubxtool.1
 man/man1/xgps.1
 man/man1/xgpsspeed.1
+man/man1/zerk.1
+man/man3/libQgpsmm.3
 man/man3/libgps.3
 man/man3/libgpsd.3
 man/man3/libgpsmm.3
+man/man5/gpsd_json.5
 man/man5/srec.5
 man/man8/gpsd.8
+man/man8/gpsdctl.8
+man/man8/gpsinit.8
 sbin/gpsd
+sbin/gpsdctl
diff --git a/gpsd/distinfo b/gpsd/distinfo
index 55023b1ed3..b46f955123 100644
--- a/gpsd/distinfo
+++ b/gpsd/distinfo
@@ -4,5 +4,6 @@ SHA1 (gpsd-3.18.tar.gz) = 9785ca861dc2fc3373119b8067f3b420c564c4c4
 RMD160 (gpsd-3.18.tar.gz) = 8499ad1637bf6dbf6b7349d74b0dd6317771e87b
 SHA512 (gpsd-3.18.tar.gz) = c80f2ef6856faa0b38f3d258be9801982588916677401654902ef0b8ec9e62c8b3cb9421f41b4a1e2e27a15a3f3562cbf68ce7bf03a19746ab62f80172d85434
 Size (gpsd-3.18.tar.gz) = 9020649 bytes
+SHA1 (patch-SConstruct) = 96eddeff747abafe5dccc76b62603bf522bf9251
 SHA1 (patch-gpspipe.c) = 43d9e99867175418874adaaf210a429819c3ea9a
 SHA1 (patch-serial.c) = b28f1d209ecf27fcd7a98dcacb201632f3667d56
diff --git a/gpsd/patches/patch-SConstruct b/gpsd/patches/patch-SConstruct
new file mode 100644
index 0000000000..08e8bd8e76
--- /dev/null
+++ b/gpsd/patches/patch-SConstruct
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- SConstruct.orig	2018-10-03 00:05:28.000000000 +0000
++++ SConstruct
+@@ -280,6 +280,7 @@ import_env = (
+     'STAGING_DIR',     # Required by the OpenWRT and CeroWrt builds.
+     'STAGING_PREFIX',  # Required by the OpenWRT and CeroWrt builds.
+     'WRITE_PAD',       # So we can test WRITE_PAD values on the fly.
++    'CWRAPPERS_CONFIG_DIR',	# pkgsrc config
+ )
+ 
+ envs = {}