CVS commit: pkgsrc/geography/gpsd

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Nov  9 11:51:11 UTC 2021

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

Log Message:
gpsd: Properly detect and honor the user's preferred Ruby version.


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 pkgsrc/geography/gpsd/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/geography/gpsd/distinfo
cvs rdiff -u -r1.3 -r1.4 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.59 pkgsrc/geography/gpsd/Makefile:1.60
--- pkgsrc/geography/gpsd/Makefile:1.59 Tue Sep 28 00:16:08 2021
+++ pkgsrc/geography/gpsd/Makefile      Tue Nov  9 11:51:11 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2021/09/28 00:16:08 gdt Exp $
+# $NetBSD: Makefile,v 1.60 2021/11/09 11:51:11 nia Exp $
 
 DISTNAME=      gpsd-3.23.1
 CATEGORIES=    geography
@@ -83,7 +83,13 @@ PLIST_SUBST+=        PLIST_DYLIB=
 
 # \todo Consider not including this and using the pre-built man pages.
 .include "../../lang/ruby/rubyversion.mk"
-BUILD_DEPENDS+=        ${RUBY_PKGPREFIX}-asciidoctor>=2.0.0:../../textproc/ruby-asciidoctor
+TOOL_DEPENDS+= ${RUBY_PKGPREFIX}-asciidoctor>=2.0.0:../../textproc/ruby-asciidoctor
+
+SUBST_CLASSES+=                ad
+SUBST_STAGE.ad=                pre-build
+SUBST_MESSAGE.ad=      Correcting the asciidoctor binary name.
+SUBST_FILES.ad+=       SConscript
+SUBST_SED.ad+=         -e "s,asciidoctor26,asciidoctor${RUBY_SUFFIX},g"
 
 # \todo Change to TOOLS or BUILD_DEPENDS after scons support is improved.
 .include "../../devel/scons/buildlink3.mk"

Index: pkgsrc/geography/gpsd/distinfo
diff -u pkgsrc/geography/gpsd/distinfo:1.33 pkgsrc/geography/gpsd/distinfo:1.34
--- pkgsrc/geography/gpsd/distinfo:1.33 Tue Oct 26 10:45:10 2021
+++ pkgsrc/geography/gpsd/distinfo      Tue Nov  9 11:51:11 2021
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.33 2021/10/26 10:45:10 nia Exp $
+$NetBSD: distinfo,v 1.34 2021/11/09 11:51:11 nia Exp $
 
 BLAKE2s (gpsd-3.23.1.tar.gz) = 1f5ecdc768d95f384055cdb564f292a289c250552911b6822ef1a09e420ffda1
 SHA512 (gpsd-3.23.1.tar.gz) = fccfac363103282581e4ea8236ce40e4600a01f02489c1aaec721a13deac556bac046a3b76f8a5e21fe8c736056e872d8c7f2e4ed2d38a164323dd9738f00388
 Size (gpsd-3.23.1.tar.gz) = 4904121 bytes
-SHA1 (patch-SConscript) = 93da56bc5158016c38fede6626ca5f32091432ce
+SHA1 (patch-SConscript) = 5d042bb9d6547c7f78ea8f37b1d12963d49584b6

Index: pkgsrc/geography/gpsd/patches/patch-SConscript
diff -u pkgsrc/geography/gpsd/patches/patch-SConscript:1.3 pkgsrc/geography/gpsd/patches/patch-SConscript:1.4
--- pkgsrc/geography/gpsd/patches/patch-SConscript:1.3  Sun Aug  8 15:20:14 2021
+++ pkgsrc/geography/gpsd/patches/patch-SConscript      Tue Nov  9 11:51:11 2021
@@ -1,23 +1,11 @@
-$NetBSD: patch-SConscript,v 1.3 2021/08/08 15:20:14 gdt Exp $
-
-Search for asciidoctor from ruby27 also.
-\todo Apply upstream.
+$NetBSD: patch-SConscript,v 1.4 2021/11/09 11:51:11 nia Exp $
 
 gpspipe requires libgpsd for serial.c cfmakeraw() compat.
 \todo Fix upstream?
 
---- SConscript.orig    2021-08-05 22:14:52.000000000 +0000
+--- SConscript.orig    2021-09-21 21:53:44.000000000 +0000
 +++ SConscript
-@@ -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
+@@ -1930,7 +1930,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'],