Multiversion support for Lua.

7 files changed, 66 insertions, 43 deletions

diff --git a/lang/lua52/Makefile b/lang/lua52/Makefile
index 387eb791e2f..cd2744c2b36 100644
--- a/lang/lua52/Makefile
+++ b/lang/lua52/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/10/30 06:18:10 dholland Exp $
+# $NetBSD: Makefile,v 1.2 2014/05/03 13:00:45 alnsn Exp $
 
 DISTNAME=	lua-${LUA_VERSION}
 PKGNAME=	lua52-${LUA_VERSION}
@@ -25,7 +25,7 @@ MAKE_ENV+=	INSTALL_DATA=${INSTALL_DATA:Q}
 CFLAGS+=	-DLUA_ROOT=\"${PREFIX}/\"
 
 PKGCONFIG_OVERRIDE=	${WRKSRC}/lua.pc
-INSTALLATION_DIRS+=	lib/pkgconfig share/doc/lua
+INSTALLATION_DIRS+=	lib/pkgconfig share/doc/lua-5.2
 
 .if ${OPSYS} == "FreeBSD"
 BUILD_TARGET=	freebsd
@@ -43,16 +43,21 @@ BUILD_TARGET=	aix
 BUILD_TARGET=	generic
 .endif
 
+DOCDIR=		${PREFIX}/share/doc/lua-5.2
+
 pre-configure:
 	sed	-e 's,@PREFIX@,${PREFIX},g' \
 		-e 's,@VER@,${PKGVERSION_NOREV:R},g' \
 		-e 's,@REV@,${PKGVERSION_NOREV},g' \
 		${FILESDIR}/lua.pc.in > ${WRKSRC}/lua.pc
