geography/gpsd: Update to 3.18.1

pkgsrc changes:
  - adapt to scons
  - patch upstream SConstruct to respect needed pkgsrc variables
  - patch upstream's use of "#!/usr/bin/env python"
  - other minor build adaptations

Upstream changes not in NEWS:

  libgpsd (header, lib, pc, man page) is no longer installed.  (This
  was an internal interface.)

Upstream NEWS:

3.18.1: 2018-10-19 (Gary E. Miller <gem@rellim.com>)
  Fix some installation issues.
  A few minor updates to ubxtool and driver_ubx.
  Add contrib/skyview2svg

3.18: 2018-10-02 (Gary E. Miller <gem@rellim.com>)
  Add ECEF support to ievermore, italk,Skytraq, SiRF, U-blox drivers.
  Add ECEF support to JSON, cgps and xgps.
  Add GREIS (Javad) driver from Virgin Orbit.
  Add CLI tools zerk and ubxtool to manage JAVAD and u-blox GPS.
  Add gnssid:svid to satellite_t, cgps and xgps.  PRN will die.
  Add gnssid:svid to JSON, cgps and xgps.
  Add stricter version checking (more to todo).
  More and better regression tests.
  Better Python dependency checking, at build time and runtime.
  Fix several buffer issues.
  New polar plots, and improved statistice, in gpsprof.
  gpsd master/slave mode works, first time ever.
  All isnan() changed to !isfinite(), fixing many bugs.
  Client-side Python libraries may automatically reconnect
  Too many other bug fixes and improvements to mention.
  Over 1,000 commits from 46 different commiters.

3.17: 2017-09-07 (Eric S. Raymond <esr@snark.thyrsus.com>)
  Repair support for non-NMEA devices requring active probing
  (e.g. Garmin USB GPSes). Apply OS X build fixes.  Fix a SiRF driver
  bug that occasionally confused NTP.  Support for Spectratime iSync
  GRClok and LNRClok oscillators. gpxlogger can reconnect when
  the GPS loses the fix. xgps and xgpsspeed moved to python-gi,
  getting shut of the deprecated pygtk2 bindings. Default mode for
  xgpsspeed is now the more interesting nautical display. gpsmon
  includes the hostname with the device display. gpsprof now has
  centimeter precision.

3.16: 2016-01-08 (Eric S. Raymond <esr@snark.thyrsus.com>)
  Test rebuilds for mid-2015 leapsecond bump. Regression tests will
  run even if "python" in Python 3.  Build correctly on systems where
  -ltinfo is split from -lncurses. Avoid some rare overflow conditions
  in PPS code.  Fix bugs in JSON sat-view parsing due to the JSON
  parser stuffing ints into shorts.  Various small fixes to AIS
  interpretation.  Prevent a memory leak in long-running gpsmon
  instances.  Fix Savannah bug #45270: serial driver does not work
  properly on pipes.  Fix Savannah bug #44648: GPSD won't build if
  CCFLAGS contains options that are only compatible with the
  cros1s-compiler. Fix Savannah bug #45342: SConstruct generates wrong
  *.pc files.  Fix Savannah bug #46495: gpsd_poll may crash due to
  unitialized pointer (probably due to buggy FD_ISSET on host
  system). Fix Savannah bug #46648: gpsd crashes and buffer overflow
  is reported when terminated.  Fix Savannah bug #46802: AIVDM to CSV
  is broken in some weird cases. Fix Savannah bug #46804: JSON
  satellite view parsing is somewhat broken.

3.15: 2015-06-03 (Eric S. Raymond <esr@snark.thyrsus.com>)
  Fix a rare crash bug related to devices becoming inaccessible while timed out.
  Accept NMEA 4.1 GSV sentences with the trailing signal-ID field.
  Fixed incorrect decode of south latitudes in AIS Type 17 messages.
  splint has been retired; this removes almost 2KLOC of annotations.
  chrpath is no longer a build dependency. Corrected Beidou/QZNSS display
  in the Python clients so the graphics don't look like SBAS.

