Allow installing multiple versions of Lua bindings. Bump PKGREVISION.

4 files changed, 37 insertions, 9 deletions

diff --git a/textproc/lua-xapian/Makefile b/textproc/lua-xapian/Makefile
index 20bd4c51efc..6ac1259c81e 100644
--- a/textproc/lua-xapian/Makefile
+++ b/textproc/lua-xapian/Makefile
@@ -1,16 +1,20 @@
-# $NetBSD: Makefile,v 1.2 2017/08/02 03:56:42 schmonz Exp $
+# $NetBSD: Makefile,v 1.3 2017/08/07 20:01:40 schmonz Exp $
 
 PKGNAME=		${LUA_PKGPREFIX}-${PKGNAME_MODULE}
+PKGREVISION=		1
 COMMENT=		Lua bindings for Xapian search engine
 HOMEPAGE=		https://xapian.org/docs/bindings/lua/
 
 CONFIGURE_ARGS+=	--with-lua
 CONFIGURE_ENV+=		LUA_INC=${BUILDLINK_INCDIRS.${LUA_PACKAGE}}
+MAKE_ENV+=		LUA_PKGPREFIX=${LUA_PKGPREFIX:Q}
 
 REPLACE_LUA=		lua/docs/examples/*.lua
 
+PLIST_SUBST+=		LUA_PKGPREFIX=${LUA_PKGPREFIX}
+
 post-install:
-	${CHMOD} +x ${DESTDIR}${PREFIX}/share/doc/xapian-bindings/lua/examples/*.lua
+	${CHMOD} +x ${DESTDIR}${PREFIX}/share/doc/xapian-bindings/${LUA_PKGPREFIX}/examples/*.lua
 
 .include "../../lang/lua/application.mk"
 .include "../../lang/lua/module.mk"
diff --git a/textproc/lua-xapian/PLIST b/textproc/lua-xapian/PLIST
index 3bd2ad07ec5..5e524e45763 100644
--- a/textproc/lua-xapian/PLIST
+++ b/textproc/lua-xapian/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1 2017/07/10 17:34:04 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.2 2017/08/07 20:01:40 schmonz Exp $
 ${LUA_CDIR}/xapian.a
 ${LUA_CDIR}/xapian.so
-share/doc/xapian-bindings/lua/examples/simpleexpand.lua
-share/doc/xapian-bindings/lua/examples/simpleindex.lua
-share/doc/xapian-bindings/lua/examples/simplematchdecider.lua
-share/doc/xapian-bindings/lua/examples/simplesearch.lua
-share/doc/xapian-bindings/lua/index.html
+share/doc/xapian-bindings/${LUA_PKGPREFIX}/examples/simpleexpand.lua
+share/doc/xapian-bindings/${LUA_PKGPREFIX}/examples/simpleindex.lua
+share/doc/xapian-bindings/${LUA_PKGPREFIX}/examples/simplematchdecider.lua
+share/doc/xapian-bindings/${LUA_PKGPREFIX}/examples/simplesearch.lua
+share/doc/xapian-bindings/${LUA_PKGPREFIX}/index.html
diff --git a/textproc/xapian/distinfo-bindings b/textproc/xapian/distinfo-bindings
index f5a474931c2..da915571caf 100644
--- a/textproc/xapian/distinfo-bindings
+++ b/textproc/xapian/distinfo-bindings
@@ -1,8 +1,9 @@
-$NetBSD: distinfo-bindings,v 1.2 2017/08/02 04:42:23 schmonz Exp $
+$NetBSD: distinfo-bindings,v 1.3 2017/08/07 20:01:39 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-lua_Makefile.in) = 7f1c5077f0d46dfdf33c2b65f144bb08d5031330
 SHA1 (patch-ruby_Makefile.in) = ddbf3ca92b11ff6955d80f6a5609e3ce36798b0b
diff --git a/textproc/xapian/patches-bindings/patch-lua_Makefile.in b/textproc/xapian/patches-bindings/patch-lua_Makefile.in
new file mode 100644
index 00000000000..2a6c9a253f1
--- /dev/null
+++ b/textproc/xapian/patches-bindings/patch-lua_Makefile.in
@@ -0,0 +1,23 @@
+$NetBSD: patch-lua_Makefile.in,v 1.1 2017/08/07 20:01:39 schmonz Exp $
+
+Allow installing multiple versions of Lua bindings.
+
+--- lua/Makefile.in.orig	2017-04-24 02:19:59.000000000 +0000
++++ lua/Makefile.in
+@@ -639,14 +639,14 @@ SWIG_GENERATED = xapian_wrap.cc
+ BUILT_SOURCES = $(SWIG_GENERATED) $(am__append_1) $(am__append_2)
+ @MAINTAINER_MODE_TRUE@RUN_SWIG = $(PERL) '$(top_srcdir)'/swig-depcomp $(SWIG)
+ MAINTAINERCLEANFILES = $(BUILT_SOURCES)
+-exampledatadir = $(docdir)/lua/examples
++exampledatadir = $(docdir)/${LUA_PKGPREFIX}/examples
+ dist_exampledata_DATA = \
+ 	docs/examples/simpleindex.lua \
+ 	docs/examples/simpleexpand.lua \
+ 	docs/examples/simplematchdecider.lua \
+ 	docs/examples/simplesearch.lua
+ 
+-docdatadir = $(docdir)/lua
++docdatadir = $(docdir)/${LUA_PKGPREFIX}
+ dist_docdata_DATA = docs/index.html
+ all: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) all-am