CVS commit: pkgsrc/geography/gpsd

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Mar 11 22:26:47 UTC 2023

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

Log Message:
gpsd: fix build with ruby 3.2


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 pkgsrc/geography/gpsd/distinfo
cvs rdiff -u -r1.8 -r1.9 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/distinfo
diff -u pkgsrc/geography/gpsd/distinfo:1.38 pkgsrc/geography/gpsd/distinfo:1.39
--- pkgsrc/geography/gpsd/distinfo:1.38 Thu Mar  9 00:52:42 2023
+++ pkgsrc/geography/gpsd/distinfo      Sat Mar 11 22:26:47 2023
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.38 2023/03/09 00:52:42 gdt Exp $
+$NetBSD: distinfo,v 1.39 2023/03/11 22:26:47 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) = 38b427262e1aa45d8a52ce0fdc9a25b4ab7702d9
+SHA1 (patch-SConscript) = 8fe415535da85a4952ae59eab09d6053cc5395d6

Index: pkgsrc/geography/gpsd/patches/patch-SConscript
diff -u pkgsrc/geography/gpsd/patches/patch-SConscript:1.8 pkgsrc/geography/gpsd/patches/patch-SConscript:1.9
--- pkgsrc/geography/gpsd/patches/patch-SConscript:1.8  Thu Mar  9 00:52:42 2023
+++ pkgsrc/geography/gpsd/patches/patch-SConscript      Sat Mar 11 22:26:47 2023
@@ -1,4 +1,4 @@
-$NetBSD: patch-SConscript,v 1.8 2023/03/09 00:52:42 gdt Exp $
+$NetBSD: patch-SConscript,v 1.9 2023/03/11 22:26:47 wiz Exp $
 
 Catch up with ruby default version changes.
 \todo Fix upstream.
@@ -6,9 +6,18 @@ Catch up with ruby default version chang
 gpspipe requires libgpsd for serial.c cfmakeraw() compat.
 \todo Fix upstream?
 
---- SConscript.orig    2022-04-27 21:31:21.000000000 +0000
+--- SConscript.orig    2023-01-10 22:38:26.000000000 +0000
 +++ SConscript
-@@ -2018,7 +2020,7 @@ gpsmon = env.Program('gpsmon/gpsmon', gp
+@@ -1410,6 +1410,8 @@ 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('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
                       LIBS=[libgpsd_static, libgps_static],
                       parse_flags=gpsdflags + gpsflags + ncurseslibs)
  gpspipe = env.Program('clients/gpspipe', ['clients/gpspipe.c'],