Sat May 3 13:00:45 2014 UTC ()
Multiversion support for Lua.


(alnsn)
diff -r1.3 -r1.4 pkgsrc/lang/lua/application.mk
diff -r1.4 -r1.5 pkgsrc/lang/lua/luaversion.mk
diff -r1.5 -r1.6 pkgsrc/lang/lua/module.mk
diff -r0 -r1.1 pkgsrc/lang/lua/tool.mk
diff -r1.1 -r1.2 pkgsrc/lang/lua51/Makefile
diff -r1.1 -r1.2 pkgsrc/lang/lua51/PLIST
diff -r1.1 -r1.2 pkgsrc/lang/lua51/distinfo
diff -r1.2 -r1.3 pkgsrc/lang/lua51/buildlink3.mk
diff -r1.1 -r1.2 pkgsrc/lang/lua51/patches/patch-aa
diff -r1.1 -r1.2 pkgsrc/lang/lua51/patches/patch-ab
diff -r0 -r1.1 pkgsrc/lang/lua51/patches/patch-etc_lua.pc
diff -r1.1 -r1.2 pkgsrc/lang/lua52/Makefile
diff -r1.1 -r1.2 pkgsrc/lang/lua52/PLIST
diff -r1.2 -r1.3 pkgsrc/lang/lua52/buildlink3.mk
diff -r1.2 -r1.3 pkgsrc/lang/lua52/distinfo
diff -r1.1 -r1.2 pkgsrc/lang/lua52/files/lua.pc.in
diff -r1.1 -r1.2 pkgsrc/lang/lua52/patches/patch-aa
diff -r1.1 -r1.2 pkgsrc/lang/lua52/patches/patch-ab
cvs diff -r1.3 -r1.4 pkgsrc/lang/lua/application.mk (expand / switch to unified diff)

--- pkgsrc/lang/lua/application.mk 2013/10/30 09:09:59 1.3
+++ pkgsrc/lang/lua/application.mk 2014/05/03 13:00:44 1.4
@@ -1,21 +1,23 @@ @@ -1,21 +1,23 @@
1# $NetBSD: application.mk,v 1.3 2013/10/30 09:09:59 obache Exp $ 1# $NetBSD: application.mk,v 1.4 2014/05/03 13:00:44 alnsn Exp $
2# 2#
3# This makefile fragment is intended to be included by packages that 3# This makefile fragment is intended to be included by packages that
4# install Lua scripts. 4# install Lua scripts.
5# 5#
6# Package-settable variables: 6# Package-settable variables:
7# 7#
8# REPLACE_LUA 8# REPLACE_LUA
9# A list of Lua scripts to be installed, relative to ${WRKSRC}. 9# A list of Lua scripts to be installed, relative to ${WRKSRC}.
10# 10#
11# Keywords: Lua 11# Keywords: Lua
12# 12#
13 13
 14.if !defined(LUA_LUAVERSION_MK)
14.include "../../lang/lua/luaversion.mk" 15.include "../../lang/lua/luaversion.mk"
 16.endif
15 17
16.if defined(REPLACE_LUA) 18.if defined(REPLACE_LUA)
17REPLACE_INTERPRETER+= lua 19REPLACE_INTERPRETER+= lua
18REPLACE.lua.old= .*lua 20REPLACE.lua.old= .*lua
19REPLACE.lua.new= ${LOCALBASE}/bin/lua 21REPLACE.lua.new= ${LUA_INTERPRETER}
20REPLACE_FILES.lua= ${REPLACE_LUA} 22REPLACE_FILES.lua= ${REPLACE_LUA}
21.endif 23.endif
cvs diff -r1.4 -r1.5 pkgsrc/lang/lua/luaversion.mk (expand / switch to unified diff)

--- pkgsrc/lang/lua/luaversion.mk 2013/11/05 11:26:44 1.4
+++ pkgsrc/lang/lua/luaversion.mk 2014/05/03 13:00:44 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: luaversion.mk,v 1.4 2013/11/05 11:26:44 obache Exp $ 1# $NetBSD: luaversion.mk,v 1.5 2014/05/03 13:00:44 alnsn Exp $
2 2
3# This file determins which Lua version is used as a dependency for 3# This file determins which Lua version is used as a dependency for
4# a package. 4# a package.
5# 5#
6# === User-settable variables === 6# === User-settable variables ===
7# 7#
8# LUA_VERSION_DEFAULT 8# LUA_VERSION_DEFAULT
9# The preferred lua version to use. 9# The preferred lua version to use.
10# 10#
11# Possible values: 51 52 11# Possible values: 51 52
12# Default: 52 12# Default: 52
13# 13#
14# === Infrastructure variables === 14# === Infrastructure variables ===
@@ -37,26 +37,37 @@ @@ -37,26 +37,37 @@
37# Default: <empty> 37# Default: <empty>
38# 38#
39# LUA_SELF_CONFLICT 39# LUA_SELF_CONFLICT
40# If set to "yes", CONFLICTS entries are added among the various 40# If set to "yes", CONFLICTS entries are added among the various
41# per-Lua-version variants of a multiversion package. 41# per-Lua-version variants of a multiversion package.
42# 42#
43# === Defined variables === 43# === Defined variables ===
44# 44#
45# LUA_PKGPREFIX 45# LUA_PKGPREFIX
46# The prefix to use in PKGNAME for multiversion packages. 46# The prefix to use in PKGNAME for multiversion packages.
47# 47#
48# Example: lua51 48# Example: lua51
49# 49#
 50# LUA_INCDIR
 51# Relative path to include files.
 52#
 53# Example: include/lua-51
 54#
 55# LUA_INTERPRETER
 56# Full path to Lua interpreter.
 57#
 58# LUA_COMPILER
 59# Full path to Lua bytecode compiler (luac).
 60#
50# Keywords: Lua 61# Keywords: Lua
51# 62#
52 63
53.if !defined (LUA_LUAVERSION_MK) 64.if !defined (LUA_LUAVERSION_MK)
54LUA_LUAVERSION_MK= # defined 65LUA_LUAVERSION_MK= # defined
55 66
56.include "../../mk/bsd.prefs.mk" 67.include "../../mk/bsd.prefs.mk"
57 68
58BUILD_DEFS+= LUA_VERSION_DEFAULT 69BUILD_DEFS+= LUA_VERSION_DEFAULT
59BUILD_DEFS_EFFECTS+= LUA_PACKAGE 70BUILD_DEFS_EFFECTS+= LUA_PACKAGE
60 71
61LUA_VERSION_DEFAULT?= 52 72LUA_VERSION_DEFAULT?= 52
62LUA_VERSIONS_ACCEPTED?= 52 51 73LUA_VERSIONS_ACCEPTED?= 52 51
@@ -117,14 +128,18 @@ LUA_PKGSRCDIR= ../../lang/lua51 @@ -117,14 +128,18 @@ LUA_PKGSRCDIR= ../../lang/lua51
117LUA_PKGPREFIX= lua51 128LUA_PKGPREFIX= lua51
118LUA_BASEDEPENDS= lua51>=5.1<5.2:${LUA_PKGSRCDIR} 129LUA_BASEDEPENDS= lua51>=5.1<5.2:${LUA_PKGSRCDIR}
119 130
120.else 131.else
121PKG_FAIL_REASION+= "No valid Lua version found" 132PKG_FAIL_REASION+= "No valid Lua version found"
122 133
123.endif 134.endif
124 135
125#LUA_DEPENDS= ${BUILDLINK_API_DEPENDS.${LUA_PACKAGE}}:${LUA_PKGSRCDIR} 136#LUA_DEPENDS= ${BUILDLINK_API_DEPENDS.${LUA_PACKAGE}}:${LUA_PKGSRCDIR}
126 137
127.include "${LUA_PKGSRCDIR}/version.mk" 138.include "${LUA_PKGSRCDIR}/version.mk"
128_LUA_DOT_VERSION= ${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR} 139_LUA_DOT_VERSION= ${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}
129 140
 141LUA_INCDIR= include/lua-${_LUA_DOT_VERSION}
 142LUA_INTERPRETER= ${LOCALBASE}/bin/lua${_LUA_DOT_VERSION}
 143LUA_COMPILER= ${LOCALBASE}/bin/luac${_LUA_DOT_VERSION}
 144
