From d2ef54b71d18fc5b70318406e06231641e56d85e Mon Sep 17 00:00:00 2001
From: "Menno E. Duursma" <druiloor@zonnet.nl>
Date: Tue, 11 May 2010 22:22:37 +0200
Subject: development/lua: Updated for version 5.1.4

---
 development/lua/lua-5.1.3-shared.diff | 71 -----------------------------------
 development/lua/lua-5.1.4-shared.diff | 71 +++++++++++++++++++++++++++++++++++
 development/lua/lua.SlackBuild        |  8 ++--
 development/lua/lua.info              |  8 ++--
 4 files changed, 80 insertions(+), 78 deletions(-)
 delete mode 100644 development/lua/lua-5.1.3-shared.diff
 create mode 100644 development/lua/lua-5.1.4-shared.diff

(limited to 'development/lua')

diff --git a/development/lua/lua-5.1.3-shared.diff b/development/lua/lua-5.1.3-shared.diff
deleted file mode 100644
index 046d788dd2..0000000000
--- a/development/lua/lua-5.1.3-shared.diff
+++ /dev/null
@@ -1,71 +0,0 @@
-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-5.1.4-shared.diff b/development/lua/lua-5.1.4-shared.diff
new file mode 100644
index 0000000000..e4083916c3
--- /dev/null
+++ b/development/lua/lua-5.1.4-shared.diff
@@ -0,0 +1,71 @@
+diff -Nur lua-5.1.4.orig/Makefile lua-5.1.4/Makefile
+--- lua-5.1.4.orig/Makefile	2008-08-11 19:40:48.000000000 -0500
++++ lua-5.1.4/Makefile	2008-10-28 11:05:20.258085554 -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 -Nur lua-5.1.4.orig/src/Makefile lua-5.1.4/src/Makefile
+--- lua-5.1.4.orig/src/Makefile	2008-01-19 13:37:58.000000000 -0600
++++ lua-5.1.4/src/Makefile	2008-10-28 11:08:46.895111523 -0500
+@@ -18,11 +18,17 @@
+ MYLDFLAGS=
+ MYLIBS=
+ 
++# Shared object info
++MAJOR= 5
++MINOR= 1
++REL= 4
++
+ # == 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 e6f78d0a4b..7c9de43283 100644
--- a/development/lua/lua.SlackBuild
+++ b/development/lua/lua.SlackBuild
@@ -6,9 +6,9 @@
 # Modified by the SlackBuilds.org project
 
 PRGNAM=lua
-VERSION=5.1.3
+VERSION=5.1.4
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -48,13 +48,15 @@ sed 's|prefix= /usr/local|prefix= /usr|' etc/lua.pc > \
 
 # Let's make sure all of the library symlinks correctly exist
 ( cd $PKG/usr/lib
-  ln -sf liblua.so.${VERSION} liblua.so
   ln -sf liblua.so.${VERSION} liblua.so.5
+  ln -sf liblua.so.${VERSION} liblua.so
+  chmod 0755 liblua.so.${VERSION}
 )
 
 ( cd $PKG
   find . -type f | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
   find . -type f | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  strip -g usr/lib/*.a
 )
 
 ( cd $PKG/usr/man
diff --git a/development/lua/lua.info b/development/lua/lua.info
index b40f4feb14..1e6b0e7f16 100644
--- a/development/lua/lua.info
+++ b/development/lua/lua.info
@@ -1,8 +1,8 @@
 PRGNAM="lua"
-VERSION="5.1.3"
+VERSION="5.1.4"
 HOMEPAGE="http://www.lua.org"
-DOWNLOAD="http://www.lua.org/ftp/lua-5.1.3.tar.gz"
-MD5SUM="a70a8dfaa150e047866dc01a46272599"
+DOWNLOAD="http://www.lua.org/ftp/lua-5.1.4.tar.gz"
+MD5SUM="d0870f2de55d59c1c8419f36e8fac150"
 MAINTAINER="Menno E. Duursma"
 EMAIL="druiloor@zonnet.nl"
-APPROVED="rworkman,Erik Hanson,David Somero"
+APPROVED="rworkman"
-- 
cgit v1.2.3