+	cp ${WRKSRC}/doc/lua.1  ${WRKSRC}/doc/lua5.2.1
+	cp ${WRKSRC}/doc/luac.1 ${WRKSRC}/doc/luac5.2.1
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/lua.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
-	${INSTALL_DATA} ${WRKSRC}/doc/*.??? ${DESTDIR}${PREFIX}/share/doc/lua
-	${INSTALL_DATA} ${WRKSRC}/doc/*.???? ${DESTDIR}${PREFIX}/share/doc/lua
+	${INSTALL_DATA} ${WRKSRC}/doc/*.[a-z][a-z][a-z] \
+	    ${WRKSRC}/doc/*.html ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/lua.pc \
+	    ${DESTDIR}${PREFIX}/lib/pkgconfig/lua-5.2.pc
 
 .include "../../mk/readline.buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
diff --git a/lang/lua52/PLIST b/lang/lua52/PLIST
index 6a5e8ad82a7..83c23b3fe55 100644
--- a/lang/lua52/PLIST
+++ b/lang/lua52/PLIST
@@ -1,21 +1,21 @@
-@comment $NetBSD: PLIST,v 1.1 2013/10/30 06:18:10 dholland Exp $
-bin/lua
-bin/luac
-include/lauxlib.h
-include/lua.h
-include/lua.hpp
-include/luaconf.h
-include/lualib.h
-lib/liblua.la
-lib/pkgconfig/lua.pc
-man/man1/lua.1
-man/man1/luac.1
-share/doc/lua/contents.html
-share/doc/lua/logo.gif
-share/doc/lua/lua.css
-share/doc/lua/manual.css
-share/doc/lua/manual.html
-share/doc/lua/osi-certified-72x60.png
-share/doc/lua/readme.html
+@comment $NetBSD: PLIST,v 1.2 2014/05/03 13:00:45 alnsn Exp $
+bin/lua5.2
+bin/luac5.2
+include/lua-5.2/lauxlib.h
+include/lua-5.2/lua.h
+include/lua-5.2/lua.hpp
+include/lua-5.2/luaconf.h
+include/lua-5.2/lualib.h
+lib/liblua5.2.la
+lib/pkgconfig/lua-5.2.pc
+man/man1/lua5.2.1
+man/man1/luac5.2.1
+share/doc/lua-5.2/contents.html
+share/doc/lua-5.2/logo.gif
+share/doc/lua-5.2/lua.css
+share/doc/lua-5.2/manual.css
+share/doc/lua-5.2/manual.html
+share/doc/lua-5.2/osi-certified-72x60.png
+share/doc/lua-5.2/readme.html
 @pkgdir share/lua/5.2
 @pkgdir lib/lua/5.2
diff --git a/lang/lua52/buildlink3.mk b/lang/lua52/buildlink3.mk
index 101431e59cd..d5545b67ffa 100644
--- a/lang/lua52/buildlink3.mk
+++ b/lang/lua52/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2013/10/30 09:02:06 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2014/05/03 13:00:45 alnsn Exp $
 
 BUILDLINK_TREE+=	lua52
 
@@ -8,6 +8,16 @@ LUA52_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.lua52+=	lua52>=5.2.0<5.3
 BUILDLINK_PKGSRCDIR.lua52?=	../../lang/lua52
 
+.if defined(BUILDLINK_DEPMETHOD.lua)
+BUILDLINK_DEPMETHOD.lua52?=	${BUILDLINK_DEPMETHOD.lua}
+.endif
+
+# -llua -> -llua5.2
+BUILDLINK_TRANSFORM+=		l:lua:lua5.2
+BUILDLINK_INCDIRS.lua52+=	include/lua-5.2
+
+BUILDLINK_FNAME_TRANSFORM.lua52+=	-e 's|lib/pkgconfig/lua-5.2.pc|lib/pkgconfig/lua.pc|'
+
 .include "../../mk/readline.buildlink3.mk"
 .endif # LUA52_BUILDLINK3_MK
 
diff --git a/lang/lua52/distinfo b/lang/lua52/distinfo
index 9d578966513..8e59e889eae 100644
--- a/lang/lua52/distinfo
+++ b/lang/lua52/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2014/01/02 19:57:39 wiz Exp $
+$NetBSD: distinfo,v 1.3 2014/05/03 13:00:45 alnsn Exp $
 
 SHA1 (lua-5.2.3.tar.gz) = 926b7907bc8d274e063d42804666b40a3f3c124c
 RMD160 (lua-5.2.3.tar.gz) = b8714669c8c0f8272104effd8a9675921ddb2fa5
 Size (lua-5.2.3.tar.gz) = 251195 bytes
-SHA1 (patch-aa) = 5fa5c7fecc7fd50dc9d88d441ad9373f59ecb841
-SHA1 (patch-ab) = 4f2f05f6a5e4cfffe8f9ef7bf4de6f054074baa4
+SHA1 (patch-aa) = ce0763ed1515f670b8a5d543af3753320cf06309
+SHA1 (patch-ab) = 92f711427090021d89b8fcb1d3633ca6300c830d
 SHA1 (patch-ac) = b8b9c0068210795e5eb22512767ac2e98bca8cbc
diff --git a/lang/lua52/files/lua.pc.in b/lang/lua52/files/lua.pc.in
index 787d06f6d8d..f290c3d0485 100644
--- a/lang/lua52/files/lua.pc.in
+++ b/lang/lua52/files/lua.pc.in
@@ -1,4 +1,4 @@
-# $NetBSD: lua.pc.in,v 1.1 2013/10/30 06:18:10 dholland Exp $
+# $NetBSD: lua.pc.in,v 1.2 2014/05/03 13:00:45 alnsn Exp $
 # lua.pc is not any longer distributed, but is still required by other packages.
 
 prefix= @PREFIX@
@@ -11,11 +11,11 @@ INSTALL_CMOD= ${prefix}/lib/lua/@VER@
 
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
-includedir=${prefix}/include
+includedir=${prefix}/include/lua-5.2
 
 Name: Lua
 Description: An Extensible Extension Language
 Version: @REV@
 Requires: 
-Libs: -L${libdir} -llua -lm
+Libs: -L${libdir} -llua5.2 -lm
 Cflags: -I${includedir}
diff --git a/lang/lua52/patches/patch-aa b/lang/lua52/patches/patch-aa
index 66315e4a442..c4e982656ff 100644
--- a/lang/lua52/patches/patch-aa
+++ b/lang/lua52/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1 2013/10/30 06:18:10 dholland Exp $
+$NetBSD: patch-aa,v 1.2 2014/05/03 13:00:45 alnsn Exp $
 
---- Makefile.orig	2012-05-17 14:05:54.000000000 +0000
+--- Makefile.orig	2013-11-10 00:49:35.000000000 +0000
 +++ Makefile
 @@ -10,11 +10,11 @@ PLAT= none
  # so take care if INSTALL_TOP is not an absolute path. See the local target.
@@ -9,7 +9,8 @@ $NetBSD: patch-aa,v 1.1 2013/10/30 06:18:10 dholland Exp $
 -INSTALL_TOP= /usr/local
 +INSTALL_TOP= ${PREFIX}
  INSTALL_BIN= $(INSTALL_TOP)/bin
- INSTALL_INC= $(INSTALL_TOP)/include
+-INSTALL_INC= $(INSTALL_TOP)/include
++INSTALL_INC= $(INSTALL_TOP)/include/lua-5.2
  INSTALL_LIB= $(INSTALL_TOP)/lib
 -INSTALL_MAN= $(INSTALL_TOP)/man/man1
 +INSTALL_MAN= $(INSTALL_TOP)/${PKGMANDIR}/man1
@@ -25,15 +26,20 @@ $NetBSD: patch-aa,v 1.1 2013/10/30 06:18:10 dholland Exp $
  #
  # If you don't have "install" you can use "cp" instead.
  # INSTALL= cp -p
-@@ -41,7 +41,7 @@ PLATS= aix ansi bsd freebsd generic linu
+@@ -39,10 +39,10 @@ RM= rm -f
+ PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
+ 
  # What to install.
- TO_BIN= lua luac
+-TO_BIN= lua luac
++TO_BIN= lua5.2 luac5.2
  TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp
 -TO_LIB= liblua.a
-+TO_LIB= liblua.la
- TO_MAN= lua.1 luac.1
+-TO_MAN= lua.1 luac.1
++TO_LIB= liblua5.2.la
++TO_MAN= lua5.2.1 luac5.2.1
  
  # Lua version and release.
+ V= 5.2
 @@ -58,11 +58,11 @@ test:	dummy
  	src/lua -v
  
diff --git a/lang/lua52/patches/patch-ab b/lang/lua52/patches/patch-ab
index f07b7a55f87..02750b89b07 100644
--- a/lang/lua52/patches/patch-ab
+++ b/lang/lua52/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.1 2013/10/30 06:18:10 dholland Exp $
+$NetBSD: patch-ab,v 1.2 2014/05/03 13:00:45 alnsn Exp $
 
---- src/Makefile.orig	2012-12-27 10:51:43.000000000 +0000
+--- src/Makefile.orig	2013-11-11 11:45:49.000000000 +0000
 +++ src/Makefile
 @@ -6,8 +6,7 @@
  # Your platform. See PLATS for possible values.
@@ -26,7 +26,7 @@ $NetBSD: patch-ab,v 1.1 2013/10/30 06:18:10 dholland Exp $
  PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
  
 -LUA_A=	liblua.a
-+LUA_A=	liblua.la
++LUA_A=	liblua5.2.la
  CORE_O=	lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
  	lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \
  	ltm.o lundump.o lvm.o lzio.o
@@ -35,12 +35,14 @@ $NetBSD: patch-ab,v 1.1 2013/10/30 06:18:10 dholland Exp $
 -BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS)
 +BASE_O= $(CORE_O:.o=.lo) $(LIB_O:.o=.lo) $(MYOBJS:.o=.lo)
  
- LUA_T=	lua
+-LUA_T=	lua
 -LUA_O=	lua.o
++LUA_T=	lua5.2
 +LUA_O=	lua.lo
  
- LUAC_T=	luac
+-LUAC_T=	luac
 -LUAC_O=	luac.o
++LUAC_T=	luac5.2
 +LUAC_O=	luac.lo
  
  ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)