130.endif # LUA_LUAVERSION_MK 145.endif # LUA_LUAVERSION_MK
cvs diff -r1.5 -r1.6 pkgsrc/lang/lua/module.mk (expand / switch to unified diff)

--- pkgsrc/lang/lua/module.mk 2013/10/30 06:18:09 1.5
+++ pkgsrc/lang/lua/module.mk 2014/05/03 13:00:44 1.6
@@ -1,29 +1,56 @@ @@ -1,29 +1,56 @@
1# $NetBSD: module.mk,v 1.5 2013/10/30 06:18:09 dholland Exp $ 1# $NetBSD: module.mk,v 1.6 2014/05/03 13:00:44 alnsn Exp $
2# 2#
3# This Makefile fragment is intended to be included by packages that 3# This Makefile fragment is intended to be included by packages that
4# install Lua packages. 4# install Lua modules.
 5#
 6# === Defined variables ===
 7#
 8# LUA_LDIR
 9# Path where Lua modules are installed.
 10#
 11# LUA_CDIR
 12# Path where Lua C modules are installed. Not defined if
 13# NO_BUILD variable is set to "yes".
 14#
 15# LUA_DOCDIR
 16# Path where documentation files are installed.
 17#
 18# LUA_EXAMPLESDIR
 19# Path where example files are installed.
 20#
 21# Keywords: lua
 22#
5 23
6.if !defined(LUA_MODULE_MK) 24.if !defined(LUA_MODULE_MK)
7LUA_MODULE_MK= # defined 25LUA_MODULE_MK= # defined
8 26
 27.if !defined(LUA_LUAVERSION_MK)
9.include "../../lang/lua/luaversion.mk" 28.include "../../lang/lua/luaversion.mk"
 29.endif
10 30
11LUA_LDIR= share/lua/${_LUA_DOT_VERSION} 31LUA_LDIR= share/lua/${_LUA_DOT_VERSION}
12PLIST_SUBST+= LUA_LDIR=${LUA_LDIR} 32PLIST_SUBST+= LUA_LDIR=${LUA_LDIR}
13 33
 34PRINT_PLIST_AWK+= /^${LUA_LDIR:S|/|\\/|g}/ \
 35 { gsub(/${LUA_LDIR:S|/|\\/|g}/, "$${LUA_LDIR}") }
 36
14.if defined(NO_BUILD) && empty(NO_BUILD:M[Nn][Oo]) 37.if defined(NO_BUILD) && empty(NO_BUILD:M[Nn][Oo])
15DEPENDS+= ${LUA_BASEDEPENDS} 38DEPENDS+= ${LUA_BASEDEPENDS}
16 39
17.else 40.else
18LUA_CDIR= lib/lua/${_LUA_DOT_VERSION} 41LUA_CDIR= lib/lua/${_LUA_DOT_VERSION}
19PLIST_SUBST+= LUA_CDIR=${LUA_CDIR} 42PLIST_SUBST+= LUA_CDIR=${LUA_CDIR}
20 43
21PRINT_PLIST_AWK+= /^${LUA_LDIR:S|/|\\/|g}/ \ 
22 { gsub(/${LUA_LDIR:S|/|\\/|g}/, "$${LUA_LDIR}") } 
23PRINT_PLIST_AWK+= /^${LUA_CDIR:S|/|\\/|g}/ \ 44PRINT_PLIST_AWK+= /^${LUA_CDIR:S|/|\\/|g}/ \
24 { gsub(/${LUA_CDIR:S|/|\\/|g}/, "$${LUA_CDIR}") } 45 { gsub(/${LUA_CDIR:S|/|\\/|g}/, "$${LUA_CDIR}") }
25 46
26.include "${LUA_PKGSRCDIR}/buildlink3.mk" 47.include "${LUA_PKGSRCDIR}/buildlink3.mk"
27.endif 48.endif
28 49
 50LUA_DOCDIR= share/doc/${PKGBASE}
 51PLIST_SUBST+= LUA_DOCDIR=${LUA_DOCDIR}
 52
 53LUA_EXAMPLESDIR= share/examples/${PKGBASE}
 54PLIST_SUBST+= LUA_EXAMPLESDIR=${LUA_EXAMPLESDIR}
 55
29.endif # LUA_MODULE_MK 56.endif # LUA_MODULE_MK
File Added: pkgsrc/lang/lua/tool.mk
# $NetBSD: tool.mk,v 1.1 2014/05/03 13:00:44 alnsn Exp $
#
# Create `lua' interpreter wrapper for applicable Lua bin.
#
# This mk fragment can be included in all packages that uses `lua'
# as a tool without version suffix.
#
# Keywords: Lua
#

.if !defined(LUA_TOOL_MK)
LUA_TOOL_MK=	defined

.if !defined(LUA_LUAVERSION_MK)
.include "../../lang/lua/luaversion.mk"
.endif

BUILDLINK_TARGETS+=	buildlink-bin-lua buildlink-bin-luac

.PHONY: buildlink-bin-lua
buildlink-bin-lua:
	${RUN} \
	f="${LUA_INTERPRETER}"; \
	t="${BUILDLINK_DIR}/bin/lua"; \
	if ${TEST} -f $$f -a ! -f $$t ; then \
		${LN} -sf $$f $$t; \
	fi

.PHONY: buildlink-bin-luac
buildlink-bin-luac:
	${RUN} \
	f="${LUA_COMPILER}"; \
	t="${BUILDLINK_DIR}/bin/luac"; \
	if ${TEST} -f $$f -a ! -f $$t ; then \
		${LN} -sf $$f $$t; \
	fi

