Attachment 211473 Details for Bug 243980 – gpsd 3.20

[patch] gpsd 3.20

gpsd.diff (text/plain), 7.44 KB, created by Loïc Bartoletti on 2020-02-08 14:44:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Loïc Bartoletti

Created: 2020-02-08 14:44:50 UTC

Size: 7.44 KB

patch

obsolete

>diff --git astro/gpsd/Makefile astro/gpsd/Makefile
>index d3d566c371f7..4270a8350edd 100644
>--- astro/gpsd/Makefile
>+++ astro/gpsd/Makefile
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	gpsd
>-PORTVERSION=	3.17
>-PORTREVISION=	1
>+PORTVERSION=	3.20
> CATEGORIES=	astro geography
> MASTER_SITES=	SAVANNAH
> 
>@@ -13,12 +12,13 @@ COMMENT=	Daemon that monitors one or more GPSes attached to a host computer
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-USES=		cpe pathfix pkgconfig python:2.7 scons shebangfix
>+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
>+		gpsfake ubxtool zerk
> 
> MAKE_ARGS=	prefix="${PREFIX}" mandir="man" pkgconfig="libdata/pkgconfig" \
> 		manbuild=no target_python="${PYTHON_CMD}" qt=no
>@@ -31,11 +31,11 @@ OPTIONS_DEFINE=	AIVDM ASHTECH CPPBIND DBUS EARTHMATE EVERMORE FURY FV18 GARMIN \
> 		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_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
>@@ -134,10 +134,11 @@ NCURSES_USES=		ncurses
> 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}
>-#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
>@@ -151,5 +152,6 @@ post-install:
> 		-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>
>diff --git astro/gpsd/distinfo astro/gpsd/distinfo
>index 26ce34fe6285..1bacb0d70082 100644
>--- astro/gpsd/distinfo
>+++ astro/gpsd/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1516146278
>-SHA256 (gpsd-3.17.tar.gz) = 68e0dbecfb5831997f8b3d6ba48aed812eb465d8c0089420ab68f9ce4d85e77a
>-SIZE (gpsd-3.17.tar.gz) = 8755304
>+TIMESTAMP = 1581144632
>+SHA256 (gpsd-3.20.tar.gz) = 172a7805068eacb815a3c5225436fcb0be46e7e49a5001a94034eac43df85e50
>+SIZE (gpsd-3.20.tar.gz) = 3600835
>diff --git astro/gpsd/files/patch-SConstruct astro/gpsd/files/patch-SConstruct
>new file mode 100644
>index 000000000000..d241dc0357b6
>--- /dev/null
>+++ astro/gpsd/files/patch-SConstruct
>@@ -0,0 +1,56 @@
>+--- 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
>diff --git astro/gpsd/pkg-plist astro/gpsd/pkg-plist
>index 3c7c84e40432..00d779bebf87 100644
>--- astro/gpsd/pkg-plist
>+++ astro/gpsd/pkg-plist
>@@ -8,16 +8,19 @@ bin/gpsfake
> %%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.23
>-lib/libgps.so.23.0.0
>+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
>@@ -29,9 +32,12 @@ man/man1/gpsfake.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
>@@ -44,22 +50,13 @@ man/man8/gpsdctl.8.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/client.pyc
>-%%PYTHON_SITELIBDIR%%/gps/client.pyo
>-%%PYTHON_SITELIBDIR%%/gps/clienthelpers.so
>+%%PYTHON_SITELIBDIR%%/gps/clienthelpers.py
> %%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

Actions: View | Diff

Attachments on bug 243980: 211473