3.14: 2015-03-14 (Eric S. Raymond <esr@snark.thyrsus.com>)
  The Pi Day release, 3.14 on 3/14 2015 at 9:26. Longer timeouts on test clients.
  Skyview support for the Beidou and QZSS constellations in the NMEA0183 driver.
  ntpmon rename to ntpshmmon - it doesn't actually monitor NTP itself.
  New HOWTO on the website: "Introduction to Time Service".

3.13: 2015-02-26 (Eric S. Raymond <esr@snark.thyrsus.com>)
  compiler.h inclusion removed for gps.h so it's standalone for /usr/include.
  TOFF JSON report gives the offset between GPS top of second and clock time.
  A new ntpmon tool supports capturing clock samples from NTP SHM segments.

3.12: 2015-02-22 (Eric S. Raymond <esr@snark.thyrsus.com>)
  The daemon's power utilization has been reduced by changing from
  non-blocking to blocking I/O; this may be significant on mobile devices.
  Better protection against false matches of Inland AIS messages; this
  required a libgps version bump to 22 (as a side effect, per-device
  footprint has decreased). PPS feature is no longer marked
  experimental/unstable.  Sentence tag fields have been dropped from
  the JSON reports. GNSS and GLONASS SKY reports are now
  merged. Addressed versions of AIS Type 25 and 26 are now
  handled. The 'nmea' build option is now 'nmea0183'. New 'minimal'
  option sets all boolean options not explicitly set on the build
  command line to false.  The 'limited_max_devices' option is now
  'max_devices'; the 'limited_max_clients' option is now 'max_clients'
  The previously deprecated 'libQgpsmm' option has been removed; use 'qt'.
  A bug fix for error modeling when NMEA 0183 reports empty DOP
  fields.  On OS X, the "osx-pl203" driver has been explicitly listed
  as unsupported. The last remnants of the old pre-JSON query protocol
  have been removed from the client library.

3.11: 2014-07-23 (Eric S. Raymond <esr@snark.thyrsus.com>)
  A bug that prevented track interpolation has been fixed.
  We now get vertical error position and speed estimates from the
  u-blox driver rather than having to interpolate them.
  Some unusual AIS talker IDs (NMEA 4.0 station classes) are supported.
  chrpath is no longer a dependency for building and testing, and
  now defaults to 'no'.  Full systemd support.  Fixes for handling
  large PPS offsets. Improved recovery from device flakeouts,
  gpsmon argument parsing.

3.10: 2013-11-22 (Eric S. Raymond <esr@snark.thyrsus.com>)
  AIS: Adds gps2udp, an AIS data relay, split24 option supports
  passing through Type 24 halves; support for Inland AIS; "scaled" no
  longer controls dumping of controlled-vocabulary fields; instead,
  the're always dumped numerically and as text, with text in an
  attribute name generated by appending "_text" to the name of the
  base attribute. The packetizer's handling of write boundaries not
  coinciding with packet boundaries is improved.  Better support for
  mode and speed switching in the UBX driver.  PPS message now ships
  nsec. PPS events are visible in gpsmon. Time-reporting fix to TSIP.

3.9: 2013-05-01 (Eric S. Raymond <esr@snark.thyrsus.com>)
  Note to packagers: this is an urgent release that fixes a possible
  DoS or security hole!  Armor the AIS driver against an implausible
  overrun attack.  A (different) fix for our first malformed-packet
  crash since about 2007. Minor improvements to the NMEA2000
  driver. New FAQ entry on how to know WAAS/EGNOS is working.
  New -u and -uu options enable usec timestamps on gpspipe output.

3.8: 2013-02-25 (Eric S. Raymond <esr@snark.thyrsus.com>)
  Fix various minor errors in the AIVDM/AIVDO description. Repair the
  xmlto support in the build system. Add two more regression
  tests. Significant improvements to NMEA2000 support. Upgrade the PHP
  client to v3 of the Google Maps API. Support for the Telit SL869
  chipset. Added a nautical-style display to xgpsspeed. Minor
  improvements to leapsecond.py.