.endif # LUA_TOOL_MK
cvs diff -r1.1 -r1.2 pkgsrc/lang/lua51/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/lua51/Makefile 2013/10/30 06:18:09 1.1
+++ pkgsrc/lang/lua51/Makefile 2014/05/03 13:00:44 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.1 2013/10/30 06:18:09 dholland Exp $ 1# $NetBSD: Makefile,v 1.2 2014/05/03 13:00:44 alnsn Exp $
2 2
3DISTNAME= lua-${LUA_VERSION} 3DISTNAME= lua-${LUA_VERSION}
4PKGNAME= lua51-${LUA_VERSION} 4PKGNAME= lua51-${LUA_VERSION}
5CATEGORIES= lang 5CATEGORIES= lang
6MASTER_SITES= http://www.lua.org/ftp/ \ 6MASTER_SITES= http://www.lua.org/ftp/ \
7 http://www.tecgraf.puc-rio.br/lua/ftp/ 7 http://www.tecgraf.puc-rio.br/lua/ftp/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.lua.org/ 10HOMEPAGE= http://www.lua.org/
11COMMENT= Powerful light-weight language for extending applications 11COMMENT= Powerful light-weight language for extending applications
12LICENSE= mit 12LICENSE= mit
13 13
14.include "../../lang/lua51/version.mk" 14.include "../../lang/lua51/version.mk"
@@ -16,28 +16,28 @@ LICENSE= mit @@ -16,28 +16,28 @@ LICENSE= mit
16PKG_INSTALLATION_TYPES= overwrite pkgviews 16PKG_INSTALLATION_TYPES= overwrite pkgviews
17CONFLICTS+= lua-[0-9]* 17CONFLICTS+= lua-[0-9]*
18 18
19.include "../../mk/bsd.prefs.mk" 19.include "../../mk/bsd.prefs.mk"
20 20
21USE_LIBTOOL= yes 21USE_LIBTOOL= yes
22USE_TOOLS+= gmake 22USE_TOOLS+= gmake
23MAKE_ENV+= DLLIB=${BUILDLINK_LDADD.dl:Q} 23MAKE_ENV+= DLLIB=${BUILDLINK_LDADD.dl:Q}
24MAKE_ENV+= INSTALL_DATA=${INSTALL_DATA:Q} 24MAKE_ENV+= INSTALL_DATA=${INSTALL_DATA:Q}
25CFLAGS+= -DLUA_ROOT=\"${PREFIX}/\" 25CFLAGS+= -DLUA_ROOT=\"${PREFIX}/\"
26 26
27MAKE_FLAGS+= CC=cc 27MAKE_FLAGS+= CC=cc
28 28
29DOCDIR= ${PREFIX}/share/doc/lua 29DOCDIR= ${PREFIX}/share/doc/lua-5.1
30EGDIR= ${PREFIX}/share/examples/lua 30EGDIR= ${PREFIX}/share/examples/lua-5.1
31 31
32.if ${OPSYS} == "FreeBSD" 32.if ${OPSYS} == "FreeBSD"
33BUILD_TARGET= freebsd 33BUILD_TARGET= freebsd
34.elif !empty(OPSYS:M*BSD*) || ${OPSYS} == "DragonFly" 34.elif !empty(OPSYS:M*BSD*) || ${OPSYS} == "DragonFly"
35BUILD_TARGET= bsd 35BUILD_TARGET= bsd
36.elif ${OPSYS} == "Linux" 36.elif ${OPSYS} == "Linux"
37BUILD_TARGET= linux 37BUILD_TARGET= linux
38.elif ${OPSYS} == "Darwin" 38.elif ${OPSYS} == "Darwin"
39BUILD_TARGET= macosx 39BUILD_TARGET= macosx
40.elif ${OPSYS} == "SunOS" 40.elif ${OPSYS} == "SunOS"
41BUILD_TARGET= solaris 41BUILD_TARGET= solaris
42.elif ${OPSYS} == "AIX" 42.elif ${OPSYS} == "AIX"
43BUILD_TARGET= aix 43BUILD_TARGET= aix
@@ -64,18 +64,19 @@ post-install: @@ -64,18 +64,19 @@ post-install:
64 cd ${WRKSRC}/doc; for f in *.html *.gif; do \ 64 cd ${WRKSRC}/doc; for f in *.html *.gif; do \
65 ${INSTALL_DATA} "$$f" ${DESTDIR}${DOCDIR}; \ 65 ${INSTALL_DATA} "$$f" ${DESTDIR}${DOCDIR}; \
66 done 66 done
67 ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR} 67 ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
68 set -e; \ 68 set -e; \
69 cd ${WRKSRC}/test; for f in README *.lua; do \ 69 cd ${WRKSRC}/test; for f in README *.lua; do \
70 ${INSTALL_DATA} "$$f" ${DESTDIR}${EGDIR}; \ 70 ${INSTALL_DATA} "$$f" ${DESTDIR}${EGDIR}; \
71 done 71 done
72 ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}/etc 72 ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}/etc
73 set -e; \ 73 set -e; \
74 cd ${WRKSRC}/etc; for f in README *.c *.ico *.lua; do \ 74 cd ${WRKSRC}/etc; for f in README *.c *.ico *.lua; do \
75 ${INSTALL_DATA} "$$f" ${DESTDIR}${EGDIR}/etc; \ 75 ${INSTALL_DATA} "$$f" ${DESTDIR}${EGDIR}/etc; \
76 done 76 done
77 ${INSTALL_DATA} ${WRKSRC}/etc/lua.pc ${DESTDIR}${PREFIX}/lib/pkgconfig 77 ${INSTALL_DATA} ${WRKSRC}/etc/lua.pc \
 78 ${DESTDIR}${PREFIX}/lib/pkgconfig/lua-5.1.pc
78 79
79.include "../../devel/readline/buildlink3.mk" 80.include "../../mk/readline.buildlink3.mk"
80.include "../../mk/dlopen.buildlink3.mk" 81.include "../../mk/dlopen.buildlink3.mk"
81.include "../../mk/bsd.pkg.mk" 82.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/lang/lua51/PLIST (expand / switch to unified diff)

--- pkgsrc/lang/lua51/PLIST 2013/10/30 06:18:09 1.1
+++ pkgsrc/lang/lua51/PLIST 2014/05/03 13:00:44 1.2
@@ -1,49 +1,49 @@ @@ -1,49 +1,49 @@
1@comment $NetBSD: PLIST,v 1.1 2013/10/30 06:18:09 dholland Exp $ 1@comment $NetBSD: PLIST,v 1.2 2014/05/03 13:00:44 alnsn Exp $
2bin/lua 2bin/lua5.1
3bin/luac 3bin/luac5.1
4include/lauxlib.h 4include/lua-5.1/lauxlib.h
5include/lua.h 5include/lua-5.1/lua.h
6include/lua.hpp 6include/lua-5.1/lua.hpp
7include/luaconf.h 7include/lua-5.1/luaconf.h
8include/lualib.h 8include/lua-5.1/lualib.h
9lib/liblua.la 9lib/liblua5.1.la
10lib/pkgconfig/lua.pc 10lib/pkgconfig/lua-5.1.pc
11man/man1/lua.1 11man/man1/lua5.1.1
12man/man1/luac.1 12man/man1/luac5.1.1
13share/doc/lua/COPYRIGHT 13share/doc/lua-5.1/COPYRIGHT
14share/doc/lua/HISTORY 14share/doc/lua-5.1/HISTORY
15share/doc/lua/README 15share/doc/lua-5.1/README
16share/doc/lua/contents.html 16share/doc/lua-5.1/contents.html
17share/doc/lua/logo.gif 17share/doc/lua-5.1/logo.gif
18share/doc/lua/lua.html 18share/doc/lua-5.1/lua.html
19share/doc/lua/luac.html 19share/doc/lua-5.1/luac.html
20share/doc/lua/manual.html 20share/doc/lua-5.1/manual.html
21share/doc/lua/readme.html 21share/doc/lua-5.1/readme.html
22share/examples/lua/README 22share/examples/lua-5.1/README
23share/examples/lua/bisect.lua 23share/examples/lua-5.1/bisect.lua
24share/examples/lua/cf.lua 24share/examples/lua-5.1/cf.lua
25share/examples/lua/echo.lua 25share/examples/lua-5.1/echo.lua
26share/examples/lua/env.lua 26share/examples/lua-5.1/env.lua
27share/examples/lua/etc/README 27share/examples/lua-5.1/etc/README
28share/examples/lua/etc/all.c 28share/examples/lua-5.1/etc/all.c
29share/examples/lua/etc/lua.ico 29share/examples/lua-5.1/etc/lua.ico
30share/examples/lua/etc/min.c 30share/examples/lua-5.1/etc/min.c
31share/examples/lua/etc/noparser.c 31share/examples/lua-5.1/etc/noparser.c
32share/examples/lua/etc/strict.lua 32share/examples/lua-5.1/etc/strict.lua
33share/examples/lua/factorial.lua 33share/examples/lua-5.1/factorial.lua
34share/examples/lua/fib.lua 34share/examples/lua-5.1/fib.lua
35share/examples/lua/fibfor.lua 35share/examples/lua-5.1/fibfor.lua
36share/examples/lua/globals.lua 36share/examples/lua-5.1/globals.lua
37share/examples/lua/hello.lua 37share/examples/lua-5.1/hello.lua
38share/examples/lua/life.lua 38share/examples/lua-5.1/life.lua
39share/examples/lua/luac.lua 39share/examples/lua-5.1/luac.lua
40share/examples/lua/printf.lua 40share/examples/lua-5.1/printf.lua
41share/examples/lua/readonly.lua 41share/examples/lua-5.1/readonly.lua
42share/examples/lua/sieve.lua 42share/examples/lua-5.1/sieve.lua
43share/examples/lua/sort.lua 43share/examples/lua-5.1/sort.lua
44share/examples/lua/table.lua 44share/examples/lua-5.1/table.lua
45share/examples/lua/trace-calls.lua 45share/examples/lua-5.1/trace-calls.lua
46share/examples/lua/trace-globals.lua 46share/examples/lua-5.1/trace-globals.lua
47share/examples/lua/xd.lua 47share/examples/lua-5.1/xd.lua
48@pkgdir share/lua/5.1 48@pkgdir share/lua/5.1
49@pkgdir lib/lua/5.1 49@pkgdir lib/lua/5.1
cvs diff -r1.1 -r1.2 pkgsrc/lang/lua51/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/lua51/distinfo 2013/10/30 06:18:09 1.1
+++ pkgsrc/lang/lua51/distinfo 2014/05/03 13:00:44 1.2
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.1 2013/10/30 06:18:09 dholland Exp $ 1$NetBSD: distinfo,v 1.2 2014/05/03 13:00:44 alnsn Exp $
2 2
3SHA1 (lua-5.1.5.tar.gz) = b3882111ad02ecc6b972f8c1241647905cb2e3fc 3SHA1 (lua-5.1.5.tar.gz) = b3882111ad02ecc6b972f8c1241647905cb2e3fc
4RMD160 (lua-5.1.5.tar.gz) = b0c2234675335a8bf158a125b6778cf800c754a0 4RMD160 (lua-5.1.5.tar.gz) = b0c2234675335a8bf158a125b6778cf800c754a0
5Size (lua-5.1.5.tar.gz) = 221213 bytes 5Size (lua-5.1.5.tar.gz) = 221213 bytes
6SHA1 (patch-aa) = 25bcd22d3fc319c51356b7f976d0215eb04900db 6SHA1 (patch-aa) = 4af5fcbd1c76bc7b0815a330c43d1e5eb715e6ff
7SHA1 (patch-ab) = 6f0964957112afbbc77648c86ae2a6ddd20c3389 7SHA1 (patch-ab) = 53e8e2693e3afa819079e253f212988a44357412
8SHA1 (patch-ac) = bd2348dcb273de09ddc09da906c93de6cc209c5c 8SHA1 (patch-ac) = bd2348dcb273de09ddc09da906c93de6cc209c5c
 9SHA1 (patch-etc_lua.pc) = fa737dc85922d8b4d9f2d61fafb8fcdebf53b059
