Sat Sep 24 19:07:20 2022 UTC ()
Remove conditional-logic remnants for older Ruby versions no longer in pkgsrc.


(schmonz)
diff -r1.9 -r1.10 pkgsrc/textproc/ruby-xapian/Makefile
diff -r1.7 -r1.8 pkgsrc/textproc/ruby-xapian/PLIST
cvs diff -r1.9 -r1.10 pkgsrc/textproc/ruby-xapian/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/ruby-xapian/Makefile 2022/01/14 16:00:16 1.9
+++ pkgsrc/textproc/ruby-xapian/Makefile 2022/09/24 19:07:20 1.10
@@ -1,27 +1,19 @@ @@ -1,27 +1,19 @@
1# $NetBSD: Makefile,v 1.9 2022/01/14 16:00:16 taca Exp $ 1# $NetBSD: Makefile,v 1.10 2022/09/24 19:07:20 schmonz Exp $
2 2
3PKGNAME= ${RUBY_PKGPREFIX}-${PKGNAME_MODULE} 3PKGNAME= ${RUBY_PKGPREFIX}-${PKGNAME_MODULE}
4COMMENT= Ruby bindings for Xapian search engine 4COMMENT= Ruby bindings for Xapian search engine
5HOMEPAGE= https://xapian.org/docs/bindings/ruby/ 5HOMEPAGE= https://xapian.org/docs/bindings/ruby/
6 6
7CONFIGURE_ARGS+= --with-ruby 7CONFIGURE_ARGS+= --with-ruby
8CONFIGURE_ENV+= RDOC=${RDOC:Q} 8CONFIGURE_ENV+= RDOC=${RDOC:Q}
9MAKE_ENV+= RUBY_PKGPREFIX=${RUBY_PKGPREFIX:Q} 9MAKE_ENV+= RUBY_PKGPREFIX=${RUBY_PKGPREFIX:Q}
10 10
11REPLACE_RUBY= ruby/docs/examples/*.rb 11REPLACE_RUBY= ruby/docs/examples/*.rb
12 12
13PLIST_VARS+= oldruby newruby 
14PLIST_SUBST+= XAPIAN_RDOC_PATH=${XAPIAN_RDOC_PATH:Q} 
15 
16.include "../../lang/ruby/rubyversion.mk" 
17 
18PLIST.newruby= yes 
19XAPIAN_RDOC_PATH= Xapian 
20 
21post-install: 13post-install:
22 ${CHMOD} +x ${DESTDIR}${PREFIX}/share/doc/xapian-bindings/${RUBY_PKGPREFIX}/examples/*.rb 14 ${CHMOD} +x ${DESTDIR}${PREFIX}/share/doc/xapian-bindings/${RUBY_PKGPREFIX}/examples/*.rb
23 15
24.include "../../lang/ruby/buildlink3.mk" 16.include "../../lang/ruby/buildlink3.mk"
25.include "../../lang/ruby/replace.mk" 17.include "../../lang/ruby/replace.mk"
26.include "../../textproc/xapian/module.mk" 18.include "../../textproc/xapian/module.mk"
27.include "../../mk/bsd.pkg.mk" 19.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/textproc/ruby-xapian/PLIST (expand / switch to unified diff)

--- pkgsrc/textproc/ruby-xapian/PLIST 2019/12/25 14:29:24 1.7
+++ pkgsrc/textproc/ruby-xapian/PLIST 2022/09/24 19:07:20 1.8
@@ -1,43 +1,40 @@ @@ -1,43 +1,40 @@
1@comment $NetBSD: PLIST,v 1.7 2019/12/25 14:29:24 schmonz Exp $ 1@comment $NetBSD: PLIST,v 1.8 2022/09/24 19:07:20 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 
12share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/LatLongCoord.html 11share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/LatLongCoord.html
13share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/MultiValueKeyMaker.html 12share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/MultiValueKeyMaker.html
14share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/MultiValueKeyMaker/KeySpec.html 13share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/MultiValueKeyMaker/KeySpec.html
15share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/${XAPIAN_RDOC_PATH}/Database.html 14share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/Database.html
16share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/${XAPIAN_RDOC_PATH}/Document.html 15share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/Document.html
17share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/${XAPIAN_RDOC_PATH}/ESet.html 16share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/ESet.html
18share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/${XAPIAN_RDOC_PATH}/Enquire.html 17share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/Enquire.html
19share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/${XAPIAN_RDOC_PATH}/ExpandTerm.html 18share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/ExpandTerm.html
20share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/${XAPIAN_RDOC_PATH}/LatLongCoords.html 19share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/LatLongCoords.html
21share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/${XAPIAN_RDOC_PATH}/MSet.html 20share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/MSet.html
22share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/${XAPIAN_RDOC_PATH}/Match.html 21share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/Match.html
23share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/${XAPIAN_RDOC_PATH}/Posting.html 22share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/Posting.html
24share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/${XAPIAN_RDOC_PATH}/Query.html 23share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/Query.html
25share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/${XAPIAN_RDOC_PATH}/QueryParser.html 24share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/QueryParser.html
26${PLIST.oldruby}share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/Xapian/Xapian.html 25share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/Term.html
27${PLIST.oldruby}share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/Xapian/Xapian/Term.html 26share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/Value.html
28${PLIST.newruby}share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/Term.html 27share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/ValueCountMatchSpy.html
29share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/${XAPIAN_RDOC_PATH}/Value.html 
30share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/${XAPIAN_RDOC_PATH}/ValueCountMatchSpy.html 
31share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/created.rid 28share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/created.rid
32share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/css/fonts.css 29share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/css/fonts.css
33share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/css/rdoc.css 30share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/css/rdoc.css
34share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/fonts/Lato-Light.ttf 31share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/fonts/Lato-Light.ttf
35share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/fonts/Lato-LightItalic.ttf 32share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/fonts/Lato-LightItalic.ttf
36share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/fonts/Lato-Regular.ttf 33share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/fonts/Lato-Regular.ttf
37share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/fonts/Lato-RegularItalic.ttf 34share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/fonts/Lato-RegularItalic.ttf
38share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/fonts/SourceCodePro-Bold.ttf 35share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/fonts/SourceCodePro-Bold.ttf
39share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/fonts/SourceCodePro-Regular.ttf 36share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/fonts/SourceCodePro-Regular.ttf
40share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/add.png 37share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/add.png
41share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/arrow_up.png 38share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/arrow_up.png
42share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/brick.png 39share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/brick.png
43share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/brick_link.png 40share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/brick_link.png