pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/textproc/ruby-xapian Well actually ruby 22 and 25 both...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/dfcba356051c
branches:  trunk
changeset: 338737:dfcba356051c
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Thu Aug 29 16:20:40 2019 +0000

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

diffstat:

 textproc/ruby-xapian/Makefile |  8 ++++++--
 textproc/ruby-xapian/PLIST    |  5 ++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r 0cf1a65f34c8 -r dfcba356051c textproc/ruby-xapian/Makefile
--- a/textproc/ruby-xapian/Makefile     Thu Aug 29 15:38:30 2019 +0000
+++ b/textproc/ruby-xapian/Makefile     Thu Aug 29 16:20:40 2019 +0000
@@ -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 @@
 
 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
diff -r 0cf1a65f34c8 -r dfcba356051c textproc/ruby-xapian/PLIST
--- a/textproc/ruby-xapian/PLIST        Thu Aug 29 15:38:30 2019 +0000
+++ b/textproc/ruby-xapian/PLIST        Thu Aug 29 16:20:40 2019 +0000
@@ -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_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



Home | Main Index | Thread Index | Old Index