cvs diff -r1.2 -r1.3 pkgsrc/lang/lua51/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/lang/lua51/buildlink3.mk 2013/10/30 08:59:36 1.2
+++ pkgsrc/lang/lua51/buildlink3.mk 2014/05/03 13:00:44 1.3
@@ -1,14 +1,24 @@ @@ -1,14 +1,24 @@
1# $NetBSD: buildlink3.mk,v 1.2 2013/10/30 08:59:36 obache Exp $ 1# $NetBSD: buildlink3.mk,v 1.3 2014/05/03 13:00:44 alnsn Exp $
2 2
3BUILDLINK_TREE+= lua51 3BUILDLINK_TREE+= lua51
4 4
5.if !defined(LUA51_BUILDLINK3_MK) 5.if !defined(LUA51_BUILDLINK3_MK)
6LUA51_BUILDLINK3_MK:= 6LUA51_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.lua51+= lua51>=5.1.1<5.2 8BUILDLINK_API_DEPENDS.lua51+= lua51>=5.1.1<5.2
9BUILDLINK_PKGSRCDIR.lua51?= ../../lang/lua51 9BUILDLINK_PKGSRCDIR.lua51?= ../../lang/lua51
10 10
11.include "../../devel/readline/buildlink3.mk" 11.if defined(BUILDLINK_DEPMETHOD.lua)
 12BUILDLINK_DEPMETHOD.lua51?= ${BUILDLINK_DEPMETHOD.lua}
 13.endif
 14
 15# -llua -> -llua5.1
 16BUILDLINK_TRANSFORM+= l:lua:lua5.1
 17BUILDLINK_INCDIRS.lua51+= include/lua-5.1
 18
 19BUILDLINK_FNAME_TRANSFORM.lua51+= -e 's|lib/pkgconfig/lua-5.1.pc|lib/pkgconfig/lua.pc|'
 20
 21.include "../../mk/readline.buildlink3.mk"
12.endif # LUA51_BUILDLINK3_MK 22.endif # LUA51_BUILDLINK3_MK
13 23
14BUILDLINK_TREE+= -lua51 24BUILDLINK_TREE+= -lua51
cvs diff -r1.1 -r1.2 pkgsrc/lang/lua51/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/lang/lua51/patches/patch-aa 2013/10/30 06:18:10 1.1
+++ pkgsrc/lang/lua51/patches/patch-aa 2014/05/03 13:00:44 1.2
@@ -1,53 +1,58 @@ @@ -1,53 +1,58 @@
1$NetBSD: patch-aa,v 1.1 2013/10/30 06:18:10 dholland Exp $ 1$NetBSD: patch-aa,v 1.2 2014/05/03 13:00:44 alnsn Exp $
2 2
3--- Makefile.orig 2008-08-12 01:40:48.000000000 +0100 3--- Makefile.orig 2012-02-10 09:50:23.000000000 +0000
4+++ Makefile 2009-12-17 16:36:32.000000000 +0000 4+++ Makefile
5@@ -9,11 +9,11 @@ PLAT= none 5@@ -9,11 +9,11 @@ PLAT= none
6  6
7 # Where to install. The installation starts in the src and doc directories, 7 # Where to install. The installation starts in the src and doc directories,
8 # so take care if INSTALL_TOP is not an absolute path. 8 # so take care if INSTALL_TOP is not an absolute path.
9-INSTALL_TOP= /usr/local 9-INSTALL_TOP= /usr/local
10+INSTALL_TOP= ${PREFIX} 10+INSTALL_TOP= ${PREFIX}
11 INSTALL_BIN= $(INSTALL_TOP)/bin 11 INSTALL_BIN= $(INSTALL_TOP)/bin
12 INSTALL_INC= $(INSTALL_TOP)/include 12-INSTALL_INC= $(INSTALL_TOP)/include
 13+INSTALL_INC= $(INSTALL_TOP)/include/lua-5.1
13 INSTALL_LIB= $(INSTALL_TOP)/lib 14 INSTALL_LIB= $(INSTALL_TOP)/lib
14-INSTALL_MAN= $(INSTALL_TOP)/man/man1 15-INSTALL_MAN= $(INSTALL_TOP)/man/man1
15+INSTALL_MAN= $(INSTALL_TOP)/${PKGMANDIR}/man1 16+INSTALL_MAN= $(INSTALL_TOP)/${PKGMANDIR}/man1
16 # 17 #
17 # You probably want to make INSTALL_LMOD and INSTALL_CMOD consistent with 18 # You probably want to make INSTALL_LMOD and INSTALL_CMOD consistent with
18 # LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h (and also with etc/lua.pc). 19 # LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h (and also with etc/lua.pc).
19@@ -24,7 +24,7 @@ INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V 20@@ -24,7 +24,7 @@ INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V
20 # may have to run ranlib on the installed liblua.a (do "make ranlib"). 21 # may have to run ranlib on the installed liblua.a (do "make ranlib").
21 INSTALL= install -p 22 INSTALL= install -p
22 INSTALL_EXEC= $(INSTALL) -m 0755 23 INSTALL_EXEC= $(INSTALL) -m 0755
23-INSTALL_DATA= $(INSTALL) -m 0644 24-INSTALL_DATA= $(INSTALL) -m 0644
24+#INSTALL_DATA= $(INSTALL) -m 0644 25+#INSTALL_DATA= $(INSTALL) -m 0644
25 # 26 #
26 # If you don't have install you can use cp instead. 27 # If you don't have install you can use cp instead.
27 # INSTALL= cp -p 28 # INSTALL= cp -p
28@@ -43,7 +43,7 @@ PLATS= aix ansi bsd freebsd generic linu 29@@ -41,9 +41,9 @@ RANLIB= ranlib
 30 PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
 31
29 # What to install. 32 # What to install.
30 TO_BIN= lua luac 33-TO_BIN= lua luac
 34+TO_BIN= lua5.1 luac5.1
