From 2c9a0ee9a83316886e03ba1f5e79b65f791856de Mon Sep 17 00:00:00 2001 From: "Menno E. Duursma" Date: Tue, 11 May 2010 19:44:17 +0200 Subject: development/lua: Updated for version 5.1.3 --- development/lua/README | 1 - development/lua/lua-5.1.2-shared.diff | 71 ----------------------------------- development/lua/lua-5.1.3-shared.diff | 71 +++++++++++++++++++++++++++++++++++ development/lua/lua.SlackBuild | 17 ++++++--- development/lua/lua.info | 8 ++-- development/lua/slack-desc | 30 +++++++++------ 6 files changed, 106 insertions(+), 92 deletions(-) delete mode 100644 development/lua/lua-5.1.2-shared.diff create mode 100644 development/lua/lua-5.1.3-shared.diff (limited to 'development') diff --git a/development/lua/README b/development/lua/README index c4b92e5c1a..3073c0d962 100644 --- a/development/lua/README +++ b/development/lua/README @@ -1,4 +1,3 @@ Lua is a free software light-weight programming language designed for extending applications. Lua is also frequently used as a general-purpose, stand-alone scripting language. - diff --git a/development/lua/lua-5.1.2-shared.diff b/development/lua/lua-5.1.2-shared.diff deleted file mode 100644 index 84b286aa65..0000000000 --- a/development/lua/lua-5.1.2-shared.diff +++ /dev/null @@ -1,71 +0,0 @@ -diff -Naur lua-5.1.2.orig/Makefile lua-5.1.2/Makefile ---- lua-5.1.2.orig/Makefile 2007-03-25 09:44:39.000000000 -0500 -+++ lua-5.1.2/Makefile 2007-04-05 09:49:38.000000000 -0500 -@@ -43,7 +43,7 @@ - # 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.$R - TO_MAN= lua.1 luac.1 - - # Lua version and release. -diff -Naur lua-5.1.2.orig/src/Makefile lua-5.1.2/src/Makefile ---- lua-5.1.2.orig/src/Makefile 2007-03-25 09:49:23.000000000 -0500 -+++ lua-5.1.2/src/Makefile 2007-04-05 09:57:48.000000000 -0500 -@@ -18,11 +18,17 @@ - MYLDFLAGS= - MYLIBS= - -+# Shared object info -+MAJOR= 5 -+MINOR= 1 -+REL= 2 -+ - # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE ========= - - PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris - - LUA_A= liblua.a -+LUA_S= 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,8 +42,9 @@ - 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_S) $(LUA_T) $(LUAC_T) - ALL_A= $(LUA_A) -+ALL_S= $(LUA_S) - - default: $(PLAT) - -@@ -47,10 +54,17 @@ - - a: $(ALL_A) - -+s: $(ALL_S) -+ - $(LUA_A): $(CORE_O) $(LIB_O) - $(AR) $@ $? - $(RANLIB) $@ - -+$(LUA_S): $(CORE_O) $(LIB_O) -+ gcc -shared -fPIC -Wl,-soname -Wl,$(LUA_S).$(MAJOR) \ -+ -o $(LUA_S).$(MAJOR).$(MINOR).$(REL) $^ $(LIBS) -+ ln -s $(LUA_S).$(MAJOR).$(MINOR).$(REL) $(LUA_S) -+ - $(LUA_T): $(LUA_O) $(LUA_A) - $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) - -@@ -58,7 +72,7 @@ - $(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) - - clean: -- $(RM) $(ALL_T) $(ALL_O) -+ $(RM) $(ALL_T) $(ALL_O) $(LUA_S) $(LUA_S).$(MAJOR).$(MINOR).$(REL) - - depend: - @$(CC) $(CFLAGS) -MM l*.c print.c diff --git a/development/lua/lua-5.1.3-shared.diff b/development/lua/lua-5.1.3-shared.diff new file mode 100644 index 0000000000..046d788dd2 --- /dev/null +++ b/development/lua/lua-5.1.3-shared.diff @@ -0,0 +1,71 @@ +diff -Naur lua-5.1.3.orig/Makefile lua-5.1.3/Makefile +--- lua-5.1.3.orig/Makefile 2007-03-25 09:44:39.000000000 -0500 ++++ lua-5.1.3/Makefile 2007-04-05 09:49:38.000000000 -0500 +@@ -43,7 +43,7 @@ + # 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.$R + TO_MAN= lua.1 luac.1 + + # Lua version and release. +diff -Naur lua-5.1.3.orig/src/Makefile lua-5.1.3/src/Makefile +--- lua-5.1.3.orig/src/Makefile 2007-03-25 09:49:23.000000000 -0500 ++++ lua-5.1.3/src/Makefile 2007-04-05 09:57:48.000000000 -0500 +@@ -18,11 +18,17 @@ + MYLDFLAGS= + MYLIBS= + ++# Shared object info ++MAJOR= 5 ++MINOR= 1 ++REL= 3 ++ + # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE ========= + + PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris + + LUA_A= liblua.a ++LUA_S= 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,8 +42,9 @@ + 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_S) $(LUA_T) $(LUAC_T) + ALL_A= $(LUA_A) ++ALL_S= $(LUA_S) + + default: $(PLAT) + +@@ -47,10 +54,17 @@ + + a: $(ALL_A) + ++s: $(ALL_S) ++ + $(LUA_A): $(CORE_O) $(LIB_O) + $(AR) $@ $? + $(RANLIB) $@ + ++$(LUA_S): $(CORE_O) $(LIB_O) ++ gcc -shared -fPIC -Wl,-soname -Wl,$(LUA_S).$(MAJOR) \ ++ -o $(LUA_S).$(MAJOR).$(MINOR).$(REL) $^ $(LIBS) ++ ln -s $(LUA_S).$(MAJOR).$(MINOR).$(REL) $(LUA_S) ++ + $(LUA_T): $(LUA_O) $(LUA_A) + $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) + +@@ -58,7 +72,7 @@ + $(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) + + clean: +- $(RM) $(ALL_T) $(ALL_O) ++ $(RM) $(ALL_T) $(ALL_O) $(LUA_S) $(LUA_S).$(MAJOR).$(MINOR).$(REL) + + depend: + @$(CC) $(CFLAGS) -MM l*.c print.c diff --git a/development/lua/lua.SlackBuild b/development/lua/lua.SlackBuild index a07cc67c33..e6f78d0a4b 100644 --- a/development/lua/lua.SlackBuild +++ b/development/lua/lua.SlackBuild @@ -6,10 +6,11 @@ # Modified by the SlackBuilds.org project PRGNAM=lua -VERSION=5.1.2 +VERSION=5.1.3 ARCH=${ARCH:-i486} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} + CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM @@ -25,7 +26,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP || exit 1 rm -rf $PRGNAM-$VERSION -tar xzvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1 +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1 cd $PRGNAM-$VERSION || exit 1 chown -R root:root . chmod -R a-s,u+rw,go-w+r . @@ -39,10 +40,16 @@ sed -i "s/-DLUA_USE_LINUX/\"-DLUA_USE_LINUX $SLKCFLAGS\"/g" src/Makefile || exit make linux make install INSTALL_TOP=$PKG/usr || exit 1 +# Install the pkg-config file so other apps can find LUA +# Also, fix the prefix path in lua.pc +mkdir -p $PKG/usr/lib/pkgconfig +sed 's|prefix= /usr/local|prefix= /usr|' etc/lua.pc > \ + $PKG/usr/lib/pkgconfig/lua.pc + # Let's make sure all of the library symlinks correctly exist ( cd $PKG/usr/lib - ln -sf liblua.so.5.1.2 liblua.so - ln -sf liblua.so.5.1.2 liblua.so.5 + ln -sf liblua.so.${VERSION} liblua.so + ln -sf liblua.so.${VERSION} liblua.so.5 ) ( cd $PKG diff --git a/development/lua/lua.info b/development/lua/lua.info index f8f2152afb..b40f4feb14 100644 --- a/development/lua/lua.info +++ b/development/lua/lua.info @@ -1,8 +1,8 @@ PRGNAM="lua" -VERSION="5.1.2" +VERSION="5.1.3" HOMEPAGE="http://www.lua.org" -DOWNLOAD="http://www.lua.org/ftp/lua-5.1.2.tar.gz" -MD5SUM="687ce4c2a1ddff18f1008490fdc4e5e0" +DOWNLOAD="http://www.lua.org/ftp/lua-5.1.3.tar.gz" +MD5SUM="a70a8dfaa150e047866dc01a46272599" MAINTAINER="Menno E. Duursma" EMAIL="druiloor@zonnet.nl" -APPROVED="rworkman,elohim" +APPROVED="rworkman,Erik Hanson,David Somero" diff --git a/development/lua/slack-desc b/development/lua/slack-desc index 08e3bb2ac6..d513d0e197 100644 --- a/development/lua/slack-desc +++ b/development/lua/slack-desc @@ -1,11 +1,19 @@ -lua: Lua - a lightweight programming language engine -lua: -lua: Lua is designed and implemented by PUC-Rio, the Pontifical Catholic -lua: University of Rio de Janeiro in Brazil. Lua was born and raised at -lua: Tecgraf, the Computer Graphics Technology Group of PUC-Rio, and is -lua: now housed at Lua.org. Both Tecgraf and Lua.org are laboratories -lua: of the Department of Computer Science. -lua: -lua: This package aditionally contains a liblua.so DLL -lua: -lua: +W TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +lua: Lua (a powerful, fast, light-weight, embeddable scripting language) +lua: +lua: Lua combines simple procedural syntax with powerful data description +lua: constructs based on associative arrays and extensible semantics. +lua: Lua is dynamically typed, runs by interpreting bytecode for a +lua: register-based virtual machine, and has automatic memory management +lua: with incremental garbage collection, making it ideal for +lua: configuration, scripting, and rapid prototyping. +lua: +lua: This package aditionally contains a liblua.so shared library. +lua: -- cgit v1.2.3