CVS commit: pkgsrc/geography/gpsd

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

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sun Aug  8 15:20:14 UTC 2021

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

Log Message:
gpsd: Add patch to use asciidoctor27 (in addition to asciidoctor26)


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 pkgsrc/geography/gpsd/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/geography/gpsd/distinfo
cvs rdiff -u -r1.2 -r1.3 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.56 pkgsrc/geography/gpsd/Makefile:1.57
--- pkgsrc/geography/gpsd/Makefile:1.56 Sat Aug  7 23:22:48 2021
+++ pkgsrc/geography/gpsd/Makefile      Sun Aug  8 15:20:14 2021
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.56 2021/08/07 23:22:48 gdt Exp $
+# $NetBSD: Makefile,v 1.57 2021/08/08 15:20:14 gdt Exp $
 
 DISTNAME=      gpsd-3.23
+PKGREVISION=   1
 CATEGORIES=    geography
 MASTER_SITES=  http://download-mirror.savannah.gnu.org/releases/gpsd/
 # will probably switch to https://gitlab.com/gpsd/gpsd/releases

Index: pkgsrc/geography/gpsd/distinfo
diff -u pkgsrc/geography/gpsd/distinfo:1.29 pkgsrc/geography/gpsd/distinfo:1.30
--- pkgsrc/geography/gpsd/distinfo:1.29 Sat Aug  7 23:22:48 2021
+++ pkgsrc/geography/gpsd/distinfo      Sun Aug  8 15:20:14 2021
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.29 2021/08/07 23:22:48 gdt Exp $
+$NetBSD: distinfo,v 1.30 2021/08/08 15:20:14 gdt Exp $
 
 SHA1 (gpsd-3.23.tar.gz) = 46fbc05944fbb55632cdb16ca211d32a0be3a189
 RMD160 (gpsd-3.23.tar.gz) = b0047925a21c859f4a2e65ca1712a0c78f9e2cfc
 SHA512 (gpsd-3.23.tar.gz) = 967cc9801271418023630df02b457b76108968992151f6e80b569e99b856bd79cc3d0369d2088f3bc609b2ab22b29dba87639bf466bf262ab80b2b3f04055f8b
 Size (gpsd-3.23.tar.gz) = 4893363 bytes
-SHA1 (patch-SConscript) = d26f5fcdea8ad78da06ea85b7d35a6eb01fff434
+SHA1 (patch-SConscript) = 93da56bc5158016c38fede6626ca5f32091432ce

Index: pkgsrc/geography/gpsd/patches/patch-SConscript
diff -u pkgsrc/geography/gpsd/patches/patch-SConscript:1.2 pkgsrc/geography/gpsd/patches/patch-SConscript:1.3
--- pkgsrc/geography/gpsd/patches/patch-SConscript:1.2  Sat Aug  7 23:22:48 2021
+++ pkgsrc/geography/gpsd/patches/patch-SConscript      Sun Aug  8 15:20:14 2021
@@ -1,10 +1,23 @@
-$NetBSD: patch-SConscript,v 1.2 2021/08/07 23:22:48 gdt Exp $
+$NetBSD: patch-SConscript,v 1.3 2021/08/08 15:20:14 gdt Exp $
+
+Search for asciidoctor from ruby27 also.
+\todo Apply upstream.
 
 gpspipe requires libgpsd for serial.c cfmakeraw() compat.
+\todo Fix upstream?
 
---- SConscript.orig    2021-07-31 00:09:29.000000000 +0000
+--- SConscript.orig    2021-08-05 22:14:52.000000000 +0000
 +++ SConscript
-@@ -1901,7 +1901,7 @@ gpsmon = env.Program('gpsmon/gpsmon', gp
+@@ -1308,6 +1308,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('asciidoctor27')
++    if (not adoc_prog):
+         adoc_prog = env.WhereIs('asciidoctor26')
+ 
+     config.env['manbuild'] = config.env['manbuild'].lower()
+@@ -1901,7 +1903,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'],