31 TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp 35 TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp
32-TO_LIB= liblua.a 36-TO_LIB= liblua.a
33+TO_LIB= liblua.la 37+TO_LIB= liblua5.1.la
34 TO_MAN= lua.1 luac.1 38 TO_MAN= lua.1 luac.1
35  39
36 # Lua version and release. 40 # Lua version and release.
37@@ -59,11 +59,11 @@ test: dummy 41@@ -59,11 +59,12 @@ test: dummy
38 src/lua test/hello.lua 42 src/lua test/hello.lua
39  43
40 install: dummy 44 install: dummy
41- cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD) 45- cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)
42- cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN) 46- cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN)
43- cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC) 47- cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
44- cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB) 48- cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
45- cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN) 49- cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
46+ cd src && $(MKDIR) $(DESTDIR)$(INSTALL_BIN) $(DESTDIR)$(INSTALL_INC) $(DESTDIR)$(INSTALL_LIB) $(DESTDIR)$(INSTALL_MAN) $(DESTDIR)$(INSTALL_LMOD) $(DESTDIR)$(INSTALL_CMOD) 50+ cd src && $(MKDIR) $(DESTDIR)$(INSTALL_BIN) $(DESTDIR)$(INSTALL_INC) $(DESTDIR)$(INSTALL_LIB) $(DESTDIR)$(INSTALL_MAN) $(DESTDIR)$(INSTALL_LMOD) $(DESTDIR)$(INSTALL_CMOD)
47+ cd src && $(LIBTOOL) --tag=CC --mode=install $(BSD_INSTALL_PROGRAM) $(TO_BIN) $(DESTDIR)$(INSTALL_BIN) 51+ cd src && $(LIBTOOL) --tag=CC --mode=install $(BSD_INSTALL_PROGRAM) $(TO_BIN) $(DESTDIR)$(INSTALL_BIN)
48+ cd src && $(INSTALL_DATA) $(TO_INC) $(DESTDIR)$(INSTALL_INC) 52+ cd src && $(INSTALL_DATA) $(TO_INC) $(DESTDIR)$(INSTALL_INC)
49+ cd src && $(LIBTOOL) --tag=CC --mode=install $(BSD_INSTALL_LIB) $(TO_LIB) $(DESTDIR)$(INSTALL_LIB) 53+ cd src && $(LIBTOOL) --tag=CC --mode=install $(BSD_INSTALL_LIB) $(TO_LIB) $(DESTDIR)$(INSTALL_LIB)
50+ cd doc && $(INSTALL_DATA) $(TO_MAN) $(DESTDIR)$(INSTALL_MAN) 54+ cd doc && $(INSTALL_DATA) lua.1 $(DESTDIR)$(INSTALL_MAN)/lua5.1.1
 55+ cd doc && $(INSTALL_DATA) luac.1 $(DESTDIR)$(INSTALL_MAN)/luac5.1.1
51  56
52 ranlib: 57 ranlib:
53 cd src && cd $(INSTALL_LIB) && $(RANLIB) $(TO_LIB) 58 cd src && cd $(INSTALL_LIB) && $(RANLIB) $(TO_LIB)
cvs diff -r1.1 -r1.2 pkgsrc/lang/lua51/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/lang/lua51/patches/patch-ab 2013/10/30 06:18:10 1.1
+++ pkgsrc/lang/lua51/patches/patch-ab 2014/05/03 13:00:44 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-ab,v 1.1 2013/10/30 06:18:10 dholland Exp $ 1$NetBSD: patch-ab,v 1.2 2014/05/03 13:00:44 alnsn Exp $
2 2
3--- src/Makefile.orig 2012-02-13 20:41:22.000000000 +0000 3--- src/Makefile.orig 2012-02-13 20:41:22.000000000 +0000
4+++ src/Makefile 4+++ src/Makefile
5@@ -7,8 +7,8 @@ 5@@ -7,8 +7,8 @@
6 # Your platform. See PLATS for possible values. 6 # Your platform. See PLATS for possible values.
7 PLAT= none 7 PLAT= none
8  8
9-CC= gcc 9-CC= gcc
10-CFLAGS= -O2 -Wall $(MYCFLAGS) 10-CFLAGS= -O2 -Wall $(MYCFLAGS)
11+CC?= gcc 11+CC?= gcc
12+CFLAGS+= -Wall $(MYCFLAGS) 12+CFLAGS+= -Wall $(MYCFLAGS)
13 AR= ar rcu 13 AR= ar rcu
14 RANLIB= ranlib 14 RANLIB= ranlib
@@ -18,44 +18,47 @@ $NetBSD: patch-ab,v 1.1 2013/10/30 06:18 @@ -18,44 +18,47 @@ $NetBSD: patch-ab,v 1.1 2013/10/30 06:18
18 MYLIBS= 18 MYLIBS=
19  19
20+.SUFFIXES: .lo 20+.SUFFIXES: .lo
21+.c.lo: 21+.c.lo:
22+ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c $< 22+ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c $<
23+LV= 5:1 23+LV= 5:1
24+ 24+
25 # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE ========= 25 # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
26  26
27 PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris 27 PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
28  28
29-LUA_A= liblua.a 29-LUA_A= liblua.a
30-CORE_O= lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \ 30-CORE_O= lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \
31+LUA_XA= liblua.a 31+LUA_XA= liblua5.1.a
32+LUA_A= liblua.la 32+LUA_A= liblua5.1.la
33+XCORE_O= lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \ 33+XCORE_O= lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \
34 lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o \ 34 lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o \
35 lundump.o lvm.o lzio.o 35 lundump.o lvm.o lzio.o
36-LIB_O= lauxlib.o lbaselib.o ldblib.o liolib.o lmathlib.o loslib.o ltablib.o \ 36-LIB_O= lauxlib.o lbaselib.o ldblib.o liolib.o lmathlib.o loslib.o ltablib.o \
37+XLIB_O= lauxlib.o lbaselib.o ldblib.o liolib.o lmathlib.o loslib.o ltablib.o \ 37+XLIB_O= lauxlib.o lbaselib.o ldblib.o liolib.o lmathlib.o loslib.o ltablib.o \
38 lstrlib.o loadlib.o linit.o 38 lstrlib.o loadlib.o linit.o
39+CORE_O= $(XCORE_O:.o=.lo) 39+CORE_O= $(XCORE_O:.o=.lo)
40+LIB_O= $(XLIB_O:.o=.lo) 40+LIB_O= $(XLIB_O:.o=.lo)
41  41
42 LUA_T= lua 42-LUA_T= lua
43-LUA_O= lua.o 43-LUA_O= lua.o
 44-
 45-LUAC_T= luac
 46-LUAC_O= luac.o print.o
 47+LUA_T= lua5.1
44+LUA_XO= lua.o 48+LUA_XO= lua.o
45+LUA_O= $(LUA_XO:.o=.lo) 49+LUA_O= $(LUA_XO:.o=.lo)
46  50+
47 LUAC_T= luac 51+LUAC_T= luac5.1
48-LUAC_O= luac.o print.o 
49+LUAC_XO= luac.o print.o 52+LUAC_XO= luac.o print.o
50+LUAC_O= $(LUAC_XO:.o=.lo) 53+LUAC_O= $(LUAC_XO:.o=.lo)
51  54
52 ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O) 55 ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O)
53 ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) 56 ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
54@@ -48,14 +58,13 @@ o: $(ALL_O) 57@@ -48,14 +58,13 @@ o: $(ALL_O)
55 a: $(ALL_A) 58 a: $(ALL_A)
56  59
57 $(LUA_A): $(CORE_O) $(LIB_O) 60 $(LUA_A): $(CORE_O) $(LIB_O)
58- $(AR) $@ $(CORE_O) $(LIB_O) # DLL needs all object files 61- $(AR) $@ $(CORE_O) $(LIB_O) # DLL needs all object files
59- $(RANLIB) $@ 62- $(RANLIB) $@
60+ ${LIBTOOL} --tag=CC --mode=link ${CC} ${LDFLAGS} -o $@ ${CORE_O} ${LIB_O} -rpath ${PREFIX}/lib -version-info ${LV} ${LIBS} 63+ ${LIBTOOL} --tag=CC --mode=link ${CC} ${LDFLAGS} -o $@ ${CORE_O} ${LIB_O} -rpath ${PREFIX}/lib -version-info ${LV} ${LIBS}
61  64
File Added: pkgsrc/lang/lua51/patches/patch-etc_lua.pc
$NetBSD: patch-etc_lua.pc,v 1.1 2014/05/03 13:00:44 alnsn Exp $

--- etc/lua.pc.orig	2014-04-18 14:08:28.000000000 +0000
+++ etc/lua.pc
@@ -19,7 +19,7 @@ INSTALL_CMOD= ${prefix}/lib/lua/${V}
 # canonical vars
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
-includedir=${prefix}/include
+includedir=${prefix}/include/lua-5.1
 
 Name: Lua
 Description: An Extensible Extension Language