3.7: 2012-07-02 (Eric S. Raymond <esr@snark.thyrsus.com>)
  Snap release to get the midnight change in the default leap-second
  constant out the door.  Port tests now pass on all Debian supported
  architectures, including the Sparc and s390 that were giving us
  trouble before. Pre-2003 Delorme Earthmate works again.

3.6: 2012-05-23 (Eric S. Raymond <esr@snark.thyrsus.com>)
  It's the Fernando Poo Day release.  Code has zero detectible defects
  under Coverity scanning and cppcheck 1.52; this is mainly a cleanup
  release to get those minor fixes into the field.  If a leap-second
  warning is available from GPS subframe information it is passed to
  ntpd. NMEA2000 is now supported via the Linux kernel CAN interface.
  There's a chrpath=no config option for distribution makers, so
  chrpath is no longer a build dependency; see build.txt for
  explanation.

3.5: 2012-04-14 (Eric S. Raymond <esr@snark.thyrsus.com>)
  Use pselect when it's available to cut down on wakeups and improve
  signal handling.  New {PPS} message exporting clock drift. The AIVDM
  driver now handles up to 16 interleaved 24A and 24B pair-halves.
  The NMEA driver interprets depth-sounder returns from SDDBT and
  reports them as negative altitudes. The pps-pin option is gone, the
  PPS code now just accepts any handshake pin. A bug that sometimes
  caused RTCM packets to be dropped rather than relayed is fixed.

3.4: 2012-01-12 (Eric S. Raymond <esr@snark.thyrsus.com>)
  Don't barf when chrpath is not available, fall back to static linking;
  helps people not running Linux.

3.3: 2011-10-29 (Eric S. Raymond <esr@snark.thyrsus.com>)
  Improvements to build and release-procedure documentation. Make
  sirf=no build work again. Main reason for this release is to make
  chrpath a mandatory build dependency and explain why in the build
  documentation.

3.2: 2011-10-25 (Eric S. Raymond <esr@snark.thyrsus.com>)
  In the build recipe, (1) set pkgconfig properly for 64-bit Fedora
  systems, (2) clean up various derived files including *.pyc on scons
  -c, (3) add an option to disable stripping of binaries (strip=no),
  (4) for embedded targets, add an option to disable building Python
  support (python=no), (5) make the help for gpsd_group and gpsd_user
  a little clearer, (6) add a force_global option to build gpsd to
  listen to all addresses (rather than just loopback). The packet
  sniffer now accepts NMEA packets with the ECDIS packet leader 'EC'.
  SBAS satellites are now properly use-flagged in SiRF and UBX
  skyviews.  The -G option now works under IPv6. Cross-build is now
  officially supported and instructions included.  gpsprof works again
  and does whole-cycle profiling. gpsd.php has Open Street Map
  support.  The pp-on-cts option is replaced by a pps_pin option that
  lets you specify the pin; the default is still DCD. New supported
  device; the Jackson Labs Fury. The chrpath utility has become a
  build prerequisite.

3.1: 2011-07-28 (Eric S. Raymond <esr@snark.thyrsus.com>)
  The Irene release, rocking you like a hurricane and brought to you
  from the storm shelter in my basement. This is a snap release mainly
  to get some scons recipe cleanups out the door.  Parallelized builds
  now work. Small but fatal problems with reconfigure=no, netfeed=no
  and sock_export=no builds have been fixed.  Build recipe ported for
  Fedora, Darwin, FreeBSD and OpenBSD.  libgps now brings -lm with it
  on systems with implicit linking. One old bug fixed (code was
  previously present but broken): Under Linux, gpsd will refrain from
  opening serial or USB devices that another process has open,
  avoiding potential problems with class 0xFF USB devices opened by
  other programs.  One new bug fix: we now use an atof()
  implementation that ignores locale, avoiding problems where decimal
  point is a comma. One new feature: Change -N semantics so it only
  suppresses backgrounding; privileges are now dropped as in normal
  background operation.

