Merge branch 'package-management'

Conflicts: app-arch/p7zip/p7zip-9.04.bep app-arch/p7zip/p7zip-9.13.bep app-arch/tar/tar-1.22.bep app-arch/tar/tar-1.23.bep app-arch/tar/tar-1.25.bep app-arch/xz-utils/xz-utils-4.999.9.bep app-cdr/bchunk/bchunk-1.2.0.bep app-cdr/cdrtools/cdrtools-2.01.01a66.bep app-cdr/cdrtools/cdrtools-3.01a01.bep app-crypt/gnupg/gnupg-1.4.11.bep app-doc/doxygen/doxygen-1.6.3.bep app-editors/nano/nano-2.2.6.bep app-editors/vim/vim-7.3.bep app-text/antiword/antiword-0.37.bep app-text/libpaper/libpaper-1.1.23.bep app-text/libpaper/libpaper-1.1.24.bep app-text/rman/rman-3.2.bep dev-db/sqlite/sqlite-3.6.22.bep dev-db/sqlite/sqlite-3.6.23.bep dev-db/sqlite/sqlite-3.7.2.bep dev-db/sqlite/sqlite-3.7.3.bep dev-db/sqlite/sqlite-3.7.4.bep dev-db/sqlite/sqlite-3.7.5.bep dev-lang/lua/lua-5.1.4.bep dev-lang/nasm/nasm-2.08.01.bep dev-lang/perl/patches/perl-5.10.0.patch dev-lang/python/python-2.5.4.bep dev-lang/python/python-2.6.4.bep dev-lang/python/python-2.6.5.bep dev-lang/python/python-2.6.6.bep dev-lang/python/python-2.6.7.bep dev-lang/python/python-2.6.8.bep dev-lang/python/python-3.2.bep dev-lang/python/python-3.2.recipe dev-lang/python/python-3.2a4.bep dev-lang/yasm/yasm-1.1.0.bep dev-libs/apr-util/apr-util-1.3.10.bep dev-libs/apr-util/apr-util-1.3.9.bep dev-libs/apr/apr-1.3.8.bep dev-libs/apr/apr-1.3.9.bep dev-libs/apr/apr-1.4.2.bep dev-libs/apr/patches/apr-1.4.2.patch dev-libs/expat/expat-2.0.1.bep dev-libs/fribidi/fribidi-0.19.2.bep dev-libs/icu/icu-4.4.1.bep dev-libs/libedit/libedit-20090923.bep dev-libs/libedit/libedit-20100424.bep dev-libs/libevent/libevent-1.4.11.bep dev-libs/libevent/libevent-1.4.13.bep dev-libs/libevent/libevent-1.4.14b.bep dev-libs/libevent/libevent-2.0.10.bep dev-libs/libiconv/libiconv-1.12.bep dev-libs/libiconv/libiconv-1.13.1.bep dev-libs/libpcre/libpcre-8.00.bep dev-libs/libpcre/libpcre-8.02.bep dev-libs/libpcre/libpcre-8.12.bep dev-libs/libxml2/libxml2-2.7.3.bep dev-libs/libxml2/libxml2-2.7.6.bep dev-libs/libxml2/libxml2-2.7.7.bep dev-libs/libxml2/libxml2-2.7.8.bep dev-libs/openssl/openssl-0.9.8l.bep dev-libs/openssl/openssl-0.9.8m.bep dev-libs/openssl/openssl-1.0.0.bep dev-libs/openssl/openssl-1.0.0a.bep dev-libs/openssl/openssl-1.0.0c.bep dev-qt/qtcore/qtcore-4.8.x-git.bep dev-qt/qtcore/qtcore-4.8.x.recipe dev-util/ccache/ccache-3.0.1.bep dev-util/cmake/cmake-2.6.4.bep dev-util/cmake/cmake-2.8.0.bep dev-util/cmake/cmake-2.8.1.bep dev-util/cmake/cmake-2.8.2.bep dev-util/cmake/cmake-2.8.3.bep dev-util/cmake/cmake-2.8.4.bep dev-util/ctags/ctags-5.8.bep dev-util/fastdep/fastdep-0.16.bep dev-util/gperf/gperf-3.0.4.bep dev-util/pkgconfig/pkgconfig-0.23.bep dev-util/pkgconfig/pkgconfig-0.25.bep dev-vcs/cvs/cvs-1.12.13.1.bep dev-vcs/cvs/cvs-1.12.13.bep dev-vcs/subversion/subversion-1.6.11.bep dev-vcs/subversion/subversion-1.6.12.bep dev-vcs/subversion/subversion-1.6.13.bep dev-vcs/subversion/subversion-1.6.15.bep dev-vcs/subversion/subversion-1.6.6.bep dev-vcs/subversion/subversion-1.6.9.bep dev-vcs/subversion/subversion-1.7.xx-svn.bep haiku-apps/bepdf/bepdf-1.1.1b4.bep haiku-apps/libwalter/libwalter-97.bep haiku-apps/paladin/paladin-1.3-hg.bep haiku-apps/pe/pe-2.4.3-600.bep haiku-apps/vision/patches/vision-908-gcc4.patch haiku-apps/vision/vision-0.9.7.bep haiku-libs/libwalter/libwalter-97.bep haiku-libs/libwalter/libwalter-97.recipe media-gfx/graphviz/graphviz-2.24.bep media-gfx/graphviz/graphviz-2.26.3.bep media-libs/flac/flac-1.2.1.bep media-libs/freetype/freetype-2.3.11.bep media-libs/freetype/freetype-2.4.2.bep media-libs/freetype/freetype-2.4.4.bep media-libs/ftgl/ftgl-2.1-svn.bep media-libs/guilib/guilib-1.2.1.bep media-libs/jpeg/jpeg-7.bep media-libs/jpeg/jpeg-8b.bep media-libs/jpeg/jpeg-8c.bep media-libs/libao/libao-1.0.0.bep media-libs/libmad/libmad-0.15.1b.bep media-libs/libmng/libmng-1.0.10.bep media-libs/libogg/libogg-1.1.4.bep media-libs/libogg/libogg-1.2.0.bep media-libs/libogg/libogg-1.2.2.bep media-libs/libpng/libpng-1.2.29.bep media-libs/libpng/libpng-1.2.30.bep media-libs/libpng/libpng-1.2.40.bep media-libs/libpng/libpng-1.2.41.bep media-libs/libpng/libpng-1.2.43.bep media-libs/libpng/libpng-1.2.44.bep media-libs/libpng/libpng-1.4.1.bep media-libs/libpng/libpng-1.4.2.bep media-libs/libpng/libpng-1.4.3.bep media-libs/libpng/libpng-1.4.4.bep media-libs/libpng/libpng-1.5.0.bep media-libs/libsdl/patches/libsdl-1.2-hg.patch media-libs/libtheora/libtheora-1.1.1.bep media-libs/libvorbis/libvorbis-1.2.3.bep media-libs/libvorbis/libvorbis-1.3.1.bep media-libs/libvorbis/libvorbis-1.3.2.bep media-libs/libvpx/libvpx-0.9.2-git.bep media-libs/smpeg/smpeg-0.4.5.bep media-libs/speex/speex-1.2-git.bep media-libs/speex/speex-1.2rc1.bep media-sound/lame/lame-3.98.4.bep media-sound/lame/lame-398-2.bep media-sound/vorbis-tools/vorbis-tools-1.2.0.bep media-sound/vorbis-tools/vorbis-tools-1.4.0.bep media-video/ffmpeg/ffmpeg-0.5.bep media-video/ffmpeg/ffmpeg-0.6.bep net-misc/curl/curl-7.18.2.bep net-misc/curl/curl-7.19.1.bep net-misc/curl/curl-7.19.2.bep net-misc/curl/curl-7.19.5.bep net-misc/curl/curl-7.19.7.bep net-misc/curl/curl-7.20.0.bep net-misc/curl/curl-7.20.1.bep net-misc/curl/curl-7.21.1.bep net-misc/curl/curl-7.21.2.bep net-misc/curl/curl-7.21.3.bep net-misc/openssh/openssh-5.4p1.bep net-misc/openssh/openssh-5.5p1.bep net-misc/openssh/openssh-5.6p1.bep net-misc/openssh/openssh-5.7p1.bep net-misc/openssh/openssh-5.8p1.bep net-wireless/b43-fwcutter/b43-fwcutter-012.bep sci-libs/gsl/gsl-1.14.bep sys-apps/ed/ed-1.4.bep sys-apps/gawk/gawk-3.1.8.bep sys-apps/grep/grep-2.5.4.bep sys-apps/grep/grep-2.7.bep sys-apps/groff/groff-1.20.1.bep sys-apps/man/man-1.6f.bep sys-apps/sed/sed-4.2.1.bep sys-apps/texinfo/texinfo-4.13a.bep sys-devel/autoconf/autoconf-2.68.bep sys-devel/automake/automake-1.11.1.bep sys-devel/bison/bison-2.4.1.bep sys-devel/bison/bison-2.4.bep sys-devel/flex/flex-2.5.35.bep sys-devel/gettext/gettext-0.18.1.1-dev.bep sys-devel/gettext/gettext-0.18.1.1.bep sys-devel/jam/jam-2.5.bep sys-devel/m4/m4-1.4.14.bep sys-libs/ncurses/ncurses-5.6.bep sys-libs/ncurses/ncurses-5.7.bep sys-libs/readline/readline-5.2.bep sys-libs/readline/readline-6.0.bep sys-libs/readline/readline-6.1.bep sys-libs/zlib/zlib-1.2.3.bep sys-libs/zlib/zlib-1.2.5.bep x11-libs/qt/qt-4.8.x-git.bep
2026-04-22 03:30:05 +02:00 · 2013-10-15 22:48:02 +02:00
parent 79f735cb8b c69048fe86
commit f3532dc2cb
1452 changed files with 31199 additions and 33804 deletions
--- a/dev-lang/lua/lua-5.1.4-3.bep
+++ b/dev-lang/lua/lua-5.1.4-3.bep
@@ -1,21 +0,0 @@
-DESCRIPTION="Lua is a powerful, fast, light-weight, embeddable scripting language."
-HOMEPAGE="http://www.lua.org"
-SRC_URI="http://www.lua.org/ftp/lua-5.1.4.tar.gz"
-CHECKSUM_MD5="d0870f2de55d59c1c8419f36e8fac150"
-REVISION="3"
-STATUS_HAIKU="stable"
-DEPEND="pkgconfig >= 0.25"
-BUILD {
-	cd lua-5.1.4
-	make haiku
-}
-
-INSTALL {
-	cd lua-5.1.4
-	make install INSTALL_TOP="${DESTDIR}`finddir B_COMMON_DIRECTORY`" \
-		INSTALL_MAN="${DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man"
-	mkdir -p ${DESTDIR}`finddir B_COMMON_LIB_DIRECTORY`/pkgconfig
-	cp etc/lua.pc ${DESTDIR}`finddir B_COMMON_LIB_DIRECTORY`/pkgconfig/lua.pc
-}
-LICENSE="MIT"
-COPYRIGHT="1994-2009, Lua.org, PUC-Rio"
--- a/dev-lang/lua/lua-5.1.4.bep
+++ b/dev-lang/lua/lua-5.1.4.bep
@@ -1,21 +0,0 @@
-DESCRIPTION="Lua is a powerful, fast, light-weight, embeddable scripting language."
-HOMEPAGE="http://www.lua.org"
-SRC_URI="http://www.lua.org/ftp/lua-5.1.4.tar.gz"
-CHECKSUM_MD5="d0870f2de55d59c1c8419f36e8fac150"
-REVISION="3"
-STATUS_HAIKU="stable"
-DEPEND="pkgconfig >= 0.25"
-BUILD {
-	cd lua-5.1.4
-	make haiku
-}
-
-INSTALL {
-	cd lua-5.1.4
-	make install INSTALL_TOP="${DESTDIR}`finddir B_COMMON_DIRECTORY`" \
-		INSTALL_MAN="${DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man"
-	mkdir -p ${DESTDIR}`finddir B_COMMON_LIB_DIRECTORY`/pkgconfig
-	cp etc/lua.pc ${DESTDIR}`finddir B_COMMON_LIB_DIRECTORY`/pkgconfig/lua.pc
-}
-LICENSE="MIT"
-COPYRIGHT="1994-2009, Lua.org, PUC-Rio"
--- a/dev-lang/lua/lua-5.1.4.recipe
+++ b/dev-lang/lua/lua-5.1.4.recipe
@@ -0,0 +1,50 @@
+SUMMARY="Lua is a powerful, fast, light-weight, embeddable scripting language."
+HOMEPAGE="http://www.lua.org"
+SRC_URI="http://www.lua.org/ftp/lua-5.1.4.tar.gz"
+CHECKSUM_MD5="d0870f2de55d59c1c8419f36e8fac150"
+REVISION="3"
+ARCHITECTURES="x86 x86_gcc2"
+
+PROVIDES="
+	lua = $portVersion compat = 5.1
+	cmd:lua = $portVersion compat = 5.1
+	cmd:luac = $portVersion
+	lib:liblua = $portVersion compat = 5.2
+	devel:liblua = $portVersion compat = 5.2
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:make
+	cmd:gcc
+	"
+
+PATCHES="lua-5.1.4.patchset"
+BUILD()
+{
+	make haiku
+}
+
+INSTALL()
+{
+	make install INSTALL_TOP="$prefix" INSTALL_MAN="$manDir" \
+		INSTALL_INC="$includeDir" INSTALL_LMOD="$dataDir/lua/$V"
+	mkdir -p $libDir/pkgconfig
+	cp etc/lua.pc $libDir/pkgconfig/lua.pc
+
+	prepareInstalledDevelLib liblua
+	fixPkgconfig
+}
+LICENSE="MIT"
+COPYRIGHT="1994-2009, Lua.org, PUC-Rio"
+DESCRIPTION="
+	Lua combines simple procedural syntax with powerful data description
+	constructs based on associative arrays and extensible semantics. Lua is
+	dynamically typed, runs by interpreting bytecode for a register-based
+	virtual machine, and has automatic memory management with incremental
+	garbage collection, making it ideal for configuration, scripting, and rapid
+	prototyping.
+	"
--- a/dev-lang/lua/lua-5.2.1.bep
+++ b/dev-lang/lua/lua-5.2.1.bep
@@ -1,18 +0,0 @@
-DESCRIPTION="Lua is a powerful, fast, light-weight, embeddable scripting language."
-HOMEPAGE="http://www.lua.org"
-SRC_URI="http://www.lua.org/ftp/lua-5.2.1.tar.gz"
-CHECKSUM_MD5="ae08f641b45d737d12d30291a5e5f6e3"
-REVISION="3"
-STATUS_HAIKU="stable"
-BUILD {
-	cd lua-5.2.1
-	make haiku
-}
-
-INSTALL {
-	cd lua-5.2.1
-	make install INSTALL_TOP="${DESTDIR}`finddir B_COMMON_DIRECTORY`" \
-		INSTALL_MAN="${DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man"
-}
-LICENSE="MIT"
-COPYRIGHT="1994-2012, Lua.org, PUC-Rio"
--- a/dev-lang/lua/lua-5.2.1.recipe
+++ b/dev-lang/lua/lua-5.2.1.recipe
@@ -0,0 +1,46 @@
+SUMMARY="Lua is a powerful, fast, light-weight, embeddable scripting language."
+HOMEPAGE="http://www.lua.org"
+SRC_URI="http://www.lua.org/ftp/lua-$portVersion.tar.gz"
+CHECKSUM_MD5="ae08f641b45d737d12d30291a5e5f6e3"
+REVISION="3"
+ARCHITECTURES="x86 x86_gcc2"
+PROVIDES="
+	lua = $portVersion compat = 5.2
+	cmd:lua = $portVersion compat = 5.2
+	cmd:luac = $portVersion
+	lib:liblua = $portVersion compat = 5.2
+	devel:liblua = $portVersion compat = 5.2
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:make
+	cmd:gcc
+	"
+
+PATCHES="lua-$portVersion.patchset"
+BUILD()
+{
+	make haiku
+}
+
+INSTALL()
+{
+	make install INSTALL_TOP="$prefix" INSTALL_MAN="$manDir" \
+		INSTALL_INC="$includeDir" INSTALL_LMOD="$dataDir/lua/$V"
+
+	prepareInstalledDevelLib liblua
+}
+LICENSE="MIT"
+COPYRIGHT="1994-2012, Lua.org, PUC-Rio"
+DESCRIPTION="
+	Lua combines simple procedural syntax with powerful data description
+	constructs based on associative arrays and extensible semantics. Lua is
+	dynamically typed, runs by interpreting bytecode for a register-based
+	virtual machine, and has automatic memory management with incremental
+	garbage collection, making it ideal for configuration, scripting, and rapid
+	prototyping.
+	"
--- a/dev-lang/lua/patches/lua-5.1.4.patch
+++ b/dev-lang/lua/patches/lua-5.1.4.patch
@@ -1,92 +0,0 @@
-diff -up lua-5.1.4/Makefile.orig lua-5.1.4/Makefile
--- lua-5.1.4/Makefile.orig	2010-04-27 22:29:15.068419584 -0600
-+++ lua-5.1.4/Makefile	2010-04-27 22:29:20.697303040 -0600
-@@ -38,12 +38,12 @@ RANLIB= ranlib
- # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
- 
- # Convenience platforms targets.
-PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
-+PLATS= aix ansi bsd freebsd generic haiku linux macosx mingw posix solaris
- 
- # What to install.
- TO_BIN= lua luac
- TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp
-TO_LIB= liblua.a
-+TO_LIB= liblua.a liblua.so
- TO_MAN= lua.1 luac.1
- 
- # Lua version and release.
-diff -up lua-5.1.4/src/Makefile.orig lua-5.1.4/src/Makefile
--- lua-5.1.4/src/Makefile.orig	2010-04-27 22:29:26.027787264 -0600
-+++ lua-5.1.4/src/Makefile	2010-04-27 22:29:38.680525824 -0600
-@@ -20,9 +20,10 @@ MYLIBS=
- 
- # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
- 
-PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
-+PLATS= aix ansi bsd freebsd generic haiku linux macosx mingw posix solaris
- 
- LUA_A=	liblua.a
-+LUA_SO=	liblua.so
- CORE_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
-@@ -36,7 +37,7 @@ LUAC_T=	luac
- LUAC_O=	luac.o print.o
- 
- ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O)
-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
-+ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO)
- ALL_A= $(LUA_A)
- 
- default: $(PLAT)
-@@ -57,6 +58,9 @@ $(LUA_T): $(LUA_O) $(LUA_A)
- $(LUAC_T): $(LUAC_O) $(LUA_A)
- 	$(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
- 
-+$(LUA_SO): $(CORE_O) $(LIB_O)
-+	$(CC) -o $@ -shared -fPIC $(MYLDFLAGS) $? $(LIBS)
-+
- clean:
- 	$(RM) $(ALL_T) $(ALL_O)
- 
-@@ -95,6 +99,9 @@ freebsd:
- generic:
- 	$(MAKE) all MYCFLAGS=
- 
-+haiku:
-+	$(MAKE) all MYCFLAGS=-DLUA_USE_HAIKU LIBS=
-+
- linux:
- 	$(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses"
- 
-diff -up lua-5.1.4/src/luaconf.h.orig lua-5.1.4/src/luaconf.h
--- lua-5.1.4/src/luaconf.h.orig	2010-04-27 22:29:48.387448832 -0600
-+++ lua-5.1.4/src/luaconf.h	2010-04-27 22:29:58.184025088 -0600
-@@ -33,6 +33,13 @@
- #define LUA_WIN
- #endif
- 
-+#if defined(LUA_USE_HAIKU)
-+#define LUA_USE_MKSTEMP
-+#define LUA_USE_ISATTY
-+#define LUA_USE_POPEN
-+#define LUA_USE_DLOPEN
-+#endif
-+
- #if defined(LUA_USE_LINUX)
- #define LUA_USE_POSIX
- #define LUA_USE_DLOPEN		/* needs an extra library: -ldl */
-@@ -94,7 +101,11 @@
- 	".\\?.dll;"  LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
- 
- #else
-#define LUA_ROOT	"/usr/local/"
-+# if defined(LUA_USE_HAIKU)
-+#  define LUA_ROOT	"/boot/common/"
-+# else
-+#  define LUA_ROOT	"/usr/local/"
-+# endif
- #define LUA_LDIR	LUA_ROOT "share/lua/5.1/"
- #define LUA_CDIR	LUA_ROOT "lib/lua/5.1/"
- #define LUA_PATH_DEFAULT  \
--- a/dev-lang/lua/patches/lua-5.1.4.patchset
+++ b/dev-lang/lua/patches/lua-5.1.4.patchset
@@ -0,0 +1,295 @@
+From 5944289e129f60d26f71646bc4e3404f93de138f Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Sat, 5 Oct 2013 22:01:42 +0200
+Subject: Import existing haikuport patch.
+
+
+diff --git a/Makefile b/Makefile
+index 6e78f66..8b8fbfc 100644
+--- a/Makefile
+++ b/Makefile
+@@ -13,11 +13,11 @@ INSTALL_TOP= /usr/local
+ INSTALL_BIN= $(INSTALL_TOP)/bin
+ INSTALL_INC= $(INSTALL_TOP)/include
+ INSTALL_LIB= $(INSTALL_TOP)/lib
+-INSTALL_MAN= $(INSTALL_TOP)/man/man1
+INSTALL_MAN= `finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man/man1
+ #
+ # You probably want to make INSTALL_LMOD and INSTALL_CMOD consistent with
+ # LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h (and also with etc/lua.pc).
+-INSTALL_LMOD= $(INSTALL_TOP)/share/lua/$V
+INSTALL_LMOD= `finddir B_COMMON_DATA_DIRECTORY`/lua/$V
+ INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V
+ 
+ # How to install. If your install program does not support "-p", then you
+@@ -38,12 +38,12 @@ RANLIB= ranlib
+ # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
+ 
+ # Convenience platforms targets.
+-PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
+PLATS= aix ansi bsd freebsd generic haiku linux macosx mingw posix solaris
+ 
+ # What to install.
+ TO_BIN= lua luac
+ TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp
+-TO_LIB= liblua.a
+TO_LIB= liblua.a liblua.so
+ TO_MAN= lua.1 luac.1
+ 
+ # Lua version and release.
+diff --git a/src/Makefile b/src/Makefile
+index e4a3cd6..86bd1ce 100644
+--- a/src/Makefile
+++ b/src/Makefile
+@@ -20,9 +20,10 @@ MYLIBS=
+ 
+ # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
+ 
+-PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
+PLATS= aix ansi bsd freebsd generic haiku linux macosx mingw posix solaris
+ 
+ LUA_A=	liblua.a
+LUA_SO=	liblua.so
+ CORE_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
+@@ -36,7 +37,7 @@ LUAC_T=	luac
+ LUAC_O=	luac.o print.o
+ 
+ ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O)
+-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
+ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO)
+ ALL_A= $(LUA_A)
+ 
+ default: $(PLAT)
+@@ -57,6 +58,9 @@ $(LUA_T): $(LUA_O) $(LUA_A)
+ $(LUAC_T): $(LUAC_O) $(LUA_A)
+ 	$(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
+ 
+$(LUA_SO): $(CORE_O) $(LIB_O)
+	$(CC) -o $@ -shared -fPIC -Wl,-soname=liblua.so.$V $(MYLDFLAGS) $? $(LIBS)
+
+ clean:
+ 	$(RM) $(ALL_T) $(ALL_O)
+ 
+@@ -95,6 +99,9 @@ freebsd:
+ generic:
+ 	$(MAKE) all MYCFLAGS=
+ 
+haiku:
+	$(MAKE) all MYCFLAGS=-DLUA_USE_HAIKU LIBS=
+
+ linux:
+ 	$(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses"
+ 
+diff --git a/src/lcode.c b/src/lcode.c
+index cff626b..679cb9c 100644
+--- a/src/lcode.c
+++ b/src/lcode.c
+@@ -1,5 +1,5 @@
+ /*
+-** $Id: lcode.c,v 2.25.1.3 2007/12/28 15:32:23 roberto Exp $
+** $Id: lcode.c,v 2.25.1.5 2011/01/31 14:53:16 roberto Exp $
+ ** Code generator for Lua
+ ** See Copyright Notice in lua.h
+ */
+@@ -544,10 +544,6 @@ void luaK_goiftrue (FuncState *fs, expdesc *e) {
+       pc = NO_JUMP;  /* always true; do nothing */
+       break;
+     }
+-    case VFALSE: {
+-      pc = luaK_jump(fs);  /* always jump */
+-      break;
+-    }
+     case VJMP: {
+       invertjump(fs, e);
+       pc = e->u.s.info;
+@@ -572,10 +568,6 @@ static void luaK_goiffalse (FuncState *fs, expdesc *e) {
+       pc = NO_JUMP;  /* always false; do nothing */
+       break;
+     }
+-    case VTRUE: {
+-      pc = luaK_jump(fs);  /* always jump */
+-      break;
+-    }
+     case VJMP: {
+       pc = e->u.s.info;
+       break;
+diff --git a/src/ldblib.c b/src/ldblib.c
+index 67de122..2027eda 100644
+--- a/src/ldblib.c
+++ b/src/ldblib.c
+@@ -1,5 +1,5 @@
+ /*
+-** $Id: ldblib.c,v 1.104.1.3 2008/01/21 13:11:21 roberto Exp $
+** $Id: ldblib.c,v 1.104.1.4 2009/08/04 18:50:18 roberto Exp $
+ ** Interface from Lua to its debug API
+ ** See Copyright Notice in lua.h
+ */
+@@ -45,6 +45,7 @@ static int db_setmetatable (lua_State *L) {
+ 
+ 
+ static int db_getfenv (lua_State *L) {
+  luaL_checkany(L, 1);
+   lua_getfenv(L, 1);
+   return 1;
+ }
+diff --git a/src/liolib.c b/src/liolib.c
+index e79ed1c..649f9a5 100644
+--- a/src/liolib.c
+++ b/src/liolib.c
+@@ -1,5 +1,5 @@
+ /*
+-** $Id: liolib.c,v 2.73.1.3 2008/01/18 17:47:43 roberto Exp $
+** $Id: liolib.c,v 2.73.1.4 2010/05/14 15:33:51 roberto Exp $
+ ** Standard I/O (and system) library
+ ** See Copyright Notice in lua.h
+ */
+@@ -276,7 +276,10 @@ static int read_number (lua_State *L, FILE *f) {
+     lua_pushnumber(L, d);
+     return 1;
+   }
+-  else return 0;  /* read fails */
+  else {
+    lua_pushnil(L);  /* "result" to be removed */
+    return 0;  /* read fails */
+  }
+ }
+ 
+ 
+diff --git a/src/llex.c b/src/llex.c
+index 6dc3193..88c6790 100644
+--- a/src/llex.c
+++ b/src/llex.c
+@@ -1,5 +1,5 @@
+ /*
+-** $Id: llex.c,v 2.20.1.1 2007/12/27 13:02:25 roberto Exp $
+** $Id: llex.c,v 2.20.1.2 2009/11/23 14:58:22 roberto Exp $
+ ** Lexical Analyzer
+ ** See Copyright Notice in lua.h
+ */
+@@ -118,8 +118,10 @@ TString *luaX_newstring (LexState *ls, const char *str, size_t l) {
+   lua_State *L = ls->L;
+   TString *ts = luaS_newlstr(L, str, l);
+   TValue *o = luaH_setstr(L, ls->fs->h, ts);  /* entry for `str' */
+-  if (ttisnil(o))
+  if (ttisnil(o)) {
+     setbvalue(o, 1);  /* make sure `str' will not be collected */
+    luaC_checkGC(L);
+  }
+   return ts;
+ }
+ 
+diff --git a/src/loadlib.c b/src/loadlib.c
+index 0d401eb..6158c53 100644
+--- a/src/loadlib.c
+++ b/src/loadlib.c
+@@ -1,5 +1,5 @@
+ /*
+-** $Id: loadlib.c,v 1.52.1.3 2008/08/06 13:29:28 roberto Exp $
+** $Id: loadlib.c,v 1.52.1.4 2009/09/09 13:17:16 roberto Exp $
+ ** Dynamic library loader for Lua
+ ** See Copyright Notice in lua.h
+ **
+@@ -639,7 +639,7 @@ LUALIB_API int luaopen_package (lua_State *L) {
+   lua_pushvalue(L, -1);
+   lua_replace(L, LUA_ENVIRONINDEX);
+   /* create `loaders' table */
+-  lua_createtable(L, 0, sizeof(loaders)/sizeof(loaders[0]) - 1);
+  lua_createtable(L, sizeof(loaders)/sizeof(loaders[0]) - 1, 0);
+   /* fill it with pre-defined loaders */
+   for (i=0; loaders[i] != NULL; i++) {
+     lua_pushcfunction(L, loaders[i]);
+diff --git a/src/lstrlib.c b/src/lstrlib.c
+index 1b4763d..7a03489 100644
+--- a/src/lstrlib.c
+++ b/src/lstrlib.c
+@@ -1,5 +1,5 @@
+ /*
+-** $Id: lstrlib.c,v 1.132.1.4 2008/07/11 17:27:21 roberto Exp $
+** $Id: lstrlib.c,v 1.132.1.5 2010/05/14 15:34:19 roberto Exp $
+ ** Standard library for string operations and pattern-matching
+ ** See Copyright Notice in lua.h
+ */
+@@ -754,6 +754,7 @@ static void addintlen (char *form) {
+ 
+ 
+ static int str_format (lua_State *L) {
+  int top = lua_gettop(L);
+   int arg = 1;
+   size_t sfl;
+   const char *strfrmt = luaL_checklstring(L, arg, &sfl);
+@@ -768,7 +769,8 @@ static int str_format (lua_State *L) {
+     else { /* format item */
+       char form[MAX_FORMAT];  /* to store the format (`%...') */
+       char buff[MAX_ITEM];  /* to store the formatted item */
+-      arg++;
+      if (++arg > top)
+        luaL_argerror(L, arg, "no value");
+       strfrmt = scanformat(L, strfrmt, form);
+       switch (*strfrmt++) {
+         case 'c': {
+diff --git a/src/luaconf.h b/src/luaconf.h
+index e2cb261..9f28f41 100644
+--- a/src/luaconf.h
+++ b/src/luaconf.h
+@@ -33,6 +33,13 @@
+ #define LUA_WIN
+ #endif
+ 
+#if defined(LUA_USE_HAIKU)
+#define LUA_USE_MKSTEMP
+#define LUA_USE_ISATTY
+#define LUA_USE_POPEN
+#define LUA_USE_DLOPEN
+#endif
+
+ #if defined(LUA_USE_LINUX)
+ #define LUA_USE_POSIX
+ #define LUA_USE_DLOPEN		/* needs an extra library: -ldl */
+@@ -94,7 +101,11 @@
+ 	".\\?.dll;"  LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
+ 
+ #else
+-#define LUA_ROOT	"/usr/local/"
+# if defined(LUA_USE_HAIKU)
+#  define LUA_ROOT	"/boot/common/"
+# else
+#  define LUA_ROOT	"/usr/local/"
+# endif
+ #define LUA_LDIR	LUA_ROOT "share/lua/5.1/"
+ #define LUA_CDIR	LUA_ROOT "lib/lua/5.1/"
+ #define LUA_PATH_DEFAULT  \
+diff --git a/src/lvm.c b/src/lvm.c
+index ee3256a..8aeafda 100644
+--- a/src/lvm.c
+++ b/src/lvm.c
+@@ -1,5 +1,5 @@
+ /*
+-** $Id: lvm.c,v 2.63.1.3 2007/12/28 15:32:23 roberto Exp $
+** $Id: lvm.c,v 2.63.1.4 2009/07/01 21:10:33 roberto Exp $
+ ** Lua virtual machine
+ ** See Copyright Notice in lua.h
+ */
+@@ -133,6 +133,7 @@ void luaV_gettable (lua_State *L, const TValue *t, TValue *key, StkId val) {
+ 
+ void luaV_settable (lua_State *L, const TValue *t, TValue *key, StkId val) {
+   int loop;
+  TValue temp;
+   for (loop = 0; loop < MAXTAGLOOP; loop++) {
+     const TValue *tm;
+     if (ttistable(t)) {  /* `t' is a table? */
+@@ -152,7 +153,9 @@ void luaV_settable (lua_State *L, const TValue *t, TValue *key, StkId val) {
+       callTM(L, tm, t, key, val);
+       return;
+     }
+-    t = tm;  /* else repeat with `tm' */ 
+    /* else repeat with `tm' */
+    setobj(L, &temp, tm);  /* avoid pointing inside table (may rehash) */
+    t = &temp;
+   }
+   luaG_runerror(L, "loop in settable");
+ }
+-- 
+1.8.3.4
+
--- a/dev-lang/lua/patches/lua-5.2.1.patchset
+++ b/dev-lang/lua/patches/lua-5.2.1.patchset
@@ -0,0 +1,127 @@
+From 4130bdecfcb78e60b64a8ade8689aa02158eda46 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Sun, 6 Oct 2013 10:13:45 +0200
+Subject: Import existing patch.
+
+
+diff --git a/Makefile b/Makefile
+index bd9515f..22d3a62 100644
+--- a/Makefile
+++ b/Makefile
+@@ -36,12 +36,12 @@ RM= rm -f
+ # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE =======
+ 
+ # Convenience platforms targets.
+-PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
+PLATS= aix ansi bsd freebsd generic haiku linux macosx mingw posix solaris
+ 
+ # What to install.
+ TO_BIN= lua luac
+ TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp
+-TO_LIB= liblua.a
+TO_LIB= liblua.a liblua.so
+ TO_MAN= lua.1 luac.1
+ 
+ # Lua version and release.
+diff --git a/src/Makefile b/src/Makefile
+index 8c9ee67..2f7065c 100644
+--- a/src/Makefile
+++ b/src/Makefile
+@@ -26,9 +26,10 @@ MYOBJS=
+ 
+ # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE =======
+ 
+-PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
+PLATS= aix ansi bsd freebsd generic haiku linux macosx mingw posix solaris
+ 
+ LUA_A=	liblua.a
+LUA_SO= liblua.so
+ 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
+@@ -43,7 +44,7 @@ LUAC_T=	luac
+ LUAC_O=	luac.o
+ 
+ ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
+-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
+ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO)
+ ALL_A= $(LUA_A)
+ 
+ # Targets start here.
+@@ -65,6 +66,9 @@ $(LUA_T): $(LUA_O) $(LUA_A)
+ $(LUAC_T): $(LUAC_O) $(LUA_A)
+ 	$(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
+ 
+$(LUA_SO): $(CORE_O) $(LIB_O)
+	$(CC) -o $@ -shared -fPIC $(LDFLAGS) $? $(LIBS)
+
+ clean:
+ 	$(RM) $(ALL_T) $(ALL_O)
+ 
+@@ -102,6 +106,9 @@ freebsd:
+ 
+ generic: $(ALL)
+ 
+haiku:
+	$(MAKE) all MUCFLAGS=-DLUA_USE_HAIKU LIBS=
+
+ linux:
+ 	$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -ldl -lreadline -lncurses"
+ 
+diff --git a/src/luaconf.h b/src/luaconf.h
+index e4335df..cef74a7 100644
+--- a/src/luaconf.h
+++ b/src/luaconf.h
+@@ -40,6 +40,13 @@
+ 
+ 
+ 
+#if defined(LUA_USE_HAIKU)
+#define LUA_USE_MKSTEMP
+#define LUA_USE_ISATTY
+#define LUA_USE_POPEN
+#define LUA_USE_DLOPEN
+#endif
+
+ #if defined(LUA_USE_LINUX)
+ #define LUA_USE_POSIX
+ #define LUA_USE_DLOPEN		/* needs an extra library: -ldl */
+@@ -100,7 +107,11 @@
+ #else			/* }{ */
+ 
+ #define LUA_VDIR	LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/"
+#if defined(LUA_USE_HAIKU)
+#define LUA_ROOT	"/boot/common/"
+#else
+ #define LUA_ROOT	"/usr/local/"
+#endif
+ #define LUA_LDIR	LUA_ROOT "share/lua/" LUA_VDIR
+ #define LUA_CDIR	LUA_ROOT "lib/lua/" LUA_VDIR
+ #define LUA_PATH_DEFAULT  \
+-- 
+1.8.3.4
+
+
+From 5fbc99c965898e393a34cff6bfb14b29dc77426b Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Sun, 6 Oct 2013 10:25:23 +0200
+Subject: Set the library soname
+
+ * prepareInstalledDevelLib will fail if there is no soname.
+
+diff --git a/src/Makefile b/src/Makefile
+index 2f7065c..b279d4b 100644
+--- a/src/Makefile
+++ b/src/Makefile
+@@ -67,7 +67,7 @@ $(LUAC_T): $(LUAC_O) $(LUA_A)
+ 	$(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
+ 
+ $(LUA_SO): $(CORE_O) $(LIB_O)
+-	$(CC) -o $@ -shared -fPIC $(LDFLAGS) $? $(LIBS)
+	$(CC) -o $@ -shared -fPIC -Wl,-soname=liblua.so.$V $(LDFLAGS) $? $(LIBS)
+ 
+ clean:
+ 	$(RM) $(ALL_T) $(ALL_O)
+-- 
+1.8.3.4
+