cvs diff -r1.1 -r1.2 pkgsrc/lang/lua52/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/lua52/Makefile 2013/10/30 06:18:10 1.1
+++ pkgsrc/lang/lua52/Makefile 2014/05/03 13:00:45 1.2
@@ -1,59 +1,64 @@ @@ -1,59 +1,64 @@
1# $NetBSD: Makefile,v 1.1 2013/10/30 06:18:10 dholland Exp $ 1# $NetBSD: Makefile,v 1.2 2014/05/03 13:00:45 alnsn Exp $
2 2
3DISTNAME= lua-${LUA_VERSION} 3DISTNAME= lua-${LUA_VERSION}
4PKGNAME= lua52-${LUA_VERSION} 4PKGNAME= lua52-${LUA_VERSION}
5CATEGORIES= lang 5CATEGORIES= lang
6MASTER_SITES= http://www.lua.org/ftp/ \ 6MASTER_SITES= http://www.lua.org/ftp/ \
7 http://www.tecgraf.puc-rio.br/lua/ftp/ 7 http://www.tecgraf.puc-rio.br/lua/ftp/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.lua.org/ 10HOMEPAGE= http://www.lua.org/
11COMMENT= Powerful light-weight language for extending applications 11COMMENT= Powerful light-weight language for extending applications
12LICENSE= mit 12LICENSE= mit
13 13
14.include "../../lang/lua52/version.mk" 14.include "../../lang/lua52/version.mk"
15 15
16PKG_INSTALLATION_TYPES= overwrite pkgviews 16PKG_INSTALLATION_TYPES= overwrite pkgviews
17CONFLICTS+= lua-[0-9]* 17CONFLICTS+= lua-[0-9]*
18 18
19.include "../../mk/bsd.prefs.mk" 19.include "../../mk/bsd.prefs.mk"
20 20
21USE_LIBTOOL= yes 21USE_LIBTOOL= yes
22USE_TOOLS+= gmake 22USE_TOOLS+= gmake
23MAKE_ENV+= DLLIB=${BUILDLINK_LDADD.dl:Q} 23MAKE_ENV+= DLLIB=${BUILDLINK_LDADD.dl:Q}
24MAKE_ENV+= INSTALL_DATA=${INSTALL_DATA:Q} 24MAKE_ENV+= INSTALL_DATA=${INSTALL_DATA:Q}
25CFLAGS+= -DLUA_ROOT=\"${PREFIX}/\" 25CFLAGS+= -DLUA_ROOT=\"${PREFIX}/\"
26 26
27PKGCONFIG_OVERRIDE= ${WRKSRC}/lua.pc 27PKGCONFIG_OVERRIDE= ${WRKSRC}/lua.pc
28INSTALLATION_DIRS+= lib/pkgconfig share/doc/lua 28INSTALLATION_DIRS+= lib/pkgconfig share/doc/lua-5.2
29 29
30.if ${OPSYS} == "FreeBSD" 30.if ${OPSYS} == "FreeBSD"
31BUILD_TARGET= freebsd 31BUILD_TARGET= freebsd
32.elif !empty(OPSYS:M*BSD*) || ${OPSYS} == "DragonFly" 32.elif !empty(OPSYS:M*BSD*) || ${OPSYS} == "DragonFly"
33BUILD_TARGET= bsd 33BUILD_TARGET= bsd
34.elif ${OPSYS} == "Linux" 34.elif ${OPSYS} == "Linux"
35BUILD_TARGET= linux 35BUILD_TARGET= linux
36.elif ${OPSYS} == "Darwin" 36.elif ${OPSYS} == "Darwin"
37BUILD_TARGET= macosx 37BUILD_TARGET= macosx
38.elif ${OPSYS} == "SunOS" 38.elif ${OPSYS} == "SunOS"
39BUILD_TARGET= solaris 39BUILD_TARGET= solaris
40.elif ${OPSYS} == "AIX" 40.elif ${OPSYS} == "AIX"
41BUILD_TARGET= aix 41BUILD_TARGET= aix
42.else 42.else
43BUILD_TARGET= generic 43BUILD_TARGET= generic
44.endif 44.endif
45 45
 46DOCDIR= ${PREFIX}/share/doc/lua-5.2
 47
46pre-configure: 48pre-configure:
47 sed -e 's,@PREFIX@,${PREFIX},g' \ 49 sed -e 's,@PREFIX@,${PREFIX},g' \
48 -e 's,@VER@,${PKGVERSION_NOREV:R},g' \ 50 -e 's,@VER@,${PKGVERSION_NOREV:R},g' \
49 -e 's,@REV@,${PKGVERSION_NOREV},g' \ 51 -e 's,@REV@,${PKGVERSION_NOREV},g' \
50 ${FILESDIR}/lua.pc.in > ${WRKSRC}/lua.pc 52 ${FILESDIR}/lua.pc.in > ${WRKSRC}/lua.pc
 53 cp ${WRKSRC}/doc/lua.1 ${WRKSRC}/doc/lua5.2.1
 54 cp ${WRKSRC}/doc/luac.1 ${WRKSRC}/doc/luac5.2.1
