View | Details | Raw Unified | Return to bug 207273 | Differences between
and this patch

Collapse All | Expand All

(-)astro/gpsd/Makefile (-4 / +5 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	gpsd
4
PORTNAME=	gpsd
5
PORTVERSION=	3.14
5
PORTVERSION=	3.16
6
PORTREVISION=	3
7
CATEGORIES=	astro geography
6
CATEGORIES=	astro geography
8
MASTER_SITES=	SAVANNAH
7
MASTER_SITES=	SAVANNAH
9
8
Lines 16-27 Link Here
16
BUILD_DEPENDS=	docbook-xsl>=0:textproc/docbook-xsl \
15
BUILD_DEPENDS=	docbook-xsl>=0:textproc/docbook-xsl \
17
		xsltproc:textproc/libxslt
16
		xsltproc:textproc/libxslt
18
17
19
USES=		cpe pathfix pkgconfig python scons
18
USES=		cpe pathfix pkgconfig python:2 scons
20
CPE_VENDOR=	gpsd_project
19
CPE_VENDOR=	gpsd_project
21
USE_RC_SUBR=	gpsd
20
USE_RC_SUBR=	gpsd
22
21
23
MAKE_ARGS=	prefix="${PREFIX}" mandir="man" pkgconfig="libdata/pkgconfig"
22
MAKE_ARGS=	prefix="${PREFIX}" mandir="man" pkgconfig="libdata/pkgconfig"
24
MAKE_ENV=	DESTDIR="${STAGEDIR}"
23
MAKE_ENV=	DESTDIR="${STAGEDIR}"
24
PLIST_SUB=	PYTHON_EGGINFO=gps-${PORTVERSION}.egg-info
25
25
26
OPTIONS_DEFINE=	AIVDM ASHTECH CPPBIND DBUS EARTHMATE EVERMORE FURY FV18 GARMIN \
26
OPTIONS_DEFINE=	AIVDM ASHTECH CPPBIND DBUS EARTHMATE EVERMORE FURY FV18 GARMIN \
27
		GARMINTXT GEOSTAR GPSCLOCK IPV6 ITRAX MTK NAVCOM NCURSES \
27
		GARMINTXT GEOSTAR GPSCLOCK IPV6 ITRAX MTK NAVCOM NCURSES \
Lines 113-119 Link Here
113
# Export methods
113
# Export methods
114
SOCKEXPORT_MAKE_ARGS_OFF=	socket_export=no
114
SOCKEXPORT_MAKE_ARGS_OFF=	socket_export=no
115
DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
115
DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
116
DBUS_MAKE_ARGS=	dbus_export=yes
116
DBUS_MAKE_ARGS=		dbus_export=yes
117
DBUS_MAKE_ARGS_OFF=	dbus_export=no
117
SHMEXPORT_MAKE_ARGS_OFF=	shm_export=no
118
SHMEXPORT_MAKE_ARGS_OFF=	shm_export=no
118
119
119
# Communication
120
# Communication
(-)astro/gpsd/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (gpsd-3.14.tar.gz) = 504fc812f3c1525a1a48e04bf4d77f9a8066c201448d98089df89d58ef53a8cb
1
SHA256 (gpsd-3.16.tar.gz) = 03579af13a4d3fe0c5b79fa44b5f75c9f3cac6749357f1d99ce5d38c09bc2029
2
SIZE (gpsd-3.14.tar.gz) = 1398425
2
SIZE (gpsd-3.16.tar.gz) = 8587490
(-)astro/gpsd/files/patch-SConstruct (-17 / +99 lines)
Lines 1-19 Link Here
1
--- SConstruct.orig	2015-03-14 11:24:41 UTC
1
Remove LIBPATH='.' - see http://lists.nongnu.org/archive/html/gpsd-dev/2016-02/msg00042.html
2
3
--- SConstruct.orig	2016-01-08 19:25:48 UTC
2
+++ SConstruct
4
+++ SConstruct
3
@@ -305,16 +305,6 @@ def installdir(dir, add_destdir=True):
5
@@ -985,37 +985,37 @@ gpsmon_sources = [
4
     wrapped.replace("/usr/lib/systemd", "/lib/systemd")
6
 ## Production programs
5
     return wrapped
6
 
7
 
7
-# Honor the specified installation prefix in link paths.
8
 gpsd = env.Program('gpsd', gpsd_sources,
8
-if env["sysroot"]:
9
-                   LIBS=['gpsd', 'gps_static'], LIBPATH='.',
9
-    env.Prepend(LIBPATH=[env["sysroot"] + installdir('libdir', add_destdir=False)])
10
+                   LIBS=['gpsd', 'gps_static'],
10
-
11
                    parse_flags=gpsdflags+gpsflags)
11
-# Don't hack RPATH unless libdir points somewhere that is not on the
12
 gpsdecode = env.Program('gpsdecode', ['gpsdecode.c'],
12
-# minimum default load path.
13
-                        LIBS=['gpsd', 'gps_static'], LIBPATH='.',
13
-if env["shared"]:
14
+                        LIBS=['gpsd', 'gps_static'],
14
-    if env["libdir"] not in ["/usr/lib", "/lib"]:
15
                         parse_flags=gpsdflags+gpsflags)
15
-        env.Prepend(RPATH=[installdir('libdir')])
16
 gpsctl = env.Program('gpsctl', ['gpsctl.c'],
16
-
17
-                     LIBS=['gpsd', 'gps_static'], LIBPATH='.',
17
 # Give deheader a way to set compiler flags
18
+                     LIBS=['gpsd', 'gps_static'],
18
 if 'MORECFLAGS' in os.environ:
19
                      parse_flags=gpsdflags+gpsflags)
19
     env.Append(CFLAGS=Split(os.environ['MORECFLAGS']))
20
 gpsmon = env.Program('gpsmon', gpsmon_sources,
21
-                     LIBS=['gpsd', 'gps_static'], LIBPATH='.',
22
+                     LIBS=['gpsd', 'gps_static'],
23
                      parse_flags=gpsdflags + gpsflags + ncurseslibs)
24
 gpsdctl = env.Program('gpsdctl', ['gpsdctl.c'],
25
-                      LIBS=['gps_static'], LIBPATH='.',
26
+                      LIBS=['gps_static'],
27
                       parse_flags=gpsflags)
28
 gpspipe = env.Program('gpspipe', ['gpspipe.c'],
29
-                      LIBS=['gps_static'], LIBPATH='.',
30
+                      LIBS=['gps_static'],
31
                       parse_flags=gpsflags)
32
 gps2udp = env.Program('gps2udp', ['gps2udp.c'],
33
-                      LIBS=['gps_static'], LIBPATH='.',
34
+                      LIBS=['gps_static'],
35
                       parse_flags=gpsflags)
36
 gpxlogger = env.Program('gpxlogger', ['gpxlogger.c'],
37
-                        LIBS=['gps_static'], LIBPATH='.',
38
+                        LIBS=['gps_static'],
39
                         parse_flags=gpsflags)
40
 lcdgps = env.Program('lcdgps', ['lcdgps.c'],
41
-                     LIBS=['gps_static'], LIBPATH='.',
42
+                     LIBS=['gps_static'],
43
                      parse_flags=gpsflags)
44
 cgps = env.Program('cgps', ['cgps.c'],
45
-                   LIBS=['gps_static'], LIBPATH='.',
46
+                   LIBS=['gps_static'],
47
                    parse_flags=gpsflags + ncurseslibs)
48
 ntpshmmon = env.Program('ntpshmmon', ['ntpshmmon.c'],
49
-                        LIBS=['gps_static'], LIBPATH='.',
50
+                        LIBS=['gps_static'],
51
                         parse_flags=gpsflags)
52
 
53
 binaries = [gpsd, gpsdecode, gpsctl, gpsdctl, gpspipe, gps2udp, gpxlogger, lcdgps, ntpshmmon]
54
@@ -1024,26 +1024,26 @@ if env["ncurses"]:
55
 
56
 # Test programs - always link locally and statically
57
 test_bits = env.Program('test_bits', ['test_bits.c'],
58
-                        LIBS=['gps_static'], LIBPATH='.')
59
+                        LIBS=['gps_static'])
60
 test_float = env.Program('test_float', ['test_float.c'])
61
 test_geoid = env.Program('test_geoid', ['test_geoid.c'],
62
                          LIBS=['gpsd', 'gps_static'],
63
-                         LIBPATH='.', parse_flags=gpsdflags)
64
+                         parse_flags=gpsdflags)
65
 test_matrix = env.Program('test_matrix', ['test_matrix.c'],
66
                           LIBS=['gpsd', 'gps_static'],
67
-                          LIBPATH='.', parse_flags=gpsdflags)
68
+                          parse_flags=gpsdflags)
69
 test_mktime = env.Program('test_mktime', ['test_mktime.c'],
70
-                          LIBS=['gps_static'], LIBPATH='.', parse_flags=["-lm"])
71
+                          LIBS=['gps_static'], parse_flags=["-lm"])
72
 test_packet = env.Program('test_packet', ['test_packet.c'],
73
                           LIBS=['gpsd', 'gps_static'],
74
-                          LIBPATH='.', parse_flags=gpsdflags)
75
+                          parse_flags=gpsdflags)
76
 test_timespec = env.Program('test_timespec', ['test_timespec.c'],
77
                           LIBS=['gpsd', 'gps_static'],
78
-                          LIBPATH='.', parse_flags=gpsdflags)
79
+                          parse_flags=gpsdflags)
80
 test_trig = env.Program('test_trig', ['test_trig.c'], parse_flags=["-lm"])