3.0: 2011-07-19 (Eric S. Raymond <esr@snark.thyrsus.com>)
  POLL subobject name changes: fixes -> tpv, skyview -> sky.
  Fix a timestamp-clobbering bug in the C library revealed by an
  obscure car-nav device, the MyGuide 3100. The DEVICE 'activated'
  attribute becomes an ISO8601 string; the client libraries will
  still backward-compatibly read a float value. gps_unpack() is
  now a documented part of the library API. There is now a
  shared-memory export from the daemon that can be accessed through
  the C and C++ client libraries.  xgps and cgps may now display
  the Maidenhead grid locator for current lat/lon.  xgps displays
  GST noise statistics if they are available. Codebase now has
  an scons build recipe. Direct support for activation of gpsd from
  Mac OS/X systemd. gpsdecode can now filter reports by RTCM2, RTCM3,
  or AIS message type. NMEA HEHDT is implemented. Remote gpsd instances
  can now be used as data sources via a gpsd:// URL.  There is a client
  for live-feeding GPSD data to Google Earth. The hotplug sequence no
  longer requires Python.

8 files changed, 116 insertions, 104 deletions

diff --git a/geography/gpsd/Makefile b/geography/gpsd/Makefile
index a29fad8984c..e18ce757a79 100644
--- a/geography/gpsd/Makefile
+++ b/geography/gpsd/Makefile
@@ -1,9 +1,6 @@
-# $NetBSD: Makefile,v 1.41 2019/04/26 14:12:39 maya Exp $
+# $NetBSD: Makefile,v 1.42 2019/05/01 20:22:02 gdt Exp $
 
-# gpsd 3.11 has been released.  It has only not been updated because
-# newer versions use scons.
-DISTNAME=	gpsd-2.96
-PKGREVISION=	7
+DISTNAME=	gpsd-3.18.1
 CATEGORIES=	geography
 MASTER_SITES=	http://download-mirror.savannah.gnu.org/releases/gpsd/
 
@@ -13,31 +10,70 @@ COMMENT=	GPS information daemon
 
 LICENSE=	modified-bsd
 
-# XXX: In theory this is not necessary.
-BUILD_DEPENDS+=	xmlto-[0-9]*:../../textproc/xmlto
-
-GNU_CONFIGURE=	YES
-CONFIGURE_ENV+=	PYTHON=${PYTHONBIN}
 PY_PATCHPLIST=	yes
-PYTHON_VERSIONS_INCOMPATIBLE=	36 37 # not yet ported as of 2.96
 
-USE_TOOLS+=	gmake
+USE_TOOLS+=	pkg-config gmake
 USE_LIBTOOL=	yes
 USE_LANGUAGES=	c99 c++
 
-# gpsd looks for ncurses but not curses. (Not yet filed upstream.)
-FAKE_NCURSES=	yes
+# \todo Separate upstream's build into configure and build.
+NO_CONFIGURE=	yes
 
-# gpsd uses syncok
+# Note that gpsd is documented to use ncurses, not curses.
+FAKE_NCURSES=	yes
+# gpsd uses syncok.  Insist on an implementation that provides it.
 USE_CURSES=	syncok
 
