From nobody Tue Jun 25 16:25:44 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W7qvD5YNHz5PbRt; Tue, 25 Jun 2024 16:25:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W7qvD52zwz42mH; Tue, 25 Jun 2024 16:25:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719332744; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E1Jt/pjHRJ81OpNez7N9+0qWOf5MqKQluRNfKidFwjU=; b=scuahRMsYZm9MrPwfNcw5Lp4zpKP8Y4thNZX36ix9JgSNyMylOYjD4ADXTIFVQZKYBZCWO M12UpLuPOqdfdDTtGd+6mHpm81L66khWihW6rAFBYX7VkHbjYjo+ie7v7QVFJM0m0ED+io ITUA0/unZPvjvGueqph0Mval89mnDfyTU7D1fPGs2UDg52hLj5g7RSQTlL7ya7OgM1Znyh vrS1Bx82kYUuQd5Dr1e+LTMEF+YC4Tgte+mgc6lMqQnrrOTYIMB2ENMCT7hXCvLylOQpcm DVcrW9MQks4MR4pNZVw5fdY1OrbUEN0nmgqndGkIDoa1VeeryhcgJU2pUYl8kA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719332744; a=rsa-sha256; cv=none; b=EOh6SnWXdILrhYTotl3AvN+l5yCaaMkm95d7/ThMy5oimpYP/j5sjNw2IvDPzHURrK4eFp /28edE48ALWZEKT9+VaZqD1yZtdhfbesuV2gBXW+uI7FXg9eXJGlm5P2+S+MbphAfCV6aO 2i+HXAynQ1daXDj5SxXROKx+Ng7bq/GAhIRrRIAuonOPJWq3UrO/acsRzkRuMx9AxUIBlO MjmtWZwW2t6n/azcLsfSVUeF+mfBs2UYcVoADt+1VGQoiVwQ37jSNebpVSj6tVl3ahppxX dNmEihQ2zgslVsF1JBmXPSkdNu6RhkPNzfyGmi3z57O9gD1O/nBnK9HBQRbQYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719332744; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E1Jt/pjHRJ81OpNez7N9+0qWOf5MqKQluRNfKidFwjU=; b=ug2ah2p7GF+z9mM7egB8fH3khRZSKIQz0Q59FbBk73cgMviWe5kP47a2ah/2WCrD8jJTyl yItJjyPgWSIYl8ef/ylA92sNbE8P6n8IANx5+oi5pUMBrNdUn/zSj9Q8lkT/DPbP85hvB9 ME7WUfU12ja4i7DL/KqQoxgLIezD4BS0y0xyXorU7vIh5cW+0z6lU4nKQTpCeLnJ/TKLlY xocEiZqaO57W/p2UoN47xMYiFnEgzjh2fo7Uyj6yPD3f4GXdhgeTViNZUOaNiJFOE9r/Nk xb3x0mE66/yMt2mhRiaexrgXqwZrKSYmZHcNpFfU58bgxrYe/BW57LG1vtiW2Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W7qvD4TWTz18FH; Tue, 25 Jun 2024 16:25:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45PGPicm005838; Tue, 25 Jun 2024 16:25:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45PGPi15005835; Tue, 25 Jun 2024 16:25:44 GMT (envelope-from git) Date: Tue, 25 Jun 2024 16:25:44 GMT Message-Id: <202406251625.45PGPi15005835@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Fernando =?utf-8?Q?Apestegu=C3=ADa?= Subject: git: 8f37092bacbf - main - astro/gpsd: update to 3.25 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8f37092bacbf5592ec127a66079f5c31a906660f Auto-Submitted: auto-generated The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=8f37092bacbf5592ec127a66079f5c31a906660f commit 8f37092bacbf5592ec127a66079f5c31a906660f Author: John Hay AuthorDate: 2024-06-20 07:11:26 +0000 Commit: Fernando Apesteguía CommitDate: 2024-06-25 16:24:48 +0000 astro/gpsd: update to 3.25 PR: 279718 Reported by: john@sanren.ac.za Approved by: z7dr6ut7gs@snkmail.com (maintainer, timeout > 2 weeks) --- astro/gpsd/Makefile | 13 +++++++++++-- astro/gpsd/distinfo | 6 +++--- astro/gpsd/files/patch-SConscript | 38 -------------------------------------- astro/gpsd/pkg-plist | 10 ++++++---- 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