Tue Nov 9 11:51:11 2021 UTC ()
gpsd: Properly detect and honor the user's preferred Ruby version.


(nia)
diff -r1.59 -r1.60 pkgsrc/geography/gpsd/Makefile
diff -r1.33 -r1.34 pkgsrc/geography/gpsd/distinfo
diff -r1.3 -r1.4 pkgsrc/geography/gpsd/patches/patch-SConscript
cvs diff -r1.59 -r1.60 pkgsrc/geography/gpsd/Makefile (expand / switch to unified diff)

--- pkgsrc/geography/gpsd/Makefile 2021/09/28 00:16:08 1.59
+++ pkgsrc/geography/gpsd/Makefile 2021/11/09 11:51:11 1.60
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.59 2021/09/28 00:16:08 gdt Exp $ 1# $NetBSD: Makefile,v 1.60 2021/11/09 11:51:11 nia Exp $
2 2
3DISTNAME= gpsd-3.23.1 3DISTNAME= gpsd-3.23.1
4CATEGORIES= geography 4CATEGORIES= geography
5MASTER_SITES= http://download-mirror.savannah.gnu.org/releases/gpsd/ 5MASTER_SITES= http://download-mirror.savannah.gnu.org/releases/gpsd/
6# will probably switch to https://gitlab.com/gpsd/gpsd/releases 6# will probably switch to https://gitlab.com/gpsd/gpsd/releases
7 7
8MAINTAINER= gdt@NetBSD.org 8MAINTAINER= gdt@NetBSD.org
9HOMEPAGE= https://gpsd.io/ 9HOMEPAGE= https://gpsd.io/
10COMMENT= GPS information daemon 10COMMENT= GPS information daemon
11 11
12LICENSE= modified-bsd 12LICENSE= modified-bsd
13 13
14PY_PATCHPLIST= yes 14PY_PATCHPLIST= yes
@@ -73,27 +73,33 @@ do-test: @@ -73,27 +73,33 @@ do-test:
73 check 73 check
74 74
75.include "../../mk/bsd.prefs.mk" 75.include "../../mk/bsd.prefs.mk"
76.if ${OPSYS} == "Darwin" 76.if ${OPSYS} == "Darwin"
77PLIST_SUBST+= PLIST_SO= 77PLIST_SUBST+= PLIST_SO=
78PLIST_SUBST+= PLIST_DYLIB=.dylib 78PLIST_SUBST+= PLIST_DYLIB=.dylib
79.else 79.else
80PLIST_SUBST+= PLIST_SO=.so 80PLIST_SUBST+= PLIST_SO=.so
81PLIST_SUBST+= PLIST_DYLIB= 81PLIST_SUBST+= PLIST_DYLIB=
82.endif 82.endif
83 83
84# \todo Consider not including this and using the pre-built man pages. 84# \todo Consider not including this and using the pre-built man pages.
85.include "../../lang/ruby/rubyversion.mk" 85.include "../../lang/ruby/rubyversion.mk"
86BUILD_DEPENDS+= ${RUBY_PKGPREFIX}-asciidoctor>=2.0.0:../../textproc/ruby-asciidoctor 86TOOL_DEPENDS+= ${RUBY_PKGPREFIX}-asciidoctor>=2.0.0:../../textproc/ruby-asciidoctor
 87
 88SUBST_CLASSES+= ad
 89SUBST_STAGE.ad= pre-build
 90SUBST_MESSAGE.ad= Correcting the asciidoctor binary name.
 91SUBST_FILES.ad+= SConscript
 92SUBST_SED.ad+= -e "s,asciidoctor26,asciidoctor${RUBY_SUFFIX},g"
87 93
88# \todo Change to TOOLS or BUILD_DEPENDS after scons support is improved. 94# \todo Change to TOOLS or BUILD_DEPENDS after scons support is improved.
89.include "../../devel/scons/buildlink3.mk" 95.include "../../devel/scons/buildlink3.mk"
90 96
91.include "../../devel/libusb1/buildlink3.mk" 97.include "../../devel/libusb1/buildlink3.mk"
92.include "../../graphics/py-cairo/buildlink3.mk" 98.include "../../graphics/py-cairo/buildlink3.mk"
93.include "../../lang/python/extension.mk" 99.include "../../lang/python/extension.mk"
94.include "../../x11/gtk3/buildlink3.mk" 100.include "../../x11/gtk3/buildlink3.mk"
95# \todo Resolve mk/curses not invoking ncurses builtin processing. 101# \todo Resolve mk/curses not invoking ncurses builtin processing.
96# For now, include the ncurses package directly. 102# For now, include the ncurses package directly.
97.include "../../devel/ncurses/buildlink3.mk" 103.include "../../devel/ncurses/buildlink3.mk"
98#.include "../../mk/curses.buildlink3.mk" 104#.include "../../mk/curses.buildlink3.mk"
99.include "../../mk/pthread.buildlink3.mk" 105.include "../../mk/pthread.buildlink3.mk"
cvs diff -r1.33 -r1.34 pkgsrc/geography/gpsd/distinfo (expand / switch to unified diff)

