[csw-devel] SF.net SVN: gar:[18534] csw/mgar/pkg/lua/trunk

[dmichelsen at users.sourceforge.net]

Revision: 18534
          http://gar.svn.sourceforge.net/gar/?rev=18534&view=rev
Author:   dmichelsen
Date:     2012-06-26 08:56:26 +0000 (Tue, 26 Jun 2012)
Log Message:
-----------
lua/trunk: Update to 5.2.1

Modified Paths:
--------------
    csw/mgar/pkg/lua/trunk/Makefile
    csw/mgar/pkg/lua/trunk/checksums
    csw/mgar/pkg/lua/trunk/files/0001-Make-shared-lib.patch

Modified: csw/mgar/pkg/lua/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lua/trunk/Makefile	2012-06-26 07:59:59 UTC (rev 18533)
+++ csw/mgar/pkg/lua/trunk/Makefile	2012-06-26 08:56:26 UTC (rev 18534)
@@ -6,7 +6,7 @@
 #     http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=560139
 
 NAME = lua
-VERSION = 5.2.0
+VERSION = 5.2.1
 CATEGORIES = lang
 GARTYPE = v2
 
@@ -22,6 +22,8 @@
 
 PATCHFILES += 0001-Make-shared-lib.patch
 
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+
 VENDOR_URL = http://www.lua.org
 
 LICENSE = doc/readme.html
@@ -44,6 +46,9 @@
 REINPLACE_WITH_luaroot = $$1"$(prefix)"
 REINPLACE_FILES_luaroot += src/luaconf.h
 
+BUILD64 = 1
+ISAEXEC = 1
+
 # No configure
 CONFIGURE_SCRIPTS =
 
@@ -60,5 +65,7 @@
 INSTALL_ARGS += INSTALL=ginstall
 INSTALL_ARGS += INSTALL_TOP=$(DESTDIR)$(prefix)
 INSTALL_ARGS += INSTALL_MAN=$(DESTDIR)$(mandir)/man1
+INSTALL_ARGS += INSTALL_BIN=$(DESTDIR)$(bindir)
+INSTALL_ARGS += INSTALL_LIB=$(DESTDIR)$(libdir)
 
 include gar/category.mk

Modified: csw/mgar/pkg/lua/trunk/checksums
===================================================================
--- csw/mgar/pkg/lua/trunk/checksums	2012-06-26 07:59:59 UTC (rev 18533)
+++ csw/mgar/pkg/lua/trunk/checksums	2012-06-26 08:56:26 UTC (rev 18534)
@@ -1 +1 @@
-f1ea831f397214bae8a265995ab1a93e  lua-5.2.0.tar.gz
+ae08f641b45d737d12d30291a5e5f6e3  lua-5.2.1.tar.gz

Modified: csw/mgar/pkg/lua/trunk/files/0001-Make-shared-lib.patch
===================================================================
--- csw/mgar/pkg/lua/trunk/files/0001-Make-shared-lib.patch	2012-06-26 07:59:59 UTC (rev 18533)
+++ csw/mgar/pkg/lua/trunk/files/0001-Make-shared-lib.patch	2012-06-26 08:56:26 UTC (rev 18534)
@@ -1,6 +1,6 @@
-From 65faf5dfa74ed9349a3b73156e271620ff227d12 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Thu, 19 Jan 2012 20:34:38 +0100
+From 4acc4fe1ee5ef0370dfdb4198f65709db9b95046 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <da\xC2m at opencsw.org>
+Date: Tue, 26 Jun 2012 10:17:46 +0200
 Subject: [PATCH] Make shared lib
 
 ---
@@ -9,7 +9,7 @@
  2 files changed, 18 insertions(+), 2 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index ec53e1a..e553643 100644
+index bd9515f..bb38500 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -42,6 +42,9 @@ PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
@@ -22,7 +22,7 @@
  TO_MAN= lua.1 luac.1
  
  # Lua version and release.
-@@ -52,7 +55,7 @@ R= $V.0
+@@ -52,7 +55,7 @@ R= $V.1
  all:	$(PLAT)
  
  $(PLATS) clean:
@@ -50,7 +50,7 @@
  	@echo "INSTALL_TOP= $(INSTALL_TOP)"
  	@echo "INSTALL_BIN= $(INSTALL_BIN)"
 diff --git a/src/Makefile b/src/Makefile
-index bba1693..fdd68b1 100644
+index 8c9ee67..2cc26e1 100644
 --- a/src/Makefile
 +++ b/src/Makefile
 @@ -29,6 +29,7 @@ MYOBJS=
@@ -79,17 +79,17 @@
 +so:	$(ALL_SO)
 +
  $(LUA_A): $(BASE_O)
- 	$(AR) $@ $?
+ 	$(AR) $@ $(BASE_O)
  	$(RANLIB) $@
  
 +$(LUA_SO): $(LUA_A)
 +	-rm -f $(LUA_SO)
-+	$(CC) -h $(LUA_SO).$(V) -G -o $(LUA_SO).$(R) $(CORE_O) $(LIB_O)
++	$(CC) $(LDFLAGS) -h $(LUA_SO).$(V) -G -o $(LUA_SO).$(R) $(CORE_O) $(LIB_O)
 +	ln -s $(LUA_SO).$(R) $(LUA_SO)
 +
  $(LUA_T): $(LUA_O) $(LUA_A)
  	$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
  
 -- 
-1.7.8.3
+1.7.10.3
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.