CVS commit: pkgsrc/geography/gpsd

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Feb 10 14:29:28 UTC 2025

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

Log Message:
gpsd: handle ruby-3.4-versioned asciidoctor

Fixes build with Ruby 3.4.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/geography/gpsd/distinfo
cvs rdiff -u -r1.10 -r1.11 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.40 pkgsrc/geography/gpsd/distinfo:1.41
--- pkgsrc/geography/gpsd/distinfo:1.40 Fri Oct 11 14:01:48 2024
+++ pkgsrc/geography/gpsd/distinfo      Mon Feb 10 14:29:28 2025
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.40 2024/10/11 14:01:48 wiz Exp $
+$NetBSD: distinfo,v 1.41 2025/02/10 14:29:28 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) = 539414a2769511ba1691a6ccb6d5c0cf766180c2
+SHA1 (patch-SConscript) = 3d338ea2ffa3fc6d847d9dbae4d7f41d8cfa089b

Index: pkgsrc/geography/gpsd/patches/patch-SConscript
diff -u pkgsrc/geography/gpsd/patches/patch-SConscript:1.10 pkgsrc/geography/gpsd/patches/patch-SConscript:1.11
--- pkgsrc/geography/gpsd/patches/patch-SConscript:1.10 Fri Oct 11 14:01:48 2024
+++ pkgsrc/geography/gpsd/patches/patch-SConscript      Mon Feb 10 14:29:28 2025
@@ -1,6 +1,6 @@
-$NetBSD: patch-SConscript,v 1.10 2024/10/11 14:01:48 wiz Exp $
+$NetBSD: patch-SConscript,v 1.11 2025/02/10 14:29:28 wiz Exp $
 
-Support Ruby 3.2 and 3.3 versioned asciidoctor binaries.
+Support Ruby 3.2, 3.3, and 3.4 versioned asciidoctor binaries.
 https://gitlab.com/gpsd/gpsd/-/issues/302
 
 gpspipe requires libgpsd for serial.c cfmakeraw() compat.
@@ -8,10 +8,12 @@ gpspipe requires libgpsd for serial.c cf
 
 --- SConscript.orig    2023-01-10 22:38:26.000000000 +0000
 +++ SConscript
-@@ -1410,6 +1410,10 @@ if not cleaning and not helping:
+@@ -1410,6 +1410,12 @@ 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('asciidoctor34')
++    if (not adoc_prog):
 +        adoc_prog = env.WhereIs('asciidoctor33')
 +    if (not adoc_prog):
 +        adoc_prog = env.WhereIs('asciidoctor32')