[pkgsrc/trunk]: pkgsrc/textproc Specify path to rdoc. Avoid CONFLICTS. Bump P...

[schmonz <schmonz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/54d6a76a12ab
branches:  trunk
changeset: 366078:54d6a76a12ab
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Wed Aug 02 04:42:23 2017 +0000

description:
Specify path to rdoc. Avoid CONFLICTS. Bump PKGREVISION.

diffstat:

 textproc/ruby-xapian/Makefile                           |    7 +-
 textproc/ruby-xapian/PLIST                              |  130 ++++++++-------
 textproc/xapian/distinfo-bindings                       |    3 +-
 textproc/xapian/patches-bindings/patch-ruby_Makefile.in |   23 ++
 4 files changed, 100 insertions(+), 63 deletions(-)

diffs (201 lines):

diff -r acf34f783fcb -r 54d6a76a12ab textproc/ruby-xapian/Makefile
--- a/textproc/ruby-xapian/Makefile     Wed Aug 02 03:56:42 2017 +0000
+++ b/textproc/ruby-xapian/Makefile     Wed Aug 02 04:42:23 2017 +0000
@@ -1,15 +1,18 @@
-# $NetBSD: Makefile,v 1.1 2017/07/10 17:34:04 schmonz Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/02 04:42:23 schmonz Exp $
 
 PKGNAME=               ${RUBY_PKGPREFIX}-${PKGNAME_MODULE}
+PKGREVISION=           1
 COMMENT=               Ruby bindings for Xapian search engine
 HOMEPAGE=              https://xapian.org/docs/bindings/ruby/
 
 CONFIGURE_ARGS+=       --with-ruby
+CONFIGURE_ENV+=                RDOC=${RDOC:Q}
+MAKE_ENV+=             RUBY_PKGPREFIX=${RUBY_PKGPREFIX:Q}
 
 REPLACE_RUBY=          ruby/docs/examples/*.rb
 
 post-install:
-       ${CHMOD} +x ${DESTDIR}${PREFIX}/share/doc/xapian-bindings/ruby/examples/*.rb
+       ${CHMOD} +x ${DESTDIR}${PREFIX}/share/doc/xapian-bindings/${RUBY_PKGPREFIX}/examples/*.rb
 
 .include "../../lang/ruby/buildlink3.mk"
 .include "../../textproc/xapian/module.mk"
diff -r acf34f783fcb -r 54d6a76a12ab textproc/ruby-xapian/PLIST
--- a/textproc/ruby-xapian/PLIST        Wed Aug 02 03:56:42 2017 +0000
+++ b/textproc/ruby-xapian/PLIST        Wed Aug 02 04:42:23 2017 +0000
@@ -1,63 +1,73 @@
-@comment $NetBSD: PLIST,v 1.1 2017/07/10 17:34:04 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.2 2017/08/02 04:42:23 schmonz Exp $
 ${RUBY_SITEARCHLIB}/_xapian.a
 ${RUBY_SITEARCHLIB}/_xapian.${RUBY_DLEXT}
 ${RUBY_SITELIB}/xapian.rb
-share/doc/xapian-bindings/ruby/examples/simpleexpand.rb
-share/doc/xapian-bindings/ruby/examples/simpleindex.rb
-share/doc/xapian-bindings/ruby/examples/simplematchdecider.rb
-share/doc/xapian-bindings/ruby/examples/simplesearch.rb
-share/doc/xapian-bindings/ruby/index.html
-share/doc/xapian-bindings/ruby/rdocs/Xapian.html
-share/doc/xapian-bindings/ruby/rdocs/Xapian/LatLongCoord.html
-share/doc/xapian-bindings/ruby/rdocs/Xapian/MultiValueKeyMaker.html
-share/doc/xapian-bindings/ruby/rdocs/Xapian/MultiValueKeyMaker/KeySpec.html
-share/doc/xapian-bindings/ruby/rdocs/Xapian/Xapian.html
-share/doc/xapian-bindings/ruby/rdocs/Xapian/Xapian/Database.html
-share/doc/xapian-bindings/ruby/rdocs/Xapian/Xapian/Document.html
-share/doc/xapian-bindings/ruby/rdocs/Xapian/Xapian/ESet.html
-share/doc/xapian-bindings/ruby/rdocs/Xapian/Xapian/Enquire.html
-share/doc/xapian-bindings/ruby/rdocs/Xapian/Xapian/ExpandTerm.html
-share/doc/xapian-bindings/ruby/rdocs/Xapian/Xapian/LatLongCoords.html
-share/doc/xapian-bindings/ruby/rdocs/Xapian/Xapian/MSet.html
-share/doc/xapian-bindings/ruby/rdocs/Xapian/Xapian/Match.html
-share/doc/xapian-bindings/ruby/rdocs/Xapian/Xapian/Posting.html
-share/doc/xapian-bindings/ruby/rdocs/Xapian/Xapian/Query.html
-share/doc/xapian-bindings/ruby/rdocs/Xapian/Xapian/Value.html
-share/doc/xapian-bindings/ruby/rdocs/Xapian/Xapian/ValueCountMatchSpy.html
-share/doc/xapian-bindings/ruby/rdocs/Xapian/Xapian/Xapian.html
-share/doc/xapian-bindings/ruby/rdocs/Xapian/Xapian/Xapian/Term.html
-share/doc/xapian-bindings/ruby/rdocs/created.rid
-share/doc/xapian-bindings/ruby/rdocs/images/add.png
-share/doc/xapian-bindings/ruby/rdocs/images/arrow_up.png
-share/doc/xapian-bindings/ruby/rdocs/images/brick.png
-share/doc/xapian-bindings/ruby/rdocs/images/brick_link.png
-share/doc/xapian-bindings/ruby/rdocs/images/bug.png
-share/doc/xapian-bindings/ruby/rdocs/images/bullet_black.png
-share/doc/xapian-bindings/ruby/rdocs/images/bullet_toggle_minus.png
-share/doc/xapian-bindings/ruby/rdocs/images/bullet_toggle_plus.png
-share/doc/xapian-bindings/ruby/rdocs/images/date.png
-share/doc/xapian-bindings/ruby/rdocs/images/delete.png
-share/doc/xapian-bindings/ruby/rdocs/images/find.png
-share/doc/xapian-bindings/ruby/rdocs/images/loadingAnimation.gif
-share/doc/xapian-bindings/ruby/rdocs/images/macFFBgHack.png
-share/doc/xapian-bindings/ruby/rdocs/images/package.png
-share/doc/xapian-bindings/ruby/rdocs/images/page_green.png
-share/doc/xapian-bindings/ruby/rdocs/images/page_white_text.png
-share/doc/xapian-bindings/ruby/rdocs/images/page_white_width.png
-share/doc/xapian-bindings/ruby/rdocs/images/plugin.png
-share/doc/xapian-bindings/ruby/rdocs/images/ruby.png
-share/doc/xapian-bindings/ruby/rdocs/images/tag_blue.png
-share/doc/xapian-bindings/ruby/rdocs/images/tag_green.png
-share/doc/xapian-bindings/ruby/rdocs/images/transparent.png
-share/doc/xapian-bindings/ruby/rdocs/images/wrench.png
-share/doc/xapian-bindings/ruby/rdocs/images/wrench_orange.png
-share/doc/xapian-bindings/ruby/rdocs/images/zoom.png
-share/doc/xapian-bindings/ruby/rdocs/index.html
-share/doc/xapian-bindings/ruby/rdocs/js/darkfish.js
-share/doc/xapian-bindings/ruby/rdocs/js/jquery.js
-share/doc/xapian-bindings/ruby/rdocs/js/navigation.js
-share/doc/xapian-bindings/ruby/rdocs/js/search.js
-share/doc/xapian-bindings/ruby/rdocs/js/search_index.js
-share/doc/xapian-bindings/ruby/rdocs/js/searcher.js
-share/doc/xapian-bindings/ruby/rdocs/rdoc.css
-share/doc/xapian-bindings/ruby/rdocs/table_of_contents.html
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/examples/simpleexpand.rb
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/examples/simpleindex.rb
+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
+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/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/created.rid
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/css/fonts.css
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/css/rdoc.css
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/fonts/Lato-Light.ttf
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/fonts/Lato-LightItalic.ttf
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/fonts/Lato-Regular.ttf
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/fonts/Lato-RegularItalic.ttf
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/fonts/SourceCodePro-Bold.ttf
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/fonts/SourceCodePro-Regular.ttf
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/add.png
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/arrow_up.png
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/brick.png
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/brick_link.png
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/bug.png
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/bullet_black.png
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/bullet_toggle_minus.png
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/bullet_toggle_plus.png
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/date.png
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/delete.png
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/find.png
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/loadingAnimation.gif
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/macFFBgHack.png
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/package.png
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/page_green.png
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/page_white_text.png
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/page_white_width.png
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/plugin.png
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/ruby.png
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/tag_blue.png
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/tag_green.png
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/transparent.png
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/wrench.png
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/wrench_orange.png
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/images/zoom.png
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/index.html
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/js/darkfish.js
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/js/jquery.js
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/js/navigation.js
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/js/navigation.js.gz
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/js/search.js
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/js/search_index.js
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/js/search_index.js.gz
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/js/searcher.js
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/js/searcher.js.gz
+share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/table_of_contents.html
diff -r acf34f783fcb -r 54d6a76a12ab textproc/xapian/distinfo-bindings
--- a/textproc/xapian/distinfo-bindings Wed Aug 02 03:56:42 2017 +0000
+++ b/textproc/xapian/distinfo-bindings Wed Aug 02 04:42:23 2017 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo-bindings,v 1.1 2017/07/14 12:55:45 joerg Exp $
+$NetBSD: distinfo-bindings,v 1.2 2017/08/02 04:42:23 schmonz Exp $
 
 SHA1 (xapian-bindings-1.4.4.tar.xz) = 1162e836f3caccee927997f0d262ef6dccd44d9f
 RMD160 (xapian-bindings-1.4.4.tar.xz) = 231d56d0989cf3a37a0b31d39680488fa1e80b39
 SHA512 (xapian-bindings-1.4.4.tar.xz) = 006e771b3ea654130b4f76f1a1caee576fd5a3fa6317ca44f1e5483671e8c83073ecbde4f3fc7f84c75590eec53acb59701af4cf9bcd72355ed9d53924492b53
 Size (xapian-bindings-1.4.4.tar.xz) = 1117140 bytes
 SHA1 (patch-configure) = df295c61cc955ba28c03fe0b328b4d6c216eafad
+SHA1 (patch-ruby_Makefile.in) = ddbf3ca92b11ff6955d80f6a5609e3ce36798b0b
diff -r acf34f783fcb -r 54d6a76a12ab textproc/xapian/patches-bindings/patch-ruby_Makefile.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/xapian/patches-bindings/patch-ruby_Makefile.in   Wed Aug 02 04:42:23 2017 +0000
@@ -0,0 +1,23 @@
+$NetBSD: patch-ruby_Makefile.in,v 1.1 2017/08/02 04:42:23 schmonz Exp $
+
+Allow installing multiple versions of Ruby bindings.
+
+--- ruby/Makefile.in.orig      2017-04-24 02:20:00.000000000 +0000
++++ ruby/Makefile.in
+@@ -663,14 +663,14 @@ MAINTAINERCLEANFILES = $(BUILT_SOURCES)
+ 
+ # Compatibility wrapper which configure creates when required.
+ DISTCLEANFILES = rubyio.h
+-exampledatadir = $(docdir)/ruby/examples
++exampledatadir = $(docdir)/${RUBY_PKGPREFIX}/examples
+ dist_exampledata_DATA = \
+       docs/examples/simpleexpand.rb \
+       docs/examples/simpleindex.rb \
+       docs/examples/simplematchdecider.rb \
+       docs/examples/simplesearch.rb
+ 
+-docdatadir = $(docdir)/ruby
++docdatadir = $(docdir)/${RUBY_PKGPREFIX}
+ dist_docdata_DATA = docs/index.html
+ all: $(BUILT_SOURCES)
+       $(MAKE) $(AM_MAKEFLAGS) all-am