diff options
| author | gdt <gdt@pkgsrc.org> | 2021-08-08 15:20:14 +0000 |
|---|---|---|
| committer | gdt <gdt@pkgsrc.org> | 2021-08-08 15:20:14 +0000 |
| commit | 47996d020c19c9d434e740cd70bfcfa4f2860d37 (patch) | |
| tree | e5ec63383e19966f4fac0f395526285b3e16b10f /geography | |
| parent | 23151d29bcdd21e38d04f4281152299180176153 (diff) | |
| download | pkgsrc-47996d020c19c9d434e740cd70bfcfa4f2860d37.tar.gz | |
gpsd: Add patch to use asciidoctor27 (in addition to asciidoctor26)
Diffstat (limited to 'geography')
| -rw-r--r-- | geography/gpsd/Makefile | 3 | ||||
| -rw-r--r-- | geography/gpsd/distinfo | 4 | ||||
| -rw-r--r-- | geography/gpsd/patches/patch-SConscript | 19 |
3 files changed, 20 insertions, 6 deletions
diff --git a/geography/gpsd/Makefile b/geography/gpsd/Makefile index bf1786466b1..959830cd566 100644 --- a/geography/gpsd/Makefile +++ b/geography/gpsd/Makefile @@ -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 diff --git a/geography/gpsd/distinfo b/geography/gpsd/distinfo index 5b6c86f1de7..e45ff6b51ff 100644 --- a/geography/gpsd/distinfo +++ b/geography/gpsd/distinfo @@ -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 diff --git a/geography/gpsd/patches/patch-SConscript b/geography/gpsd/patches/patch-SConscript index c5b4322a2ba..84ea5971e85 100644 --- a/geography/gpsd/patches/patch-SConscript +++ b/geography/gpsd/patches/patch-SConscript @@ -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'], |