CVS commit: pkgsrc/geography/gpsd

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Mon Nov 14 14:07:34 UTC 2022

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

Log Message:
geography/gpsd: Catch up with ruby version changes

The pathname of asciidoctor changes when pkgsrc changes the default
ruby version.  Upstream gpsd has code to look for asciidoctorNN for
several NN, but not 31.  However, pkg_alternatives provides
asciidoctor which is found, making this not noticeable when building
on normal systems -- but of course bulk builds failed.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/geography/gpsd/distinfo
cvs rdiff -u -r1.6 -r1.7 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.36 pkgsrc/geography/gpsd/distinfo:1.37
--- pkgsrc/geography/gpsd/distinfo:1.36 Thu Apr 28 11:43:14 2022
+++ pkgsrc/geography/gpsd/distinfo      Mon Nov 14 14:07:34 2022
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.36 2022/04/28 11:43:14 gdt Exp $
+$NetBSD: distinfo,v 1.37 2022/11/14 14:07:34 gdt Exp $
 
 BLAKE2s (gpsd-3.24.tar.gz) = daaca7f934b778990bcb35882cfcb42c62b253137324d547febed2df5ed6bdf2
 SHA512 (gpsd-3.24.tar.gz) = 250bae709e19ac10421d5a537e68dcdf4c025071c152cf3c84a2f6977615bd7e445a45f3b1e5f3b64123fad3c11e1ec256bae5afc1b869f499b187116f8b028b
 Size (gpsd-3.24.tar.gz) = 5152429 bytes
-SHA1 (patch-SConscript) = 5d042bb9d6547c7f78ea8f37b1d12963d49584b6
+SHA1 (patch-SConscript) = 15d5e056b283ab3cf3ae2a35e43e17440372f71e

Index: pkgsrc/geography/gpsd/patches/patch-SConscript
diff -u pkgsrc/geography/gpsd/patches/patch-SConscript:1.6 pkgsrc/geography/gpsd/patches/patch-SConscript:1.7
--- pkgsrc/geography/gpsd/patches/patch-SConscript:1.6  Thu Apr 28 11:43:15 2022
+++ pkgsrc/geography/gpsd/patches/patch-SConscript      Mon Nov 14 14:07:34 2022
@@ -1,11 +1,28 @@
-$NetBSD: patch-SConscript,v 1.6 2022/04/28 11:43:15 gdt Exp $
+$NetBSD: patch-SConscript,v 1.7 2022/11/14 14:07:34 gdt Exp $
+
+Catch up with ruby default version changes.
+\todo Fix upstream.
 
 gpspipe requires libgpsd for serial.c cfmakeraw() compat.
 \todo Fix upstream?
 
---- SConscript.orig    2021-09-21 21:53:44.000000000 +0000
+--- SConscript.orig    2022-04-27 21:31:21.000000000 +0000
 +++ SConscript
-@@ -1930,7 +1930,7 @@ gpsmon = env.Program('gpsmon/gpsmon', gp
+@@ -1380,9 +1380,11 @@ 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('asciidoctor27')
++        adoc_prog = env.WhereIs('asciidoctor31')
++    if (not adoc_prog):
++        adoc_prog = env.WhereIs('asciidoctor30')
+     if (not adoc_prog):
+-        adoc_prog = env.WhereIs('asciidoctor26')
++        adoc_prog = env.WhereIs('asciidoctor27')
+ 
+     config.env['manbuild'] = config.env['manbuild'].lower()
+     if ((not config.env['manbuild'] or
+@@ -2018,7 +2020,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'],