From ohauer@FreeBSD.org  Sat Mar 31 20:06:55 2012
Return-Path: <ohauer@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9564F106564A;
	Sat, 31 Mar 2012 20:06:55 +0000 (UTC)
	(envelope-from ohauer@FreeBSD.org)
Received: from p578be941.dip0.t-ipconnect.de (p578be941.dip0.t-ipconnect.de [87.139.233.65])
	by mx1.freebsd.org (Postfix) with ESMTP id 52FEC8FC0C;
	Sat, 31 Mar 2012 20:06:55 +0000 (UTC)
Received: by p578be941.dip0.t-ipconnect.de (Postfix, from userid 1100)
	id 73AA82082F; Sat, 31 Mar 2012 22:06:51 +0200 (CEST)
Message-Id: <20120331200651.73AA82082F@p578be941.dip0.t-ipconnect.de>
Date: Sat, 31 Mar 2012 22:06:51 +0200 (CEST)
From: Olli Hauer <ohauer@FreeBSD.org>
To: <FreeBSD-gnats-submit@freebsd.org>
Cc: <lua@FreeBSD.org>
Subject: [patch] port lang/lua update to 5.1.5
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         166540
>Category:       ports
>Synopsis:       [patch] port lang/lua update to 5.1.5
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    lua
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Mar 31 20:10:10 UTC 2012
>Closed-Date:    Fri Apr 06 17:40:21 UTC 2012
>Last-Modified:  Fri Apr  6 18:00:24 UTC 2012
>Originator:     Olli Hauer
>Release:        
>Organization:
>Environment:


>Description:
Update lang/lua to 5.1.5

Question to the lua team:
The following expression in archivers/rpm5/Makefile doesn't look valid

archivers/rpm5/Makefile line 54: USE_LUA= 5.1-

shouldn't this be 5.1+ ??

>How-To-Repeat:
>Fix:


--- patch_lua.txt begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/lang/lua/Makefile,v
retrieving revision 1.48
diff -u -r1.48 Makefile
--- Makefile	16 Mar 2012 18:18:01 -0000	1.48
+++ Makefile	31 Mar 2012 19:04:19 -0000
@@ -6,16 +6,12 @@
 #
 
 PORTNAME=	lua
-PORTVERSION=	5.1.4
-PORTREVISION=	6
+PORTVERSION=	5.1.5
 CATEGORIES=	lang
 MASTER_SITES=	http://www.lua.org/ftp/ \
 		ftp://ftp.ntua.gr/pub/lang/lua/ \
 		ftp://ftp.gwdg.de/pub/languages/lua/
 
-PATCH_SITES=	http://www.lua.org/ftp/
-PATCHFILES=	patch-lua-5.1.4-3
-
 MAINTAINER=	lua@FreeBSD.org
 COMMENT=	Small, compilable scripting language providing easy access to C code
 
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/lang/lua/distinfo,v
retrieving revision 1.16
diff -u -r1.16 distinfo
--- distinfo	6 Jul 2011 00:13:41 -0000	1.16
+++ distinfo	31 Mar 2012 19:04:19 -0000
@@ -1,4 +1,2 @@
-SHA256 (lua-5.1.4.tar.gz) = b038e225eaf2a5b57c9bcc35cd13aa8c6c8288ef493d52970c9545074098af3a
-SIZE (lua-5.1.4.tar.gz) = 216679
-SHA256 (patch-lua-5.1.4-3) = 260fcbdb558001f0a8a8e49bdcb83bf9bdcf9065bb82b661f458ee061f5ff44c
-SIZE (patch-lua-5.1.4-3) = 5004
+SHA256 (lua-5.1.5.tar.gz) = 2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333
+SIZE (lua-5.1.5.tar.gz) = 221213
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/lang/lua/pkg-plist,v
retrieving revision 1.12
diff -u -r1.12 pkg-plist
--- pkg-plist	5 Feb 2009 18:14:06 -0000	1.12
+++ pkg-plist	31 Mar 2012 19:04:19 -0000
@@ -1,5 +1,3 @@
-@exec mkdir -p %D/share/lua/%%LUA_VER%%
-@exec mkdir -p %D/lib/lua/%%LUA_VER%%
 bin/lua-%%LUA_VER%%
 %%LUA_BINDIR%%/lua
 %%LUA_BINDIR%%/luac
@@ -11,14 +9,16 @@
 %%LUA_INCDIR%%/lualib.h
 lib/liblua-%%LUA_VER%%.so
 lib/liblua-%%LUA_VER%%.so.%%LUA_VER_SH%%