51 55
52post-install: 56post-install:
53 ${INSTALL_DATA} ${WRKSRC}/lua.pc ${DESTDIR}${PREFIX}/lib/pkgconfig 57 ${INSTALL_DATA} ${WRKSRC}/doc/*.[a-z][a-z][a-z] \
54 ${INSTALL_DATA} ${WRKSRC}/doc/*.??? ${DESTDIR}${PREFIX}/share/doc/lua 58 ${WRKSRC}/doc/*.html ${DESTDIR}${DOCDIR}
55 ${INSTALL_DATA} ${WRKSRC}/doc/*.???? ${DESTDIR}${PREFIX}/share/doc/lua 59 ${INSTALL_DATA} ${WRKSRC}/lua.pc \
 60 ${DESTDIR}${PREFIX}/lib/pkgconfig/lua-5.2.pc
56 61
57.include "../../mk/readline.buildlink3.mk" 62.include "../../mk/readline.buildlink3.mk"
58.include "../../mk/dlopen.buildlink3.mk" 63.include "../../mk/dlopen.buildlink3.mk"
59.include "../../mk/bsd.pkg.mk" 64.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/lang/lua52/PLIST (expand / switch to unified diff)

--- pkgsrc/lang/lua52/PLIST 2013/10/30 06:18:10 1.1
+++ pkgsrc/lang/lua52/PLIST 2014/05/03 13:00:45 1.2
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1@comment $NetBSD: PLIST,v 1.1 2013/10/30 06:18:10 dholland Exp $ 1@comment $NetBSD: PLIST,v 1.2 2014/05/03 13:00:45 alnsn Exp $
2bin/lua 2bin/lua5.2
3bin/luac 3bin/luac5.2
4include/lauxlib.h 4include/lua-5.2/lauxlib.h
5include/lua.h 5include/lua-5.2/lua.h
6include/lua.hpp 6include/lua-5.2/lua.hpp
7include/luaconf.h 7include/lua-5.2/luaconf.h
8include/lualib.h 8include/lua-5.2/lualib.h
9lib/liblua.la 9lib/liblua5.2.la
10lib/pkgconfig/lua.pc 10lib/pkgconfig/lua-5.2.pc
11man/man1/lua.1 11man/man1/lua5.2.1
12man/man1/luac.1 12man/man1/luac5.2.1
13share/doc/lua/contents.html 13share/doc/lua-5.2/contents.html
14share/doc/lua/logo.gif 14share/doc/lua-5.2/logo.gif
15share/doc/lua/lua.css 15share/doc/lua-5.2/lua.css
16share/doc/lua/manual.css 16share/doc/lua-5.2/manual.css
17share/doc/lua/manual.html 17share/doc/lua-5.2/manual.html
18share/doc/lua/osi-certified-72x60.png 18share/doc/lua-5.2/osi-certified-72x60.png
19share/doc/lua/readme.html 19share/doc/lua-5.2/readme.html
20@pkgdir share/lua/5.2 20@pkgdir share/lua/5.2
21@pkgdir lib/lua/5.2 21@pkgdir lib/lua/5.2
cvs diff -r1.2 -r1.3 pkgsrc/lang/lua52/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/lang/lua52/buildlink3.mk 2013/10/30 09:02:06 1.2
+++ pkgsrc/lang/lua52/buildlink3.mk 2014/05/03 13:00:45 1.3
@@ -1,14 +1,24 @@ @@ -1,14 +1,24 @@
1# $NetBSD: buildlink3.mk,v 1.2 2013/10/30 09:02:06 obache Exp $ 1# $NetBSD: buildlink3.mk,v 1.3 2014/05/03 13:00:45 alnsn Exp $
2 2
3BUILDLINK_TREE+= lua52 3BUILDLINK_TREE+= lua52
4 4
5.if !defined(LUA52_BUILDLINK3_MK) 5.if !defined(LUA52_BUILDLINK3_MK)
6LUA52_BUILDLINK3_MK:= 6LUA52_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.lua52+= lua52>=5.2.0<5.3 8BUILDLINK_API_DEPENDS.lua52+= lua52>=5.2.0<5.3
9BUILDLINK_PKGSRCDIR.lua52?= ../../lang/lua52 9BUILDLINK_PKGSRCDIR.lua52?= ../../lang/lua52
10 10
 11.if defined(BUILDLINK_DEPMETHOD.lua)
 12BUILDLINK_DEPMETHOD.lua52?= ${BUILDLINK_DEPMETHOD.lua}
 13.endif
 14
 15# -llua -> -llua5.2
 16BUILDLINK_TRANSFORM+= l:lua:lua5.2
 17BUILDLINK_INCDIRS.lua52+= include/lua-5.2
 18
 19BUILDLINK_FNAME_TRANSFORM.lua52+= -e 's|lib/pkgconfig/lua-5.2.pc|lib/pkgconfig/lua.pc|'
 20
11.include "../../mk/readline.buildlink3.mk" 21.include "../../mk/readline.buildlink3.mk"
12.endif # LUA52_BUILDLINK3_MK 22.endif # LUA52_BUILDLINK3_MK
13 23
14BUILDLINK_TREE+= -lua52 24BUILDLINK_TREE+= -lua52
cvs diff -r1.2 -r1.3 pkgsrc/lang/lua52/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/lua52/distinfo 2014/01/02 19:57:39 1.2
+++ pkgsrc/lang/lua52/distinfo 2014/05/03 13:00:45 1.3
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.2 2014/01/02 19:57:39 wiz Exp $ 1$NetBSD: distinfo,v 1.3 2014/05/03 13:00:45 alnsn Exp $
2 2
3SHA1 (lua-5.2.3.tar.gz) = 926b7907bc8d274e063d42804666b40a3f3c124c 3SHA1 (lua-5.2.3.tar.gz) = 926b7907bc8d274e063d42804666b40a3f3c124c
4RMD160 (lua-5.2.3.tar.gz) = b8714669c8c0f8272104effd8a9675921ddb2fa5 4RMD160 (lua-5.2.3.tar.gz) = b8714669c8c0f8272104effd8a9675921ddb2fa5
5Size (lua-5.2.3.tar.gz) = 251195 bytes 5Size (lua-5.2.3.tar.gz) = 251195 bytes
6SHA1 (patch-aa) = 5fa5c7fecc7fd50dc9d88d441ad9373f59ecb841 6SHA1 (patch-aa) = ce0763ed1515f670b8a5d543af3753320cf06309
7SHA1 (patch-ab) = 4f2f05f6a5e4cfffe8f9ef7bf4de6f054074baa4 7SHA1 (patch-ab) = 92f711427090021d89b8fcb1d3633ca6300c830d
8SHA1 (patch-ac) = b8b9c0068210795e5eb22512767ac2e98bca8cbc 8SHA1 (patch-ac) = b8b9c0068210795e5eb22512767ac2e98bca8cbc
cvs diff -r1.1 -r1.2 pkgsrc/lang/lua52/files/lua.pc.in (expand / switch to unified diff)

--- pkgsrc/lang/lua52/files/lua.pc.in 2013/10/30 06:18:10 1.1
+++ pkgsrc/lang/lua52/files/lua.pc.in 2014/05/03 13:00:45 1.2
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1# $NetBSD: lua.pc.in,v 1.1 2013/10/30 06:18:10 dholland Exp $ 1# $NetBSD: lua.pc.in,v 1.2 2014/05/03 13:00:45 alnsn Exp $
2# lua.pc is not any longer distributed, but is still required by other packages. 2# lua.pc is not any longer distributed, but is still required by other packages.
3 3
4prefix= @PREFIX@ 4prefix= @PREFIX@
5INSTALL_BIN= ${prefix}/bin 5INSTALL_BIN= ${prefix}/bin
6INSTALL_INC= ${prefix}/include 6INSTALL_INC= ${prefix}/include
7INSTALL_LIB= ${prefix}/lib 7INSTALL_LIB= ${prefix}/lib
8INSTALL_MAN= ${prefix}/man/man1 8INSTALL_MAN= ${prefix}/man/man1
9INSTALL_LMOD= ${prefix}/share/lua/@VER@ 9INSTALL_LMOD= ${prefix}/share/lua/@VER@
10INSTALL_CMOD= ${prefix}/lib/lua/@VER@ 10INSTALL_CMOD= ${prefix}/lib/lua/@VER@
11 11
12exec_prefix=${prefix} 12exec_prefix=${prefix}
13libdir=${exec_prefix}/lib 13libdir=${exec_prefix}/lib
14includedir=${prefix}/include 14includedir=${prefix}/include/lua-5.2
15 15
16Name: Lua 16Name: Lua
17Description: An Extensible Extension Language 17Description: An Extensible Extension Language
18Version: @REV@ 18Version: @REV@
19Requires:  19Requires:
20Libs: -L${libdir} -llua -lm 20Libs: -L${libdir} -llua5.2 -lm
21Cflags: -I${includedir} 21Cflags: -I${includedir}
cvs diff -r1.1 -r1.2 pkgsrc/lang/lua52/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/lang/lua52/patches/patch-aa 2013/10/30 06:18:10 1.1
+++ pkgsrc/lang/lua52/patches/patch-aa 2014/05/03 13:00:45 1.2
@@ -1,49 +1,55 @@ @@ -1,49 +1,55 @@
1$NetBSD: patch-aa,v 1.1 2013/10/30 06:18:10 dholland Exp $ 1$NetBSD: patch-aa,v 1.2 2014/05/03 13:00:45 alnsn Exp $
2 2
3--- Makefile.orig 2012-05-17 14:05:54.000000000 +0000 3--- Makefile.orig 2013-11-10 00:49:35.000000000 +0000
4+++ Makefile 4+++ Makefile
5@@ -10,11 +10,11 @@ PLAT= none 5@@ -10,11 +10,11 @@ PLAT= none
6 # so take care if INSTALL_TOP is not an absolute path. See the local target. 6 # so take care if INSTALL_TOP is not an absolute path. See the local target.
7 # You may want to make INSTALL_LMOD and INSTALL_CMOD consistent with 7 # You may want to make INSTALL_LMOD and INSTALL_CMOD consistent with
8 # LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h. 8 # LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h.
9-INSTALL_TOP= /usr/local 9-INSTALL_TOP= /usr/local
10+INSTALL_TOP= ${PREFIX} 10+INSTALL_TOP= ${PREFIX}
11 INSTALL_BIN= $(INSTALL_TOP)/bin 11 INSTALL_BIN= $(INSTALL_TOP)/bin
12 INSTALL_INC= $(INSTALL_TOP)/include 12-INSTALL_INC= $(INSTALL_TOP)/include
 13+INSTALL_INC= $(INSTALL_TOP)/include/lua-5.2
13 INSTALL_LIB= $(INSTALL_TOP)/lib 14 INSTALL_LIB= $(INSTALL_TOP)/lib
14-INSTALL_MAN= $(INSTALL_TOP)/man/man1 15-INSTALL_MAN= $(INSTALL_TOP)/man/man1
15+INSTALL_MAN= $(INSTALL_TOP)/${PKGMANDIR}/man1 16+INSTALL_MAN= $(INSTALL_TOP)/${PKGMANDIR}/man1
16 INSTALL_LMOD= $(INSTALL_TOP)/share/lua/$V 17 INSTALL_LMOD= $(INSTALL_TOP)/share/lua/$V
17 INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V 18 INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V
18  19
19@@ -22,7 +22,7 @@ INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V 20@@ -22,7 +22,7 @@ INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V
20 # you may have to run ranlib on the installed liblua.a. 21 # you may have to run ranlib on the installed liblua.a.
21 INSTALL= install -p 22 INSTALL= install -p
22 INSTALL_EXEC= $(INSTALL) -m 0755 23 INSTALL_EXEC= $(INSTALL) -m 0755
23-INSTALL_DATA= $(INSTALL) -m 0644 24-INSTALL_DATA= $(INSTALL) -m 0644
24+#INSTALL_DATA= $(INSTALL) -m 0644 25+#INSTALL_DATA= $(INSTALL) -m 0644
25 # 26 #
26 # If you don't have "install" you can use "cp" instead. 27 # If you don't have "install" you can use "cp" instead.
27 # INSTALL= cp -p 28 # INSTALL= cp -p
28@@ -41,7 +41,7 @@ PLATS= aix ansi bsd freebsd generic linu 29@@ -39,10 +39,10 @@ RM= rm -f
 30 PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
 31
29 # What to install. 32 # What to install.
30 TO_BIN= lua luac 33-TO_BIN= lua luac
 34+TO_BIN= lua5.2 luac5.2
31 TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp 35 TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp
32-TO_LIB= liblua.a 36-TO_LIB= liblua.a
33+TO_LIB= liblua.la 37-TO_MAN= lua.1 luac.1
34 TO_MAN= lua.1 luac.1 38+TO_LIB= liblua5.2.la
 39+TO_MAN= lua5.2.1 luac5.2.1
35  40
36 # Lua version and release. 41 # Lua version and release.
 42 V= 5.2
37@@ -58,11 +58,11 @@ test: dummy 43@@ -58,11 +58,11 @@ test: dummy
38 src/lua -v 44 src/lua -v
39  45
40 install: dummy 46 install: dummy
41- cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD) 47- cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)
42- cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN) 48- cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN)
43- cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC) 49- cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
44- cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB) 50- cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
45- cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN) 51- cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
46+ cd src && $(MKDIR) $(DESTDIR)$(INSTALL_BIN) $(DESTDIR)$(INSTALL_INC) $(DESTDIR)$(INSTALL_LIB) $(DESTDIR)$(INSTALL_MAN) $(DESTDIR)$(INSTALL_LMOD) $(DESTDIR)$(INSTALL_CMOD) 52+ cd src && $(MKDIR) $(DESTDIR)$(INSTALL_BIN) $(DESTDIR)$(INSTALL_INC) $(DESTDIR)$(INSTALL_LIB) $(DESTDIR)$(INSTALL_MAN) $(DESTDIR)$(INSTALL_LMOD) $(DESTDIR)$(INSTALL_CMOD)
47+ cd src && $(LIBTOOL) --tag=CC --mode=install $(BSD_INSTALL_PROGRAM) $(TO_BIN) $(DESTDIR)$(INSTALL_BIN) 53+ cd src && $(LIBTOOL) --tag=CC --mode=install $(BSD_INSTALL_PROGRAM) $(TO_BIN) $(DESTDIR)$(INSTALL_BIN)
48+ cd src && $(INSTALL_DATA) $(TO_INC) $(DESTDIR)$(INSTALL_INC) 54+ cd src && $(INSTALL_DATA) $(TO_INC) $(DESTDIR)$(INSTALL_INC)
49+ cd src && $(LIBTOOL) --tag=CC --mode=install $(BSD_INSTALL_LIB) $(TO_LIB) $(DESTDIR)$(INSTALL_LIB) 55+ cd src && $(LIBTOOL) --tag=CC --mode=install $(BSD_INSTALL_LIB) $(TO_LIB) $(DESTDIR)$(INSTALL_LIB)
cvs diff -r1.1 -r1.2 pkgsrc/lang/lua52/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/lang/lua52/patches/patch-ab 2013/10/30 06:18:10 1.1
+++ pkgsrc/lang/lua52/patches/patch-ab 2014/05/03 13:00:45 1.2
@@ -1,56 +1,58 @@ @@ -1,56 +1,58 @@
1$NetBSD: patch-ab,v 1.1 2013/10/30 06:18:10 dholland Exp $ 1$NetBSD: patch-ab,v 1.2 2014/05/03 13:00:45 alnsn Exp $
2 2
3--- src/Makefile.orig 2012-12-27 10:51:43.000000000 +0000 3--- src/Makefile.orig 2013-11-11 11:45:49.000000000 +0000
4+++ src/Makefile 4+++ src/Makefile
5@@ -6,8 +6,7 @@ 5@@ -6,8 +6,7 @@
6 # Your platform. See PLATS for possible values. 6 # Your platform. See PLATS for possible values.
7 PLAT= none 7 PLAT= none
8  8
9-CC= gcc 9-CC= gcc
10-CFLAGS= -O2 -Wall -DLUA_COMPAT_ALL $(SYSCFLAGS) $(MYCFLAGS) 10-CFLAGS= -O2 -Wall -DLUA_COMPAT_ALL $(SYSCFLAGS) $(MYCFLAGS)
11+CFLAGS+= -Wall -DLUA_COMPAT_ALL $(SYSCFLAGS) $(MYCFLAGS) 11+CFLAGS+= -Wall -DLUA_COMPAT_ALL $(SYSCFLAGS) $(MYCFLAGS)
12 LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS) 12 LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)
13 LIBS= -lm $(SYSLIBS) $(MYLIBS) 13 LIBS= -lm $(SYSLIBS) $(MYLIBS)
14  14
15@@ -24,23 +23,28 @@ MYLDFLAGS= 15@@ -24,23 +23,28 @@ MYLDFLAGS=
16 MYLIBS= 16 MYLIBS=
17 MYOBJS= 17 MYOBJS=
18  18
19+.SUFFIXES: .lo 19+.SUFFIXES: .lo
20+.c.lo: 20+.c.lo:
21+ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c $< 21+ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c $<
22+LV= 5:2 22+LV= 5:2
23+ 23+
24 # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE ======= 24 # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE =======
25  25
26 PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris 26 PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
27  27
28-LUA_A= liblua.a 28-LUA_A= liblua.a
29+LUA_A= liblua.la 29+LUA_A= liblua5.2.la
30 CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \ 30 CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
31 lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \ 31 lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \
32 ltm.o lundump.o lvm.o lzio.o 32 ltm.o lundump.o lvm.o lzio.o
33 LIB_O= lauxlib.o lbaselib.o lbitlib.o lcorolib.o ldblib.o liolib.o \ 33 LIB_O= lauxlib.o lbaselib.o lbitlib.o lcorolib.o ldblib.o liolib.o \
34 lmathlib.o loslib.o lstrlib.o ltablib.o loadlib.o linit.o 34 lmathlib.o loslib.o lstrlib.o ltablib.o loadlib.o linit.o
35-BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS) 35-BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS)
36+BASE_O= $(CORE_O:.o=.lo) $(LIB_O:.o=.lo) $(MYOBJS:.o=.lo) 36+BASE_O= $(CORE_O:.o=.lo) $(LIB_O:.o=.lo) $(MYOBJS:.o=.lo)
37  37
38 LUA_T= lua 38-LUA_T= lua
39-LUA_O= lua.o 39-LUA_O= lua.o
 40+LUA_T= lua5.2
40+LUA_O= lua.lo 41+LUA_O= lua.lo
41  42
42 LUAC_T= luac 43-LUAC_T= luac
43-LUAC_O= luac.o 44-LUAC_O= luac.o
 45+LUAC_T= luac5.2
44+LUAC_O= luac.lo 46+LUAC_O= luac.lo
45  47
46 ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) 48 ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
47 ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) 49 ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
48@@ -56,14 +60,13 @@ o: $(ALL_O) 50@@ -56,14 +60,13 @@ o: $(ALL_O)
49 a: $(ALL_A) 51 a: $(ALL_A)
50  52
51 $(LUA_A): $(BASE_O) 53 $(LUA_A): $(BASE_O)
52- $(AR) $@ $(BASE_O) 54- $(AR) $@ $(BASE_O)
53- $(RANLIB) $@ 55- $(RANLIB) $@
54+ ${LIBTOOL} --tag=CC --mode=link $(CC) $(LDFLAGS) -o $@ $(BASE_O) -rpath ${PREFIX}/lib -version-info ${LV} ${LIBS} 56+ ${LIBTOOL} --tag=CC --mode=link $(CC) $(LDFLAGS) -o $@ $(BASE_O) -rpath ${PREFIX}/lib -version-info ${LV} ${LIBS}
55  57
56 $(LUA_T): $(LUA_O) $(LUA_A) 58 $(LUA_T): $(LUA_O) $(LUA_A)