CVS commit: pkgsrc/textproc/ruby-xapian

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Thu Aug 29 16:20:40 UTC 2019

Modified Files:
        pkgsrc/textproc/ruby-xapian: Makefile PLIST

Log Message:
Well actually ruby 22 and 25 both still install jquery.js.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/ruby-xapian/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/textproc/ruby-xapian/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/ruby-xapian/Makefile
diff -u pkgsrc/textproc/ruby-xapian/Makefile:1.4 pkgsrc/textproc/ruby-xapian/Makefile:1.5
--- pkgsrc/textproc/ruby-xapian/Makefile:1.4    Tue Aug 27 21:54:22 2019
+++ pkgsrc/textproc/ruby-xapian/Makefile        Thu Aug 29 16:20:40 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/08/27 21:54:22 schmonz Exp $
+# $NetBSD: Makefile,v 1.5 2019/08/29 16:20:40 schmonz Exp $
 
 PKGNAME=               ${RUBY_PKGPREFIX}-${PKGNAME_MODULE}
 PKGREVISION=           1
@@ -13,11 +13,15 @@ REPLACE_RUBY=               ruby/docs/examples/*.rb
 
 RUBY_VERSIONS_ACCEPTED=        22 24 25 26
 
-PLIST_VARS+=           oldruby newruby
+PLIST_VARS+=           jquery oldruby newruby
 PLIST_SUBST+=          XAPIAN_RDOC_PATH=${XAPIAN_RDOC_PATH:Q}
 
 .include "../../lang/ruby/rubyversion.mk"
 
+.if ${RUBY_VER} == 22 || ${RUBY_VER} == 25
+PLIST.jquery=          yes
+.endif
+
 .if ${RUBY_VER} < 25
 PLIST.oldruby=         yes
 XAPIAN_RDOC_PATH=      Xapian/Xapian

Index: pkgsrc/textproc/ruby-xapian/PLIST
diff -u pkgsrc/textproc/ruby-xapian/PLIST:1.5 pkgsrc/textproc/ruby-xapian/PLIST:1.6
--- pkgsrc/textproc/ruby-xapian/PLIST:1.5       Thu Aug 29 14:26:26 2019
+++ pkgsrc/textproc/ruby-xapian/PLIST   Thu Aug 29 16:20:40 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2019/08/29 14:26:26 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.6 2019/08/29 16:20:40 schmonz Exp $
 ${RUBY_SITEARCHLIB}/_xapian.a
 ${RUBY_SITEARCHLIB}/_xapian.${RUBY_DLEXT}
 ${RUBY_SITELIB}/xapian.rb
@@ -64,8 +64,7 @@ share/doc/xapian-bindings/${RUBY_PKGPREF
 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
-${PLIST.oldruby}share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/js/jquery.js
-share/doc/xapian-bindings/${RUBY_PKGPREFIX}/rdocs/js/jquery.js
+${PLIST.jquery}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