Hi!
Here is an update to gpsd-3.20.
gpsd has some API changes so it's consumers need fixes. See my
previous mail.
Comments? OKs?
Index: Makefile
===================================================================
RCS file: /cvs/ports/misc/gpsd/Makefile,v
retrieving revision 1.76
diff -u -p -u -p -r1.76 Makefile
--- Makefile 26 Sep 2019 21:59:30 -0000 1.76
+++ Makefile 6 May 2020 12:31:32 -0000
@@ -4,14 +4,13 @@ COMMENT-main= service daemon that monit
COMMENT-x11= GUI test apps using gpsd
COMMENT-php= web-based gpsd monitor in php
-VERSION= 3.19
+VERSION= 3.20
DISTNAME= gpsd-${VERSION}
PKGNAME-main= gpsd-${VERSION}
PKGNAME-x11= gpsd-x11-${VERSION}
PKGNAME-php= gpsd-php-${VERSION}
-REVISION-php= 0
-SHARED_LIBS += gps 20.0 # 25.0
+SHARED_LIBS += gps 21.0 # 25.0
CATEGORIES= misc geo
HOMEPAGE = https://gpsd.gitlab.io/gpsd/index.html
@@ -40,6 +39,8 @@ MODSCONS_FLAGS += gpsd_user=_gpsd \
MULTI_PACKAGES = -main -php -x11
BUILD_DEPENDS= devel/py-gobject3 \
+ devel/py-serial \
+ graphics/py-cairo \
textproc/xmlto \
textproc/libxslt \
textproc/docbook \
Index: distinfo
===================================================================
RCS file: /cvs/ports/misc/gpsd/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- distinfo 31 Jul 2019 15:44:30 -0000 1.10
+++ distinfo 6 May 2020 12:31:32 -0000
@@ -1,2 +1,2 @@
-SHA256 (gpsd-3.19.tar.gz) = J90k1Fsqxpuqt5M9or9q5fsL6QEw9n51PBEKNHcVXzk=
-SIZE (gpsd-3.19.tar.gz) = 10581777
+SHA256 (gpsd-3.20.tar.gz) = Fyp4BQaOrLgVo8UiVDb8sL5G5+SaUAGpQDTqxD34XlA=
+SIZE (gpsd-3.20.tar.gz) = 3600835
Index: patches/patch-SConstruct
===================================================================
RCS file: /cvs/ports/misc/gpsd/patches/patch-SConstruct,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-SConstruct
--- patches/patch-SConstruct 31 Jul 2019 15:44:30 -0000 1.1
+++ patches/patch-SConstruct 6 May 2020 12:31:32 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-SConstruct,v 1.1 2019/07
Index: SConstruct
--- SConstruct.orig
+++ SConstruct
-@@ -72,8 +72,7 @@ gpsd_version = "3.19"
+@@ -68,8 +68,7 @@ gpsd_version = "3.20"
libgps_version_current = 25
libgps_version_revision = 0
libgps_version_age = 0
@@ -12,7 +12,7 @@ Index: SConstruct
#
# Release identification ends here
-@@ -546,7 +545,7 @@ def CheckPKG(context, name):
+@@ -530,7 +529,7 @@ def CheckPKG(context, name):
# Stylesheet URLs for making HTML and man pages from DocBook XML.
@@ -21,7 +21,21 @@ Index: SConstruct
docbook_man_uri = docbook_url_stem + 'manpages/docbook.xsl'
docbook_html_uri = docbook_url_stem + 'html/docbook.xsl'
-@@ -1090,6 +1089,10 @@ else:
+@@ -1138,12 +1137,8 @@ else:
+ " --nonet %s $SOURCE")
+ htmlbuilder = build % docbook_html_uri
+ manbuilder = build % docbook_man_uri
+- elif WhereIs("xmlto"):
+- xmlto = "xmlto -o `dirname $TARGET` %s $SOURCE"
+- htmlbuilder = xmlto % "html-nochunks"
+- manbuilder = xmlto % "man"
+ else:
+- announce("Neither xsltproc nor xmlto found, documentation "
++ announce("xsltproc not found, documentation "
+ "cannot be built.")
+ else:
+ announce("Build of man and HTML documentation is disabled.")
+@@ -1159,6 +1154,10 @@ else:
# if not, force qt to off
if config.env["qt"]:
qt_net_name = 'Qt%sNetwork' % config.env["qt_versioned"]
@@ -32,7 +46,7 @@ Index: SConstruct
qt_network = config.CheckPKG(qt_net_name)
if not qt_network:
config.env["qt"] = False
-@@ -1685,9 +1688,7 @@ else:
+@@ -1791,9 +1790,7 @@ else:
python_objects[ext].append(
python_env.NoCache(
python_env.SharedObject(
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/misc/gpsd/pkg/PLIST-main,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 PLIST-main
--- pkg/PLIST-main 31 Jul 2019 15:44:31 -0000 1.10
+++ pkg/PLIST-main 6 May 2020 12:31:32 -0000
@@ -15,6 +15,7 @@ bin/gpsprof
@bin bin/gpsrinex
@bin bin/gpxlogger
@bin bin/lcdgps
+@bin bin/ntpshmmon
bin/ubxtool
bin/zerk
include/gps.h
@@ -30,7 +31,9 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/gps/client.py
lib/python${MODPY_VERSION}/site-packages/gps/client.pyc
lib/python${MODPY_VERSION}/site-packages/gps/client.${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/gps/clienthelpers.so
+lib/python${MODPY_VERSION}/site-packages/gps/clienthelpers.py
+lib/python${MODPY_VERSION}/site-packages/gps/clienthelpers.pyc
+lib/python${MODPY_VERSION}/site-packages/gps/clienthelpers.${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/gps/fake.py
lib/python${MODPY_VERSION}/site-packages/gps/fake.pyc
lib/python${MODPY_VERSION}/site-packages/gps/fake.${MODPY_PYOEXTENSION}
@@ -40,7 +43,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/gps/misc.py
lib/python${MODPY_VERSION}/site-packages/gps/misc.pyc
lib/python${MODPY_VERSION}/site-packages/gps/misc.${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/gps/packet.so
+@so lib/python${MODPY_VERSION}/site-packages/gps/packet.so
lib/python${MODPY_VERSION}/site-packages/gps/watch_options.py
lib/python${MODPY_VERSION}/site-packages/gps/watch_options.pyc
lib/python${MODPY_VERSION}/site-packages/gps/watch_options.${MODPY_PYOEXTENSION}
@@ -58,6 +61,7 @@ lib/python${MODPY_VERSION}/site-packages
@man man/man1/gpsrinex.1
@man man/man1/gpxlogger.1
@man man/man1/lcdgps.1
+@man man/man1/ntpshmmon.1
@man man/man1/ubxtool.1
@man man/man1/zerk.1
@man man/man3/libQgpsmm.3
