optimize ipkg package management

- generate ipkg control file from PKG_* variables
- automatically install init scripts from ./files/*.init
  set #PKG pkgname to set the binary package
- rename FWINIT -> INIT
- move postinst and conffiles meta data to ./files
- update the packages to the latest upstream version
- remove some unready or unused package (strongswan,..)

more cleanups needed after allmodconfig

8 files changed, 32 insertions, 90 deletions

diff --git a/package/lua/Makefile b/package/lua/Makefile
index 62c48501b..4df8515cc 100644
--- a/package/lua/Makefile
+++ b/package/lua/Makefile
@@ -6,20 +6,23 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		lua
-PKG_VERSION:=		5.0.2
+PKG_VERSION:=		5.1.4
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		dea74646b7e5c621fef7174df83c34b1
-MASTER_SITES:=		http://www.lua.org/ftp/ \
+PKG_MD5SUM:=		d0870f2de55d59c1c8419f36e8fac150
+PKG_DESCR:=		LUA programming language
+PKG_SECTION:=		admin
+PKG_URL:=		http://www.lua.org
+PKG_SITES:=		http://www.lua.org/ftp/ \
 			http://ftp.gwdg.de/pub/languages/lua/ \
 			http://mirrors.dotsrc.org/lua/ \
 			http://www.tecgraf.puc-rio.br/lua/ftp/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBLUA,liblua,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,LUA,lua,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,LUAC,luac,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,LUA_EXAMPLES,lua-examples,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,LIBLUA,liblua,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LUA,lua,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LUAC,luac,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LUA_EXAMPLES,lua-examples,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 do-build:
 	${MAKE} -C ${WRKBUILD} \
@@ -27,30 +30,17 @@ do-build:
 		LD="${TARGET_CROSS}ld" \
 		AR="${TARGET_CROSS}ar rcu" \
 		RANLIB="${TARGET_CROSS}ranlib" \
-		INSTALL_ROOT=/usr \
-		MYCFLAGS="${TCFLAGS} ${TCPPFLAGS}" \
+		INSTALL_TOP=/usr \
+		CFLAGS="${TCFLAGS} ${TCPPFLAGS} -DLUA_USE_LINUX -fPIC" \
 		MYLDFLAGS="${TLDFLAGS}" \
-		all so
-	# remove statically linked binaries, so that they will get linked against shlib this time
-	rm -f ${WRKBUILD}/bin/lua{,c}
+		linux
 	${MAKE} -C ${WRKBUILD} \
-		CC="${TARGET_CC}" \
-		LD="${TARGET_CROSS}ld" \
-		AR="${TARGET_CROSS}ar rcu" \
-		RANLIB="${TARGET_CROSS}ranlib" \
-		INSTALL_ROOT=/usr \
-		MYCFLAGS="${TCFLAGS} ${TCPPFLAGS}" \
-		MYLDFLAGS="${TLDFLAGS}" \
-		all
-	rm -rf ${WRKINST}
-	mkdir -p ${WRKINST}
-	${MAKE} -C ${WRKBUILD} \
-		INSTALL_ROOT="${WRKINST}/usr" \
-		install soinstall
+		INSTALL_TOP="${WRKINST}/usr" \
+		install
 
 do-install:
 	${INSTALL_DIR} ${IDIR_LIBLUA}/usr/lib
-	${CP} ${WRKINST}/usr/lib/liblua{,lib}.so.* ${IDIR_LIBLUA}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/liblua.a ${IDIR_LIBLUA}/usr/lib/
 	${INSTALL_DIR} ${IDIR_LUA}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/lua ${IDIR_LUA}/usr/bin/
 	${INSTALL_DIR} ${IDIR_LUAC}/usr/bin
diff --git a/package/lua/ipkg/liblua.control b/package/lua/ipkg/liblua.control
deleted file mode 100644
index 502523a53..000000000
--- a/package/lua/ipkg/liblua.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: liblua
-Priority: optional
-Section: libs
-Description: LUA programming language shared libraries
diff --git a/package/lua/ipkg/lua-examples.control b/package/lua/ipkg/lua-examples.control
deleted file mode 100644
index fc0e46e07..000000000
--- a/package/lua/ipkg/lua-examples.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: lua-examples
-Priority: optional
-Section: devel
-Description: LUA programming language examples
-Depends: lua
diff --git a/package/lua/ipkg/lua.control b/package/lua/ipkg/lua.control
deleted file mode 100644
index a938103ee..000000000
--- a/package/lua/ipkg/lua.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: lua
-Priority: optional
-Section: admin
-Description: LUA programming language interpreter
-Depends: liblua
diff --git a/package/lua/ipkg/luac.control b/package/lua/ipkg/luac.control
deleted file mode 100644
index f379f9e45..000000000
--- a/package/lua/ipkg/luac.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: luac
-Priority: optional
-Section: devel
-Description: LUA programming language compiler
-Depends: liblua
diff --git a/package/lua/patches/lua-5.0.2-config.patch b/package/lua/patches/lua-5.0.2-config.patch
deleted file mode 100644
index fa5b0e765..000000000
--- a/package/lua/patches/lua-5.0.2-config.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -ruN lua-5.0.2-orig/config lua-5.0.2-1/config
---- lua-5.0.2-orig/config	2003-04-11 16:00:41.000000000 +0200
-+++ lua-5.0.2-1/config	2005-05-25 11:23:35.000000000 +0200
-@@ -25,15 +25,15 @@
- # interface (e.g., Linux, Solaris, IRIX, BSD, AIX, HPUX, and probably others),
- # uncomment the next two lines.
- #
--#LOADLIB= -DUSE_DLOPEN=1
--#DLLIB= -ldl
-+LOADLIB= -DUSE_DLOPEN=1
-+DLLIB= -ldl
- #
- # In Linux with gcc, you should also uncomment the next definition for
- # MYLDFLAGS, which passes -E (= -export-dynamic) to the linker. This option
- # allows dynamic libraries to link back to the `lua' program, so that they do
- # not need the Lua libraries. (Other systems may have an equivalent facility.)
- #
--#MYLDFLAGS= -Wl,-E
-+MYLDFLAGS= -Wl,-E
- #
- # On Windows systems. support for dynamic loading is enabled by default.
- # To disable this support, uncomment the next line.
-@@ -142,7 +142,7 @@
- 
- # This should work in all Unix systems, but you may want to add options.
- #
--STRIP= strip
-+STRIP= /bin/true
- 
- # ------------------------------------------------------------------ install
- 
diff --git a/package/lua/patches/lua-5.0.2-soname.patch b/package/lua/patches/lua-5.0.2-soname.patch
deleted file mode 100644
index 3364ff6ad..000000000
--- a/package/lua/patches/lua-5.0.2-soname.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ruN lua-5.0.2-orig/Makefile lua-5.0.2-1/Makefile
---- lua-5.0.2-orig/Makefile	2004-03-12 02:50:55.000000000 +0100
-+++ lua-5.0.2-1/Makefile	2005-05-25 11:41:44.000000000 +0200
-@@ -38,8 +38,8 @@
- 
- # shared libraries (for Linux)
- so:
--	ld -o lib/liblua.so.$V -shared src/*.o
--	ld -o lib/liblualib.so.$V -shared src/lib/*.o
-+	$(LD) -o lib/liblua.so.$V -shared -soname="liblua.so.$V" src/*.o
-+	$(LD) -o lib/liblualib.so.$V -shared -soname="liblualib.so.$V" src/lib/*.o
- 	cd lib; ln -fs liblua.so.$V liblua.so; ln -fs liblualib.so.$V liblualib.so
- 
- # binaries using shared libraries
diff --git a/package/lua/patches/patch-src_Makefile b/package/lua/patches/patch-src_Makefile
new file mode 100644
index 000000000..59179c379
--- /dev/null
+++ b/package/lua/patches/patch-src_Makefile
@@ -0,0 +1,16 @@
+$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
+--- lua-5.1.4.orig/src/Makefile	2008-01-19 20:37:58.000000000 +0100
++++ lua-5.1.4/src/Makefile	2009-05-29 23:41:06.936423384 +0200
+@@ -14,15 +14,16 @@ RANLIB= ranlib
+ RM= rm -f
+ LIBS= -lm $(MYLIBS)
+ 
+-MYCFLAGS=
+-MYLDFLAGS=
+-MYLIBS=
++MYCFLAGS?=
++MYLDFLAGS?=
++MYLIBS?=
+ 
+ # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
+