diff options
| -rw-r--r-- | geography/gpsd/Makefile | 7 | ||||
| -rw-r--r-- | geography/gpsd/PLIST | 8 | ||||
| -rw-r--r-- | geography/gpsd/distinfo | 13 | ||||
| -rw-r--r-- | geography/gpsd/patches/patch-SConstruct | 19 | ||||
| -rw-r--r-- | geography/gpsd/patches/patch-gpspipe.c | 22 | ||||
| -rw-r--r-- | geography/gpsd/patches/patch-serial.c | 15 |
6 files changed, 13 insertions, 71 deletions
diff --git a/geography/gpsd/Makefile b/geography/gpsd/Makefile index b1841cabbf7..ef00615bfb7 100644 --- a/geography/gpsd/Makefile +++ b/geography/gpsd/Makefile @@ -1,14 +1,12 @@ -# $NetBSD: Makefile,v 1.44 2019/06/04 10:43:21 gdt Exp $ +# $NetBSD: Makefile,v 1.45 2019/07/02 13:44:05 gdt Exp $ -DISTNAME= gpsd-3.18.1 -PKGREVISION= 1 +DISTNAME= gpsd-3.19 CATEGORIES= geography MASTER_SITES= http://download-mirror.savannah.gnu.org/releases/gpsd/ # will probably switch to https://gitlab.com/gpsd/gpsd/releases MAINTAINER= gdt@NetBSD.org HOMEPAGE= https://gpsd.io/ -#HOMEPAGE_OLD =https://savannah.nongnu.org/projects/gpsd COMMENT= GPS information daemon LICENSE= modified-bsd @@ -51,6 +49,7 @@ SUBST_FILES.pyenv+= ubxtool SUBST_FILES.pyenv+= xgps SUBST_FILES.pyenv+= xgpsspeed SUBST_FILES.pyenv+= zerk +SUBST_FILES.pyenv+= 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). diff --git a/geography/gpsd/PLIST b/geography/gpsd/PLIST index 21e7a4f5b14..37f8176dbfe 100644 --- a/geography/gpsd/PLIST +++ b/geography/gpsd/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 2019/05/01 20:22:02 gdt Exp $ +@comment $NetBSD: PLIST,v 1.12 2019/07/02 13:44:05 gdt Exp $ bin/cgps bin/gegps bin/gps2udp @@ -9,6 +9,7 @@ bin/gpsfake bin/gpsmon bin/gpspipe bin/gpsprof +bin/gpsrinex bin/gpxlogger bin/lcdgps bin/ntpshmmon @@ -20,8 +21,8 @@ include/gps.h @comment include/gpsd.h include/libgpsmm.h lib/libgps.so -lib/libgps.so.24 -lib/libgps.so.24.0.0 +lib/libgps.so.25 +lib/libgps.so.25.0.0 @comment lib/libgpsd.la lib/pkgconfig/libgps.pc @comment lib/pkgconfig/libgpsd.pc @@ -45,6 +46,7 @@ man/man1/gpsfake.1 man/man1/gpsmon.1 man/man1/gpspipe.1 man/man1/gpsprof.1 +man/man1/gpsrinex.1 man/man1/gpxlogger.1 man/man1/lcdgps.1 man/man1/ntpshmmon.1 diff --git a/geography/gpsd/distinfo b/geography/gpsd/distinfo index dcaea714d99..5e0d8b8e9a3 100644 --- a/geography/gpsd/distinfo +++ b/geography/gpsd/distinfo @@ -1,9 +1,6 @@ -$NetBSD: distinfo,v 1.23 2019/05/01 20:22:02 gdt Exp $ +$NetBSD: distinfo,v 1.24 2019/07/02 13:44:05 gdt Exp $ -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 +SHA1 (gpsd-3.19.tar.gz) = fd4a256189b4115b5668effcda555c04fa84a348 +RMD160 (gpsd-3.19.tar.gz) = b9f41521519f6887585eb4cafa85a058ad1385b0 +SHA512 (gpsd-3.19.tar.gz) = c9f9a9ff65759f852771ec4cf97ab15343c9176a149dd5ea6c2e2dc18b47aa7c7bf9ff1f2e8523121564d33a34ae6aa08169c5454847b4fe7848e616fd20a814 +Size (gpsd-3.19.tar.gz) = 10581777 bytes diff --git a/geography/gpsd/patches/patch-SConstruct b/geography/gpsd/patches/patch-SConstruct deleted file mode 100644 index edebf2be105..00000000000 --- a/geography/gpsd/patches/patch-SConstruct +++ /dev/null @@ -1,19 +0,0 @@ -$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-gpspipe.c b/geography/gpsd/patches/patch-gpspipe.c deleted file mode 100644 index a41ca574128..00000000000 --- a/geography/gpsd/patches/patch-gpspipe.c +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-gpspipe.c,v 1.2 2019/05/01 20:22:02 gdt Exp $ - -cfmakeraw compatability for SunOS. - ---- gpspipe.c.orig 2018-09-22 23:24:39.000000000 +0000 -+++ gpspipe.c -@@ -97,7 +97,15 @@ static void open_serial(char *device) - memset(&newtio, 0, sizeof(newtio)); - - /* make it raw */ -+#if defined(__sun) -+ newtio.c_iflag &= ~(IMAXBEL|IGNBRK|BRKINT|PARMRK|ISTRIP|INLCR|IGNCR|ICRNL|IXON); -+ newtio.c_oflag &= ~OPOST; -+ newtio.c_lflag &= ~(ECHO|ECHONL|ICANON|ISIG|IEXTEN); -+ newtio.c_cflag &= ~(CSIZE|PARENB); -+ newtio.c_cflag |= CS8; -+#else - (void)cfmakeraw(&newtio); -+#endif - /* set speed */ - (void)cfsetospeed(&newtio, BAUDRATE); - diff --git a/geography/gpsd/patches/patch-serial.c b/geography/gpsd/patches/patch-serial.c deleted file mode 100644 index 35c8b1995ac..00000000000 --- a/geography/gpsd/patches/patch-serial.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-serial.c,v 1.2 2019/05/01 20:22:02 gdt Exp $ - -Need cfmakeraw on SunOS. - ---- serial.c.orig 2018-09-22 23:24:39.000000000 +0000 -+++ serial.c -@@ -173,7 +173,7 @@ void gpsd_tty_init(struct gps_device_t * - session->reawake = (time_t)0; - } - --#if defined(__CYGWIN__) -+#if defined(__CYGWIN__) || defined(__sun) - /* Workaround for Cygwin, which is missing cfmakeraw */ - /* Pasted from man page; added in serial.c arbitrarily */ - void cfmakeraw(struct termios *termios_p) |