Attachment #230404 for bug #258109




# Created by: Anton Karpov <toxa@toxahost.ru>

PORTNAME=	gpsd
PORTVERSION=	3.23.1
PORTREVISION=	2
CATEGORIES=	astro geography
MASTER_SITES=	SAVANNAH


LICENSE=	BSD3CLAUSE
LICENSE_FILE=	${WRKSRC}/COPYING

BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyserial>=0:comms/py-pyserial@${PY_FLAVOR}
RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyserial>=0:comms/py-pyserial@${PY_FLAVOR}

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

MAKE_ARGS=	manbuild=no \
		mandir="man" \
		pkgconfig="libdata/pkgconfig" \
		prefix="${PREFIX}" \
		qt=no \
		target_python="${PYTHON_CMD}"
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 NETFEED NMEA0183 NTP NTPSHM NTRIP OCEANSERVER \
		ONCORE 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

USB_DESC=		libusb support for USB devices

# Options related to GPS protocols
NMEA0183_MAKE_ARGS_OFF=		nmea0183=no
ASHTECH_MAKE_ARGS_OFF=		ashtech=no
EARTHMATE_MAKE_ARGS_OFF=	earthmate=no
EVERMORE_MAKE_ARGS_OFF=		evermore=no
FURY_MAKE_ARGS_OFF=		fury=no
FV18_MAKE_ARGS_OFF=		fv18=no
GARMIN_MAKE_ARGS_OFF=		garmin=no
GARMINTXT_MAKE_ARGS_OFF=	garmintxt=no
GEOSTAR_MAKE_ARGS_OFF=		geostar=no
ITRAX_MAKE_ARGS_OFF=		itrax=no
MTK_MAKE_ARGS_OFF=		mtk3301=no
NAVCOM_MAKE_ARGS_OFF=		navcom=no
ONCORE_MAKE_ARGS_OFF=		oncore=no
SIRF_MAKE_ARGS_OFF=		sirf=no
SUPERSTARII_MAKE_ARGS_OFF=	superstar2=no
TNT_MAKE_ARGS_OFF=		tnt=no
TRIPMATE_MAKE_ARGS_OFF=		tripmate=no
TSIP_MAKE_ARGS_OFF=		tsip=no
UBLOX_MAKE_ARGS_OFF=		ublox=no

# Options related to Non-GPS protocols
AIVDM_MAKE_ARGS_OFF=		aivdm=no
GPSCLOCK_MAKE_ARGS_OFF=		gpsclock=no
NTRIP_MAKE_ARGS_OFF=		ntrip=no
OCEANSERVER_MAKE_ARGS_OFF=	oceanserver=no
RTCM104V2_MAKE_ARGS_OFF=	rtcm104v2=no
RTCM104V3_MAKE_ARGS_OFF=	rtcm104v3=no

SHMEXPORT_MAKE_ARGS_OFF=	shm_export=no

# Communication
USB_MAKE_ARGS_OFF=		usb=no
IPV6_MAKE_ARGS_OFF=		ipv6=no
NETFEED_MAKE_ARGS_OFF=		netfeed=no
PASSTHROUGH_MAKE_ARGS_OFF=	passthrough=no

# Other daemon options
TIMING_MAKE_ARGS_OFF=	timing=no

