Thu Aug 29 16:20:40 2019 UTC ()
Well actually ruby 22 and 25 both still install jquery.js.


(schmonz)
diff -r1.4 -r1.5 pkgsrc/textproc/ruby-xapian/Makefile
diff -r1.5 -r1.6 pkgsrc/textproc/ruby-xapian/PLIST
cvs diff -r1.4 -r1.5 pkgsrc/textproc/ruby-xapian/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/ruby-xapian/Makefile 2019/08/27 21:54:22 1.4
+++ pkgsrc/textproc/ruby-xapian/Makefile 2019/08/29 16:20:40 1.5
@@ -1,33 +1,37 @@ @@ -1,33 +1,37 @@
1# $NetBSD: Makefile,v 1.4 2019/08/27 21:54:22 schmonz Exp $ 1# $NetBSD: Makefile,v 1.5 2019/08/29 16:20:40 schmonz Exp $
2 2
3PKGNAME= ${RUBY_PKGPREFIX}-${PKGNAME_MODULE} 3PKGNAME= ${RUBY_PKGPREFIX}-${PKGNAME_MODULE}
4PKGREVISION= 1 4PKGREVISION= 1
5COMMENT= Ruby bindings for Xapian search engine 5COMMENT= Ruby bindings for Xapian search engine
6HOMEPAGE= https://xapian.org/docs/bindings/ruby/ 6HOMEPAGE= https://xapian.org/docs/bindings/ruby/
7 7
8CONFIGURE_ARGS+= --with-ruby 8CONFIGURE_ARGS+= --with-ruby
9CONFIGURE_ENV+= RDOC=${RDOC:Q} 9CONFIGURE_ENV+= RDOC=${RDOC:Q}
10MAKE_ENV+= RUBY_PKGPREFIX=${RUBY_PKGPREFIX:Q} 10MAKE_ENV+= RUBY_PKGPREFIX=${RUBY_PKGPREFIX:Q}
11 11
12REPLACE_RUBY= ruby/docs/examples/*.rb 12REPLACE_RUBY= ruby/docs/examples/*.rb
13 13
14RUBY_VERSIONS_ACCEPTED= 22 24 25 26 14RUBY_VERSIONS_ACCEPTED= 22 24 25 26
15 15
16PLIST_VARS+= oldruby newruby 16PLIST_VARS+= jquery oldruby newruby
17PLIST_SUBST+= XAPIAN_RDOC_PATH=${XAPIAN_RDOC_PATH:Q} 17PLIST_SUBST+= XAPIAN_RDOC_PATH=${XAPIAN_RDOC_PATH:Q}
18 18
19.include "../../lang/ruby/rubyversion.mk" 19.include "../../lang/ruby/rubyversion.mk"
20 20
 21.if ${RUBY_VER} == 22 || ${RUBY_VER} == 25
 22PLIST.jquery= yes
 23.endif
 24
21.if ${RUBY_VER} < 25 25.if ${RUBY_VER} < 25
22PLIST.oldruby= yes 26PLIST.oldruby= yes
23XAPIAN_RDOC_PATH= Xapian/Xapian 27XAPIAN_RDOC_PATH= Xapian/Xapian
24.else 28.else
25PLIST.newruby= yes 29PLIST.newruby= yes
26XAPIAN_RDOC_PATH= Xapian 30XAPIAN_RDOC_PATH= Xapian
27.endif 31.endif
28 32
29post-install: 33post-install:
30 ${CHMOD} +x ${DESTDIR}${PREFIX}/share/doc/xapian-bindings/${RUBY_PKGPREFIX}/examples/*.rb 34 ${CHMOD} +x ${DESTDIR}${PREFIX}/share/doc/xapian-bindings/${RUBY_PKGPREFIX}/examples/*.rb
31 35
32.include "../../lang/ruby/buildlink3.mk" 36.include "../../lang/ruby/buildlink3.mk"
33.include "../../lang/ruby/replace.mk" 37.include "../../lang/ruby/replace.mk"
cvs diff -r1.5 -r1.6 pkgsrc/textproc/ruby-xapian/PLIST (expand / switch to unified diff)

--- pkgsrc/textproc/ruby-xapian/PLIST 2019/08/29 14:26:26 1.5
+++ pkgsrc/textproc/ruby-xapian/PLIST 2019/08/29 16:20:40 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.5 2019/08/29 14:26:26 schmonz Exp $ 1@comment $NetBSD: PLIST,v 1.6 2019/08/29 16:20:40 schmonz Exp $
2${RUBY_SITEARCHLIB}/_xapian.a 2${RUBY_SITEARCHLIB}/_xapian.a
3${RUBY_SITEARCHLIB}/_xapian.${RUBY_DLEXT} 3${RUBY_SITEARCHLIB}/_xapian.${RUBY_DLEXT}
4${RUBY_SITELIB}/xapian.rb 4${RUBY_SITELIB}/xapian.rb
5share/doc/xapian-bindings/${RUBY_PKGPREFIX}/examples/simpleexpand.rb 5share/doc/xapian-bindings/${RUBY_PKGPREFIX}/examples/simpleexpand.rb
6share/doc/xapian-bindings/${RUBY_PKGPREFIX}/examples/simpleindex.rb 6share/doc/xapian-bindings/${RUBY_PKGPREFIX}/examples/simpleindex.rb
7share/doc/xapian-bindings/${RUBY_PKGPREFIX}/examples/simplematchdecider.rb 7share/doc/xapian-bindings/${RUBY_PKGPREFIX}/examples/simplematchdecider.rb
8share/doc/xapian-bindings/${RUBY_PKGPREFIX}/examples/simplesearch.rb 8share/doc/xapian-bindings/${RUBY_PKGPREFIX}/examples/simplesearch.rb
9share/doc/xapian-bindings/${RUBY_PKGPREFIX}/index.html 9share/doc/xapian-bindings/${RUBY_PKGPREFIX}/index.html
10share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian.html 10share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian.html
11${PLIST.oldruby}share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/Xapian.html 11${PLIST.oldruby}share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/Xapian.html
12share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/LatLongCoord.html 12share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/LatLongCoord.html
13share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/MultiValueKeyMaker.html 13share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/MultiValueKeyMaker.html
14share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/MultiValueKeyMaker/KeySpec.html 14share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/MultiValueKeyMaker/KeySpec.html
@@ -54,23 +54,22 @@ share/doc/xapian-bindings/${RUBY_PKGPREF @@ -54,23 +54,22 @@ share/doc/xapian-bindings/${RUBY_PKGPREF
54share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/page_green.png 54share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/page_green.png
55share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/page_white_text.png 55share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/page_white_text.png
56share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/page_white_width.png 56share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/page_white_width.png
57share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/plugin.png 57share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/plugin.png
58share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/ruby.png 58share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/ruby.png
59share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/tag_blue.png 59share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/tag_blue.png
60share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/tag_green.png 60share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/tag_green.png
61share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/transparent.png 61share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/transparent.png
62share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/wrench.png 62share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/wrench.png
63share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/wrench_orange.png 63share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/wrench_orange.png
64share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/zoom.png 64share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/zoom.png
65share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/index.html 65share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/index.html
66share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/js/darkfish.js 66share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/js/darkfish.js
67${PLIST.oldruby}share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/js/jquery.js 67${PLIST.jquery}share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/js/jquery.js
68share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/js/jquery.js 
69share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/js/navigation.js 68share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/js/navigation.js
70share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/js/navigation.js.gz 69share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/js/navigation.js.gz
71share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/js/search.js 70share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/js/search.js
72share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/js/search_index.js 71share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/js/search_index.js
73share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/js/search_index.js.gz 72share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/js/search_index.js.gz
74share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/js/searcher.js 73share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/js/searcher.js
75share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/js/searcher.js.gz 74share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/js/searcher.js.gz
76share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/table_of_contents.html 75share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/table_of_contents.html