moved extra/* to main/

and fixed misc build issues

3 files changed, 0 insertions, 142 deletions

diff --git a/extra/lua/APKBUILD b/extra/lua/APKBUILD
deleted file mode 100644
index 5e41bc03ad..0000000000
--- a/extra/lua/APKBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=lua
-pkgver=5.1.4
-pkgrel=2
-pkgdesc="A powerful light-weight programming language designed for extending applications."
-url="http://www.lua.org/"
-license="MIT"
-depends=
-makedepends="readline-dev libtool"
-subpackages="$pkgname-dev $pkgname-doc"
-source="http://www.$pkgname.org/ftp/$pkgname-$pkgver.tar.gz
-	lua-5.1-make.patch
-	lua-5.1-module_paths.patch
-	"
-
-build () 
-{ 
-	cd "$srcdir"/$pkgname-$pkgver
-	for i in ../*.patch; do
-		msg "Applying $i"
-		patch -p1 < $i || return 1
-	done
-
-	# correct lua versioning
-	sed -i -e 's/\(LIB_VERSION = \)6:1:1/\16:4:1/' src/Makefile
-	
-	# we want packages to find our things
-	sed -i -e 's:/usr/local:/usr:' etc/lua.pc
-
-	cd src
-	make CFLAGS=" -DLUA_USE_LINUX $CFLAGS" \
-		RPATH="/usr/lib" \
-		LUA_LIBS="-lreadline" \
-		LIB_LIBS="-lm -ldl" \
-		V=$pkgver \
-		gentoo_all || return 1
-
-	cd "$srcdir/$pkgname-$pkgver"
-	make INSTALL_TOP="$pkgdir"/usr INSTALL_LIB="$pkgdir"/usr/lib \
-		V=$pkgver gentoo_install || return 1
-
-	install -D -m 644 etc/lua.pc "$pkgdir"/usr/lib/pkgconfig/lua.pc
-	install -D -m 644 doc/lua.1 "$pkgdir"/usr/share/man/man1/lua.1
-	install -D -m 644 doc/luac.1 "$pkgdir"/usr/share/man/man1/luac.1
-}
-md5sums="d0870f2de55d59c1c8419f36e8fac150  lua-5.1.4.tar.gz
-0145ff6036eb6bfdab427dc8f0c3f3c0  lua-5.1-make.patch
-e60ef15deefb72a5930c498f1184aced  lua-5.1-module_paths.patch"
diff --git a/extra/lua/lua-5.1-make.patch b/extra/lua/lua-5.1-make.patch
deleted file mode 100644
index d051a21cb6..0000000000
--- a/extra/lua/lua-5.1-make.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- lua-5.1.1.orig/Makefile	2006-06-02 12:53:38.000000000 +0200
-+++ lua-5.1.1/Makefile	2006-11-16 02:16:53.000000000 +0100
-@@ -127,3 +127,22 @@
- .PHONY: all $(PLATS) clean test install local none dummy echo pecho lecho newer
- 
- # (end of Makefile)
-+
-+# Use libtool for binary installs, etc.
-+
-+export V
-+export LIBTOOL = libtool --quiet --tag=CC
-+# See libtool manual about how to set this
-+
-+gentoo_clean:
-+	cd src; $(MAKE) $@
-+
-+gentoo_test: gentoo_linux
-+	test/lua.static test/hello.lua
-+
-+gentoo_install:
-+	mkdir -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB)
-+	cd src; $(LIBTOOL) --mode=install $(INSTALL_EXEC) lua luac $(INSTALL_BIN)
-+	cd src; $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
-+	cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblua.la $(INSTALL_LIB)
-+	cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblua.a $(INSTALL_LIB)
---- lua-5.1.1.orig/src/Makefile	2006-03-22 01:41:49.000000000 +0100
-+++ lua-5.1.1/src/Makefile	2006-11-16 02:10:27.000000000 +0100
-@@ -176,3 +176,36 @@
-   ltm.h lzio.h lmem.h lopcodes.h lundump.h
- 
- # (end of Makefile)
-+
-+export LIBTOOL = libtool --quiet --tag=CC
-+export LIB_VERSION = 6:1:1
-+
-+# The following rules use libtool for compiling and linking in order to
-+# provide shared library support.
-+
-+LIB_NAME = liblua.la
-+LIB_OBJS = $(CORE_O:.o=.lo) $(LIB_O:.o=.lo)
-+
-+%.lo %.o: %.c
-+	$(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
-+
-+$(LIB_NAME): $(LIB_OBJS)
-+	$(LIBTOOL) --mode=link $(CC) -version-info $(LIB_VERSION) \
-+            -rpath $(RPATH) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS)
-+
-+$(LIB_NAME:.la=.a): $(LIB_OBJS)
-+	$(LIBTOOL) --mode=link $(CC) -static -o $(LIB_NAME:.la=.a) $(LIB_OBJS)
-+
-+$(LUA_T): $(LUA_O) $(LIB_NAME)
-+	$(LIBTOOL) --mode=link $(CC) -Wl,-E -o $@ $(LUA_O) $(LUA_LIBS) -llua
-+
-+lua_test: $(LUA_O) $(LIB_NAME)
-+	$(LIBTOOL) --mode=link $(CC) -static -Wl,-E -o $@ $(LUA_O) $(LIB_NAME) $(LUA_LIBS)
-+
-+$(LUAC_T): $(LUAC_O) $(LIB_NAME)
-+	$(LIBTOOL) --mode=link $(CC) -static -o $@ $(LUAC_O) $(LIB_NAME)
-+
-+gentoo_clean:
-+	$(LIBTOOL) --mode=clean $(RM) $(ALL_O:.o=.lo) $(LIB_NAME) lua luac
-+
-+gentoo_all: $(LIB_NAME) $(LIB_NAME:.la=.a) $(LUA_T) lua_test $(LUAC_T)
diff --git a/extra/lua/lua-5.1-module_paths.patch b/extra/lua/lua-5.1-module_paths.patch
deleted file mode 100644
index 29ac4c3bf4..0000000000
--- a/extra/lua/lua-5.1-module_paths.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## src_luaconf.h.dpatch by John V. Belmonte <jbelmonte@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Set Lua's default PATH and CPATH.
-
-@DPATCH@
-diff -urNad trunk~/src/luaconf.h trunk/src/luaconf.h
---- trunk~/src/luaconf.h	2006-02-10 12:44:06.000000000 -0500
-+++ trunk/src/luaconf.h	2006-02-17 21:32:55.000000000 -0500
-@@ -83,13 +83,17 @@
- 
- #else
- #define LUA_ROOT	"/usr/local/"
-+#define LUA_ROOT2	"/usr/"
- #define LUA_LDIR	LUA_ROOT "share/lua/5.1/"
-+#define LUA_LDIR2	LUA_ROOT2 "share/lua/5.1/"
- #define LUA_CDIR	LUA_ROOT "lib/lua/5.1/"
-+#define LUA_CDIR2	LUA_ROOT2 "lib/lua/5.1/"
- #define LUA_PATH_DEFAULT  \
- 		"./?.lua;"  LUA_LDIR"?.lua;"  LUA_LDIR"?/init.lua;" \
--		            LUA_CDIR"?.lua;"  LUA_CDIR"?/init.lua"
-+		            LUA_CDIR"?.lua;"  LUA_CDIR"?/init.lua;" \
-+		            LUA_LDIR2"?.lua;"  LUA_LDIR2"?/init.lua"
- #define LUA_CPATH_DEFAULT \
--	"./?.so;"  LUA_CDIR"?.so;" LUA_CDIR"loadall.so"
-+	"./?.so;" LUA_CDIR"?.so;" LUA_CDIR2"?.so;" LUA_CDIR"loadall.so"
- #endif
- 
-