81
 # test_libgps for glibc older than 2.17
82
 test_libgps = env.Program('test_libgps', ['test_libgps.c'],
83
-                          LIBS=['gps_static'], LIBPATH='.', parse_flags=["-lm"] + rtlibs + dbusflags)
84
+                          LIBS=['gps_static'], parse_flags=["-lm"] + rtlibs + dbusflags)
85
 
86
 if not env['socket_export']:
87
     announce("test_json not building because socket_export is disabled")
88
@@ -1051,11 +1051,11 @@ if not env['socket_export']:
89
 else:
90
     test_json = env.Program(
91
         'test_json', ['test_json.c'],
92
-	LIBS=['gps_static'], LIBPATH='.',
93
+	LIBS=['gps_static'],
94
 	parse_flags=["-lm"] + rtlibs + usbflags + dbusflags)
95
 
96
 test_gpsmm = env.Program('test_gpsmm', ['test_gpsmm.cpp'],
97
-                         LIBS=['gps_static'], LIBPATH='.', parse_flags=["-lm"])
98
+                         LIBS=['gps_static'], parse_flags=["-lm"])
99
 testprogs = [test_bits, test_float, test_geoid, test_libgps, test_matrix, test_mktime, test_packet, test_timespec, test_trig]
100
 if env['socket_export']:
