Match PLIST to reality. Tested on macOS with ruby 22, 24, 25, 26.

While here, actually do REPLACE_RUBY. Bump PKGREVISION.

2 files changed, 36 insertions, 18 deletions

diff --git a/textproc/ruby-xapian/Makefile b/textproc/ruby-xapian/Makefile
index 00e784962f4..b1e41ce3adc 100644
--- a/textproc/ruby-xapian/Makefile
+++ b/textproc/ruby-xapian/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2018/07/06 16:23:12 schmonz Exp $
+# $NetBSD: Makefile,v 1.4 2019/08/27 21:54:22 schmonz Exp $
 
 PKGNAME=		${RUBY_PKGPREFIX}-${PKGNAME_MODULE}
+PKGREVISION=		1
 COMMENT=		Ruby bindings for Xapian search engine
 HOMEPAGE=		https://xapian.org/docs/bindings/ruby/
 
@@ -10,9 +11,25 @@ MAKE_ENV+=		RUBY_PKGPREFIX=${RUBY_PKGPREFIX:Q}
 
 REPLACE_RUBY=		ruby/docs/examples/*.rb
 
+RUBY_VERSIONS_ACCEPTED=	22 24 25 26
+
+PLIST_VARS+=		oldruby newruby
+PLIST_SUBST+=		XAPIAN_RDOC_PATH=${XAPIAN_RDOC_PATH:Q}
+
+.include "../../lang/ruby/rubyversion.mk"
+
+.if ${RUBY_VER} < 25
+PLIST.oldruby=		yes
+XAPIAN_RDOC_PATH=	Xapian/Xapian
+.else
+PLIST.newruby=		yes
+XAPIAN_RDOC_PATH=	Xapian
+.endif
+
 post-install:
 	${CHMOD} +x ${DESTDIR}${PREFIX}/share/doc/xapian-bindings/${RUBY_PKGPREFIX}/examples/*.rb
 
 .include "../../lang/ruby/buildlink3.mk"
+.include "../../lang/ruby/replace.mk"
 .include "../../textproc/xapian/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ruby-xapian/PLIST b/textproc/ruby-xapian/PLIST
index c3a5e0dc073..cefbaf342d1 100644
--- a/textproc/ruby-xapian/PLIST
+++ b/textproc/ruby-xapian/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2019/08/02 21:28:53 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.4 2019/08/27 21:54:22 schmonz Exp $
 ${RUBY_SITEARCHLIB}/_xapian.a
 ${RUBY_SITEARCHLIB}/_xapian.${RUBY_DLEXT}
 ${RUBY_SITELIB}/xapian.rb
@@ -8,25 +8,26 @@ share/doc/xapian-bindings/${RUBY_PKGPREFIX}/examples/simplematchdecider.rb
 share/doc/xapian-bindings/${RUBY_PKGPREFIX}/examples/simplesearch.rb
 share/doc/xapian-bindings/${RUBY_PKGPREFIX}/index.html
 share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian.html
+${PLIST.oldruby}share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/Xapian.html
 share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/LatLongCoord.html
 share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/MultiValueKeyMaker.html
 share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/MultiValueKeyMaker/KeySpec.html
-share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/Xapian.html
-share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/Xapian/Database.html
-share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/Xapian/Document.html
-share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/Xapian/ESet.html
-share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/Xapian/Enquire.html
-share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/Xapian/ExpandTerm.html
-share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/Xapian/LatLongCoords.html
-share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/Xapian/MSet.html
-share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/Xapian/Match.html
-share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/Xapian/Posting.html
-share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/Xapian/Query.html
-share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/Xapian/QueryParser.html
-share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/Xapian/Value.html
-share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/Xapian/ValueCountMatchSpy.html
-share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/Xapian/Xapian.html
-share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/Xapian/Xapian/Term.html
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/${XAPIAN_RDOC_PATH}/Database.html
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/${XAPIAN_RDOC_PATH}/Document.html
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/${XAPIAN_RDOC_PATH}/ESet.html
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/${XAPIAN_RDOC_PATH}/Enquire.html
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/${XAPIAN_RDOC_PATH}/ExpandTerm.html
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/${XAPIAN_RDOC_PATH}/LatLongCoords.html
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/${XAPIAN_RDOC_PATH}/MSet.html
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/${XAPIAN_RDOC_PATH}/Match.html
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/${XAPIAN_RDOC_PATH}/Posting.html
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/${XAPIAN_RDOC_PATH}/Query.html
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/${XAPIAN_RDOC_PATH}/QueryParser.html
+${PLIST.oldruby}share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/Xapian/Xapian.html
+${PLIST.oldruby}share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/Xapian/Xapian/Term.html
+${PLIST.newruby}share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/Xapian/Term.html
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/${XAPIAN_RDOC_PATH}/Value.html
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/${XAPIAN_RDOC_PATH}/ValueCountMatchSpy.html
 share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/created.rid
 share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/css/fonts.css
 share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/css/rdoc.css