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

Collapse All | Expand All

(-)astro/gpsd/Makefile (-53 / +55 lines)
Lines 1-8 Link Here
1
# Created by: Anton Karpov <toxa@toxahost.ru>
1
# Created by: Anton Karpov <toxa@toxahost.ru>
2
2
3
PORTNAME=	gpsd
3
PORTNAME=	gpsd
4
PORTVERSION=	3.20
4
PORTVERSION=	3.23
5
PORTREVISION=	2
6
CATEGORIES=	astro geography
5
CATEGORIES=	astro geography
7
MASTER_SITES=	SAVANNAH
6
MASTER_SITES=	SAVANNAH
8
7
Lines 12-41 COMMENT= Daemon that monitors one or more GPSes attached to a host computer Link Here
12
LICENSE=	BSD3CLAUSE
11
LICENSE=	BSD3CLAUSE
13
LICENSE_FILE=	${WRKSRC}/COPYING
12
LICENSE_FILE=	${WRKSRC}/COPYING
14
13
15
USES=		cpe pathfix pkgconfig python:3.6+ scons shebangfix
14
USES=		cpe pathfix pkgconfig python:3.6+ scons
16
CPE_VENDOR=	gpsd_project
15
CPE_VENDOR=	gpsd_project
17
USE_LDCONFIG=	yes
16
USE_LDCONFIG=	yes
18
USE_RC_SUBR=	gpsd
17
USE_RC_SUBR=	gpsd
19
SHEBANG_FILES=	*.py gps/*.py gegps xgps gpscat xgpsspeed gpsprof \
20
		gpsfake ubxtool zerk
21
18
22
MAKE_ARGS=	prefix="${PREFIX}" mandir="man" pkgconfig="libdata/pkgconfig" \
19
MAKE_ARGS=	manbuild=no \
23
		manbuild=no target_python="${PYTHON_CMD}" qt=no
20
		mandir="man" \
21
		pkgconfig="libdata/pkgconfig" \
22
		prefix="${PREFIX}" \
23
		qt=no \
24
		target_python="${PYTHON_CMD}"
24
MAKE_ENV=	DESTDIR="${STAGEDIR}"
25
MAKE_ENV=	DESTDIR="${STAGEDIR}"
25
PLIST_SUB=	PYTHON_EGGINFO=gps-${PORTVERSION}.egg-info
26
PLIST_SUB=	PYTHON_EGGINFO=gps-${PORTVERSION}.egg-info
26
27
27
OPTIONS_DEFINE=	AIVDM ASHTECH CPPBIND DBUS EARTHMATE EVERMORE FURY FV18 GARMIN \
28
OPTIONS_DEFINE=		AIVDM ASHTECH CPPBIND DBUS EARTHMATE EVERMORE FURY FV18 \
28
		GARMINTXT GEOSTAR GPSCLOCK IPV6 ITRAX MTK NAVCOM NCURSES \
29
			GARMIN GARMINTXT GEOSTAR GPSCLOCK IPV6 ITRAX MTK NAVCOM \
29
		NETFEED NMEA0183 NTP NTPSHM NTRIP OCEANSERVER ONCORE \
30
			NCURSES NETFEED NMEA0183 NTP NTPSHM NTRIP OCEANSERVER \
30
		PASSTHROUGH PPS PROFILING RECONFIGURE RTCM104V2 RTCM104V3 \
31
			ONCORE PASSTHROUGH PPS PROFILING RECONFIGURE RTCM104V2 \
31
		SHMEXPORT SIRF SOCKEXPORT SUPERSTARII TIMING TNT TRIPMATE \
32
			RTCM104V3 SHMEXPORT SIRF SOCKEXPORT SUPERSTARII TIMING \
32
		TSIP UBLOX USB X11
33
			TNT TRIPMATE TSIP UBLOX USB X11
33
OPTIONS_DEFAULT=	AIVDM ASHTECH CPPBIND EARTHMATE EVERMORE FURY FV18 GARMIN \
34
OPTIONS_DEFAULT=	AIVDM ASHTECH CPPBIND EARTHMATE EVERMORE FURY FV18 \
34
			GARMINTXT GEOSTAR GPSCLOCK ITRAX NAVCOM NCURSES NETFEED \
35
			GARMIN GARMINTXT GEOSTAR GPSCLOCK ITRAX NAVCOM NCURSES \
35
			NMEA0183 NTP NTPSHM NTRIP OCEANSERVER ONCORE PASSTHROUGH \
36
			NETFEED NMEA0183 NTP NTPSHM NTRIP OCEANSERVER ONCORE \
36
			RECONFIGURE RTCM104V2 RTCM104V3 SHMEXPORT SIRF SOCKEXPORT \
37
			PASSTHROUGH RECONFIGURE RTCM104V2 RTCM104V3 SHMEXPORT \
37
			SUPERSTARII TIMING TNT TRIPMATE TSIP UBLOX USB X11
38
			SIRF SOCKEXPORT SUPERSTARII TIMING TNT TRIPMATE TSIP \
38
OPTIONS_SUB=	yes
39
			UBLOX USB X11
40
OPTIONS_SUB=		yes
39
41
40
AIVDM_DESC=		Aivdm support
42
AIVDM_DESC=		Aivdm support
41
ASHTECH_DESC=		Ashtech support
43
ASHTECH_DESC=		Ashtech support
Lines 77-106 UBLOX_DESC= u-blox protocol support Link Here
77
USB_DESC=		libusb support for USB devices
79
USB_DESC=		libusb support for USB devices
78
80
79
# Options related to GPS protocols
81
# Options related to GPS protocols
80
NMEA0183_MAKE_ARGS_OFF=	nmea0183=no
82
NMEA0183_MAKE_ARGS_OFF=		nmea0183=no
81
ASHTECH_MAKE_ARGS_OFF=	ashtech=no
83
ASHTECH_MAKE_ARGS_OFF=		ashtech=no
82
EARTHMATE_MAKE_ARGS_OFF=	earthmate=no
84
EARTHMATE_MAKE_ARGS_OFF=	earthmate=no
83
EVERMORE_MAKE_ARGS_OFF=	evermore=no
85
EVERMORE_MAKE_ARGS_OFF=		evermore=no
84
FURY_MAKE_ARGS_OFF=	fury=no
86
FURY_MAKE_ARGS_OFF=		fury=no
85
FV18_MAKE_ARGS_OFF=	fv18=no
87
FV18_MAKE_ARGS_OFF=		fv18=no
86
GARMIN_MAKE_ARGS_OFF=	garmin=no
88
GARMIN_MAKE_ARGS_OFF=		garmin=no
87
GARMINTXT_MAKE_ARGS_OFF=	garmintxt=no
89
GARMINTXT_MAKE_ARGS_OFF=	garmintxt=no
88
GEOSTAR_MAKE_ARGS_OFF=	geostar=no
90
GEOSTAR_MAKE_ARGS_OFF=		geostar=no
89
ITRAX_MAKE_ARGS_OFF=	itrax=no
91
ITRAX_MAKE_ARGS_OFF=		itrax=no
90
MTK_MAKE_ARGS_OFF=	mtk3301=no
92
MTK_MAKE_ARGS_OFF=		mtk3301=no
91
NAVCOM_MAKE_ARGS_OFF=	navcom=no
93
NAVCOM_MAKE_ARGS_OFF=		navcom=no
92
ONCORE_MAKE_ARGS_OFF=	oncore=no
94
ONCORE_MAKE_ARGS_OFF=		oncore=no
93
SIRF_MAKE_ARGS_OFF=	sirf=no
95
SIRF_MAKE_ARGS_OFF=		sirf=no
94
SUPERSTARII_MAKE_ARGS_OFF=	superstar2=no
96
SUPERSTARII_MAKE_ARGS_OFF=	superstar2=no
95
TNT_MAKE_ARGS_OFF=	tnt=no
97
TNT_MAKE_ARGS_OFF=		tnt=no
96
TRIPMATE_MAKE_ARGS_OFF=	tripmate=no
98
TRIPMATE_MAKE_ARGS_OFF=		tripmate=no
97
TSIP_MAKE_ARGS_OFF=	tsip=no
99
TSIP_MAKE_ARGS_OFF=		tsip=no
98
UBLOX_MAKE_ARGS_OFF=	ublox=no
100
UBLOX_MAKE_ARGS_OFF=		ublox=no
99
101
100
# Options related to Non-GPS protocols
102
# Options related to Non-GPS protocols
101
AIVDM_MAKE_ARGS_OFF=	aivdm=no
103
AIVDM_MAKE_ARGS_OFF=		aivdm=no
102
GPSCLOCK_MAKE_ARGS_OFF=	gpsclock=no
104
GPSCLOCK_MAKE_ARGS_OFF=		gpsclock=no
103
NTRIP_MAKE_ARGS_OFF=	ntrip=no
105
NTRIP_MAKE_ARGS_OFF=		ntrip=no
104
OCEANSERVER_MAKE_ARGS_OFF=	oceanserver=no
106
OCEANSERVER_MAKE_ARGS_OFF=	oceanserver=no
105
RTCM104V2_MAKE_ARGS_OFF=	rtcm104v2=no
107
RTCM104V2_MAKE_ARGS_OFF=	rtcm104v2=no
106
RTCM104V3_MAKE_ARGS_OFF=	rtcm104v3=no
108
RTCM104V3_MAKE_ARGS_OFF=	rtcm104v3=no
Lines 113-143 PPS_IMPLIES= NTPSHM Link Here
113
115
114
# Export methods
116
# Export methods
115
SOCKEXPORT_MAKE_ARGS_OFF=	socket_export=no
117
SOCKEXPORT_MAKE_ARGS_OFF=	socket_export=no
116
DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
118
DBUS_LIB_DEPENDS=		libdbus-1.so:devel/dbus
117
DBUS_MAKE_ARGS=		dbus_export=yes
119
DBUS_MAKE_ARGS=			dbus_export=yes
118
DBUS_MAKE_ARGS_OFF=	dbus_export=no
120
DBUS_MAKE_ARGS_OFF=		dbus_export=no
119
SHMEXPORT_MAKE_ARGS_OFF=	shm_export=no
121
SHMEXPORT_MAKE_ARGS_OFF=	shm_export=no
120
122
121
# Communication
123
# Communication
122
USB_MAKE_ARGS_OFF=	usb=no
124
USB_MAKE_ARGS_OFF=		usb=no
123
IPV6_MAKE_ARGS_OFF=	ipv6=no
125
IPV6_MAKE_ARGS_OFF=		ipv6=no
124
NETFEED_MAKE_ARGS_OFF=	netfeed=no
126
NETFEED_MAKE_ARGS_OFF=		netfeed=no
125
PASSTHROUGH_MAKE_ARGS_OFF=	passthrough=no
127
PASSTHROUGH_MAKE_ARGS_OFF=	passthrough=no
126
128
127
# Other daemon options
129
# Other daemon options
128
TIMING_MAKE_ARGS_OFF=	timing=no
130
TIMING_MAKE_ARGS_OFF=	timing=no
129
131
130
# Client-side options
132
# Client-side options
131
NCURSES_MAKE_ARGS_OFF=	ncurses=no
133
NCURSES_MAKE_ARGS_OFF=		ncurses=no
132
NCURSES_USES=		ncurses
134
NCURSES_USES=			ncurses
133
RECONFIGURE_MAKE_ARGS_OFF=	reconfigure=no
135
RECONFIGURE_MAKE_ARGS_OFF=	reconfigure=no
134
CPPBIND_MAKE_ARGS_OFF=	libgpsmm=no
136
CPPBIND_MAKE_ARGS_OFF=		libgpsmm=no
135
X11_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${PY_FLAVOR} \
137
X11_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${PY_FLAVOR} \
136
			${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${PY_FLAVOR} \
138
				${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${PY_FLAVOR} \
137
			${PYTHON_PKGNAMEPREFIX}pyserial>=0:comms/py-pyserial@${PY_FLAVOR}
139
				${PYTHON_PKGNAMEPREFIX}pyserial>=0:comms/py-pyserial@${PY_FLAVOR}
138
X11_USES=	gnome
140
X11_USES=			gnome
139
X11_USE=	GNOME=gtk30
141
X11_USE=			GNOME=gtk30
140
X11_MAKE_ARGS_OFF=	xgps=no
142
X11_MAKE_ARGS_OFF=		xgps=no
141
143
142
# Build control
144
# Build control
143
PROFILING_MAKE_ARGS=	profiling=yes
145
PROFILING_MAKE_ARGS=	profiling=yes
(-)astro/gpsd/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1581144632
1
TIMESTAMP = 1629301662
2
SHA256 (gpsd-3.20.tar.gz) = 172a7805068eacb815a3c5225436fcb0be46e7e49a5001a94034eac43df85e50
2
SHA256 (gpsd-3.23.tar.gz) = 522c2362a7eb2d7ac37eaa1504f12aded1c373479a87ba06cc6795974b567bbc
3
SIZE (gpsd-3.20.tar.gz) = 3600835
3
SIZE (gpsd-3.23.tar.gz) = 4893363
(-)astro/gpsd/files/patch-SConstruct (-56 lines)
Removed Link Here
1
--- SConstruct.orig	2020-02-08 06:51:40 UTC
2
+++ SConstruct
3
@@ -1267,32 +1267,32 @@ else:
4
             config.env['aiogps'] = True
5
6
         # check for pyserial
7
-        try:
8
-            imp.find_module('serial')
9
-            announce("Python module serial (pyserial) found.")
10
-        except ImportError:
11
-            # no pycairo, don't build xgps, xgpsspeed
12
-            announce("WARNING: Python module serial (pyserial) not found.")
13
-            config.env['xgps'] = False
14
+        #try:
15
+        #    imp.find_module('serial')
16
+        #    announce("Python module serial (pyserial) found.")
17
+        #except ImportError:
18
+        #    # no pycairo, don't build xgps, xgpsspeed
19
+        #    announce("WARNING: Python module serial (pyserial) not found.")
20
+        #    config.env['xgps'] = False
21
22
         if config.env['xgps']:
23
             # check for pycairo
24
-            try:
25
-                imp.find_module('cairo')
26
-                announce("Python module cairo (pycairo) found.")
27
-            except ImportError:
28
-                # no pycairo, don't build xgps, xgpsspeed
29
-                announce("WARNING: Python module cairo (pycairo) not found.")
30
-                config.env['xgps'] = False
31
+            #try:
32
+            #    imp.find_module('cairo')
33
+            #    announce("Python module cairo (pycairo) found.")
34
+            #except ImportError:
35
+            #    # no pycairo, don't build xgps, xgpsspeed
36
+            #    announce("WARNING: Python module cairo (pycairo) not found.")
37
+            #    config.env['xgps'] = False
38
39
             # check for pygobject
40
-            try:
41
-                imp.find_module('gi')
42
-                announce("Python module gi (pygobject) found.")
43
-            except ImportError:
44
-                # no pygobject, don't build xgps, xgpsspeed
45
-                announce("WARNING: Python module gi (pygobject) not found.")
46
-                config.env['xgps'] = False
47
+            #try:
48
+            #    imp.find_module('gi')
49
+            #    announce("Python module gi (pygobject) found.")
50
+            #except ImportError:
51
+            #    # no pygobject, don't build xgps, xgpsspeed
52
+            #    announce("WARNING: Python module gi (pygobject) not found.")
53
+            #    config.env['xgps'] = False
54
55
             if not config.CheckPKG('gtk+-3.0'):
56
                 config.env['xgps'] = False
(-)astro/gpsd/pkg-plist (-4 / +26 lines)
Lines 2-14 Link Here
2
bin/gegps
2
bin/gegps
3
bin/gps2udp
3
bin/gps2udp
4
bin/gpscat
4
bin/gpscat
5
bin/gpscsv
5
bin/gpsctl
6
bin/gpsctl
7
bin/gpsdebuginfo
6
bin/gpsdecode
8
bin/gpsdecode
7
bin/gpsfake
9
bin/gpsfake
8
%%NCURSES%%bin/gpsmon
10
%%NCURSES%%bin/gpsmon
9
bin/gpspipe
11
bin/gpspipe
12
bin/gpsplot
10
bin/gpsprof
13
bin/gpsprof
11
bin/gpsrinex
14
bin/gpsrinex
15
bin/gpssnmp
16
bin/gpssubframe
12
bin/gpxlogger
17
bin/gpxlogger
13
bin/lcdgps
18
bin/lcdgps
14
%%PPS%%bin/ntpshmmon
19
%%PPS%%bin/ntpshmmon
Lines 19-38 bin/zerk Link Here
19
include/gps.h
24
include/gps.h
20
include/libgpsmm.h
25
include/libgpsmm.h
21
lib/libgps.so
26
lib/libgps.so
22
lib/libgps.so.25
27
lib/libgps.so.29
23
lib/libgps.so.25.0.0
28
lib/libgps.so.29.0.0
29
lib/libgpsdpacket.so
30
lib/libgpsdpacket.so.29
31
lib/libgpsdpacket.so.29.0.0
24
man/man1/cgps.1.gz
32
man/man1/cgps.1.gz
25
man/man1/gegps.1.gz
33
man/man1/gegps.1.gz
26
man/man1/gps.1.gz
34
man/man1/gps.1.gz
27
man/man1/gps2udp.1.gz
35
man/man1/gps2udp.1.gz
28
man/man1/gpscat.1.gz
36
man/man1/gpscat.1.gz
37
man/man1/gpscsv.1.gz
29
man/man1/gpsctl.1.gz
38
man/man1/gpsctl.1.gz
39
man/man1/gpsdebuginfo.1.gz
30
man/man1/gpsdecode.1.gz
40
man/man1/gpsdecode.1.gz
31
man/man1/gpsfake.1.gz
41
man/man1/gpsfake.1.gz
32
man/man1/gpsmon.1.gz
42
man/man1/gpsmon.1.gz
33
man/man1/gpspipe.1.gz
43
man/man1/gpspipe.1.gz
44
man/man1/gpsplot.1.gz
34
man/man1/gpsprof.1.gz
45
man/man1/gpsprof.1.gz
35
man/man1/gpsrinex.1.gz
46
man/man1/gpsrinex.1.gz
47
man/man1/gpssnmp.1.gz
48
man/man1/gpssubframe.1.gz
36
man/man1/gpxlogger.1.gz
49
man/man1/gpxlogger.1.gz
37
man/man1/lcdgps.1.gz
50
man/man1/lcdgps.1.gz
38
man/man1/ntpshmmon.1.gz
51
man/man1/ntpshmmon.1.gz
Lines 44-53 man/man3/libQgpsmm.3.gz Link Here
44
man/man3/libgps.3.gz
57
man/man3/libgps.3.gz
45
man/man3/libgpsmm.3.gz
58
man/man3/libgpsmm.3.gz
46
man/man5/gpsd_json.5.gz
59
man/man5/gpsd_json.5.gz
47
man/man5/srec.5.gz
48
man/man8/gpsd.8.gz
60
man/man8/gpsd.8.gz
49
man/man8/gpsdctl.8.gz
61
man/man8/gpsdctl.8.gz
50
man/man8/gpsinit.8.gz
62
man/man8/gpsinit.8.gz
63
man/man8/ppscheck.8.gz
51
%%PYTHON_SITELIBDIR%%/%%PYTHON_EGGINFO%%
64
%%PYTHON_SITELIBDIR%%/%%PYTHON_EGGINFO%%
52
%%PYTHON_SITELIBDIR%%/gps/__init__.py
65
%%PYTHON_SITELIBDIR%%/gps/__init__.py
53
%%PYTHON_SITELIBDIR%%/gps/aiogps.py
66
%%PYTHON_SITELIBDIR%%/gps/aiogps.py
Lines 56-63 man/man8/gpsinit.8.gz Link Here
56
%%PYTHON_SITELIBDIR%%/gps/fake.py
69
%%PYTHON_SITELIBDIR%%/gps/fake.py
57
%%PYTHON_SITELIBDIR%%/gps/gps.py
70
%%PYTHON_SITELIBDIR%%/gps/gps.py
58
%%PYTHON_SITELIBDIR%%/gps/misc.py
71
%%PYTHON_SITELIBDIR%%/gps/misc.py
59
%%PYTHON_SITELIBDIR%%/gps/packet%%PYTHON_EXT_SUFFIX%%.so
72
%%PYTHON_SITELIBDIR%%/gps/packet.py
73
%%PYTHON_SITELIBDIR%%/gps/ubx.py
60
%%PYTHON_SITELIBDIR%%/gps/watch_options.py
74
%%PYTHON_SITELIBDIR%%/gps/watch_options.py
61
libdata/pkgconfig/libgps.pc
75
libdata/pkgconfig/libgps.pc
76
%%DATADIR%%/doc/AUTHORS
77
%%DATADIR%%/doc/COPYING
78
%%DATADIR%%/doc/NEWS
79
%%DATADIR%%/doc/README.adoc
80
%%DATADIR%%/doc/SUPPORT.adoc
81
%%DATADIR%%/doc/build.adoc
82
%%DATADIR%%/doc/example1.c.txt
83
%%DATADIR%%/icons/gpsd-logo.png
62
sbin/gpsd
84
sbin/gpsd
63
sbin/gpsdctl
85
sbin/gpsdctl

Return to bug 258109