Re: UPDATE misc/gpsd

? 20210514_130947+0300.gpx
Index: Makefile
===================================================================
RCS file: /cvs/ports/misc/gpsd/Makefile,v
retrieving revision 1.82
diff -u -p -u -p -r1.82 Makefile
--- Makefile 24 Feb 2021 16:49:00 -0000 1.82
+++ Makefile 29 Jun 2021 22:22:53 -0000
@@ -4,15 +4,14 @@ COMMENT-main= service daemon that monit
COMMENT-x11= GUI test apps using gpsd
COMMENT-php= web-based gpsd monitor in php

-VERSION= 3.21
-REVISION-php= 0
+VERSION= 3.22
DISTNAME= gpsd-${VERSION}
PKGNAME-main= gpsd-${VERSION}
PKGNAME-x11= gpsd-x11-${VERSION}
PKGNAME-php= gpsd-php-${VERSION}

-SHARED_LIBS += gps 21.0 # 27.0
-SHARED_LIBS += gpsdpacket 0.0 # 21.0
+SHARED_LIBS += gps 22.0 # 28.0
+SHARED_LIBS += gpsdpacket 1.0 # 21.0
CATEGORIES= misc geo

HOMEPAGE = https://gpsd.gitlab.io/gpsd/index.html
@@ -76,13 +75,13 @@ pre-configure:
@perl -pi -e "s,/usr/share/gpsd/,," ${WRKSRC}/packaging/X11/*.desktop
@perl -pi -e "s,http://docbook.sourceforge.net/release/xsl/current/,\
${LOCALBASE}/share/xsl/docbook/," \
- ${WRKSRC}/SConstruct
- ${SUBST_CMD} ${WRKSRC}/SConstruct
+ ${WRKSRC}/SConscript
+ ${SUBST_CMD} ${WRKSRC}/SConscript

post-install:
${INSTALL_DATA_DIR} ${WRKINST}/var/www/gpsd
- ${INSTALL_SCRIPT} ${WRKSRC}/gpsd.php ${WRKINST}/var/www/gpsd
- ${INSTALL_DATA} ${WRKSRC}/gpsd_config.h ${PREFIX}/include
+ ${INSTALL_SCRIPT} ${WRKSRC}/${DISTNAME}/clients/gpsd.php ${WRKINST}/var/www/gpsd
+ ${INSTALL_DATA} ${WRKSRC}/${DISTNAME}/include/gpsd_config.h ${PREFIX}/include
${INSTALL_DATA_DIR} ${PREFIX}/share/applications/
${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps/
${INSTALL_DATA} ${WRKSRC}/packaging/X11/*.desktop \
Index: distinfo
===================================================================
RCS file: /cvs/ports/misc/gpsd/distinfo,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 distinfo
--- distinfo 14 Feb 2021 08:30:56 -0000 1.11
+++ distinfo 29 Jun 2021 22:22:53 -0000
@@ -1,2 +1,2 @@
-SHA256 (gpsd-3.21.tar.gz) = ZVBMOvjTsMzjwHQFuIFddzDS0r4tp9KNJ18anFfG/pE=
-SIZE (gpsd-3.21.tar.gz) = 3984157
+SHA256 (gpsd-3.22.tar.gz) = eD/fKl94pZMjDHv6i0CZVlRXZVYyJMbFatacxsKmN6M=
+SIZE (gpsd-3.22.tar.gz) = 4758761
Index: patches/patch-SConscript
===================================================================
RCS file: patches/patch-SConscript
diff -N patches/patch-SConscript
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-SConscript 29 Jun 2021 22:22:53 -0000
@@ -0,0 +1,58 @@
+$OpenBSD$
+
+Index: SConscript
+--- SConscript.orig
++++ SConscript
+@@ -272,8 +272,7 @@ api_version_minor = 14
+ libgps_version_current = 28
+ libgps_version_revision = 0
+ libgps_version_age = 0
+-libgps_version = "%d.%d.%d" % (libgps_version_current, libgps_version_age,
+- libgps_version_revision)
++libgps_version = "%s" % ('${LIBgps_VERSION}')
+ #
+ # Release identification ends here
+
+@@ -805,7 +804,7 @@ def CheckPKG(context, name):
+
+
+ # Stylesheet URLs for making HTML and man pages from DocBook XML.
+-docbook_url_stem = 'http://docbook.sourceforge.net/release/xsl/current/'
++docbook_url_stem = '${LOCALBASE}/share/xsl/docbook/'
+ docbook_man_uri = docbook_url_stem + 'manpages/docbook.xsl'
+ docbook_html_uri = docbook_url_stem + 'html/docbook.xsl'
+
+@@ -1440,6 +1439,10 @@ if not cleaning and not helping:
+ # if not, force qt to off
+ if config.env["qt"]:
+ qt_net_name = 'Qt%sNetwork' % config.env["qt_versioned"]
++ if env["qt_versioned"] == "5":
++ qt_net_name = 'Qt5Network'
++ elif env["qt_versioned"] == "4":
++ qt_net_name = 'QtNetwork'
+ qt_network = config.CheckPKG(qt_net_name)
+ if not qt_network:
+ config.env["qt"] = False
+@@ -1616,13 +1619,6 @@ if not cleaning and not helping and config.env['python
+ config.env['xgps_deps'] = False
+ announce("WARNING: Python module cairo (pycairo) not found.")
+
+- # check for pygobject
+- if not config.GetPythonValue('module gi (pygobject)',
+- 'import gi', '"found"'):
+- # no pygobject, used by xgps, xgpsspeed
+- config.env['xgps_deps'] = False
+- announce("WARNING: Python module gi (pygobject) not found.")
+-
+ # gtk+ needed by pygobject
+ if not config.CheckPKG('gtk+-3.0'):
+ config.env['xgps_deps'] = False
+@@ -1847,7 +1843,7 @@ libgpsd_static = env.StaticLibrary(
+ packet_ffi_objects = [env.SharedObject(s) for s in packet_ffi_extension]
+ packet_ffi_shared = env.SharedLibrary(target="gpsdpacket",
+ source=packet_ffi_objects,
+- SHLIBVERSION=libgps_version,
++ SHLIBVERSION="%s" % ('${LIBgpsdpacket_VERSION}'),
+ parse_flags=rtlibs + libgps_flags)
+
+ libraries = [libgps_shared, packet_ffi_shared]
Index: patches/patch-SConstruct
===================================================================
RCS file: patches/patch-SConstruct
diff -N patches/patch-SConstruct
--- patches/patch-SConstruct 14 Feb 2021 08:30:56 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,64 +0,0 @@
-$OpenBSD: patch-SConstruct,v 1.3 2021/02/14 08:30:56 kirby Exp $
-Index: SConstruct
---- SConstruct.orig
-+++ SConstruct
-@@ -264,8 +264,7 @@ api_version_minor = 14
- libgps_version_current = 27
- libgps_version_revision = 0
- libgps_version_age = 0
--libgps_version = "%d.%d.%d" % (libgps_version_current, libgps_version_age,
-- libgps_version_revision)
-+libgps_version = "%s" % ('${LIBgps_VERSION}')
- #
- # Release identification ends here
-
-@@ -754,7 +753,7 @@ def CheckPKG(context, name):
-
-
- # Stylesheet URLs for making HTML and man pages from DocBook XML.
--docbook_url_stem = 'http://docbook.sourceforge.net/release/xsl/current/'
-+docbook_url_stem = '${LOCALBASE}/share/xsl/docbook/'
- docbook_man_uri = docbook_url_stem + 'manpages/docbook.xsl'
- docbook_html_uri = docbook_url_stem + 'html/docbook.xsl'
-
-@@ -1374,6 +1373,10 @@ else:
- # if not, force qt to off
- if config.env["qt"]:
- qt_net_name = 'Qt%sNetwork' % config.env["qt_versioned"]
-+ if env["qt_versioned"] == "5":
-+ qt_net_name = 'Qt5Network'
-+ elif env["qt_versioned"] == "4":
-+ qt_net_name = 'QtNetwork'
- qt_network = config.CheckPKG(qt_net_name)
- if not qt_network:
- config.env["qt"] = False
-@@ -1500,20 +1503,6 @@ elif config.env['python']:
-
- config.env['xgps_deps'] = True
-
-- # check for pycairo
-- if not config.GetPythonValue('module cairo (pycairo)',
-- 'import cairo', '"found"'):
-- # no pycairo, used by xgps, xgpsspeed
-- config.env['xgps_deps'] = False
-- announce("WARNING: Python module cairo (pycairo) not found.")
--
-- # check for pycairo
-- if not config.GetPythonValue('module gi (pygobject)',
-- 'import gi', '"found"'):
-- # no pycairo, used by xgps, xgpsspeed
-- config.env['xgps_deps'] = False
-- announce("WARNING: Python module gi (pygobject) not found.")
--
- # gtk+ needed by pygobject
- if not config.CheckPKG('gtk+-3.0'):
- config.env['xgps_deps'] = False
-@@ -1730,7 +1719,7 @@ static_gpsdlib = env.StaticLibrary(
- packet_ffi_objects = [env.SharedObject(s) for s in packet_ffi_extension]
- packet_ffi_shared = env.SharedLibrary(target="gpsdpacket",
- source=packet_ffi_objects,
-- SHLIBVERSION=libgps_version,
-+ SHLIBVERSION="%s" % ('${LIBgpsdpacket_VERSION}'),
- parse_flags=rtlibs + libgps_flags)
-
- env.Clean(libgps_shared, "gps_maskdump.c")
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/misc/gpsd/pkg/PLIST-main,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 PLIST-main
--- pkg/PLIST-main 14 Feb 2021 08:30:56 -0000 1.13
+++ pkg/PLIST-main 29 Jun 2021 22:22:53 -0000
@@ -6,13 +6,16 @@
bin/gegps
@bin bin/gps2udp
bin/gpscat
+bin/gpscsv
@bin bin/gpsctl
@bin bin/gpsdecode
bin/gpsfake
@bin bin/gpsmon
@bin bin/gpspipe
+bin/gpsplot
bin/gpsprof
@bin bin/gpsrinex
+bin/gpssubframe
@bin bin/gpxlogger
@bin bin/lcdgps
@bin bin/ntpshmmon
@@ -44,6 +47,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}misc.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}packet.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}packet.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}ubx.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}ubx.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}watch_options.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}watch_options.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gps/aiogps.py
@@ -53,19 +58,23 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/gps/gps.py
lib/python${MODPY_VERSION}/site-packages/gps/misc.py
lib/python${MODPY_VERSION}/site-packages/gps/packet.py
+lib/python${MODPY_VERSION}/site-packages/gps/ubx.py
lib/python${MODPY_VERSION}/site-packages/gps/watch_options.py
@man man/man1/cgps.1
@man man/man1/gegps.1
@man man/man1/gps.1
@man man/man1/gps2udp.1
@man man/man1/gpscat.1
+@man man/man1/gpscsv.1
@man man/man1/gpsctl.1
@man man/man1/gpsdecode.1
@man man/man1/gpsfake.1
@man man/man1/gpsmon.1
@man man/man1/gpspipe.1
+@man man/man1/gpsplot.1
@man man/man1/gpsprof.1
@man man/man1/gpsrinex.1
+@man man/man1/gpssubframe.1
@man man/man1/gpxlogger.1
@man man/man1/lcdgps.1
@man man/man1/ntpshmmon.1
@@ -75,7 +84,6 @@ lib/python${MODPY_VERSION}/site-packages
@man man/man3/libgps.3
@man man/man3/libgpsmm.3
@man man/man5/gpsd_json.5
-@man man/man5/srec.5
@man man/man8/gpsd.8
@man man/man8/gpsdctl.8
@man man/man8/gpsinit.8
On Sat, June 26, 2021 12:33, Landry Breuil wrote:
> Le Thu, Jun 24, 2021 at 11:02:04AM +0300, Kirill Bychkov a ?crit :
>> On Sun, June 6, 2021 21:24, Kirill Bychkov wrote:
>> > On Sun, May 23, 2021 20:48, Kirill Bychkov wrote:
>> >> On Fri, May 14, 2021 13:15, Kirill Bychkov wrote:
>> >>> Hi ports@,
>> >>> Attached is an update to gpsd. All consumers seems to be happy with it.
>> >>> OK? Comments?
>> >>
>> >> Ping.
>> >>
>> >>
>> > Ping
>>
>> Anyone?
>
> Reads good, but shouldnt patches/patch-SConstruct be also removed if the
> file was moved upstream to SConscript ?
>
> Landry

Yep. Missed cvs rm. Also reported by solene@
Fixed diff attached.
>