101
     testprogs.append(test_json)
(-)astro/gpsd/files/patch-compiler.h (-14 lines)
Lines 1-14 Link Here
1
--- compiler.h.orig	2015-03-13 12:36:31 UTC
2
+++ compiler.h
3
@@ -46,9 +46,9 @@
4
 
5
 #ifndef S_SPLINT_S
6
 #ifdef HAVE_STDATOMIC_H
7
-#ifndef __COVERITY__	/* Coverity is confused by a GNU typedef */
8
+#if !defined(__COVERITY__) && !defined(__cplusplus)
9
 #include <stdatomic.h>
10
-#endif /* __COVERITY__ */
11
+#endif /* __COVERITY__ || __cplusplus */
12
 #endif /* HAVE_STDATOMIC_H */
13
 #endif /* S_SPLINT_S */
14
 
(-)astro/gpsd/files/patch-libgps.pc.in (-10 lines)
Lines 1-10 Link Here
1
--- libgps.pc.in.orig	2015-01-25 12:09:01 UTC
2
+++ libgps.pc.in
3
@@ -1,6 +1,6 @@
4
 prefix=@prefix@
5
 exec_prefix=${prefix}
6
-libdir=@libdir@
7
+libdir=${prefix}/@libdir@
8
 includedir=${prefix}/include
9
 
10
 Name: GPSD
