[104585] trunk/dports/devel/lua-lpeg

[and.damore at macports.org]

Revision: 104585
          https://trac.macports.org/changeset/104585
Author:   and.damore at macports.org
Date:     2013-03-29 01:04:51 -0700 (Fri, 29 Mar 2013)
Log Message:
-----------
port lua-lpeg: removing exec from portfile main level, fix #38570

Modified Paths:
--------------
    trunk/dports/devel/lua-lpeg/Portfile
    trunk/dports/devel/lua-lpeg/files/patch-makefile.diff

Modified: trunk/dports/devel/lua-lpeg/Portfile
===================================================================
--- trunk/dports/devel/lua-lpeg/Portfile	2013-03-28 22:17:54 UTC (rev 104584)
+++ trunk/dports/devel/lua-lpeg/Portfile	2013-03-29 08:04:51 UTC (rev 104585)
@@ -27,6 +27,9 @@
 
 patchfiles          patch-makefile.diff
 post-patch {
+    reinplace  "s|%%CFLAGS%%|${configure.cflags}  [exec ${prefix}/bin/pkg-config lua --cflags]|" ${worksrcpath}/makefile
+    reinplace "s|%%LDFLAGS%%|${configure.ldflags} [exec ${prefix}/bin/pkg-config lua --libs]|"   ${worksrcpath}/makefile
+
     reinplace "s|/usr/bin/env lua5.1|${prefix}/bin/lua|" ${worksrcpath}/test.lua
 }
 
@@ -36,9 +39,7 @@
 
 build.target
 build.args          CC="${configure.cc} [get_canonical_archflags]" \
-                    LUADIR=${prefix}/include \
-                    CFLAGS="${configure.cflags}" \
-                    LDFLAGS="${configure.ldflags} [exec ${prefix}/bin/pkg-config lua --libs]"
+                    LUADIR=${prefix}/include 
 
 destroot {
     set lua_cmod [exec ${prefix}/bin/pkg-config lua --variable INSTALL_CMOD]

Modified: trunk/dports/devel/lua-lpeg/files/patch-makefile.diff
===================================================================
--- trunk/dports/devel/lua-lpeg/files/patch-makefile.diff	2013-03-28 22:17:54 UTC (rev 104584)
+++ trunk/dports/devel/lua-lpeg/files/patch-makefile.diff	2013-03-29 08:04:51 UTC (rev 104585)
@@ -1,6 +1,11 @@
---- makefile.orig	2013-03-27 20:08:01.000000000 +0100
-+++ makefile	2013-03-27 22:33:43.000000000 +0100
-@@ -26,12 +26,12 @@
+--- makefile.orig	2013-03-29 08:31:31.000000000 +0100
++++ makefile	2013-03-29 08:32:58.000000000 +0100
+@@ -22,16 +22,16 @@
+ 	#  -Wunreachable-code \
+ 
+ 
+-CFLAGS = $(CWARNS) $(COPT) -ansi -I$(LUADIR) -fPIC
++CFLAGS = $(CWARNS) $(COPT) -ansi -I$(LUADIR) -fPIC %%CFLAGS%%
  CC = gcc
  
  # For Linux
@@ -12,7 +17,7 @@
  # For Mac OS
  # ENV = MACOSX_DEPLOYMENT_TARGET=10.4
 -# DLLFLAGS = -bundle -undefined dynamic_lookup
-+ DLLFLAGS = -bundle -undefined dynamic_lookup
++ DLLFLAGS = -bundle -undefined dynamic_lookup %%LDFLAGS%%
  
  
  FILES = lpvm.o lpcap.o lptree.o lpcode.o lpprint.o
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130329/b53fa870/attachment.html>