+# Documentation depends
+BUILD_DEPENDS+=	libxslt-[0-9]*:../../textproc/libxslt
+
+# \todo Decide if buildlink3 is more appropriate.
+DEPENDS+=	${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
+
 CFLAGS.SunOS=	-DLOG_PERROR=0
 
-INSTALLATION_DIRS=	sbin
+# 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 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_SED.pyenv=	-e 's,/usr/bin/env python.*$$,${PYTHONBIN},'
+
+# \todo: Determine if CC/CXX are needed (e.g, when using other than gcc).
+#	CC=${CC:Q} CXX=${CXX:Q}
+do-build:
+	cd ${WRKSRC} && \
+	${SETENV} ${MAKE_ENV} ${SCONSBIN} \
+	prefix=${PREFIX} mandir=${PREFIX}/${PKGMANDIR} \
+	${SCONS_ARGS} \
+	-j${MAKE_JOBS:U1}
+
+do-install:
+	cd ${WRKSRC} && \
+	${SETENV} ${INSTALL_ENV} ${SCONSBIN} install
+
+do-test:
+	cd ${WRKSRC} && \
+	${SETENV} ${INSTALL_ENV} ${SCONSBIN} check
 
-TEST_TARGET=	check
+# \todo Change to TOOLS or BUILD_DEPENDS after scons support is improved.
+.include "../../devel/scons/buildlink3.mk"
 
+.include "../../devel/libusb1/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
+.include "../../graphics/py-cairo/buildlink3.mk"
 .include "../../lang/python/extension.mk"
-.include "../../mk/curses.buildlink3.mk"
+# \todo Resolve mk/curses not invoking ncurses builtin processing.
+#.include "../../mk/curses.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/geography/gpsd/PLIST b/geography/gpsd/PLIST
index c19e8b0351b..21e7a4f5b14 100644
--- a/geography/gpsd/PLIST
+++ b/geography/gpsd/PLIST
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.10 2011/03/23 16:08:34 gdt Exp $
+@comment $NetBSD: PLIST,v 1.11 2019/05/01 20:22:02 gdt Exp $
 bin/cgps
+bin/gegps
+bin/gps2udp
 bin/gpscat
 bin/gpsctl
 bin/gpsdecode
@@ -9,32 +11,33 @@ bin/gpspipe
 bin/gpsprof
 bin/gpxlogger
 bin/lcdgps
+bin/ntpshmmon
+bin/ubxtool
 bin/xgps
 bin/xgpsspeed
+bin/zerk
 include/gps.h
-include/gpsd.h
+@comment include/gpsd.h
 include/libgpsmm.h
-lib/libgps.la
-lib/libgpsd.la
+lib/libgps.so
+lib/libgps.so.24
+lib/libgps.so.24.0.0
+@comment lib/libgpsd.la
 lib/pkgconfig/libgps.pc
-lib/pkgconfig/libgpsd.pc
+@comment lib/pkgconfig/libgpsd.pc
+${PYSITELIB}/gps-${PKGVERSION}.egg-info
 ${PYSITELIB}/gps/__init__.py
-${PYSITELIB}/gps/__init__.pyc
 ${PYSITELIB}/gps/client.py
-${PYSITELIB}/gps/client.pyc
 ${PYSITELIB}/gps/clienthelpers.so
 ${PYSITELIB}/gps/fake.py
-${PYSITELIB}/gps/fake.pyc
 ${PYSITELIB}/gps/gps.py
-${PYSITELIB}/gps/gps.pyc
 ${PYSITELIB}/gps/misc.py
-${PYSITELIB}/gps/misc.pyc
 ${PYSITELIB}/gps/packet.so
-${PYSITELIB}/gpscap.py
-${PYSITELIB}/gpscap.pyc
-${PYSITELIB}/gpscap.pyo
+${PYSITELIB}/gps/watch_options.py
 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
+@comment 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/geography/gpsd/distinfo b/geography/gpsd/distinfo
index 8e85deaf284..dcaea714d99 100644
--- a/geography/gpsd/distinfo
+++ b/geography/gpsd/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.22 2015/11/03 00:08:42 agc Exp $
+$NetBSD: distinfo,v 1.23 2019/05/01 20:22:02 gdt Exp $
 
-SHA1 (gpsd-2.96.tar.gz) = a3674940e3325ccc1dc6d2890eb18d31a978425c
-RMD160 (gpsd-2.96.tar.gz) = cb37dc7811f8e7880a091fe7bec69a38efa4fda9
-SHA512 (gpsd-2.96.tar.gz) = cc68c8606a956cfcefd820136b73d9e0786085b72ee2b0ac8465fb641cc5a252ce7a3487aa1778d996547c42d00ae1908725b4b09b732b25a7cf5f9d501659c0
-Size (gpsd-2.96.tar.gz) = 1554607 bytes
-SHA1 (patch-aa) = b77bd7491ee890fc66f807cbfe4c6d62423d67d5
-SHA1 (patch-gpsd.h-tail) = 00e60adb91758777ded2e8874e997990b7bc65a2
-SHA1 (patch-gpspipe.c) = 6ce6a212dd08abb563d5e88410dab92869e249c8
-SHA1 (patch-serial.c) = e6fb2be909efcb55fbdbbfa8a799a6dc79b6c99d
+SHA1 (gpsd-3.18.1.tar.gz) = e72402ce559932ad65ab5792b59ccfce34cb1160
+RMD160 (gpsd-3.18.1.tar.gz) = 08f95b51218f11f7b07c1a5046cead366216fdc8
+SHA512 (gpsd-3.18.1.tar.gz) = b381b177fcd29089a61aa11f5df2c67473720a6bbc5590ca1c4fda627331c407de01c62caceeddae780626b9a02392e9a770d52a143357e1babdcc2fbff0ed38
+Size (gpsd-3.18.1.tar.gz) = 9031595 bytes
+SHA1 (patch-SConstruct) = 9a0904c003f1883e188e277f9e45c324e09f9c9f
+SHA1 (patch-gpspipe.c) = 43d9e99867175418874adaaf210a429819c3ea9a
+SHA1 (patch-serial.c) = b28f1d209ecf27fcd7a98dcacb201632f3667d56
diff --git a/geography/gpsd/patches/patch-SConstruct b/geography/gpsd/patches/patch-SConstruct
new file mode 100644
index 00000000000..edebf2be105
--- /dev/null
+++ b/geography/gpsd/patches/patch-SConstruct
@@ -0,0 +1,19 @@
+$NetBSD: patch-SConstruct,v 1.1 2019/05/01 20:22:02 gdt Exp $
+
+Tell scons to pass the wrapper config variable to children, so the
+wrapped compiler works.
+
+Not yet addressed upstream.
+
+--- SConstruct.orig	2018-10-03 00:05:28.000000000 +0000
++++ SConstruct
+@@ -280,6 +280,9 @@ 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.
++    # pkgsrc
++    'CWRAPPERS_CONFIG_DIR',
++    'CCACHE_DIR',
+ )
+ 
+ envs = {}
diff --git a/geography/gpsd/patches/patch-aa b/geography/gpsd/patches/patch-aa
deleted file mode 100644
index 1c1c16acb5f..00000000000
--- a/geography/gpsd/patches/patch-aa
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2010/02/07 17:59:40 gdt Exp $
-
---- configure.orig	2009-12-04 21:45:59.000000000 +0100
-+++ configure
-@@ -4630,7 +4630,7 @@ sys.exit(sys.hexversion < minverhex)"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- else
--  as_fn_error "too old" "$LINENO" 5
-+  true
- fi
-       am_display_PYTHON=$PYTHON
-     else
-@@ -16571,13 +16570,13 @@ if test "x$ac_cv_lib_c_open" = x""yes; t
- fi
- 
- 
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_setcancelstate in -lpthread" >&5
--$as_echo_n "checking for pthread_setcancelstate in -lpthread... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_setcancelstate in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
-+$as_echo_n "checking for pthread_setcancelstate in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... " >&6; }
- if test "${ac_cv_lib_pthread_pthread_setcancelstate+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpthread  $LIBS"
-+LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}  $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -16608,7 +16607,7 @@ fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_setcancelstate" >&5
- $as_echo "$ac_cv_lib_pthread_pthread_setcancelstate" >&6; }
- if test "x$ac_cv_lib_pthread_pthread_setcancelstate" = x""yes; then :
--  LIBPTHREAD="-lpthread"
-+  LIBPTHREAD="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
- 
- $as_echo "#define HAVE_LIBPTHREAD /**/" >>confdefs.h
- 
diff --git a/geography/gpsd/patches/patch-gpsd.h-tail b/geography/gpsd/patches/patch-gpsd.h-tail
deleted file mode 100644
index d31bb66d530..00000000000
--- a/geography/gpsd/patches/patch-gpsd.h-tail
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-gpsd.h-tail,v 1.1 2013/12/10 12:22:52 jperkin Exp $
-
-Need cfmakeraw on SunOS.
-
---- gpsd.h-tail.orig	2011-03-21 22:03:35.000000000 +0000
-+++ gpsd.h-tail
-@@ -758,7 +758,7 @@ extern struct tm *localtime_r(const time
- #define NITEMS(x) (int)(sizeof(x)/sizeof(x[0]))
- 
- /* Cygwin, in addition to NAN, doesn't have cfmakeraw */
--#if defined(__CYGWIN__)
-+#if defined(__CYGWIN__) || defined(__sun)
- void cfmakeraw(struct termios *);
- #endif /* defined(__CYGWIN__) */
- 
diff --git a/geography/gpsd/patches/patch-gpspipe.c b/geography/gpsd/patches/patch-gpspipe.c
index c99ee9b5168..a41ca574128 100644
--- a/geography/gpsd/patches/patch-gpspipe.c
+++ b/geography/gpsd/patches/patch-gpspipe.c
@@ -1,11 +1,11 @@
-$NetBSD: patch-gpspipe.c,v 1.1 2013/12/10 12:22:52 jperkin Exp $
+$NetBSD: patch-gpspipe.c,v 1.2 2019/05/01 20:22:02 gdt Exp $
 
 cfmakeraw compatability for SunOS.
 
---- gpspipe.c.orig	2011-01-13 13:36:18.000000000 +0000
+--- gpspipe.c.orig	2018-09-22 23:24:39.000000000 +0000
 +++ gpspipe.c
-@@ -77,7 +77,15 @@ static void open_serial(char *device)
-     /*@i@*/ bzero(&newtio, sizeof(newtio));
+@@ -97,7 +97,15 @@ static void open_serial(char *device)
+     memset(&newtio, 0, sizeof(newtio));
  
      /* make it raw */
 +#if defined(__sun)
@@ -18,5 +18,5 @@ cfmakeraw compatability for SunOS.
      (void)cfmakeraw(&newtio);
 +#endif
      /* set speed */
-     /*@i@*/ (void)cfsetospeed(&newtio, BAUDRATE);
+     (void)cfsetospeed(&newtio, BAUDRATE);
  
diff --git a/geography/gpsd/patches/patch-serial.c b/geography/gpsd/patches/patch-serial.c
index 2e4d236d454..35c8b1995ac 100644
--- a/geography/gpsd/patches/patch-serial.c
+++ b/geography/gpsd/patches/patch-serial.c
@@ -1,11 +1,11 @@
-$NetBSD: patch-serial.c,v 1.1 2013/12/10 12:22:52 jperkin Exp $
+$NetBSD: patch-serial.c,v 1.2 2019/05/01 20:22:02 gdt Exp $
 
 Need cfmakeraw on SunOS.
 
---- serial.c.orig	2011-03-15 03:34:32.000000000 +0000
+--- serial.c.orig	2018-09-22 23:24:39.000000000 +0000
 +++ serial.c
-@@ -125,7 +125,7 @@ void gpsd_tty_init(struct gps_device_t *
-     session->reawake = (timestamp_t)0;
+@@ -173,7 +173,7 @@ void gpsd_tty_init(struct gps_device_t *
+     session->reawake = (time_t)0;
  }
  
 -#if defined(__CYGWIN__)