Attachment 189898 Details for Bug 225310 – [patch] update to gpsd-3.17

[patch] update to gpsd-3.17

pr-update-3.17.diff (text/plain), 9.78 KB, created by John Hein on 2018-01-19 06:01:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Hein

Created: 2018-01-19 06:01:20 UTC

Size: 9.78 KB

patch

obsolete

>Update to gpsd-3.17 [201709]
>
> - bin/ntpshmmon is dependent on PPS option (see sConstruct)
>
> - remove patch that has been upstreamed
>
> - explicitly reference python2.7 rather than python2 (per current ports tree guidelines)
>
> - use python flavors [1]
>
> - plist changes to reflect upstream changes: lib version bumps, added man page, removed a pkg-config file
>
> - add X11 option for bin/xpgs*; update dependencies for 3.17 version of xgps* (needs python gi module & gtk3)
>
>[1] Note: there is support for python3 in upstream.  Reserving that
>change for a future update (as yet untested).
>
>Index: Makefile
>===================================================================
>--- Makefile	(revision 459165)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	gpsd
>-PORTVERSION=	3.16
>+PORTVERSION=	3.17
> CATEGORIES=	astro geography
> MASTER_SITES=	SAVANNAH
> 
>@@ -12,14 +12,15 @@
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-USES=		cpe pathfix pkgconfig python:2 scons shebangfix
>+USES=		cpe pathfix pkgconfig python:2.7 scons shebangfix
> CPE_VENDOR=	gpsd_project
>+USE_PYTHON=	flavors
> USE_RC_SUBR=	gpsd
> SHEBANG_FILES=	*.py gps/*.py gegps xgps gpscat xgpsspeed gpsprof \
> 		gpsfake
> 
> MAKE_ARGS=	prefix="${PREFIX}" mandir="man" pkgconfig="libdata/pkgconfig" \
>-		manbuild=no
>+		manbuild=no target_python="${PYTHON_CMD}"
> MAKE_ENV=	DESTDIR="${STAGEDIR}"
> PLIST_SUB=	PYTHON_EGGINFO=gps-${PORTVERSION}.egg-info
> 
>@@ -28,12 +29,12 @@
> 		NETFEED NMEA0183 NTP NTPSHM NTRIP OCEANSERVER ONCORE \
> 		PASSTHROUGH PPS PROFILING RECONFIGURE RTCM104V2 RTCM104V3 \
> 		SHMEXPORT SIRF SOCKEXPORT SUPERSTARII TIMING TNT TRIPMATE \
>-		TSIP QTBIND UBLOX USB
>+		TSIP QTBIND UBLOX USB X11
> OPTIONS_DEFAULT= AIVDM ASHTECH CPPBIND EARTHMATE EVERMORE FURY FV18 GARMIN \
> 		GARMINTXT GEOSTAR GPSCLOCK ITRAX NAVCOM NCURSES NETFEED \
> 		NMEA0183 NTP NTPSHM NTRIP OCEANSERVER ONCORE PASSTHROUGH \
> 		RECONFIGURE RTCM104V2 RTCM104V3 SHMEXPORT SIRF SOCKEXPORT \
>-		SUPERSTARII TIMING TNT TRIPMATE TSIP UBLOX USB
>+		SUPERSTARII TIMING TNT TRIPMATE TSIP UBLOX USB X11
> OPTIONS_SUB=	yes
> 
> AIVDM_DESC=		Aivdm support
>@@ -137,6 +138,10 @@
> QTBIND_PLIST_SUB_OFF=	QTBIND="@comment "
> RECONFIGURE_MAKE_ARGS_OFF=	reconfigure=no
> CPPBIND_MAKE_ARGS_OFF=	libgpsmm=no
>+X11_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${FLAVOR} \
>+	${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${FLAVOR}
>+#X11_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${FLAVOR}
>+X11_USE=	GNOME=gtk30
> 
> # Build control
> PROFILING_MAKE_ARGS=	profiling=yes
>Index: distinfo
>===================================================================
>--- distinfo	(revision 459165)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1493742351
>-SHA256 (gpsd-3.16.tar.gz) = 03579af13a4d3fe0c5b79fa44b5f75c9f3cac6749357f1d99ce5d38c09bc2029
>-SIZE (gpsd-3.16.tar.gz) = 8587490
>+TIMESTAMP = 1516146278
>+SHA256 (gpsd-3.17.tar.gz) = 68e0dbecfb5831997f8b3d6ba48aed812eb465d8c0089420ab68f9ce4d85e77a
>+SIZE (gpsd-3.17.tar.gz) = 8755304
>Index: files/patch-SConstruct
>===================================================================
>--- files/patch-SConstruct	(revision 459165)
>+++ files/patch-SConstruct	(nonexistent)
>@@ -1,101 +0,0 @@
>-Remove LIBPATH='.' - see http://lists.nongnu.org/archive/html/gpsd-dev/2016-02/msg00042.html
>-
>---- SConstruct.orig	2016-01-08 19:25:48 UTC
>-+++ SConstruct
>-@@ -985,37 +985,37 @@ gpsmon_sources = [
>- ## Production programs
>- 
>- gpsd = env.Program('gpsd', gpsd_sources,
>--                   LIBS=['gpsd', 'gps_static'], LIBPATH='.',
>-+                   LIBS=['gpsd', 'gps_static'],
>-                    parse_flags=gpsdflags+gpsflags)
>- gpsdecode = env.Program('gpsdecode', ['gpsdecode.c'],
>--                        LIBS=['gpsd', 'gps_static'], LIBPATH='.',
>-+                        LIBS=['gpsd', 'gps_static'],
>-                         parse_flags=gpsdflags+gpsflags)
>- gpsctl = env.Program('gpsctl', ['gpsctl.c'],
>--                     LIBS=['gpsd', 'gps_static'], LIBPATH='.',
>-+                     LIBS=['gpsd', 'gps_static'],
>-                      parse_flags=gpsdflags+gpsflags)
>- gpsmon = env.Program('gpsmon', gpsmon_sources,
>--                     LIBS=['gpsd', 'gps_static'], LIBPATH='.',
>-+                     LIBS=['gpsd', 'gps_static'],
>-                      parse_flags=gpsdflags + gpsflags + ncurseslibs)
>- gpsdctl = env.Program('gpsdctl', ['gpsdctl.c'],
>--                      LIBS=['gps_static'], LIBPATH='.',
>-+                      LIBS=['gps_static'],
>-                       parse_flags=gpsflags)
>- gpspipe = env.Program('gpspipe', ['gpspipe.c'],
>--                      LIBS=['gps_static'], LIBPATH='.',
>-+                      LIBS=['gps_static'],
>-                       parse_flags=gpsflags)
>- gps2udp = env.Program('gps2udp', ['gps2udp.c'],
>--                      LIBS=['gps_static'], LIBPATH='.',
>-+                      LIBS=['gps_static'],
>-                       parse_flags=gpsflags)
>- gpxlogger = env.Program('gpxlogger', ['gpxlogger.c'],
>--                        LIBS=['gps_static'], LIBPATH='.',
>-+                        LIBS=['gps_static'],
>-                         parse_flags=gpsflags)
>- lcdgps = env.Program('lcdgps', ['lcdgps.c'],
>--                     LIBS=['gps_static'], LIBPATH='.',
>-+                     LIBS=['gps_static'],
>-                      parse_flags=gpsflags)
>- cgps = env.Program('cgps', ['cgps.c'],
>--                   LIBS=['gps_static'], LIBPATH='.',
>-+                   LIBS=['gps_static'],
>-                    parse_flags=gpsflags + ncurseslibs)
>- ntpshmmon = env.Program('ntpshmmon', ['ntpshmmon.c'],
>--                        LIBS=['gps_static'], LIBPATH='.',
>-+                        LIBS=['gps_static'],
>-                         parse_flags=gpsflags)
>- 
>- binaries = [gpsd, gpsdecode, gpsctl, gpsdctl, gpspipe, gps2udp, gpxlogger, lcdgps, ntpshmmon]
>-@@ -1024,26 +1024,26 @@ if env["ncurses"]:
>- 
>- # Test programs - always link locally and statically
>- test_bits = env.Program('test_bits', ['test_bits.c'],
>--                        LIBS=['gps_static'], LIBPATH='.')
>-+                        LIBS=['gps_static'])
>- test_float = env.Program('test_float', ['test_float.c'])
>- test_geoid = env.Program('test_geoid', ['test_geoid.c'],
>-                          LIBS=['gpsd', 'gps_static'],
>--                         LIBPATH='.', parse_flags=gpsdflags)
>-+                         parse_flags=gpsdflags)
>- test_matrix = env.Program('test_matrix', ['test_matrix.c'],
>-                           LIBS=['gpsd', 'gps_static'],
>--                          LIBPATH='.', parse_flags=gpsdflags)
>-+                          parse_flags=gpsdflags)
>- test_mktime = env.Program('test_mktime', ['test_mktime.c'],
>--                          LIBS=['gps_static'], LIBPATH='.', parse_flags=["-lm"])
>-+                          LIBS=['gps_static'], parse_flags=["-lm"])
>- test_packet = env.Program('test_packet', ['test_packet.c'],
>-                           LIBS=['gpsd', 'gps_static'],
>--                          LIBPATH='.', parse_flags=gpsdflags)
>-+                          parse_flags=gpsdflags)
>- test_timespec = env.Program('test_timespec', ['test_timespec.c'],
>-                           LIBS=['gpsd', 'gps_static'],
>--                          LIBPATH='.', parse_flags=gpsdflags)
>-+                          parse_flags=gpsdflags)
>- test_trig = env.Program('test_trig', ['test_trig.c'], parse_flags=["-lm"])
>- # test_libgps for glibc older than 2.17
>- test_libgps = env.Program('test_libgps', ['test_libgps.c'],
>--                          LIBS=['gps_static'], LIBPATH='.', parse_flags=["-lm"] + rtlibs + dbusflags)
>-+                          LIBS=['gps_static'], parse_flags=["-lm"] + rtlibs + dbusflags)
>- 
>- if not env['socket_export']:
>-     announce("test_json not building because socket_export is disabled")
>-@@ -1051,11 +1051,11 @@ if not env['socket_export']:
>- else:
>-     test_json = env.Program(
>-         'test_json', ['test_json.c'],
>--	LIBS=['gps_static'], LIBPATH='.',
>-+	LIBS=['gps_static'],
>- 	parse_flags=["-lm"] + rtlibs + usbflags + dbusflags)
>- 
>- test_gpsmm = env.Program('test_gpsmm', ['test_gpsmm.cpp'],
>--                         LIBS=['gps_static'], LIBPATH='.', parse_flags=["-lm"])
>-+                         LIBS=['gps_static'], parse_flags=["-lm"])
>- testprogs = [test_bits, test_float, test_geoid, test_libgps, test_matrix, test_mktime, test_packet, test_timespec, test_trig]
>- if env['socket_export']:
>-     testprogs.append(test_json)
>
>Property changes on: files/patch-SConstruct
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 459165)
>+++ pkg-plist	(working copy)
>@@ -10,18 +10,18 @@
> bin/gpsprof
> bin/gpxlogger
> bin/lcdgps
>-bin/ntpshmmon
>-bin/xgps
>-bin/xgpsspeed
>+%%PPS%%bin/ntpshmmon
>+%%X11%%bin/xgps
>+%%X11%%bin/xgpsspeed
> include/gps.h
> include/libgpsmm.h
> %%QTBIND%%lib/libQgpsmm.prl
> %%QTBIND%%lib/libQgpsmm.so
>-%%QTBIND%%lib/libQgpsmm.so.22
>-%%QTBIND%%lib/libQgpsmm.so.22.0.0
>+%%QTBIND%%lib/libQgpsmm.so.23
>+%%QTBIND%%lib/libQgpsmm.so.23.0.0
> lib/libgps.so
>-lib/libgps.so.22
>-lib/libgps.so.22.0.0
>+lib/libgps.so.23
>+lib/libgps.so.23.0.0
> man/man1/cgps.1.gz
> man/man1/gegps.1.gz
> man/man1/gps.1.gz
>@@ -33,10 +33,11 @@
> man/man1/gpsmon.1.gz
> man/man1/gpspipe.1.gz
> man/man1/gpsprof.1.gz
>+man/man1/gpxlogger.1.gz
> man/man1/lcdgps.1.gz
> man/man1/ntpshmmon.1.gz
>-man/man1/xgps.1.gz
>-man/man1/xgpsspeed.1.gz
>+%%X11%%man/man1/xgps.1.gz
>+%%X11%%man/man1/xgpsspeed.1.gz
> man/man3/libQgpsmm.3.gz
> man/man3/libgps.3.gz
> man/man3/libgpsmm.3.gz
>@@ -65,6 +66,5 @@
> %%PYTHON_SITELIBDIR%%/gps/packet.so
> %%QTBIND%%libdata/pkgconfig/Qgpsmm.pc
> libdata/pkgconfig/libgps.pc
>-libdata/pkgconfig/libgpsd.pc
> sbin/gpsd
> sbin/gpsdctl

Flags:

jcfyecrayz: maintainer-approval+

Actions: View

Attachments on bug 225310: 189898