diff options
| author | nia <nia@pkgsrc.org> | 2021-11-09 11:51:11 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2021-11-09 11:51:11 +0000 |
| commit | 63027357c06c67a5a5cff0b1ae74bb0105166440 (patch) | |
| tree | 2c2c0d4f0faa15ff448bba01c6cd3d7a8f7848e7 /geography | |
| parent | b5b3c9e9c5a512e7786af057adf422f9479b1a96 (diff) | |
| download | pkgsrc-63027357c06c67a5a5cff0b1ae74bb0105166440.tar.gz | |
gpsd: Properly detect and honor the user's preferred Ruby version.
Diffstat (limited to 'geography')
| -rw-r--r-- | geography/gpsd/Makefile | 10 | ||||
| -rw-r--r-- | geography/gpsd/distinfo | 4 | ||||
| -rw-r--r-- | geography/gpsd/patches/patch-SConscript | 18 |
3 files changed, 13 insertions, 19 deletions
diff --git a/geography/gpsd/Makefile b/geography/gpsd/Makefile index 78bef7aa124..c6bc2ec8bf5 100644 --- a/geography/gpsd/Makefile +++ b/geography/gpsd/Makefile @@ -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" diff --git a/geography/gpsd/distinfo b/geography/gpsd/distinfo index b19237bb6c9..3fddbe9c270 100644 --- a/geography/gpsd/distinfo +++ b/geography/gpsd/distinfo @@ -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 diff --git a/geography/gpsd/patches/patch-SConscript b/geography/gpsd/patches/patch-SConscript index 84ea5971e85..de6dc8edd0b 100644 --- a/geography/gpsd/patches/patch-SConscript +++ b/geography/gpsd/patches/patch-SConscript @@ -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'], |