From 02645c3876604612507880ae53603426a9cf25be Mon Sep 17 00:00:00 2001
From: Phil Sutter <phil@nwl.cc>
Date: Sat, 24 Apr 2010 23:51:50 +0200
Subject: massive PKG_SECTION adjustments

---
 package/lua/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package/lua/Makefile')

diff --git a/package/lua/Makefile b/package/lua/Makefile
index bafdadb50..c21483754 100644
--- a/package/lua/Makefile
+++ b/package/lua/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:=		5.1.4
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		d0870f2de55d59c1c8419f36e8fac150
 PKG_DESCR:=		LUA programming language
-PKG_SECTION:=		admin
+PKG_SECTION:=		lang
 PKG_URL:=		http://www.lua.org
 PKG_SITES:=		http://www.lua.org/ftp/ \
 			http://ftp.gwdg.de/pub/languages/lua/ \
-- 
cgit v1.2.3


From b933c4476c861250229fe6238b0e4b9ca5b7ea18 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 13 Jul 2010 13:48:20 +0200
Subject: optimize lua package

---
 package/lua/Makefile | 51 +++++++++++++++++++++------------------------------
 1 file changed, 21 insertions(+), 30 deletions(-)

(limited to 'package/lua/Makefile')

diff --git a/package/lua/Makefile b/package/lua/Makefile
index c21483754..59e50bbd8 100644
--- a/package/lua/Makefile
+++ b/package/lua/Makefile
@@ -5,44 +5,35 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		lua
 PKG_VERSION:=		5.1.4
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		d0870f2de55d59c1c8419f36e8fac150
-PKG_DESCR:=		LUA programming language
+PKG_DESCR:=		LUA programming language interpreter
 PKG_SECTION:=		lang
-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/
+PKG_BUILDDEP:=		readline
+PKG_DEPENDS:=		libreadline
+PKG_MULTI:=		1
+PKG_URL:=		http://www.lua.org/
+PKG_SITES:=		http://www.lua.org/ftp/
+
+PKG_DESCR_LUAC:=	LUA bytecode compiler
+PKG_DESCR_LUAEX:=	LUA script examples
 
 include ${TOPDIR}/mk/package.mk
 
-$(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}))
+$(eval $(call PKG_template,LUAC,luac,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_LUAC},${PKG_SECTION}))
+$(eval $(call PKG_template,LUA_EXAMPLES,lua-examples,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_LUAEX},${PKG_SECTION}))
 
 CONFIG_STYLE:=		manual
-BUILD_STYLE:=		manual
-INSTALL_STYLE:=		manual
-
-do-build:
-	${MAKE} -C ${WRKBUILD} \
-		CC="${TARGET_CC}" \
-		LD="${TARGET_CROSS}ld" \
-		AR="${TARGET_CROSS}ar rcu" \
-		RANLIB="${TARGET_CROSS}ranlib" \
-		INSTALL_TOP=/usr \
-		CFLAGS="${TCFLAGS} ${TCPPFLAGS} -DLUA_USE_LINUX -fPIC" \
-		MYLDFLAGS="${TLDFLAGS}" \
-		linux
-	${MAKE} -C ${WRKBUILD} \
-		INSTALL_TOP="${WRKINST}/usr" \
-		install
-
-do-install:
-	${INSTALL_DIR} ${IDIR_LIBLUA}/usr/lib
-	${CP} ${WRKINST}/usr/lib/liblua.a ${IDIR_LIBLUA}/usr/lib/
+MAKE_FLAGS+=		CFLAGS="${TCFLAGS} ${TCPPFLAGS} -DLUA_USE_LINUX -fPIC" \
+			MYLDFLAGS="${TLDFLAGS}" \
+			CC="${TARGET_CC}" LD="${TARGET_CROSS}ld" \
+			AR="${TARGET_CROSS}ar rcu" \
+			RANLIB="${TARGET_CROSS}ranlib"
+XAKE_FLAGS+=		INSTALL_TOP="${WRKINST}/usr"
+ALL_TARGET:=		linux
+
+post-install:
 	${INSTALL_DIR} ${IDIR_LUA}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/lua ${IDIR_LUA}/usr/bin/
 	${INSTALL_DIR} ${IDIR_LUAC}/usr/bin
-- 
cgit v1.2.3