+%%LUA_LIBDIR%%/liblua-%%LUA_VER%%.so.%%LUA_VER_SH%%
 %%LUA_LIBDIR%%/liblua.a
 %%LUA_LIBDIR%%/liblua.so
-%%LUA_LIBDIR%%/liblua-%%LUA_VER%%.so.%%LUA_VER_SH%%
 libdata/pkgconfig/lua-%%LUA_VER%%.pc
-@dirrm share/lua/%%LUA_VER%%
-@dirrmtry share/lua
+@dirrm %%DATADIR%%/%%LUA_VER%%
+@dirrmtry %%DATADIR%%
 @dirrm %%LUA_LIBDIR%%
 @dirrm lib/lua/%%LUA_VER%%
 @dirrmtry lib/lua
 @dirrm %%LUA_INCDIR%%
 @dirrm %%LUA_BINDIR%%
+@exec mkdir -p %D/%%DATADIR%%/%%LUA_VER%%
+@exec mkdir -p %D/lib/lua/%%LUA_VER%%
Index: files/patch-src-Makefile
===================================================================
RCS file: /home/pcvs/ports/lang/lua/files/patch-src-Makefile,v
retrieving revision 1.3
diff -u -r1.3 patch-src-Makefile
--- files/patch-src-Makefile	16 Sep 2010 13:54:16 -0000	1.3
+++ files/patch-src-Makefile	31 Mar 2012 19:04:19 -0000
@@ -33,7 +33,7 @@
 +	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(MYLDFLAGS) -shared -Wl,-soname=$(LUA_SONAME) $?
 +
  $(LUA_A): $(CORE_O) $(LIB_O)
--	$(AR) $@ $?
+-	$(AR) $@ $(CORE_O) $(LIB_O)	# DLL needs all object files
 +	$(AR) $(ARFLAGS) $@ $?
  	$(RANLIB) $@
  
--- patch_lua.txt ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->lua 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sat Mar 31 20:10:24 UTC 2012 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=166540 

From: Olli Hauer <ohauer@FreeBSD.org>
To: bug-followup@FreeBSD.org
Cc: Olli Hauer <ohauer@gmx.de>
Subject: Re: ports/166540: [patch] port lang/lua update to 5.1.5
Date: Sat, 31 Mar 2012 22:48:03 +0200

 Ahem, something additional.
 
 If someone really use one of this directories for local modules, then they should be preserved.
 
 LUA_LDIR  ->  "share/lua/5.1/"
 LUA_CDIR  ->  "lib/lua/5.1/"
 
 
 Additional changes for pkg-plist.
 
 -@dirrm %%DATADIR%%/%%LUA_VER%%
 +@dirrmtry %%DATADIR%%/%%LUA_VER%%
  @dirrmtry %%DATADIR%%
  @dirrm %%LUA_LIBDIR%%
 -@dirrm lib/lua/%%LUA_VER%%
 +@dirrmtry lib/lua/%%LUA_VER%%
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/166540: commit references a PR
Date: Fri,  6 Apr 2012 17:39:26 +0000 (UTC)

 mandree     2012-04-06 17:39:13 UTC
 
   FreeBSD ports repository
 
   Modified files:
     lang/lua             Makefile distinfo pkg-plist 
     lang/lua/files       patch-src-Makefile 
   Log:
   Update to bug-fix release 5.1.5.
   
   Submitted by: ohauer
   Feature safe: yes
   PR:           ports/166540
   
   Revision  Changes    Path
   1.49      +1 -5      ports/lang/lua/Makefile
   1.17      +2 -4      ports/lang/lua/distinfo
   1.4       +1 -1      ports/lang/lua/files/patch-src-Makefile
   1.13      +5 -5      ports/lang/lua/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: mandree 
State-Changed-When: Fri Apr 6 17:40:19 UTC 2012 
State-Changed-Why:  
Committed. Thanks! Regarding rpm5, the syntax is officially documented 
in bsd.lua.mk as 'maximum version 5.1', so whether that is correct or 
not, you'll have to ask the rpm5 maintainers about. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=166540 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/166540: commit references a PR
Date: Fri,  6 Apr 2012 17:50:53 +0000 (UTC)

 mandree     2012-04-06 17:50:45 UTC
 
   FreeBSD ports repository
 
   Modified files:
     lang/lua             Makefile pkg-plist 
   Log:
   Bring in additional changes by ohauer to preserve LUA_LDIR/LUA_CDIR.
   
   Submitted by: ohauer
   PR:           ports/166540
   Feature safe: yes
   
   Revision  Changes    Path
   1.50      +1 -0      ports/lang/lua/Makefile
   1.14      +2 -2      ports/lang/lua/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
