Attachment 177888 Details for Bug 207273 – [patch] [v3] update gpsd to 3.16

[patch] [patch] [v3] update gpsd to 3.16

pr-gpsd-3.16-v3.diff (text/plain), 10.37 KB, created by John Hein on 2016-12-11 22:09:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Hein

Created: 2016-12-11 22:09:52 UTC

Size: 10.37 KB

patch

obsolete

>Index: astro/gpsd/Makefile
>===================================================================
>--- astro/gpsd/Makefile	(revision 428344)
>+++ astro/gpsd/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	gpsd
>-PORTVERSION=	3.14
>-PORTREVISION=	3
>+PORTVERSION=	3.16
> CATEGORIES=	astro geography
> MASTER_SITES=	SAVANNAH
> 
>@@ -16,12 +15,13 @@
> BUILD_DEPENDS=	docbook-xsl>=0:textproc/docbook-xsl \
> 		xsltproc:textproc/libxslt
> 
>-USES=		cpe pathfix pkgconfig python scons
>+USES=		cpe pathfix pkgconfig python:2 scons
> CPE_VENDOR=	gpsd_project
> USE_RC_SUBR=	gpsd
> 
> MAKE_ARGS=	prefix="${PREFIX}" mandir="man" pkgconfig="libdata/pkgconfig"
> MAKE_ENV=	DESTDIR="${STAGEDIR}"
>+PLIST_SUB=	PYTHON_EGGINFO=gps-${PORTVERSION}.egg-info
> 
> OPTIONS_DEFINE=	AIVDM ASHTECH CPPBIND DBUS EARTHMATE EVERMORE FURY FV18 GARMIN \
> 		GARMINTXT GEOSTAR GPSCLOCK IPV6 ITRAX MTK NAVCOM NCURSES \
>@@ -113,7 +113,8 @@
> # Export methods
> SOCKEXPORT_MAKE_ARGS_OFF=	socket_export=no
> DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
>-DBUS_MAKE_ARGS=	dbus_export=yes
>+DBUS_MAKE_ARGS=		dbus_export=yes
>+DBUS_MAKE_ARGS_OFF=	dbus_export=no
> SHMEXPORT_MAKE_ARGS_OFF=	shm_export=no
> 
> # Communication
>Index: astro/gpsd/distinfo
>===================================================================
>--- astro/gpsd/distinfo	(revision 428344)
>+++ astro/gpsd/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (gpsd-3.14.tar.gz) = 504fc812f3c1525a1a48e04bf4d77f9a8066c201448d98089df89d58ef53a8cb
>-SIZE (gpsd-3.14.tar.gz) = 1398425
>+SHA256 (gpsd-3.16.tar.gz) = 03579af13a4d3fe0c5b79fa44b5f75c9f3cac6749357f1d99ce5d38c09bc2029
>+SIZE (gpsd-3.16.tar.gz) = 8587490
>Index: astro/gpsd/files/patch-SConstruct
>===================================================================
>--- astro/gpsd/files/patch-SConstruct	(revision 428344)
>+++ astro/gpsd/files/patch-SConstruct	(working copy)
>@@ -1,19 +1,101 @@
>---- SConstruct.orig	2015-03-14 11:24:41 UTC
>+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
>-@@ -305,16 +305,6 @@ def installdir(dir, add_destdir=True):
>-     wrapped.replace("/usr/lib/systemd", "/lib/systemd")
>-     return wrapped
>+@@ -985,37 +985,37 @@ gpsmon_sources = [
>+ ## Production programs
>  
>--# Honor the specified installation prefix in link paths.
>--if env["sysroot"]:
>--    env.Prepend(LIBPATH=[env["sysroot"] + installdir('libdir', add_destdir=False)])
>--
>--# Don't hack RPATH unless libdir points somewhere that is not on the
>--# minimum default load path.
>--if env["shared"]:
>--    if env["libdir"] not in ["/usr/lib", "/lib"]:
>--        env.Prepend(RPATH=[installdir('libdir')])
>--
>- # Give deheader a way to set compiler flags
>- if 'MORECFLAGS' in os.environ:
>-     env.Append(CFLAGS=Split(os.environ['MORECFLAGS']))
>+ 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)
>Index: astro/gpsd/files/patch-compiler.h
>===================================================================
>--- astro/gpsd/files/patch-compiler.h	(revision 428344)
>+++ astro/gpsd/files/patch-compiler.h	(working copy)
>@@ -1,14 +0,0 @@
>---- compiler.h.orig	2015-03-13 12:36:31 UTC
>-+++ compiler.h
>-@@ -46,9 +46,9 @@
>- 
>- #ifndef S_SPLINT_S
>- #ifdef HAVE_STDATOMIC_H
>--#ifndef __COVERITY__	/* Coverity is confused by a GNU typedef */
>-+#if !defined(__COVERITY__) && !defined(__cplusplus)
>- #include <stdatomic.h>
>--#endif /* __COVERITY__ */
>-+#endif /* __COVERITY__ || __cplusplus */
>- #endif /* HAVE_STDATOMIC_H */
>- #endif /* S_SPLINT_S */
>- 
>Index: astro/gpsd/files/patch-libgps.pc.in
>===================================================================
>--- astro/gpsd/files/patch-libgps.pc.in	(revision 428344)
>+++ astro/gpsd/files/patch-libgps.pc.in	(working copy)
>@@ -1,10 +0,0 @@
>---- libgps.pc.in.orig	2015-01-25 12:09:01 UTC
>-+++ libgps.pc.in
>-@@ -1,6 +1,6 @@
>- prefix=@prefix@
>- exec_prefix=${prefix}
>--libdir=@libdir@
>-+libdir=${prefix}/@libdir@
>- includedir=${prefix}/include
>- 
>- Name: GPSD
>Index: astro/gpsd/files/patch-libgpsd.pc.in
>===================================================================
>--- astro/gpsd/files/patch-libgpsd.pc.in	(revision 428344)
>+++ astro/gpsd/files/patch-libgpsd.pc.in	(working copy)
>@@ -1,10 +0,0 @@
>---- libgpsd.pc.in.orig	2015-01-23 18:48:09 UTC
>-+++ libgpsd.pc.in
>-@@ -1,6 +1,6 @@
>- prefix=@prefix@
>- exec_prefix=${prefix}
>--libdir=${exec_prefix}@libdir@
>-+libdir=${prefix}/@libdir@
>- includedir=${prefix}/include
>- 
>- Name: libgpsd
>Index: astro/gpsd/pkg-plist
>===================================================================
>--- astro/gpsd/pkg-plist	(revision 428344)
>+++ astro/gpsd/pkg-plist	(working copy)
>@@ -18,16 +18,10 @@
> %%QTBIND%%lib/libQgpsmm.prl
> %%QTBIND%%lib/libQgpsmm.so
> %%QTBIND%%lib/libQgpsmm.so.22
>-%%QTBIND%%lib/libQgpsmm.so.22.0
> %%QTBIND%%lib/libQgpsmm.so.22.0.0
> lib/libgps.so
> lib/libgps.so.22
>-lib/libgps.so.22.0
> lib/libgps.so.22.0.0
>-lib/libgpsd.so
>-lib/libgpsd.so.22
>-lib/libgpsd.so.22.0
>-lib/libgpsd.so.22.0.0
> man/man1/cgps.1.gz
> man/man1/gegps.1.gz
> man/man1/gps.1.gz
>@@ -45,7 +39,6 @@
> man/man1/xgpsspeed.1.gz
> man/man3/libQgpsmm.3.gz
> man/man3/libgps.3.gz
>-man/man3/libgpsd.3.gz
> man/man3/libgpsmm.3.gz
> man/man5/gpsd_json.5.gz
> man/man5/srec.5.gz
>@@ -52,7 +45,7 @@
> man/man8/gpsd.8.gz
> man/man8/gpsdctl.8.gz
> man/man8/gpsinit.8.gz
>-%%PYTHON_SITELIBDIR%%/gps-3.14.egg-info
>+%%PYTHON_SITELIBDIR%%/%%PYTHON_EGGINFO%%
> %%PYTHON_SITELIBDIR%%/gps/__init__.py
> %%PYTHON_SITELIBDIR%%/gps/__init__.pyc
> %%PYTHON_SITELIBDIR%%/gps/__init__.pyo
>@@ -72,6 +65,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 | Diff

Attachments on bug 207273: 167107 | 167108 | 177888