aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Hay <john@sanren.ac.za>2024-06-20 07:11:26 +0000
committerFernando ApesteguĂ­a <fernape@FreeBSD.org>2024-06-25 16:24:48 +0000
commit8f37092bacbf5592ec127a66079f5c31a906660f (patch)
treedae0adeed057b208c90beb79b4f2a96d445af37d
parent1e8c176a6a9c55ad2d5419e2f7a1fe5bb38d3d15 (diff)
downloadports-8f37092bacbf5592ec127a66079f5c31a906660f.tar.gz
ports-8f37092bacbf5592ec127a66079f5c31a906660f.zip
astro/gpsd: update to 3.25
PR: 279718 Reported by: john@sanren.ac.za Approved by: z7dr6ut7gs@snkmail.com (maintainer, timeout > 2 weeks)
-rw-r--r--astro/gpsd/Makefile13
-rw-r--r--astro/gpsd/distinfo6
-rw-r--r--astro/gpsd/files/patch-SConscript38
-rw-r--r--astro/gpsd/pkg-plist10
4 files changed, 20 insertions, 47 deletions
diff --git a/astro/gpsd/Makefile b/astro/gpsd/Makefile
index d1fc0a6bc2cb..baa6bc079526 100644
--- a/astro/gpsd/Makefile
+++ b/astro/gpsd/Makefile
@@ -1,6 +1,5 @@
PORTNAME= gpsd
-PORTVERSION= 3.23.1
-PORTREVISION= 3
+PORTVERSION= 3.25
CATEGORIES= astro geography
MASTER_SITES= SAVANNAH
@@ -11,6 +10,10 @@ WWW= https://gpsd.gitlab.io/gpsd/index.html
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING
+FLAVORS= default nox11
+FLAVOR?= ${FLAVORS:[1]}
+nox11_PKGNAMESUFFIX= -nox11
+
USES= cpe pathfix pkgconfig python scons
CPE_VENDOR= gpsd_project
USE_LDCONFIG= yes
@@ -31,6 +34,12 @@ OPTIONS_DEFINE= AIVDM ASHTECH CPPBIND DBUS EARTHMATE EVERMORE FURY FV18 \
ONCORE PASSTHROUGH PPS PROFILING PYSERIAL RECONFIGURE \
RTCM104V2 RTCM104V3 SHMEXPORT SIRF SOCKEXPORT \
SUPERSTARII TIMING TNT TRIPMATE TSIP UBLOX USB X11
+
+.if ${FLAVOR} == nox11
+COMMENT+= (without GUI)
+OPTIONS_EXCLUDE= X11
+.endif
+
OPTIONS_DEFAULT= AIVDM ASHTECH CPPBIND EARTHMATE EVERMORE FURY FV18 \
GARMIN GARMINTXT GEOSTAR GPSCLOCK ITRAX NAVCOM NCURSES \
NETFEED NMEA0183 NTP NTPSHM NTRIP OCEANSERVER ONCORE \
diff --git a/astro/gpsd/distinfo b/astro/gpsd/distinfo
index 588e0d978518..34295dd022b2 100644
--- a/astro/gpsd/distinfo
+++ b/astro/gpsd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1640093689
-SHA256 (gpsd-3.23.1.tar.gz) = 0b991ce9a46538c4ea450f7a8ee428ff44fb4f8d665fddf2ffe40fe0ae9a6c09
-SIZE (gpsd-3.23.1.tar.gz) = 4904121
+TIMESTAMP = 1717929727
+SHA256 (gpsd-3.25.tar.gz) = b368b6a305e3f7a6382d23a0cbfc1d78923060b6b7f54cf7987a73c7b4a9afc2
+SIZE (gpsd-3.25.tar.gz) = 5225194
diff --git a/astro/gpsd/files/patch-SConscript b/astro/gpsd/files/patch-SConscript
deleted file mode 100644
index 29352adf2a7f..000000000000
--- a/astro/gpsd/files/patch-SConscript
+++ /dev/null
@@ -1,38 +0,0 @@
---- 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" %
diff --git a/astro/gpsd/pkg-plist b/astro/gpsd/pkg-plist
index 895e82ef3995..fe05f06609ca 100644
--- a/astro/gpsd/pkg-plist
+++ b/astro/gpsd/pkg-plist
@@ -24,11 +24,11 @@ bin/zerk
include/gps.h
include/libgpsmm.h
lib/libgps.so
-lib/libgps.so.29
-lib/libgps.so.29.0.0
+lib/libgps.so.30
+lib/libgps.so.30.0.0
lib/libgpsdpacket.so
-lib/libgpsdpacket.so.29
-lib/libgpsdpacket.so.29.0.0
+lib/libgpsdpacket.so.30
+lib/libgpsdpacket.so.30.0.0
share/man/man1/cgps.1.gz
share/man/man1/gegps.1.gz
share/man/man1/gps.1.gz
@@ -61,6 +61,7 @@ share/man/man8/gpsd.8.gz
share/man/man8/gpsdctl.8.gz
share/man/man8/gpsinit.8.gz
share/man/man8/ppscheck.8.gz
+share/snmp/mibs/gpsd/GPSD-MIB
%%PYTHON_SITELIBDIR%%/%%PYTHON_EGGINFO%%
%%PYTHON_SITELIBDIR%%/gps/__init__.py
%%PYTHON_SITELIBDIR%%/gps/aiogps.py
@@ -80,6 +81,7 @@ libdata/pkgconfig/libgps.pc
%%DATADIR%%/doc/SUPPORT.adoc
%%DATADIR%%/doc/build.adoc
%%DATADIR%%/doc/example1.c.txt
+%%DATADIR%%/doc/example2.py.txt
%%DATADIR%%/icons/gpsd-logo.png
sbin/gpsd
sbin/gpsdctl