--- pkgsrc/geography/gpsd/distinfo 2021/10/26 10:45:10 1.33
+++ pkgsrc/geography/gpsd/distinfo 2021/11/09 11:51:11 1.34
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.33 2021/10/26 10:45:10 nia Exp $ 1$NetBSD: distinfo,v 1.34 2021/11/09 11:51:11 nia Exp $
2 2
3BLAKE2s (gpsd-3.23.1.tar.gz) = 1f5ecdc768d95f384055cdb564f292a289c250552911b6822ef1a09e420ffda1 3BLAKE2s (gpsd-3.23.1.tar.gz) = 1f5ecdc768d95f384055cdb564f292a289c250552911b6822ef1a09e420ffda1
4SHA512 (gpsd-3.23.1.tar.gz) = fccfac363103282581e4ea8236ce40e4600a01f02489c1aaec721a13deac556bac046a3b76f8a5e21fe8c736056e872d8c7f2e4ed2d38a164323dd9738f00388 4SHA512 (gpsd-3.23.1.tar.gz) = fccfac363103282581e4ea8236ce40e4600a01f02489c1aaec721a13deac556bac046a3b76f8a5e21fe8c736056e872d8c7f2e4ed2d38a164323dd9738f00388
5Size (gpsd-3.23.1.tar.gz) = 4904121 bytes 5Size (gpsd-3.23.1.tar.gz) = 4904121 bytes
6SHA1 (patch-SConscript) = 93da56bc5158016c38fede6626ca5f32091432ce 6SHA1 (patch-SConscript) = 5d042bb9d6547c7f78ea8f37b1d12963d49584b6
cvs diff -r1.3 -r1.4 pkgsrc/geography/gpsd/patches/patch-SConscript (expand / switch to unified diff)

--- pkgsrc/geography/gpsd/patches/patch-SConscript 2021/08/08 15:20:14 1.3
+++ pkgsrc/geography/gpsd/patches/patch-SConscript 2021/11/09 11:51:11 1.4
@@ -1,28 +1,16 @@ @@ -1,28 +1,16 @@
1$NetBSD: patch-SConscript,v 1.3 2021/08/08 15:20:14 gdt Exp $ 1$NetBSD: patch-SConscript,v 1.4 2021/11/09 11:51:11 nia Exp $
2 
3Search for asciidoctor from ruby27 also. 
4\todo Apply upstream. 
5 2
6gpspipe requires libgpsd for serial.c cfmakeraw() compat. 3gpspipe requires libgpsd for serial.c cfmakeraw() compat.
7\todo Fix upstream? 4\todo Fix upstream?
8 5
9--- SConscript.orig 2021-08-05 22:14:52.000000000 +0000 6--- SConscript.orig 2021-09-21 21:53:44.000000000 +0000
10+++ SConscript 7+++ SConscript
11@@ -1308,6 +1308,8 @@ if not cleaning and not helping: 8@@ -1930,7 +1930,7 @@ gpsmon = env.Program('gpsmon/gpsmon', gp
12 # do we have asciidoctor, perhaps versioned? 
13 adoc_prog = env.WhereIs('asciidoctor') 
14 if (not adoc_prog): 
15+ adoc_prog = env.WhereIs('asciidoctor27') 
16+ if (not adoc_prog): 
17 adoc_prog = env.WhereIs('asciidoctor26') 
18  
19 config.env['manbuild'] = config.env['manbuild'].lower() 
20@@ -1901,7 +1903,7 @@ gpsmon = env.Program('gpsmon/gpsmon', gp 
21 LIBS=[libgpsd_static, libgps_static], 9 LIBS=[libgpsd_static, libgps_static],
22 parse_flags=gpsdflags + gpsflags + ncurseslibs) 10 parse_flags=gpsdflags + gpsflags + ncurseslibs)
23 gpspipe = env.Program('clients/gpspipe', ['clients/gpspipe.c'], 11 gpspipe = env.Program('clients/gpspipe', ['clients/gpspipe.c'],
24- LIBS=[libgps_static], 12- LIBS=[libgps_static],
25+ LIBS=[libgpsd_static, libgps_static], 13+ LIBS=[libgpsd_static, libgps_static],
26 parse_flags=gpsflags) 14 parse_flags=gpsflags)
27 gpsrinex = env.Program('clients/gpsrinex', ['clients/gpsrinex.c'], 15 gpsrinex = env.Program('clients/gpsrinex', ['clients/gpsrinex.c'],
28 LIBS=[libgps_static], 16 LIBS=[libgps_static],