# Client-side options
NCURSES_MAKE_ARGS_OFF=		ncurses=no
NCURSES_USES=			ncurses
RECONFIGURE_MAKE_ARGS_OFF=	reconfigure=no
CPPBIND_MAKE_ARGS_OFF=		libgpsmm=no
X11_BUILD_DEPENDS=		${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${PY_FLAVOR} \
				${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${PY_FLAVOR}
X11_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${PY_FLAVOR} \
				${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${PY_FLAVOR}
X11_USES=			gnome
X11_USE=			GNOME=gtk30
X11_MAKE_ARGS_OFF=		xgps=no

# Build control
PROFILING_MAKE_ARGS=	profiling=yes

Lines 1-3 Link Here

(-)b/astro/gpsd/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1581144632	1	TIMESTAMP = 1640093689
2	SHA256 (gpsd-3.20.tar.gz) = 172a7805068eacb815a3c5225436fcb0be46e7e49a5001a94034eac43df85e50	2	SHA256 (gpsd-3.23.1.tar.gz) = 0b991ce9a46538c4ea450f7a8ee428ff44fb4f8d665fddf2ffe40fe0ae9a6c09
3	SIZE (gpsd-3.20.tar.gz) = 3600835	3	SIZE (gpsd-3.23.1.tar.gz) = 4904121




--- SConscript.orig	2021-09-21 21:53:44 UTC
+++ SConscript
@@ -20,7 +20,7 @@ import re
 import subprocess
 import sys
 import time
-from distutils import sysconfig
+import sysconfig
 import SCons
 
 # scons does not like targets that come and go (if cleaning, if python,
@@ -243,7 +243,7 @@ website = "https://gpsd.io/"
 # Hosting information ends here
 
 
-PYTHON_SYSCONFIG_IMPORT = 'from distutils import sysconfig'
+PYTHON_SYSCONFIG_IMPORT = 'import sysconfig'
 
 # Utility productions
 
@@ -1419,7 +1419,7 @@ if not cleaning and not helping:
 
 # Set up configuration for target Python
 
-PYTHON_LIBDIR_CALL = 'sysconfig.get_python_lib()'
+PYTHON_LIBDIR_CALL = 'sysconfig.get_paths()["purelib"]'
 
 PYTHON_CONFIG_NAMES = ['SO']  # Now a fairly degenerate list
 PYTHON_CONFIG_QUOTED = ["'%s'" % s for s in PYTHON_CONFIG_NAMES]
@@ -1520,7 +1520,7 @@ if not cleaning and not helping and config.env['python
                                        'import sys',
                                        '"%d.%d" % sys.version_info[0:2]')
 
-        if 3 > int(sysver[0]) or 6 > int(sysver[2]):
+        if 3 > int(sysver[0]) or 6 > int(sysver[2:]):
             config.env['aiogps'] = False
             announce("WARNING: Python%s too old (need 3.6): "
                      "gps/aiogps.py will not be installed" %




--- 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

Lines 2-14 Link Here

(-)b/astro/gpsd/pkg-plist (-4 / +26 lines)
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

Lines 1-8 Link Here

(-)b/astro/gpsd/Makefile (-49 / +55 lines)
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.1
5	PORTREVISION= 2
6	CATEGORIES= astro geography	5	CATEGORIES= astro geography
7	MASTER_SITES= SAVANNAH	6	MASTER_SITES= SAVANNAH
8		7
Lines 12-40 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	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyserial>=0:comms/py-pyserial@${PY_FLAVOR}
		15	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyserial>=0:comms/py-pyserial@${PY_FLAVOR}
		16
		17	USES= cpe pathfix pkgconfig python:3.6+ scons
16	CPE_VENDOR= gpsd_project	18	CPE_VENDOR= gpsd_project
17	USE_LDCONFIG= yes	19	USE_LDCONFIG= yes
18	USE_RC_SUBR= gpsd	20	USE_RC_SUBR= gpsd
19	SHEBANG_FILES= .py gps/.py gegps xgps gpscat xgpsspeed gpsprof \
20	gpsfake ubxtool zerk
21		21
22	MAKE_ARGS= prefix="${PREFIX}" mandir="man" pkgconfig="libdata/pkgconfig" \	22	MAKE_ARGS= manbuild=no \
23	manbuild=no target_python="${PYTHON_CMD}" qt=no	23	mandir="man" \
		24	pkgconfig="libdata/pkgconfig" \
		25	prefix="${PREFIX}" \
		26	qt=no \
		27	target_python="${PYTHON_CMD}"
24	MAKE_ENV= DESTDIR="${STAGEDIR}"	28	MAKE_ENV= DESTDIR="${STAGEDIR}"
25	PLIST_SUB= PYTHON_EGGINFO=gps-${PORTVERSION}.egg-info	29	PLIST_SUB= PYTHON_EGGINFO=gps-${PORTVERSION}.egg-info
26		30
27	OPTIONS_DEFINE= AIVDM ASHTECH CPPBIND DBUS EARTHMATE EVERMORE FURY FV18 GARMIN \	31	OPTIONS_DEFINE= AIVDM ASHTECH CPPBIND DBUS EARTHMATE EVERMORE FURY FV18 \
28	GARMINTXT GEOSTAR GPSCLOCK IPV6 ITRAX MTK NAVCOM NCURSES \	32	GARMIN GARMINTXT GEOSTAR GPSCLOCK IPV6 ITRAX MTK NAVCOM \
29	NETFEED NMEA0183 NTP NTPSHM NTRIP OCEANSERVER ONCORE \	33	NCURSES NETFEED NMEA0183 NTP NTPSHM NTRIP OCEANSERVER \
30	PASSTHROUGH PPS PROFILING RECONFIGURE RTCM104V2 RTCM104V3 \	34	ONCORE PASSTHROUGH PPS PROFILING RECONFIGURE RTCM104V2 \
31	SHMEXPORT SIRF SOCKEXPORT SUPERSTARII TIMING TNT TRIPMATE \	35	RTCM104V3 SHMEXPORT SIRF SOCKEXPORT SUPERSTARII TIMING \
32	TSIP UBLOX USB X11	36	TNT TRIPMATE TSIP UBLOX USB X11
33	OPTIONS_DEFAULT= AIVDM ASHTECH CPPBIND EARTHMATE EVERMORE FURY FV18 GARMIN \	37	OPTIONS_DEFAULT= AIVDM ASHTECH CPPBIND EARTHMATE EVERMORE FURY FV18 \
34	GARMINTXT GEOSTAR GPSCLOCK ITRAX NAVCOM NCURSES NETFEED \	38	GARMIN GARMINTXT GEOSTAR GPSCLOCK ITRAX NAVCOM NCURSES \
35	NMEA0183 NTP NTPSHM NTRIP OCEANSERVER ONCORE PASSTHROUGH \	39	NETFEED NMEA0183 NTP NTPSHM NTRIP OCEANSERVER ONCORE \
36	RECONFIGURE RTCM104V2 RTCM104V3 SHMEXPORT SIRF SOCKEXPORT \	40	PASSTHROUGH RECONFIGURE RTCM104V2 RTCM104V3 SHMEXPORT \
37	SUPERSTARII TIMING TNT TRIPMATE TSIP UBLOX USB X11	41	SIRF SOCKEXPORT SUPERSTARII TIMING TNT TRIPMATE TSIP \
		42	UBLOX USB X11
38	OPTIONS_SUB= yes	43	OPTIONS_SUB= yes
39		44
40	AIVDM_DESC= Aivdm support	45	AIVDM_DESC= Aivdm support
Lines 77-106 UBLOX_DESC= u-blox protocol support Link Here
77	USB_DESC= libusb support for USB devices	82	USB_DESC= libusb support for USB devices
78		83
79	# Options related to GPS protocols	84	# Options related to GPS protocols
80	NMEA0183_MAKE_ARGS_OFF= nmea0183=no	85	NMEA0183_MAKE_ARGS_OFF= nmea0183=no
81	ASHTECH_MAKE_ARGS_OFF= ashtech=no	86	ASHTECH_MAKE_ARGS_OFF= ashtech=no
82	EARTHMATE_MAKE_ARGS_OFF= earthmate=no	87	EARTHMATE_MAKE_ARGS_OFF= earthmate=no
83	EVERMORE_MAKE_ARGS_OFF= evermore=no	88	EVERMORE_MAKE_ARGS_OFF= evermore=no
84	FURY_MAKE_ARGS_OFF= fury=no	89	FURY_MAKE_ARGS_OFF= fury=no
85	FV18_MAKE_ARGS_OFF= fv18=no	90	FV18_MAKE_ARGS_OFF= fv18=no
86	GARMIN_MAKE_ARGS_OFF= garmin=no	91	GARMIN_MAKE_ARGS_OFF= garmin=no
87	GARMINTXT_MAKE_ARGS_OFF= garmintxt=no	92	GARMINTXT_MAKE_ARGS_OFF= garmintxt=no
88	GEOSTAR_MAKE_ARGS_OFF= geostar=no	93	GEOSTAR_MAKE_ARGS_OFF= geostar=no
89	ITRAX_MAKE_ARGS_OFF= itrax=no	94	ITRAX_MAKE_ARGS_OFF= itrax=no
90	MTK_MAKE_ARGS_OFF= mtk3301=no	95	MTK_MAKE_ARGS_OFF= mtk3301=no
91	NAVCOM_MAKE_ARGS_OFF= navcom=no	96	NAVCOM_MAKE_ARGS_OFF= navcom=no
92	ONCORE_MAKE_ARGS_OFF= oncore=no	97	ONCORE_MAKE_ARGS_OFF= oncore=no
93	SIRF_MAKE_ARGS_OFF= sirf=no	98	SIRF_MAKE_ARGS_OFF= sirf=no
94	SUPERSTARII_MAKE_ARGS_OFF= superstar2=no	99	SUPERSTARII_MAKE_ARGS_OFF= superstar2=no
95	TNT_MAKE_ARGS_OFF= tnt=no	100	TNT_MAKE_ARGS_OFF= tnt=no
96	TRIPMATE_MAKE_ARGS_OFF= tripmate=no	101	TRIPMATE_MAKE_ARGS_OFF= tripmate=no
97	TSIP_MAKE_ARGS_OFF= tsip=no	102	TSIP_MAKE_ARGS_OFF= tsip=no
98	UBLOX_MAKE_ARGS_OFF= ublox=no	103	UBLOX_MAKE_ARGS_OFF= ublox=no
99		104
100	# Options related to Non-GPS protocols	105	# Options related to Non-GPS protocols
101	AIVDM_MAKE_ARGS_OFF= aivdm=no	106	AIVDM_MAKE_ARGS_OFF= aivdm=no
102	GPSCLOCK_MAKE_ARGS_OFF= gpsclock=no	107	GPSCLOCK_MAKE_ARGS_OFF= gpsclock=no
103	NTRIP_MAKE_ARGS_OFF= ntrip=no	108	NTRIP_MAKE_ARGS_OFF= ntrip=no
104	OCEANSERVER_MAKE_ARGS_OFF= oceanserver=no	109	OCEANSERVER_MAKE_ARGS_OFF= oceanserver=no
105	RTCM104V2_MAKE_ARGS_OFF= rtcm104v2=no	110	RTCM104V2_MAKE_ARGS_OFF= rtcm104v2=no
106	RTCM104V3_MAKE_ARGS_OFF= rtcm104v3=no	111	RTCM104V3_MAKE_ARGS_OFF= rtcm104v3=no
Lines 119-143 DBUS_MAKE_ARGS_OFF= dbus_export=no Link Here
119	SHMEXPORT_MAKE_ARGS_OFF= shm_export=no	124	SHMEXPORT_MAKE_ARGS_OFF= shm_export=no
120		125
121	# Communication	126	# Communication
122	USB_MAKE_ARGS_OFF= usb=no	127	USB_MAKE_ARGS_OFF= usb=no
123	IPV6_MAKE_ARGS_OFF= ipv6=no	128	IPV6_MAKE_ARGS_OFF= ipv6=no
124	NETFEED_MAKE_ARGS_OFF= netfeed=no	129	NETFEED_MAKE_ARGS_OFF= netfeed=no
125	PASSTHROUGH_MAKE_ARGS_OFF= passthrough=no	130	PASSTHROUGH_MAKE_ARGS_OFF= passthrough=no
126		131
127	# Other daemon options	132	# Other daemon options
128	TIMING_MAKE_ARGS_OFF= timing=no	133	TIMING_MAKE_ARGS_OFF= timing=no
129		134
130	# Client-side options	135	# Client-side options
131	NCURSES_MAKE_ARGS_OFF= ncurses=no	136	NCURSES_MAKE_ARGS_OFF= ncurses=no
132	NCURSES_USES= ncurses	137	NCURSES_USES= ncurses
133	RECONFIGURE_MAKE_ARGS_OFF= reconfigure=no	138	RECONFIGURE_MAKE_ARGS_OFF= reconfigure=no
134	CPPBIND_MAKE_ARGS_OFF= libgpsmm=no	139	CPPBIND_MAKE_ARGS_OFF= libgpsmm=no
135	X11_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${PY_FLAVOR} \	140	X11_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${PY_FLAVOR} \
136	${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${PY_FLAVOR} \	141	${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${PY_FLAVOR}
137	${PYTHON_PKGNAMEPREFIX}pyserial>=0:comms/py-pyserial@${PY_FLAVOR}	142	X11_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${PY_FLAVOR} \
138	X11_USES= gnome	143	${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${PY_FLAVOR}
139	X11_USE= GNOME=gtk30	144	X11_USES= gnome
140	X11_MAKE_ARGS_OFF= xgps=no	145	X11_USE= GNOME=gtk30
		146	X11_MAKE_ARGS_OFF= xgps=no
141		147
142	# Build control	148	# Build control
143	PROFILING_MAKE_ARGS= profiling=yes	149	PROFILING_MAKE_ARGS= profiling=yes

Added Link Here

(-)b/astro/gpsd/files/patch-SConscript (+38 lines)
1	--- SConscript.orig 2021-09-21 21:53:44 UTC
2	+++ SConscript
3	@@ -20,7 +20,7 @@ import re
4	import subprocess
5	import sys
6	import time
7	-from distutils import sysconfig
8	+import sysconfig
9	import SCons
10
11	# scons does not like targets that come and go (if cleaning, if python,
12	@@ -243,7 +243,7 @@ website = "https://gpsd.io/"
13	# Hosting information ends here
14
15
16	-PYTHON_SYSCONFIG_IMPORT = 'from distutils import sysconfig'
17	+PYTHON_SYSCONFIG_IMPORT = 'import sysconfig'
18
19	# Utility productions
20
21	@@ -1419,7 +1419,7 @@ if not cleaning and not helping:
22
23	# Set up configuration for target Python
24
25	-PYTHON_LIBDIR_CALL = 'sysconfig.get_python_lib()'
26	+PYTHON_LIBDIR_CALL = 'sysconfig.get_paths()["purelib"]'
27
28	PYTHON_CONFIG_NAMES = ['SO'] # Now a fairly degenerate list
29	PYTHON_CONFIG_QUOTED = ["'%s'" % s for s in PYTHON_CONFIG_NAMES]
30	@@ -1520,7 +1520,7 @@ if not cleaning and not helping and config.env['python
31	'import sys',
32	'"%d.%d" % sys.version_info[0:2]')
33
34	- if 3 > int(sysver[0]) or 6 > int(sysver[2]):
35	+ if 3 > int(sysver[0]) or 6 > int(sysver[2:]):
36	config.env['aiogps'] = False
37	announce("WARNING: Python%s too old (need 3.6): "
38	"gps/aiogps.py will not be installed" %

Removed Link Here

(-)a/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