tech-pkg archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
multiversion Lua patch
[if you're in cc, you're a maintainer of a package I touched]
I've prepared a patch that allows multiple Lua versions to coexist.
I've tested it mostly on modules but I've also successfully built
graphics/graphviz and www/nginx{,-devel} with lua and luajit options,
respectively.
Patch is attached. Main changes are listed below.
Alex
lang/lua:
- module.mk: new defined variables LUA_DOCDIR and LUA_EXAMPLESDIR.
- luaversion.mk: new defined variable LUA_INTERPRETER for a full path
to the Lua binary.
- tool.mk: new file for packages that expect 'lua' binary in the $PATH.
- buildlink3.mk: added BUILDLINK_DEPMETHOD.lua (similar
to lang/python) and transform rules for -llua, include files and
pkg-config files.
databases/lua-sqlite: 5.1 only.
databases/lua-sqlite3: added a fix for 2 functions removed from 5.2.
databases/lua-tokyocabinet: moved bin/tc{b,f,h,u}test.lua files to
${LUA_EXAMPLESDIR}.
devel/lua-BitOp: added a new package from wip, needed for lua-posix.
devel/lua-posix: added lua-BitOp dependency for lua51 flavour.
devel/lua-stdlib-doc: merged to devel/lua-stdlib.
devel/lua-stdlib: doesn't depend on lua-stdlib-doc.
devel/lua-lpeg: gott rid of unnecessary SUBST_CLASSES.
textproc/lua-slnunicode: doesn't build anymore, I need to understand
FIND_PREFIX logic and whether it's needed.
www/lua-curl: added an include for tool.mk.
Index: lang/lua/application.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/lua/application.mk,v
retrieving revision 1.3
diff -p -u -u -r1.3 application.mk
--- lang/lua/application.mk 30 Oct 2013 09:09:59 -0000 1.3
+++ lang/lua/application.mk 27 Apr 2014 20:01:34 -0000
@@ -11,11 +11,13 @@
# Keywords: Lua
#
+.if !defined(LUA_LUAVERSION_MK)
.include "../../lang/lua/luaversion.mk"
+.endif
.if defined(REPLACE_LUA)
REPLACE_INTERPRETER+= lua
REPLACE.lua.old= .*lua
-REPLACE.lua.new= ${LOCALBASE}/bin/lua
+REPLACE.lua.new= ${LUA_INTERPRETER}
REPLACE_FILES.lua= ${REPLACE_LUA}
.endif
Index: lang/lua/luaversion.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/lua/luaversion.mk,v
retrieving revision 1.4
diff -p -u -u -r1.4 luaversion.mk
--- lang/lua/luaversion.mk 5 Nov 2013 11:26:44 -0000 1.4
+++ lang/lua/luaversion.mk 27 Apr 2014 20:01:34 -0000
@@ -47,6 +47,9 @@
#
# Example: lua51
#
+# LUA_INTERPRETER
+# Full path to Lua interpreter.
+#
# Keywords: Lua
#
@@ -127,4 +130,6 @@ PKG_FAIL_REASION+= "No valid Lua version
.include "${LUA_PKGSRCDIR}/version.mk"
_LUA_DOT_VERSION= ${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}
+LUA_INTERPRETER= ${LOCALBASE}/bin/lua${_LUA_DOT_VERSION}
+
.endif # LUA_LUAVERSION_MK
Index: lang/lua/module.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/lua/module.mk,v
retrieving revision 1.5
diff -p -u -u -r1.5 module.mk
--- lang/lua/module.mk 30 Oct 2013 06:18:09 -0000 1.5
+++ lang/lua/module.mk 27 Apr 2014 20:01:34 -0000
@@ -1,16 +1,39 @@
# $NetBSD: module.mk,v 1.5 2013/10/30 06:18:09 dholland Exp $
#
# This Makefile fragment is intended to be included by packages that
-# install Lua packages.
+# install Lua modules.
+#
+# === Defined variables ===
+#
+# LUA_LDIR
+# Path where Lua modules are installed.
+#
+# LUA_CDIR
+# Path where Lua C modules are installed. Not defined if
+# NO_BUILD variable is set to "yes".
+#
+# LUA_DOCDIR
+# Path where documentation files are installed.
+#
+# LUA_EXAMPLESDIR
+# Path where example files are installed.
+#
+# Keywords: lua
+#
.if !defined(LUA_MODULE_MK)
LUA_MODULE_MK= # defined
+.if !defined(LUA_LUAVERSION_MK)
.include "../../lang/lua/luaversion.mk"
+.endif
LUA_LDIR= share/lua/${_LUA_DOT_VERSION}
PLIST_SUBST+= LUA_LDIR=${LUA_LDIR}
+PRINT_PLIST_AWK+= /^${LUA_LDIR:S|/|\\/|g}/ \
+ { gsub(/${LUA_LDIR:S|/|\\/|g}/, "$${LUA_LDIR}") }
+
.if defined(NO_BUILD) && empty(NO_BUILD:M[Nn][Oo])
DEPENDS+= ${LUA_BASEDEPENDS}
@@ -18,12 +41,16 @@ DEPENDS+= ${LUA_BASEDEPENDS}
LUA_CDIR= lib/lua/${_LUA_DOT_VERSION}
PLIST_SUBST+= LUA_CDIR=${LUA_CDIR}
-PRINT_PLIST_AWK+= /^${LUA_LDIR:S|/|\\/|g}/ \
- { gsub(/${LUA_LDIR:S|/|\\/|g}/, "$${LUA_LDIR}") }
PRINT_PLIST_AWK+= /^${LUA_CDIR:S|/|\\/|g}/ \
{ gsub(/${LUA_CDIR:S|/|\\/|g}/, "$${LUA_CDIR}") }
.include "${LUA_PKGSRCDIR}/buildlink3.mk"
.endif
+LUA_DOCDIR= share/doc/${PKGBASE}
+PLIST_SUBST+= LUA_DOCDIR=${LUA_DOCDIR}
+
+LUA_EXAMPLESDIR= share/examples/${PKGBASE}
+PLIST_SUBST+= LUA_EXAMPLESDIR=${LUA_EXAMPLESDIR}
+
.endif # LUA_MODULE_MK
Index: lang/lua/tool.mk
===================================================================
RCS file: lang/lua/tool.mk
diff -N lang/lua/tool.mk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/lua/tool.mk 27 Apr 2014 20:01:34 -0000
@@ -0,0 +1,29 @@
+# $NetBSD$
+#
+# 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
+
+.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
+
+.endif # LUA_TOOL_MK
Index: lang/lua51/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/lua51/Makefile,v
retrieving revision 1.1
diff -p -u -u -r1.1 Makefile
--- lang/lua51/Makefile 30 Oct 2013 06:18:09 -0000 1.1
+++ lang/lua51/Makefile 27 Apr 2014 20:01:34 -0000
@@ -26,8 +26,8 @@ CFLAGS+= -DLUA_ROOT=\"${PREFIX}/\"
MAKE_FLAGS+= CC=cc
-DOCDIR= ${PREFIX}/share/doc/lua
-EGDIR= ${PREFIX}/share/examples/lua
+DOCDIR= ${PREFIX}/share/doc/lua-5.1
+EGDIR= ${PREFIX}/share/examples/lua-5.1
.if ${OPSYS} == "FreeBSD"
BUILD_TARGET= freebsd
@@ -74,7 +74,8 @@ post-install:
cd ${WRKSRC}/etc; for f in README *.c *.ico *.lua; do \
${INSTALL_DATA} "$$f" ${DESTDIR}${EGDIR}/etc; \
done
- ${INSTALL_DATA} ${WRKSRC}/etc/lua.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
+ ${INSTALL_DATA} ${WRKSRC}/etc/lua.pc \
+ ${DESTDIR}${PREFIX}/lib/pkgconfig/lua-5.1.pc
.include "../../devel/readline/buildlink3.mk"
.include "../../mk/dlopen.buildlink3.mk"
Index: lang/lua51/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/lang/lua51/PLIST,v
retrieving revision 1.1
diff -p -u -u -r1.1 PLIST
--- lang/lua51/PLIST 30 Oct 2013 06:18:09 -0000 1.1
+++ lang/lua51/PLIST 27 Apr 2014 20:01:34 -0000
@@ -1,49 +1,49 @@
@comment $NetBSD: PLIST,v 1.1 2013/10/30 06:18:09 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/COPYRIGHT
-share/doc/lua/HISTORY
-share/doc/lua/README
-share/doc/lua/contents.html
-share/doc/lua/logo.gif
-share/doc/lua/lua.html
-share/doc/lua/luac.html
-share/doc/lua/manual.html
-share/doc/lua/readme.html
-share/examples/lua/README
-share/examples/lua/bisect.lua
-share/examples/lua/cf.lua
-share/examples/lua/echo.lua
-share/examples/lua/env.lua
-share/examples/lua/etc/README
-share/examples/lua/etc/all.c
-share/examples/lua/etc/lua.ico
-share/examples/lua/etc/min.c
-share/examples/lua/etc/noparser.c
-share/examples/lua/etc/strict.lua
-share/examples/lua/factorial.lua
-share/examples/lua/fib.lua
-share/examples/lua/fibfor.lua
-share/examples/lua/globals.lua
-share/examples/lua/hello.lua
-share/examples/lua/life.lua
-share/examples/lua/luac.lua
-share/examples/lua/printf.lua
-share/examples/lua/readonly.lua
-share/examples/lua/sieve.lua
-share/examples/lua/sort.lua
-share/examples/lua/table.lua
-share/examples/lua/trace-calls.lua
-share/examples/lua/trace-globals.lua
-share/examples/lua/xd.lua
+bin/lua5.1
+bin/luac5.1
+include/lua-5.1/lauxlib.h
+include/lua-5.1/lua.h
+include/lua-5.1/lua.hpp
+include/lua-5.1/luaconf.h
+include/lua-5.1/lualib.h
+lib/liblua5.1.la
+lib/pkgconfig/lua-5.1.pc
+man/man1/lua5.1.1
+man/man1/luac5.1.1
+share/doc/lua-5.1/COPYRIGHT
+share/doc/lua-5.1/HISTORY
+share/doc/lua-5.1/README
+share/doc/lua-5.1/contents.html
+share/doc/lua-5.1/logo.gif
+share/doc/lua-5.1/lua.html
+share/doc/lua-5.1/luac.html
+share/doc/lua-5.1/manual.html
+share/doc/lua-5.1/readme.html
+share/examples/lua-5.1/README
+share/examples/lua-5.1/bisect.lua
+share/examples/lua-5.1/cf.lua
+share/examples/lua-5.1/echo.lua
+share/examples/lua-5.1/env.lua
+share/examples/lua-5.1/etc/README
+share/examples/lua-5.1/etc/all.c
+share/examples/lua-5.1/etc/lua.ico
+share/examples/lua-5.1/etc/min.c
+share/examples/lua-5.1/etc/noparser.c
+share/examples/lua-5.1/etc/strict.lua
+share/examples/lua-5.1/factorial.lua
+share/examples/lua-5.1/fib.lua
+share/examples/lua-5.1/fibfor.lua
+share/examples/lua-5.1/globals.lua
+share/examples/lua-5.1/hello.lua
+share/examples/lua-5.1/life.lua
+share/examples/lua-5.1/luac.lua
+share/examples/lua-5.1/printf.lua
+share/examples/lua-5.1/readonly.lua
+share/examples/lua-5.1/sieve.lua
+share/examples/lua-5.1/sort.lua
+share/examples/lua-5.1/table.lua
+share/examples/lua-5.1/trace-calls.lua
+share/examples/lua-5.1/trace-globals.lua
+share/examples/lua-5.1/xd.lua
@pkgdir share/lua/5.1
@pkgdir lib/lua/5.1
Index: lang/lua51/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/lua51/buildlink3.mk,v
retrieving revision 1.2
diff -p -u -u -r1.2 buildlink3.mk
--- lang/lua51/buildlink3.mk 30 Oct 2013 08:59:36 -0000 1.2
+++ lang/lua51/buildlink3.mk 27 Apr 2014 20:01:34 -0000
@@ -8,6 +8,16 @@ LUA51_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.lua51+= lua51>=5.1.1<5.2
BUILDLINK_PKGSRCDIR.lua51?= ../../lang/lua51
+.if defined(BUILDLINK_DEPMETHOD.lua)
+BUILDLINK_DEPMETHOD.lua51?= ${BUILDLINK_DEPMETHOD.lua}
+.endif
+
+# -llua -> -llua5.1
+BUILDLINK_TRANSFORM+= l:lua:lua5.1
+BUILDLINK_INCDIRS.lua51+= include/lua-5.1
+
+BUILDLINK_FNAME_TRANSFORM.lua51+= -e
's|lib/pkgconfig/lua-5.1.pc|lib/pkgconfig/lua.pc|'
+
.include "../../devel/readline/buildlink3.mk"
.endif # LUA51_BUILDLINK3_MK
Index: lang/lua51/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/lang/lua51/distinfo,v
retrieving revision 1.1
diff -p -u -u -r1.1 distinfo
--- lang/lua51/distinfo 30 Oct 2013 06:18:09 -0000 1.1
+++ lang/lua51/distinfo 27 Apr 2014 20:01:34 -0000
@@ -3,6 +3,7 @@ $NetBSD: distinfo,v 1.1 2013/10/30 06:18
SHA1 (lua-5.1.5.tar.gz) = b3882111ad02ecc6b972f8c1241647905cb2e3fc
RMD160 (lua-5.1.5.tar.gz) = b0c2234675335a8bf158a125b6778cf800c754a0
Size (lua-5.1.5.tar.gz) = 221213 bytes
-SHA1 (patch-aa) = 25bcd22d3fc319c51356b7f976d0215eb04900db
-SHA1 (patch-ab) = 6f0964957112afbbc77648c86ae2a6ddd20c3389
+SHA1 (patch-aa) = 4af5fcbd1c76bc7b0815a330c43d1e5eb715e6ff
+SHA1 (patch-ab) = 53e8e2693e3afa819079e253f212988a44357412
SHA1 (patch-ac) = bd2348dcb273de09ddc09da906c93de6cc209c5c
+SHA1 (patch-etc_lua.pc) = fa737dc85922d8b4d9f2d61fafb8fcdebf53b059
Index: lang/lua51/patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/lang/lua51/patches/patch-aa,v
retrieving revision 1.1
diff -p -u -u -r1.1 patch-aa
--- lang/lua51/patches/patch-aa 30 Oct 2013 06:18:10 -0000 1.1
+++ lang/lua51/patches/patch-aa 27 Apr 2014 20:01:34 -0000
@@ -1,7 +1,7 @@
$NetBSD: patch-aa,v 1.1 2013/10/30 06:18:10 dholland Exp $
---- Makefile.orig 2008-08-12 01:40:48.000000000 +0100
-+++ Makefile 2009-12-17 16:36:32.000000000 +0000
+--- Makefile.orig 2012-02-10 09:50:23.000000000 +0000
++++ Makefile
@@ -9,11 +9,11 @@ PLAT= none
# Where to install. The installation starts in the src and doc directories,
@@ -9,7 +9,8 @@ $NetBSD: patch-aa,v 1.1 2013/10/30 06:18
-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.1
INSTALL_LIB= $(INSTALL_TOP)/lib
-INSTALL_MAN= $(INSTALL_TOP)/man/man1
+INSTALL_MAN= $(INSTALL_TOP)/${PKGMANDIR}/man1
@@ -25,16 +26,19 @@ $NetBSD: patch-aa,v 1.1 2013/10/30 06:18
#
# If you don't have install you can use cp instead.
# INSTALL= cp -p
-@@ -43,7 +43,7 @@ PLATS= aix ansi bsd freebsd generic linu
+@@ -41,9 +41,9 @@ RANLIB= ranlib
+ 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.1 luac5.1
TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp
-TO_LIB= liblua.a
-+TO_LIB= liblua.la
++TO_LIB= liblua5.1.la
TO_MAN= lua.1 luac.1
# Lua version and release.
-@@ -59,11 +59,11 @@ test: dummy
+@@ -59,11 +59,12 @@ test: dummy
src/lua test/hello.lua
install: dummy
@@ -47,7 +51,8 @@ $NetBSD: patch-aa,v 1.1 2013/10/30 06:18
+ cd src && $(LIBTOOL) --tag=CC --mode=install $(BSD_INSTALL_PROGRAM)
$(TO_BIN) $(DESTDIR)$(INSTALL_BIN)
+ cd src && $(INSTALL_DATA) $(TO_INC) $(DESTDIR)$(INSTALL_INC)
+ cd src && $(LIBTOOL) --tag=CC --mode=install $(BSD_INSTALL_LIB)
$(TO_LIB) $(DESTDIR)$(INSTALL_LIB)
-+ cd doc && $(INSTALL_DATA) $(TO_MAN) $(DESTDIR)$(INSTALL_MAN)
++ cd doc && $(INSTALL_DATA) lua.1 $(DESTDIR)$(INSTALL_MAN)/lua5.1.1
++ cd doc && $(INSTALL_DATA) luac.1 $(DESTDIR)$(INSTALL_MAN)/luac5.1.1
ranlib:
cd src && cd $(INSTALL_LIB) && $(RANLIB) $(TO_LIB)
Index: lang/lua51/patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/lang/lua51/patches/patch-ab,v
retrieving revision 1.1
diff -p -u -u -r1.1 patch-ab
--- lang/lua51/patches/patch-ab 30 Oct 2013 06:18:10 -0000 1.1
+++ lang/lua51/patches/patch-ab 27 Apr 2014 20:01:34 -0000
@@ -28,8 +28,8 @@ $NetBSD: patch-ab,v 1.1 2013/10/30 06:18
-LUA_A= liblua.a
-CORE_O= lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o
lmem.o \
-+LUA_XA= liblua.a
-+LUA_A= liblua.la
++LUA_XA= liblua5.1.a
++LUA_A= liblua5.1.la
+XCORE_O= lapi.o lcode.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
@@ -39,13 +39,16 @@ $NetBSD: patch-ab,v 1.1 2013/10/30 06:18
+CORE_O= $(XCORE_O:.o=.lo)
+LIB_O= $(XLIB_O:.o=.lo)
- LUA_T= lua
+-LUA_T= lua
-LUA_O= lua.o
+-
+-LUAC_T= luac
+-LUAC_O= luac.o print.o
++LUA_T= lua5.1
+LUA_XO= lua.o
+LUA_O= $(LUA_XO:.o=.lo)
-
- LUAC_T= luac
--LUAC_O= luac.o print.o
++
++LUAC_T= luac5.1
+LUAC_XO= luac.o print.o
+LUAC_O= $(LUAC_XO:.o=.lo)
Index: lang/lua51/patches/patch-etc_lua.pc
===================================================================
RCS file: lang/lua51/patches/patch-etc_lua.pc
diff -N lang/lua51/patches/patch-etc_lua.pc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/lua51/patches/patch-etc_lua.pc 27 Apr 2014 20:01:34 -0000
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- 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
Index: lang/lua52/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/lua52/Makefile,v
retrieving revision 1.1
diff -p -u -u -r1.1 Makefile
--- lang/lua52/Makefile 30 Oct 2013 06:18:10 -0000 1.1
+++ lang/lua52/Makefile 27 Apr 2014 20:01:34 -0000
@@ -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"
Index: lang/lua52/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/lang/lua52/PLIST,v
retrieving revision 1.1
diff -p -u -u -r1.1 PLIST
--- lang/lua52/PLIST 30 Oct 2013 06:18:10 -0000 1.1
+++ lang/lua52/PLIST 27 Apr 2014 20:01:34 -0000
@@ -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
+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
Index: lang/lua52/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/lua52/buildlink3.mk,v
retrieving revision 1.2
diff -p -u -u -r1.2 buildlink3.mk
--- lang/lua52/buildlink3.mk 30 Oct 2013 09:02:06 -0000 1.2
+++ lang/lua52/buildlink3.mk 27 Apr 2014 20:01:34 -0000
@@ -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
Index: lang/lua52/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/lang/lua52/distinfo,v
retrieving revision 1.2
diff -p -u -u -r1.2 distinfo
--- lang/lua52/distinfo 2 Jan 2014 19:57:39 -0000 1.2
+++ lang/lua52/distinfo 27 Apr 2014 20:01:34 -0000
@@ -3,6 +3,6 @@ $NetBSD: distinfo,v 1.2 2014/01/02 19:57
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
Index: lang/lua52/files/lua.pc.in
===================================================================
RCS file: /cvsroot/pkgsrc/lang/lua52/files/lua.pc.in,v
retrieving revision 1.1
diff -p -u -u -r1.1 lua.pc.in
--- lang/lua52/files/lua.pc.in 30 Oct 2013 06:18:10 -0000 1.1
+++ lang/lua52/files/lua.pc.in 27 Apr 2014 20:01:34 -0000
@@ -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}
Index: lang/lua52/patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/lang/lua52/patches/patch-aa,v
retrieving revision 1.1
diff -p -u -u -r1.1 patch-aa
--- lang/lua52/patches/patch-aa 30 Oct 2013 06:18:10 -0000 1.1
+++ lang/lua52/patches/patch-aa 27 Apr 2014 20:01:34 -0000
@@ -1,6 +1,6 @@
$NetBSD: patch-aa,v 1.1 2013/10/30 06:18:10 dholland 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
-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
#
# 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
Index: lang/lua52/patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/lang/lua52/patches/patch-ab,v
retrieving revision 1.1
diff -p -u -u -r1.1 patch-ab
--- lang/lua52/patches/patch-ab 30 Oct 2013 06:18:10 -0000 1.1
+++ lang/lua52/patches/patch-ab 27 Apr 2014 20:01:34 -0000
@@ -1,6 +1,6 @@
$NetBSD: patch-ab,v 1.1 2013/10/30 06:18:10 dholland 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
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
-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)
Index: ./databases/lua-sqlite/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/databases/lua-sqlite/Makefile,v
retrieving revision 1.17
diff -p -u -u -r1.17 Makefile
--- ./databases/lua-sqlite/Makefile 26 Nov 2013 07:19:30 -0000 1.17
+++ ./databases/lua-sqlite/Makefile 27 Apr 2014 20:01:34 -0000
@@ -3,7 +3,7 @@
DISTNAME= lsqlite_src
PKGNAME= ${LUA_PKGPREFIX}-sqlite-20030228
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= databases
MASTER_SITES=
http://lua-users.org/files/wiki_insecure/binary_modules/luasqlite/
EXTRACT_SUFX= .zip
@@ -19,18 +19,20 @@ LIBS+= -llua -lsqlite
LUA_VERSIONS_INCOMPATIBLE= 52
-AUTO_MKDIRS= yes
+AUTO_MKDIRS= yes
+INSTALLATION_DIRS+= ${LUA_CDIR} ${LUA_DOCDIR} ${LUA_EXAMPLESDIR}
do-build:
cd ${WRKSRC}; ${CC} -shared ${CFLAGS} ${LDFLAGS} lsqlite.c \
-o libluasqlite.so ${LIBS}
do-install:
- ${INSTALL_DATA} ${WRKSRC}/libluasqlite.so ${DESTDIR}${PREFIX}/lib
+ ${INSTALL_DATA} ${WRKSRC}/libluasqlite.so \
+ ${DESTDIR}${PREFIX}/${LUA_CDIR}
${INSTALL_DATA} ${WRKSRC}/readme.txt \
- ${DESTDIR}${PREFIX}/share/doc/lua-sqlite
+ ${DESTDIR}${PREFIX}/${LUA_DOCDIR}
${INSTALL_DATA} ${WRKSRC}/test.lua \
- ${DESTDIR}${PREFIX}/share/examples/lua-sqlite
+ ${DESTDIR}${PREFIX}/${LUA_EXAMPLESDIR}
.include "../../databases/sqlite/buildlink3.mk"
.include "../../lang/lua/module.mk"
Index: ./databases/lua-sqlite/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/databases/lua-sqlite/PLIST,v
retrieving revision 1.2
diff -p -u -u -r1.2 PLIST
--- ./databases/lua-sqlite/PLIST 4 Jun 2007 07:37:58 -0000 1.2
+++ ./databases/lua-sqlite/PLIST 27 Apr 2014 20:01:34 -0000
@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.2 2007/06/04 07:37:58 rillig Exp $
-lib/libluasqlite.so
-share/doc/lua-sqlite/readme.txt
-share/examples/lua-sqlite/test.lua
+${LUA_CDIR}/libluasqlite.so
+${LUA_DOCDIR}/readme.txt
+${LUA_EXAMPLESDIR}/test.lua
Index: ./databases/lua-sqlite3/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/databases/lua-sqlite3/Makefile,v
retrieving revision 1.4
diff -p -u -u -r1.4 Makefile
--- ./databases/lua-sqlite3/Makefile 9 Apr 2014 07:27:04 -0000 1.4
+++ ./databases/lua-sqlite3/Makefile 27 Apr 2014 20:01:34 -0000
@@ -2,7 +2,7 @@
DISTNAME= lua-sqlite3-0.4.1
PKGNAME= ${LUA_PKGPREFIX}-sqlite3-0.4.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= databases
MASTER_SITES= http://www.mroth.net/lua-sqlite3/
EXTRACT_SUFX= .tar.bz2
@@ -13,6 +13,16 @@ COMMENT= SQLite3 binding for LUA
LICENSE= mit
GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --libdir=${PREFIX}/${LUA_CDIR}
+CONFIGURE_ARGS+= --with-lua=${LUA_INTERPRETER:Q}
+
+CFLAGS+= -fPIC
+
+INSTALLATION_DIRS+= ${LUA_LDIR} ${LUA_CDIR}
+
+post-install:
+ mv ${DESTDIR}${PREFIX}/${LUA_CDIR}/*.lua \
+ ${DESTDIR}${PREFIX}/${LUA_LDIR}
.include "../../databases/sqlite3/buildlink3.mk"
.include "../../lang/lua/module.mk"
Index: ./databases/lua-sqlite3/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/databases/lua-sqlite3/PLIST,v
retrieving revision 1.1
diff -p -u -u -r1.1 PLIST
--- ./databases/lua-sqlite3/PLIST 4 Jul 2013 18:06:24 -0000 1.1
+++ ./databases/lua-sqlite3/PLIST 27 Apr 2014 20:01:34 -0000
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2013/07/04 18:06:24 adam Exp $
-lib/lua/libluasqlite3-loader.lua
-lib/lua/libluasqlite3.so
-lib/lua/luasql-sqlite3.lua
-lib/lua/sqlite3.lua
+@comment $NetBSD$
+${LUA_CDIR}/libluasqlite3.so
+${LUA_LDIR}/libluasqlite3-loader.lua
+${LUA_LDIR}/luasql-sqlite3.lua
+${LUA_LDIR}/sqlite3.lua
Index: ./databases/lua-sqlite3/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/databases/lua-sqlite3/distinfo,v
retrieving revision 1.1
diff -p -u -u -r1.1 distinfo
--- ./databases/lua-sqlite3/distinfo 4 Jul 2013 18:06:24 -0000 1.1
+++ ./databases/lua-sqlite3/distinfo 27 Apr 2014 20:01:34 -0000
@@ -3,4 +3,6 @@ $NetBSD: distinfo,v 1.1 2013/07/04 18:06
SHA1 (lua-sqlite3-0.4.1.tar.bz2) = cdc1043c1c5a0d5456e5b5e9bfb23ad64644fb99
RMD160 (lua-sqlite3-0.4.1.tar.bz2) = ab502207f8cdaaf7749500b2f02cf7990da1f87c
Size (lua-sqlite3-0.4.1.tar.bz2) = 54780 bytes
-SHA1 (patch-configure) = b0e6f7045da2be407b3babe8098aa4d2a87248d8
+SHA1 (patch-Makefile.in) = 6a1482242354c6b1b5c935695fd49154312a9a5d
+SHA1 (patch-configure) = a9950af9c314bf3bc2ab813d3cc7d8e6c410b4dd
+SHA1 (patch-libluasqlite3.c) = 7eccef9ebdbc9e33b6bb52ce0b214a19786aa230
Index: ./databases/lua-sqlite3/patches/patch-Makefile.in
===================================================================
RCS file: ./databases/lua-sqlite3/patches/patch-Makefile.in
diff -N ./databases/lua-sqlite3/patches/patch-Makefile.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ ./databases/lua-sqlite3/patches/patch-Makefile.in 27 Apr 2014 20:01:34
-0000
@@ -0,0 +1,30 @@
+$NetBSD$
+
+--- Makefile.in.orig 2006-05-11 11:07:19.000000000 +0000
++++ Makefile.in
+@@ -9,7 +9,7 @@ libdir := @libdir@
+ libexecdir := @libexecdir@
+ mandir := @mandir@
+
+-luadir := @libdir@/lua
++luadir := @libdir@
+
+ install := install
+ install-data := $(install) -p -m 644
+@@ -27,7 +27,6 @@ LIBS := @LIBS@
+
+ COMPILE = $(CC) -c $(CFLAGS) -o $@ $<
+ LINK = $(CC) $(LDFLAGS) -o $@ $+ $(LIBS)
+-LINKSHARED = $(CC) -shared $(LDFLAGS) -o $@ $+ $(LIBS)
+
+ DESTDIR =
+
+@@ -127,7 +126,7 @@ libluasqlite3.o: libluasqlite3.c
+ $(COMPILE)
+
+ libluasqlite3.so: libluasqlite3.o
+- $(LINKSHARED)
++ $(CC) -shared $(LDFLAGS) libluasqlite3.o -o $@ $(LIBS)
+
+ libluasqlite3-loader.lua.install: libluasqlite3-loader.lua.in
+ m4 -DSHARED_LIB_PATH=$(luadir)
\
Index: ./databases/lua-sqlite3/patches/patch-configure
===================================================================
RCS file: /cvsroot/pkgsrc/databases/lua-sqlite3/patches/patch-configure,v
retrieving revision 1.1
diff -p -u -u -r1.1 patch-configure
--- ./databases/lua-sqlite3/patches/patch-configure 4 Jul 2013 18:06:24
-0000 1.1
+++ ./databases/lua-sqlite3/patches/patch-configure 27 Apr 2014 20:01:34
-0000
@@ -2,7 +2,7 @@ $NetBSD: patch-configure,v 1.1 2013/07/0
nm -D is not portable, but -llua is needed anyway.
---- configure.orig 2013-07-04 17:48:44.000000000 +0000
+--- configure.orig 2006-05-11 11:23:29.000000000 +0000
+++ configure
@@ -3513,7 +3513,6 @@ fi
echo "$as_me:$LINENO: checking if we need -llua" >&5
Index: ./databases/lua-sqlite3/patches/patch-libluasqlite3.c
===================================================================
RCS file: ./databases/lua-sqlite3/patches/patch-libluasqlite3.c
diff -N ./databases/lua-sqlite3/patches/patch-libluasqlite3.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ ./databases/lua-sqlite3/patches/patch-libluasqlite3.c 27 Apr 2014
20:01:35 -0000
@@ -0,0 +1,122 @@
+$NetBSD$
+
+--- libluasqlite3.c.orig 2006-05-11 11:06:16.000000000 +0000
++++ libluasqlite3.c
+@@ -302,10 +302,28 @@ static void report_error(lua_State * L,
+ #define checkint(L, narg) ( (int) checknumber((L), (narg)) )
+ #define checkdouble(L, narg) ( (double) checknumber((L), (narg)) )
+
++#if LUA_VERSION_NUM >= 502 /* Lua 5.2 */
++#define stringlen(L, narg) lua_rawlen(L, narg)
++#else
++#define stringlen(L, narg) lua_strlen(L, narg)
++#endif
++
++/*
++ * Quote from http://www.lua.org/manual/5.2/manual.html#8.3:
++ * luaL_typerror was removed. Write your own version if you need it.
++ */
++static int typerror(lua_State *L, int narg, const char *tname)
++{
++ const char *msg;
++
++ msg = lua_pushfstring(L, "%s expected, got %s", tname, luaL_typename(L,
narg));
++ return luaL_argerror(L, narg, msg);
++}
++
+ static void * checkudata(lua_State * L, int narg)
+ {
+ if (!lua_isuserdata(L, narg))
+- luaL_typerror(L, narg, "userdata");
++ typerror(L, narg, "userdata");
+ return lua_touserdata(L, narg);
+ }
+
+@@ -330,7 +348,7 @@ static int checknilornoneorfunc(lua_Stat
+ return 0;
+ if (lua_isfunction(L, narg))
+ return 1;
+- luaL_typerror(L, narg, "nil, none or function");
++ typerror(L, narg, "nil, none or function");
+ return 0; /* never reached, make compiler happy... */
+ }
+
+@@ -348,14 +366,14 @@ FUNC( l_sqlite3_bind_null )
+
+ FUNC( l_sqlite3_bind_text )
+ {
+- lua_pushnumber(L, sqlite3_bind_text(checkstmt_stmt(L, 1), checkint(L, 2),
checkstr(L, 3), lua_strlen(L, 3), SQLITE_TRANSIENT) );
++ lua_pushnumber(L, sqlite3_bind_text(checkstmt_stmt(L, 1), checkint(L, 2),
checkstr(L, 3), stringlen(L, 3), SQLITE_TRANSIENT) );
+ return 1;
+ }
+
+
+ FUNC( l_sqlite3_bind_blob )
+ {
+- lua_pushnumber(L, sqlite3_bind_blob(checkstmt_stmt(L, 1), checkint(L, 2),
checkstr(L, 3), lua_strlen(L, 3), SQLITE_TRANSIENT) );
++ lua_pushnumber(L, sqlite3_bind_blob(checkstmt_stmt(L, 1), checkint(L, 2),
checkstr(L, 3), stringlen(L, 3), SQLITE_TRANSIENT) );
+ return 1;
+ }
+
+@@ -420,7 +438,7 @@ FUNC( l_sqlite3_bind )
+ break;
+
+ case LUA_TSTRING:
+- lua_pushnumber(L, sqlite3_bind_text(stmt, index, lua_tostring(L, 3),
lua_strlen(L, 3), SQLITE_TRANSIENT) );
++ lua_pushnumber(L, sqlite3_bind_text(stmt, index, lua_tostring(L, 3),
stringlen(L, 3), SQLITE_TRANSIENT) );
+ break;
+
+ default:
+@@ -764,7 +782,7 @@ FUNC( l_sqlite3_prepare )
+
+ DB * db = checkdb(L, 1);
+ const char * sql = checkstr(L, 2);
+- int sql_size = lua_strlen(L, 2);
++ int sql_size = stringlen(L, 2);
+ const char * leftover = 0;
+ sqlite3_stmt * sqlite3_stmt = 0;
+ int error, leftover_size;
+@@ -898,7 +916,7 @@ static void func_callback_wrapper(int wh
+ if (lua_pcall(L, values ? 3 : 1, 0, 0))
+ {
+ fprintf(stderr, "libluasqlite3: func_callback_wrapper: Warning: user
function error: %s\n", lua_tostring(L, -1));
+- sqlite3_result_error(ctx, lua_tostring(L, -1), lua_strlen(L, -1));
++ sqlite3_result_error(ctx, lua_tostring(L, -1), stringlen(L, -1));
+ lua_pop(L, 1);
+ }
+ }
+@@ -1077,7 +1095,7 @@ FUNC( l_sqlite3_result_null )
+
+ FUNC( l_sqlite3_result_error )
+ {
+- sqlite3_result_error(checkcontext(L, 1), checkstr(L, 2), lua_strlen(L, 2));
++ sqlite3_result_error(checkcontext(L, 1), checkstr(L, 2), stringlen(L, 2));
+ return 0;
+ }
+
+@@ -1111,14 +1129,14 @@ FUNC( l_sqlite3_result_number )
+
+ FUNC( l_sqlite3_result_blob )
+ {
+- sqlite3_result_blob(checkcontext(L, 1), checkstr(L, 2), lua_strlen(L, 2),
SQLITE_TRANSIENT);
++ sqlite3_result_blob(checkcontext(L, 1), checkstr(L, 2), stringlen(L, 2),
SQLITE_TRANSIENT);
+ return 0;
+ }
+
+
+ FUNC( l_sqlite3_result_text )
+ {
+- sqlite3_result_text(checkcontext(L, 1), checkstr(L, 2), lua_strlen(L, 2),
SQLITE_TRANSIENT);
++ sqlite3_result_text(checkcontext(L, 1), checkstr(L, 2), stringlen(L, 2),
SQLITE_TRANSIENT);
+ return 0;
+ }
+
+@@ -1161,7 +1179,7 @@ FUNC( l_sqlite3_result )
+ break;
+
+ case LUA_TSTRING:
+- sqlite3_result_text(context, lua_tostring(L, 2), lua_strlen(L, 2),
SQLITE_TRANSIENT);
++ sqlite3_result_text(context, lua_tostring(L, 2), stringlen(L, 2),
SQLITE_TRANSIENT);
+ break;
+
+ default:
Index: ./databases/lua-tokyocabinet/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/databases/lua-tokyocabinet/Makefile,v
retrieving revision 1.20
diff -p -u -u -r1.20 Makefile
--- ./databases/lua-tokyocabinet/Makefile 30 Oct 2013 13:27:22 -0000
1.20
+++ ./databases/lua-tokyocabinet/Makefile 27 Apr 2014 20:01:35 -0000
@@ -3,6 +3,7 @@
DISTNAME= tokyocabinet-lua-1.10
PKGNAME= ${LUA_PKGPREFIX}-${DISTNAME:S/-lua-/-/}
+PKGREVISION= 1
CATEGORIES= databases
MASTER_SITES= ${HOMEPAGE:S/luadoc/luapkg/}
@@ -20,7 +21,7 @@ TEST_ENV+= LUA_CDIR=${WRKSRC}
REPLACE_LUA= *.lua
-INSTALLATION_DIRS+= share/tokyocabinet/doc/lua
+INSTALLATION_DIRS+= ${LUA_DOCDIR} ${LUA_EXAMPLESDIR}
MAKE_ENV+= INCLUDEDIR=${BUILDLINK_PREFIX.tokyocabinet}/include
@@ -29,12 +30,15 @@ post-extract:
post-install:
cd ${WRKSRC}/doc && pax -rwpe . \
- ${DESTDIR}${PREFIX}/share/tokyocabinet/doc/lua
+ ${DESTDIR}${PREFIX}/${LUA_DOCDIR}
+ mv ${DESTDIR}${PREFIX}/bin/*.lua \
+ ${DESTDIR}${PREFIX}/${LUA_EXAMPLESDIR}
BUILDLINK_API_DEPENDS.tokyocabinet+= tokyocabinet>=1.4.29
.include "../../databases/tokyocabinet/buildlink3.mk"
.include "../../lang/lua/application.mk"
.include "../../lang/lua/module.mk"
+.include "../../lang/lua/tool.mk"
PTHREAD_AUTO_VARS= yes
.include "../../mk/pthread.buildlink3.mk"
.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} != "none"
Index: ./databases/lua-tokyocabinet/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/databases/lua-tokyocabinet/PLIST,v
retrieving revision 1.2
diff -p -u -u -r1.2 PLIST
--- ./databases/lua-tokyocabinet/PLIST 14 Jun 2009 17:43:18 -0000 1.2
+++ ./databases/lua-tokyocabinet/PLIST 27 Apr 2014 20:01:35 -0000
@@ -1,9 +1,9 @@
@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:43:18 joerg Exp $
-bin/tcbtest.lua
-bin/tcftest.lua
-bin/tchtest.lua
-bin/tcutest.lua
+${LUA_EXAMPLESDIR}/tcbtest.lua
+${LUA_EXAMPLESDIR}/tcftest.lua
+${LUA_EXAMPLESDIR}/tchtest.lua
+${LUA_EXAMPLESDIR}/tcutest.lua
${LUA_CDIR}/tokyocabinet.so
-share/tokyocabinet/doc/lua/index.html
-share/tokyocabinet/doc/lua/luadoc.css
-share/tokyocabinet/doc/lua/modules/tokyocabinet.html
+${LUA_DOCDIR}/index.html
+${LUA_DOCDIR}/luadoc.css
+${LUA_DOCDIR}/modules/tokyocabinet.html
Index: ./devel/lua-BitOp/DESCR
===================================================================
RCS file: ./devel/lua-BitOp/DESCR
diff -N ./devel/lua-BitOp/DESCR
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ ./devel/lua-BitOp/DESCR 27 Apr 2014 20:01:35 -0000
@@ -0,0 +1,2 @@
+Lua BitOp is a C extension module for Lua which adds bitwise
+operations on numbers.
Index: ./devel/lua-BitOp/Makefile
===================================================================
RCS file: ./devel/lua-BitOp/Makefile
diff -N ./devel/lua-BitOp/Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ ./devel/lua-BitOp/Makefile 27 Apr 2014 20:01:35 -0000
@@ -0,0 +1,24 @@
+# $NetBSD$
+
+DISTNAME= LuaBitOp-1.0.2
+PKGNAME= ${DISTNAME:S/Lua/${LUA_PKGPREFIX}-/}
+CATEGORIES= devel
+MASTER_SITES= http://bitop.luajit.org/download/
+
+MAINTAINER= alnsn%NetBSD.org@localhost
+HOMEPAGE= http://bitop.luajit.org/
+COMMENT= Lua module which adds bitwise operations on numbers
+LICENSE= mit
+
+NO_CONFIGURE= yes
+USE_TOOLS+= gmake
+MAKE_FLAGS+= LUA_CDIR=${LUA_CDIR}
+MAKE_FLAGS+= LUA_DOCDIR=${LUA_DOCDIR}
+MAKE_FLAGS+= INSTALLPATH=${DESTDIR}${PREFIX}/${LUA_CDIR}
+
+INSTALLATION_DIRS+= ${LUA_CDIR} ${LUA_DOCDIR}
+
+TEST_TARGET= test
+
+.include "../../lang/lua/module.mk"
+.include "../../mk/bsd.pkg.mk"
Index: ./devel/lua-BitOp/PLIST
===================================================================
RCS file: ./devel/lua-BitOp/PLIST
diff -N ./devel/lua-BitOp/PLIST
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ ./devel/lua-BitOp/PLIST 27 Apr 2014 20:01:35 -0000
@@ -0,0 +1,11 @@
+@comment $NetBSD$
+${LUA_CDIR}/bit.so
+${LUA_DOCDIR}/api.html
+${LUA_DOCDIR}/bluequad-print.css
+${LUA_DOCDIR}/bluequad.css
+${LUA_DOCDIR}/changes.html
+${LUA_DOCDIR}/contact.html
+${LUA_DOCDIR}/img/contact.png
+${LUA_DOCDIR}/index.html
+${LUA_DOCDIR}/install.html
+${LUA_DOCDIR}/semantics.html
Index: ./devel/lua-BitOp/distinfo
===================================================================
RCS file: ./devel/lua-BitOp/distinfo
diff -N ./devel/lua-BitOp/distinfo
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ ./devel/lua-BitOp/distinfo 27 Apr 2014 20:01:35 -0000
@@ -0,0 +1,6 @@
+$NetBSD$
+
+SHA1 (LuaBitOp-1.0.2.tar.gz) = 1f611edbc4f65279072c96af15bd6e455ea9dd10
+RMD160 (LuaBitOp-1.0.2.tar.gz) = 6b5a44515022ed1f4edb9d966b8ea3aa9c38a892
+Size (LuaBitOp-1.0.2.tar.gz) = 23127 bytes
+SHA1 (patch-Makefile) = 2dd050bc9bf276798b6fe63c0a1c4e4d5fc9ef27
Index: ./devel/lua-BitOp/patches/patch-Makefile
===================================================================
RCS file: ./devel/lua-BitOp/patches/patch-Makefile
diff -N ./devel/lua-BitOp/patches/patch-Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ ./devel/lua-BitOp/patches/patch-Makefile 27 Apr 2014 20:01:35 -0000
@@ -0,0 +1,23 @@
+$NetBSD$
+
+--- Makefile.orig 2012-05-08 19:15:00.000000000 +0000
++++ Makefile
+@@ -3,7 +3,7 @@
+ # To compile with MinGW please run: mingw32-make -f Makefile.mingw
+
+ # Include path where lua.h, luaconf.h and lauxlib.h reside:
+-INCLUDES= -I/usr/local/include
++INCLUDES= -I $(LUA_INC)
+
+ DEFINES=
+ # Use this for the old ARM ABI with swapped FPA doubles.
+@@ -39,7 +39,8 @@ $(MODSO): $(MODNAME).o
+ $(SOCC) $(SOLDFLAGS) -o $@ $<
+
+ install: $(MODSO)
+- $(INSTALL) $< `$(INSTALLPATH) $(MODNAME)`
++ ${BSD_INSTALL_LIB} ${MODSO} ${DESTDIR}${PREFIX}/${LUA_CDIR}
++ cp -r doc/* ${DESTDIR}${PREFIX}/${LUA_DOCDIR}
+
+ test: $(MODSO)
+ @$(LUA) bittest.lua && echo "basic test OK"
Index: ./devel/lua-posix/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/lua-posix/Makefile,v
retrieving revision 1.5
diff -p -u -u -r1.5 Makefile
--- ./devel/lua-posix/Makefile 28 Jan 2014 11:53:07 -0000 1.5
+++ ./devel/lua-posix/Makefile 27 Apr 2014 20:01:35 -0000
@@ -2,6 +2,7 @@
DISTNAME= luaposix-release-v31
PKGNAME= ${DISTNAME:S/lua/${LUA_PKGPREFIX}-/:S/release-v//}
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= -https://github.com/luaposix/luaposix/archive/release-v31.tar.gz
@@ -15,17 +16,21 @@ USE_TOOLS+= perl:build
USE_LIBTOOL= yes
GNU_CONFIGURE_LIBDIR= ${PREFIX}/${LUA_CDIR}
-CONFIGURE_ARGS+= --docdir=${PREFIX}/share/doc/${PKGNAME_NOREV}
-CONFIGURE_ARGS+= --datadir=${PREFIX}/share/${PKGNAME_NOREV}
+CONFIGURE_ARGS+= --docdir=${PREFIX}/${LUA_DOCDIR}
+CONFIGURE_ARGS+= --datadir=${PREFIX}/${LUA_LDIR}
+
+INSTALLATION_DIRS+= ${LUA_LDIR} ${LUA_CDIR}
+
+.include "../../lang/lua/luaversion.mk"
+
+.if ${LUA_PKGPREFIX} == "lua51"
+DEPENDS+= lua51-BitOp:../../devel/lua-BitOp
+.endif
post-patch:
${TOUCH} ${WRKSRC}/configure ${WRKSRC}/aclocal.m4 ${WRKSRC}/Makefile.in
-post-install:
- cd ${DESTDIR}${PREFIX}/${LUA_CDIR} && \
- ${LN} -fs ../../../share/${PKGNAME}/posix.lua && \
- ${LN} -fs ../../../share/${PKGNAME}/curses.lua
-
.include "../../lang/lua/module.mk"
+.include "../../lang/lua/tool.mk"
.include "../../mk/curses.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: ./devel/lua-posix/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/devel/lua-posix/PLIST,v
retrieving revision 1.2
diff -p -u -u -r1.2 PLIST
--- ./devel/lua-posix/PLIST 30 Oct 2013 06:04:16 -0000 1.2
+++ ./devel/lua-posix/PLIST 27 Apr 2014 20:01:35 -0000
@@ -1,11 +1,9 @@
@comment $NetBSD: PLIST,v 1.2 2013/10/30 06:04:16 dholland Exp $
-${LUA_CDIR}/curses.lua
+${LUA_LDIR}/curses.lua
+${LUA_LDIR}/posix.lua
${LUA_CDIR}/curses_c.la
-${LUA_CDIR}/posix.lua
${LUA_CDIR}/posix_c.la
-share/doc/${PKGNAME}/curses.html
-share/doc/${PKGNAME}/curses_c.html
-share/doc/${PKGNAME}/index.html
-share/doc/${PKGNAME}/ldoc.css
-share/${PKGNAME}/curses.lua
-share/${PKGNAME}/posix.lua
+${LUA_DOCDIR}/curses.html
+${LUA_DOCDIR}/curses_c.html
+${LUA_DOCDIR}/index.html
+${LUA_DOCDIR}/ldoc.css
Index: ./devel/lua-stdlib-doc/DESCR
===================================================================
RCS file: ./devel/lua-stdlib-doc/DESCR
diff -N ./devel/lua-stdlib-doc/DESCR
--- ./devel/lua-stdlib-doc/DESCR 12 Feb 2009 01:47:49 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
-This package provides a documentation for Lua stdlib, a library of
-modules for common programming tasks, including list, table and
-functional operations, regexps, objects, pretty-printing and getopt.
-The whole thing can be loaded with 'require "std"', or modules can be
-used individually.
Index: ./devel/lua-stdlib-doc/Makefile
===================================================================
RCS file: ./devel/lua-stdlib-doc/Makefile
diff -N ./devel/lua-stdlib-doc/Makefile
--- ./devel/lua-stdlib-doc/Makefile 1 Nov 2013 18:17:43 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2013/11/01 18:17:43 jperkin Exp $
-
-.include "../../devel/lua-stdlib/Makefile.common"
-
-PKGNAME= ${DISTNAME:S/stdlib/${LUA_PKGPREFIX}-stdlib-doc/}
-PKGREVISION= 2
-MAINTAINER= cheusov%NetBSD.org@localhost
-
-COMMENT= Documentation for modules from lua-stdlib
-
-DOCDIR= share/doc/lua-stdlib
-
-DEPENDS+=
${LUA_PKGPREFIX}-${DISTNAME}{,nb*}:../../devel/lua-stdlib
-INSTALLATION_DIRS+= ${DOCDIR}/modules
-
-do-install:
- ${INSTALL_DATA} ${WRKSRC}/src/*.html \
- ${DESTDIR}${PREFIX}/${DOCDIR}/
- ${INSTALL_DATA} ${WRKSRC}/src/modules/*.html \
- ${DESTDIR}${PREFIX}/${DOCDIR}/modules/
-
-.include "../../lang/lua/luaversion.mk" # for LUA_PKGPREFIX
-.include "../../mk/bsd.pkg.mk"
Index: ./devel/lua-stdlib-doc/PLIST
===================================================================
RCS file: ./devel/lua-stdlib-doc/PLIST
diff -N ./devel/lua-stdlib-doc/PLIST
--- ./devel/lua-stdlib-doc/PLIST 2 Dec 2012 09:26:08 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2012/12/02 09:26:08 cheusov Exp $
-share/doc/lua-stdlib/index.html
-share/doc/lua-stdlib/modules/base.html
-share/doc/lua-stdlib/modules/bin.html
-share/doc/lua-stdlib/modules/debug.html
-share/doc/lua-stdlib/modules/fstable.html
-share/doc/lua-stdlib/modules/getopt.html
-share/doc/lua-stdlib/modules/io.html
-share/doc/lua-stdlib/modules/lcs.html
-share/doc/lua-stdlib/modules/list.html
-share/doc/lua-stdlib/modules/math.html
-share/doc/lua-stdlib/modules/mbox.html
-share/doc/lua-stdlib/modules/object.html
-share/doc/lua-stdlib/modules/package.html
-share/doc/lua-stdlib/modules/parser.html
-share/doc/lua-stdlib/modules/set.html
-share/doc/lua-stdlib/modules/std.html
-share/doc/lua-stdlib/modules/strbuf.html
-share/doc/lua-stdlib/modules/string.html
-share/doc/lua-stdlib/modules/table.html
-share/doc/lua-stdlib/modules/tree.html
Index: ./devel/lua-stdlib/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/lua-stdlib/Makefile,v
retrieving revision 1.4
diff -p -u -u -r1.4 Makefile
--- ./devel/lua-stdlib/Makefile 15 Aug 2013 06:32:06 -0000 1.4
+++ ./devel/lua-stdlib/Makefile 27 Apr 2014 20:01:35 -0000
@@ -1,18 +1,30 @@
# $NetBSD: Makefile,v 1.4 2013/08/15 06:32:06 obache Exp $
-.include "../../devel/lua-stdlib/Makefile.common"
-
+DISTNAME= stdlib-28
PKGNAME= ${DISTNAME:S/stdlib/${LUA_PKGPREFIX}-stdlib/}
-PKGREVISION= 1
+PKGREVISION= 2
+CATEGORIES= devel
COMMENT= Standard library for Lua programming language
+MASTER_SITES= http://cloud.github.com/downloads/rrthomas/lua-stdlib/
+EXTRACT_SUFX= .zip
MAINTAINER= cheusov%NetBSD.org@localhost
-INSTALLATION_DIRS+= ${LUA_LDIR}
+HOMEPAGE= https://github.com/rrthomas/lua-stdlib
+LICENSE= mit
+
+NO_BUILD= yes
+NO_CONFIGURE= yes
+
+INSTALLATION_DIRS+= ${LUA_LDIR} ${LUA_DOCDIR}/modules
.include "../../lang/lua/module.mk"
do-install:
${INSTALL_DATA} ${WRKSRC}/src/*.lua \
${DESTDIR}${PREFIX}/${LUA_LDIR}
+ ${INSTALL_DATA} ${WRKSRC}/src/*.html \
+ ${DESTDIR}${PREFIX}/${LUA_DOCDIR}/
+ ${INSTALL_DATA} ${WRKSRC}/src/modules/*.html \
+ ${DESTDIR}${PREFIX}/${LUA_DOCDIR}/modules/
.include "../../mk/bsd.pkg.mk"
Index: ./devel/lua-stdlib/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/devel/lua-stdlib/PLIST,v
retrieving revision 1.2
diff -p -u -u -r1.2 PLIST
--- ./devel/lua-stdlib/PLIST 2 Dec 2012 09:26:08 -0000 1.2
+++ ./devel/lua-stdlib/PLIST 27 Apr 2014 20:01:35 -0000
@@ -22,3 +22,23 @@ ${LUA_LDIR}/string_ext.lua
${LUA_LDIR}/tree.lua
${LUA_LDIR}/table_ext.lua
${LUA_LDIR}/xml.lua
+${LUA_DOCDIR}/index.html
+${LUA_DOCDIR}/modules/base.html
+${LUA_DOCDIR}/modules/bin.html
+${LUA_DOCDIR}/modules/debug.html
+${LUA_DOCDIR}/modules/fstable.html
+${LUA_DOCDIR}/modules/getopt.html
+${LUA_DOCDIR}/modules/io.html
+${LUA_DOCDIR}/modules/lcs.html
+${LUA_DOCDIR}/modules/list.html
+${LUA_DOCDIR}/modules/math.html
+${LUA_DOCDIR}/modules/mbox.html
+${LUA_DOCDIR}/modules/object.html
+${LUA_DOCDIR}/modules/package.html
+${LUA_DOCDIR}/modules/parser.html
+${LUA_DOCDIR}/modules/set.html
+${LUA_DOCDIR}/modules/std.html
+${LUA_DOCDIR}/modules/strbuf.html
+${LUA_DOCDIR}/modules/string.html
+${LUA_DOCDIR}/modules/table.html
+${LUA_DOCDIR}/modules/tree.html
Index: ./textproc/lua-slnunicode/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/lua-slnunicode/Makefile,v
retrieving revision 1.4
diff -p -u -u -r1.4 Makefile
--- ./textproc/lua-slnunicode/Makefile 30 Oct 2013 06:24:57 -0000 1.4
+++ ./textproc/lua-slnunicode/Makefile 27 Apr 2014 20:01:35 -0000
@@ -23,4 +23,5 @@ do-install:
${INSTALL_LIB} ${WRKSRC}/unicode.so ${DESTDIR}${PREFIX}/${LUA_CDIR}
.include "../../lang/lua/module.mk"
+.include "../../lang/lua/tool.mk"
.include "../../mk/bsd.pkg.mk"
Index: ./textproc/lua-slnunicode/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/lua-slnunicode/PLIST,v
retrieving revision 1.1
diff -p -u -u -r1.1 PLIST
--- ./textproc/lua-slnunicode/PLIST 3 Sep 2013 16:18:41 -0000 1.1
+++ ./textproc/lua-slnunicode/PLIST 27 Apr 2014 20:01:35 -0000
@@ -1,2 +1,2 @@
@comment $NetBSD: PLIST,v 1.1 2013/09/03 16:18:41 ryoon Exp $
-lib/lua/5.2/unicode.so
+${LUA_CDIR}/unicode.so
Index: ./www/lua-curl/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/lua-curl/Makefile,v
retrieving revision 1.9
diff -p -u -u -r1.9 Makefile
--- ./www/lua-curl/Makefile 12 Feb 2014 23:18:46 -0000 1.9
+++ ./www/lua-curl/Makefile 27 Apr 2014 20:01:35 -0000
@@ -3,7 +3,7 @@
DISTNAME= lua-curl-0.2
PKGNAME= ${LUA_PKGPREFIX}-curl-0.2
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= www
MASTER_SITES= http://luaforge.net/frs/download.php/2634/
@@ -21,5 +21,5 @@ AUTO_MKDIRS= yes
.include "../../www/curl/buildlink3.mk"
.include "../../lang/lua/module.mk"
-
+.include "../../lang/lua/tool.mk"
.include "../../mk/bsd.pkg.mk"
Home |
Main Index |
Thread Index |
Old Index