Attachment #211473 for bug #243980

View | Details | Raw Unified | Return to bug 243980
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	gpsd
PORTVERSION=	3.20
PORTREVISION=	1
CATEGORIES=	astro geography
MASTER_SITES=	SAVANNAH


LICENSE=	BSD3CLAUSE
LICENSE_FILE=	${WRKSRC}/COPYING

USES=		cpe pathfix pkgconfig python:3.7 scons shebangfix
CPE_VENDOR=	gpsd_project
USE_PYTHON=	flavors
USE_LDCONFIG=	yes
USE_RC_SUBR=	gpsd
SHEBANG_FILES=	*.py gps/*.py gegps xgps gpscat xgpsspeed gpsprof \
		gpsfake ubxtool zerk

MAKE_ARGS=	prefix="${PREFIX}" mandir="man" pkgconfig="libdata/pkgconfig" \
		manbuild=no target_python="${PYTHON_CMD}" qt=no

		PASSTHROUGH PPS PROFILING RECONFIGURE RTCM104V2 RTCM104V3 \
		SHMEXPORT SIRF SOCKEXPORT SUPERSTARII TIMING TNT TRIPMATE \
		TSIP 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 X11
OPTIONS_SUB=	yes

AIVDM_DESC=		Aivdm support

RECONFIGURE_MAKE_ARGS_OFF=	reconfigure=no
CPPBIND_MAKE_ARGS_OFF=	libgpsmm=no
X11_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${PY_FLAVOR} \
			${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${PY_FLAVOR} \
			${PYTHON_PKGNAMEPREFIX}serial>=0:comms/py-serial@${PY_FLAVOR}
X11_USES=	gnome
X11_USE=	GNOME=gtk30
X11_MAKE_ARGS_OFF=	xgps=no

# Build control
PROFILING_MAKE_ARGS=	profiling=yes

		-d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;} && \
	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
		-d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;})
	${RM} -r ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/gps/__pycache__

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)astro/gpsd/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1516146278	1	TIMESTAMP = 1581144632
2	SHA256 (gpsd-3.17.tar.gz) = 68e0dbecfb5831997f8b3d6ba48aed812eb465d8c0089420ab68f9ce4d85e77a	2	SHA256 (gpsd-3.20.tar.gz) = 172a7805068eacb815a3c5225436fcb0be46e7e49a5001a94034eac43df85e50
3	SIZE (gpsd-3.17.tar.gz) = 8755304	3	SIZE (gpsd-3.20.tar.gz) = 3600835




--- SConstruct.orig	2020-02-08 06:51:40 UTC
+++ SConstruct
@@ -1267,32 +1267,32 @@ else:
             config.env['aiogps'] = True
 
         # check for pyserial
-        try:
-            imp.find_module('serial')
-            announce("Python module serial (pyserial) found.")
-        except ImportError:
-            # no pycairo, don't build xgps, xgpsspeed
-            announce("WARNING: Python module serial (pyserial) not found.")
-            config.env['xgps'] = False
+        #try:
+        #    imp.find_module('serial')
+        #    announce("Python module serial (pyserial) found.")
+        #except ImportError:
+        #    # no pycairo, don't build xgps, xgpsspeed
+        #    announce("WARNING: Python module serial (pyserial) not found.")
+        #    config.env['xgps'] = False
 
         if config.env['xgps']:
             # check for pycairo
-            try:
-                imp.find_module('cairo')
-                announce("Python module cairo (pycairo) found.")
-            except ImportError:
-                # no pycairo, don't build xgps, xgpsspeed
-                announce("WARNING: Python module cairo (pycairo) not found.")
-                config.env['xgps'] = False
+            #try:
+            #    imp.find_module('cairo')
+            #    announce("Python module cairo (pycairo) found.")
+            #except ImportError:
+            #    # no pycairo, don't build xgps, xgpsspeed
+            #    announce("WARNING: Python module cairo (pycairo) not found.")
+            #    config.env['xgps'] = False
 
             # check for pygobject
-            try:
-                imp.find_module('gi')
-                announce("Python module gi (pygobject) found.")
-            except ImportError:
-                # no pygobject, don't build xgps, xgpsspeed
-                announce("WARNING: Python module gi (pygobject) not found.")
-                config.env['xgps'] = False
+            #try:
+            #    imp.find_module('gi')
+            #    announce("Python module gi (pygobject) found.")
+            #except ImportError:
+            #    # no pygobject, don't build xgps, xgpsspeed
+            #    announce("WARNING: Python module gi (pygobject) not found.")
+            #    config.env['xgps'] = False
 
             if not config.CheckPKG('gtk+-3.0'):
                 config.env['xgps'] = False




%%NCURSES%%bin/gpsmon
bin/gpspipe
bin/gpsprof
bin/gpsrinex
bin/gpxlogger
bin/lcdgps
%%PPS%%bin/ntpshmmon
bin/ubxtool
%%X11%%bin/xgps
%%X11%%bin/xgpsspeed
bin/zerk
include/gps.h
include/libgpsmm.h
lib/libgps.so
lib/libgps.so.25
lib/libgps.so.25.0.0
man/man1/cgps.1.gz
man/man1/gegps.1.gz
man/man1/gps.1.gz

man/man1/gpsmon.1.gz
man/man1/gpspipe.1.gz
man/man1/gpsprof.1.gz
man/man1/gpsrinex.1.gz
man/man1/gpxlogger.1.gz
man/man1/lcdgps.1.gz
man/man1/ntpshmmon.1.gz
man/man1/ubxtool.1.gz
man/man1/zerk.1.gz
%%X11%%man/man1/xgps.1.gz
%%X11%%man/man1/xgpsspeed.1.gz
man/man3/libQgpsmm.3.gz

man/man8/gpsinit.8.gz
%%PYTHON_SITELIBDIR%%/%%PYTHON_EGGINFO%%
%%PYTHON_SITELIBDIR%%/gps/__init__.py
%%PYTHON_SITELIBDIR%%/gps/__init__.pyc
%%PYTHON_SITELIBDIR%%/gps/__init__.pyo
%%PYTHON_SITELIBDIR%%/gps/client.py
%%PYTHON_SITELIBDIR%%/gps/clienthelpers.py
%%PYTHON_SITELIBDIR%%/gps/client.pyo
%%PYTHON_SITELIBDIR%%/gps/clienthelpers.so
%%PYTHON_SITELIBDIR%%/gps/fake.py
%%PYTHON_SITELIBDIR%%/gps/fake.pyc
%%PYTHON_SITELIBDIR%%/gps/fake.pyo
%%PYTHON_SITELIBDIR%%/gps/gps.py
%%PYTHON_SITELIBDIR%%/gps/gps.pyc
%%PYTHON_SITELIBDIR%%/gps/gps.pyo
%%PYTHON_SITELIBDIR%%/gps/misc.py
%%PYTHON_SITELIBDIR%%/gps/misc.pyc
%%PYTHON_SITELIBDIR%%/gps/misc.pyo
%%PYTHON_SITELIBDIR%%/gps/packet.so
%%PYTHON_SITELIBDIR%%/gps/watch_options.py
libdata/pkgconfig/libgps.pc
sbin/gpsd
sbin/gpsdctl

Return to bug 243980

Lines 2-9 Link Here

(-)astro/gpsd/Makefile (-11 / +13 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= gpsd	4	PORTNAME= gpsd
5	PORTVERSION= 3.17	5	PORTVERSION= 3.20
6	PORTREVISION= 1
7	CATEGORIES= astro geography	6	CATEGORIES= astro geography
8	MASTER_SITES= SAVANNAH	7	MASTER_SITES= SAVANNAH
9		8
Lines 13-24 COMMENT= Daemon that monitors one or more GPSes attached to a host computer Link Here
13	LICENSE= BSD3CLAUSE	12	LICENSE= BSD3CLAUSE
14	LICENSE_FILE= ${WRKSRC}/COPYING	13	LICENSE_FILE= ${WRKSRC}/COPYING
15		14
16	USES= cpe pathfix pkgconfig python:2.7 scons shebangfix	15	USES= cpe pathfix pkgconfig python:3.7 scons shebangfix
17	CPE_VENDOR= gpsd_project	16	CPE_VENDOR= gpsd_project
18	USE_PYTHON= flavors	17	USE_PYTHON= flavors
		18	USE_LDCONFIG= yes
19	USE_RC_SUBR= gpsd	19	USE_RC_SUBR= gpsd
20	SHEBANG_FILES= .py gps/.py gegps xgps gpscat xgpsspeed gpsprof \	20	SHEBANG_FILES= .py gps/.py gegps xgps gpscat xgpsspeed gpsprof \
21	gpsfake	21	gpsfake ubxtool zerk
22		22
23	MAKE_ARGS= prefix="${PREFIX}" mandir="man" pkgconfig="libdata/pkgconfig" \	23	MAKE_ARGS= prefix="${PREFIX}" mandir="man" pkgconfig="libdata/pkgconfig" \
24	manbuild=no target_python="${PYTHON_CMD}" qt=no	24	manbuild=no target_python="${PYTHON_CMD}" qt=no
Lines 31-41 OPTIONS_DEFINE= AIVDM ASHTECH CPPBIND DBUS EARTHMATE EVERMORE FURY FV18 GARMIN \ Link Here
31	PASSTHROUGH PPS PROFILING RECONFIGURE RTCM104V2 RTCM104V3 \	31	PASSTHROUGH PPS PROFILING RECONFIGURE RTCM104V2 RTCM104V3 \
32	SHMEXPORT SIRF SOCKEXPORT SUPERSTARII TIMING TNT TRIPMATE \	32	SHMEXPORT SIRF SOCKEXPORT SUPERSTARII TIMING TNT TRIPMATE \
33	TSIP UBLOX USB X11	33	TSIP UBLOX USB X11
34	OPTIONS_DEFAULT= AIVDM ASHTECH CPPBIND EARTHMATE EVERMORE FURY FV18 GARMIN \	34	OPTIONS_DEFAULT= AIVDM ASHTECH CPPBIND EARTHMATE EVERMORE FURY FV18 GARMIN \
35	GARMINTXT GEOSTAR GPSCLOCK ITRAX NAVCOM NCURSES NETFEED \	35	GARMINTXT GEOSTAR GPSCLOCK ITRAX NAVCOM NCURSES NETFEED \
36	NMEA0183 NTP NTPSHM NTRIP OCEANSERVER ONCORE PASSTHROUGH \	36	NMEA0183 NTP NTPSHM NTRIP OCEANSERVER ONCORE PASSTHROUGH \
37	RECONFIGURE RTCM104V2 RTCM104V3 SHMEXPORT SIRF SOCKEXPORT \	37	RECONFIGURE RTCM104V2 RTCM104V3 SHMEXPORT SIRF SOCKEXPORT \
38	SUPERSTARII TIMING TNT TRIPMATE TSIP UBLOX USB X11	38	SUPERSTARII TIMING TNT TRIPMATE TSIP UBLOX USB X11
39	OPTIONS_SUB= yes	39	OPTIONS_SUB= yes
40		40
41	AIVDM_DESC= Aivdm support	41	AIVDM_DESC= Aivdm support
Lines 134-143 NCURSES_USES= ncurses Link Here
134	RECONFIGURE_MAKE_ARGS_OFF= reconfigure=no	134	RECONFIGURE_MAKE_ARGS_OFF= reconfigure=no
135	CPPBIND_MAKE_ARGS_OFF= libgpsmm=no	135	CPPBIND_MAKE_ARGS_OFF= libgpsmm=no
136	X11_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${PY_FLAVOR} \	136	X11_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${PY_FLAVOR} \
137	${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${PY_FLAVOR}	137	${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${PY_FLAVOR} \
138	#X11_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${PY_FLAVOR}	138	${PYTHON_PKGNAMEPREFIX}serial>=0:comms/py-serial@${PY_FLAVOR}
139	X11_USES= gnome	139	X11_USES= gnome
140	X11_USE= GNOME=gtk30	140	X11_USE= GNOME=gtk30
		141	X11_MAKE_ARGS_OFF= xgps=no
141		142
142	# Build control	143	# Build control
143	PROFILING_MAKE_ARGS= profiling=yes	144	PROFILING_MAKE_ARGS= profiling=yes
Lines 151-155 post-install: Link Here
151	-d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;} && \	152	-d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;} && \
152	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \	153	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
153	-d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;})	154	-d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;})
		155	${RM} -r ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/gps/__pycache__
154		156
155	.include <bsd.port.mk>	157	.include <bsd.port.mk>

Added Link Here

(-)astro/gpsd/files/patch-SConstruct (+56 lines)
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

Lines 8-23 bin/gpsfake Link Here

(-)astro/gpsd/pkg-plist (-13 / +10 lines)
8	%%NCURSES%%bin/gpsmon	8	%%NCURSES%%bin/gpsmon
9	bin/gpspipe	9	bin/gpspipe
10	bin/gpsprof	10	bin/gpsprof
		11	bin/gpsrinex
11	bin/gpxlogger	12	bin/gpxlogger
12	bin/lcdgps	13	bin/lcdgps
13	%%PPS%%bin/ntpshmmon	14	%%PPS%%bin/ntpshmmon
		15	bin/ubxtool
14	%%X11%%bin/xgps	16	%%X11%%bin/xgps
15	%%X11%%bin/xgpsspeed	17	%%X11%%bin/xgpsspeed
		18	bin/zerk
16	include/gps.h	19	include/gps.h
17	include/libgpsmm.h	20	include/libgpsmm.h
18	lib/libgps.so	21	lib/libgps.so
19	lib/libgps.so.23	22	lib/libgps.so.25
20	lib/libgps.so.23.0.0	23	lib/libgps.so.25.0.0
21	man/man1/cgps.1.gz	24	man/man1/cgps.1.gz
22	man/man1/gegps.1.gz	25	man/man1/gegps.1.gz
23	man/man1/gps.1.gz	26	man/man1/gps.1.gz
Lines 29-37 man/man1/gpsfake.1.gz Link Here
29	man/man1/gpsmon.1.gz	32	man/man1/gpsmon.1.gz
30	man/man1/gpspipe.1.gz	33	man/man1/gpspipe.1.gz
31	man/man1/gpsprof.1.gz	34	man/man1/gpsprof.1.gz
		35	man/man1/gpsrinex.1.gz
32	man/man1/gpxlogger.1.gz	36	man/man1/gpxlogger.1.gz
33	man/man1/lcdgps.1.gz	37	man/man1/lcdgps.1.gz
34	man/man1/ntpshmmon.1.gz	38	man/man1/ntpshmmon.1.gz
		39	man/man1/ubxtool.1.gz
		40	man/man1/zerk.1.gz
35	%%X11%%man/man1/xgps.1.gz	41	%%X11%%man/man1/xgps.1.gz
36	%%X11%%man/man1/xgpsspeed.1.gz	42	%%X11%%man/man1/xgpsspeed.1.gz
37	man/man3/libQgpsmm.3.gz	43	man/man3/libQgpsmm.3.gz
Lines 44-65 man/man8/gpsdctl.8.gz Link Here
44	man/man8/gpsinit.8.gz	50	man/man8/gpsinit.8.gz
45	%%PYTHON_SITELIBDIR%%/%%PYTHON_EGGINFO%%	51	%%PYTHON_SITELIBDIR%%/%%PYTHON_EGGINFO%%
46	%%PYTHON_SITELIBDIR%%/gps/__init__.py	52	%%PYTHON_SITELIBDIR%%/gps/__init__.py
47	%%PYTHON_SITELIBDIR%%/gps/__init__.pyc
48	%%PYTHON_SITELIBDIR%%/gps/__init__.pyo
49	%%PYTHON_SITELIBDIR%%/gps/client.py	53	%%PYTHON_SITELIBDIR%%/gps/client.py
50	%%PYTHON_SITELIBDIR%%/gps/client.pyc	54	%%PYTHON_SITELIBDIR%%/gps/clienthelpers.py
51	%%PYTHON_SITELIBDIR%%/gps/client.pyo
52	%%PYTHON_SITELIBDIR%%/gps/clienthelpers.so
53	%%PYTHON_SITELIBDIR%%/gps/fake.py	55	%%PYTHON_SITELIBDIR%%/gps/fake.py
54	%%PYTHON_SITELIBDIR%%/gps/fake.pyc
55	%%PYTHON_SITELIBDIR%%/gps/fake.pyo
56	%%PYTHON_SITELIBDIR%%/gps/gps.py	56	%%PYTHON_SITELIBDIR%%/gps/gps.py
57	%%PYTHON_SITELIBDIR%%/gps/gps.pyc
58	%%PYTHON_SITELIBDIR%%/gps/gps.pyo
59	%%PYTHON_SITELIBDIR%%/gps/misc.py	57	%%PYTHON_SITELIBDIR%%/gps/misc.py
60	%%PYTHON_SITELIBDIR%%/gps/misc.pyc
61	%%PYTHON_SITELIBDIR%%/gps/misc.pyo
62	%%PYTHON_SITELIBDIR%%/gps/packet.so	58	%%PYTHON_SITELIBDIR%%/gps/packet.so
		59	%%PYTHON_SITELIBDIR%%/gps/watch_options.py
63	libdata/pkgconfig/libgps.pc	60	libdata/pkgconfig/libgps.pc
64	sbin/gpsd	61	sbin/gpsd
65	sbin/gpsdctl	62	sbin/gpsdctl