CVS commit: pkgsrc/geography/gpsd

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Oct 11 14:01:48 UTC 2024

Modified Files:
        pkgsrc/geography/gpsd: Makefile distinfo
        pkgsrc/geography/gpsd/patches: patch-SConscript

Log Message:
gpsd: support Ruby 3.3

File bug report upstream, and refer to it.


To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 pkgsrc/geography/gpsd/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/geography/gpsd/distinfo
cvs rdiff -u -r1.9 -r1.10 pkgsrc/geography/gpsd/patches/patch-SConscript

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/geography/gpsd/Makefile
diff -u pkgsrc/geography/gpsd/Makefile:1.80 pkgsrc/geography/gpsd/Makefile:1.81
--- pkgsrc/geography/gpsd/Makefile:1.80 Mon May  6 08:40:26 2024
+++ pkgsrc/geography/gpsd/Makefile      Fri Oct 11 14:01:48 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.80 2024/05/06 08:40:26 jperkin Exp $
+# $NetBSD: Makefile,v 1.81 2024/10/11 14:01:48 wiz Exp $
 
 DISTNAME=      gpsd-3.25
 PKGREVISION=   8
@@ -20,7 +20,6 @@ USE_LIBTOOL=  yes
 USE_LANGUAGES= c99 c++
 
 PY_PATCHPLIST=                 yes
-PYTHON_VERSIONS_INCOMPATIBLE=  27 38
 
 # Note that gpsd is documented to use ncurses, not curses.
 FAKE_NCURSES=  yes

Index: pkgsrc/geography/gpsd/distinfo
diff -u pkgsrc/geography/gpsd/distinfo:1.39 pkgsrc/geography/gpsd/distinfo:1.40
--- pkgsrc/geography/gpsd/distinfo:1.39 Sat Mar 11 22:26:47 2023
+++ pkgsrc/geography/gpsd/distinfo      Fri Oct 11 14:01:48 2024
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.39 2023/03/11 22:26:47 wiz Exp $
+$NetBSD: distinfo,v 1.40 2024/10/11 14:01:48 wiz Exp $
 
 BLAKE2s (gpsd-3.25.tar.gz) = ac568df54726336209bf1a2d567a2a6fda727336ad4dde5fb44c37d7fb3ae192
 SHA512 (gpsd-3.25.tar.gz) = 0684cbd30defa1a328898589e1d61b2431462a774aff56c588bd00c1fbd92ac94cf6fc1f2b981debac78c34ab09fa24f48ed6334f3ecd09e6b8f5faa92ae1085
 Size (gpsd-3.25.tar.gz) = 5225194 bytes
-SHA1 (patch-SConscript) = 8fe415535da85a4952ae59eab09d6053cc5395d6
+SHA1 (patch-SConscript) = 539414a2769511ba1691a6ccb6d5c0cf766180c2

Index: pkgsrc/geography/gpsd/patches/patch-SConscript
diff -u pkgsrc/geography/gpsd/patches/patch-SConscript:1.9 pkgsrc/geography/gpsd/patches/patch-SConscript:1.10
--- pkgsrc/geography/gpsd/patches/patch-SConscript:1.9  Sat Mar 11 22:26:47 2023
+++ pkgsrc/geography/gpsd/patches/patch-SConscript      Fri Oct 11 14:01:48 2024
@@ -1,23 +1,25 @@
-$NetBSD: patch-SConscript,v 1.9 2023/03/11 22:26:47 wiz Exp $
+$NetBSD: patch-SConscript,v 1.10 2024/10/11 14:01:48 wiz Exp $
 
-Catch up with ruby default version changes.
-\todo Fix upstream.
+Support Ruby 3.2 and 3.3 versioned asciidoctor binaries.
+https://gitlab.com/gpsd/gpsd/-/issues/302
 
 gpspipe requires libgpsd for serial.c cfmakeraw() compat.
 \todo Fix upstream?
 
 --- SConscript.orig    2023-01-10 22:38:26.000000000 +0000
 +++ SConscript
-@@ -1410,6 +1410,8 @@ if not cleaning and not helping:
+@@ -1410,6 +1410,10 @@ if not cleaning and not helping:
      # do we have asciidoctor, perhaps versioned?
      adoc_prog = env.WhereIs('asciidoctor')
      if (not adoc_prog):
++        adoc_prog = env.WhereIs('asciidoctor33')
++    if (not adoc_prog):
 +        adoc_prog = env.WhereIs('asciidoctor32')
 +    if (not adoc_prog):
          adoc_prog = env.WhereIs('asciidoctor31')
      if (not adoc_prog):
          adoc_prog = env.WhereIs('asciidoctor30')
-@@ -2054,7 +2056,7 @@ gpsmon = env.Program('gpsmon/gpsmon', gp
+@@ -2054,7 +2058,7 @@ gpsmon = env.Program('gpsmon/gpsmon', gp
                       LIBS=[libgpsd_static, libgps_static],
                       parse_flags=gpsdflags + gpsflags + ncurseslibs)
  gpspipe = env.Program('clients/gpspipe', ['clients/gpspipe.c'],