(-)astro/gpsd/files/patch-libgpsd.pc.in (-10 lines)
Lines 1-10 Link Here
1
--- libgpsd.pc.in.orig	2015-01-23 18:48:09 UTC
2
+++ libgpsd.pc.in
3
@@ -1,6 +1,6 @@
4
 prefix=@prefix@
5
 exec_prefix=${prefix}
6
-libdir=${exec_prefix}@libdir@
7
+libdir=${prefix}/@libdir@
8
 includedir=${prefix}/include
9
 
10
 Name: libgpsd
(-)astro/gpsd/pkg-plist (-9 / +1 lines)
Lines 18-33 Link Here
18
%%QTBIND%%lib/libQgpsmm.prl
18
%%QTBIND%%lib/libQgpsmm.prl
19
%%QTBIND%%lib/libQgpsmm.so
19
%%QTBIND%%lib/libQgpsmm.so
20
%%QTBIND%%lib/libQgpsmm.so.22
20
%%QTBIND%%lib/libQgpsmm.so.22
21
%%QTBIND%%lib/libQgpsmm.so.22.0
22
%%QTBIND%%lib/libQgpsmm.so.22.0.0
21
%%QTBIND%%lib/libQgpsmm.so.22.0.0
23
lib/libgps.so
22
lib/libgps.so
24
lib/libgps.so.22
23
lib/libgps.so.22
25
lib/libgps.so.22.0
26
lib/libgps.so.22.0.0
24
lib/libgps.so.22.0.0
27
lib/libgpsd.so
28
lib/libgpsd.so.22
29
lib/libgpsd.so.22.0
30
lib/libgpsd.so.22.0.0
31
man/man1/cgps.1.gz
25
man/man1/cgps.1.gz
32
man/man1/gegps.1.gz
26
man/man1/gegps.1.gz
33
man/man1/gps.1.gz
27
man/man1/gps.1.gz
Lines 45-51 Link Here
45
man/man1/xgpsspeed.1.gz
39
man/man1/xgpsspeed.1.gz
46
man/man3/libQgpsmm.3.gz
40
man/man3/libQgpsmm.3.gz
47
man/man3/libgps.3.gz
41
man/man3/libgps.3.gz
48
man/man3/libgpsd.3.gz
49
man/man3/libgpsmm.3.gz
42
man/man3/libgpsmm.3.gz
50
man/man5/gpsd_json.5.gz
43
man/man5/gpsd_json.5.gz
51
man/man5/srec.5.gz
44
man/man5/srec.5.gz
Lines 52-58 Link Here
52
man/man8/gpsd.8.gz
45
man/man8/gpsd.8.gz
53
man/man8/gpsdctl.8.gz
46
man/man8/gpsdctl.8.gz
54
man/man8/gpsinit.8.gz
47
man/man8/gpsinit.8.gz
55
%%PYTHON_SITELIBDIR%%/gps-3.14.egg-info
48
%%PYTHON_SITELIBDIR%%/%%PYTHON_EGGINFO%%
56
%%PYTHON_SITELIBDIR%%/gps/__init__.py
49
%%PYTHON_SITELIBDIR%%/gps/__init__.py
57
%%PYTHON_SITELIBDIR%%/gps/__init__.pyc
50
%%PYTHON_SITELIBDIR%%/gps/__init__.pyc
58
%%PYTHON_SITELIBDIR%%/gps/__init__.pyo
51
%%PYTHON_SITELIBDIR%%/gps/__init__.pyo
Lines 72-77 Link Here
72
%%PYTHON_SITELIBDIR%%/gps/packet.so
65
%%PYTHON_SITELIBDIR%%/gps/packet.so
73
%%QTBIND%%libdata/pkgconfig/Qgpsmm.pc
66
%%QTBIND%%libdata/pkgconfig/Qgpsmm.pc
74
libdata/pkgconfig/libgps.pc
67
libdata/pkgconfig/libgps.pc
75
libdata/pkgconfig/libgpsd.pc
76
sbin/gpsd
68
sbin/gpsd
77
sbin/gpsdctl
69
sbin/gpsdctl

Return to bug 207273