[89929] trunk/dports/devel/lua-luafilesystem

and.damore at macports.org and.damore at macports.org
Wed Feb 15 13:17:00 PST 2012


Revision: 89929
          http://trac.macports.org/changeset/89929
Author:   and.damore at macports.org
Date:     2012-02-15 13:16:59 -0800 (Wed, 15 Feb 2012)
Log Message:
-----------
port lua-luafilesystem: using the right compiler, moved patching to a single file, set proper build target, set license, revision bumped, closing ticket #33263

Modified Paths:
--------------
    trunk/dports/devel/lua-luafilesystem/Portfile
    trunk/dports/devel/lua-luafilesystem/files/patch-config.diff

Removed Paths:
-------------
    trunk/dports/devel/lua-luafilesystem/files/patch-Makefile.diff

Modified: trunk/dports/devel/lua-luafilesystem/Portfile
===================================================================
--- trunk/dports/devel/lua-luafilesystem/Portfile	2012-02-15 20:19:22 UTC (rev 89928)
+++ trunk/dports/devel/lua-luafilesystem/Portfile	2012-02-15 21:16:59 UTC (rev 89929)
@@ -3,7 +3,8 @@
 
 name                lua-luafilesystem
 version             1.5.0
-revision            1
+revision            2
+license             MIT
 categories          devel
 platforms           darwin
 maintainers         and.damore openmaintainer
@@ -19,15 +20,18 @@
 
 distname            luafilesystem-${version}
 depends_lib         port:lua
-patchfiles          patch-config.diff \
-                    patch-Makefile.diff
+patchfiles          patch-config.diff
 
 post-patch {
    reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/config
 }
 use_configure       no
-build.target        
+build.args          CC="${configure.cc}"
+build.env-append    CFLAGS=" ${configure.cflags}  [get_canonical_archflags cc]" \
+                    LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
 
+build.target        lib
+
 post-destroot {
     xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
     xinstall -m 755 -d ${destroot}${prefix}/share/examples/${name}

Deleted: trunk/dports/devel/lua-luafilesystem/files/patch-Makefile.diff
===================================================================
--- trunk/dports/devel/lua-luafilesystem/files/patch-Makefile.diff	2012-02-15 20:19:22 UTC (rev 89928)
+++ trunk/dports/devel/lua-luafilesystem/files/patch-Makefile.diff	2012-02-15 21:16:59 UTC (rev 89929)
@@ -1,13 +0,0 @@
---- Makefile.orig	2010-02-01 22:48:50.000000000 +0100
-+++ Makefile	2010-02-01 22:47:55.000000000 +0100
-@@ -15,8 +15,8 @@
- 	MACOSX_DEPLOYMENT_TARGET="10.3"; export MACOSX_DEPLOYMENT_TARGET; $(CC) $(CFLAGS) $(LIB_OPTION) -o src/lfs.so $(OBJS)
- 
- install:
--	mkdir -p $(LUA_LIBDIR)
--	cp src/lfs.so $(LUA_LIBDIR)
-+	mkdir -p $(DESTDIR)$(LUA_LIBDIR)
-+	cp src/lfs.so $(DESTDIR)$(LUA_LIBDIR)
- 
- clean:
- 	rm -f src/lfs.so $(OBJS)

Modified: trunk/dports/devel/lua-luafilesystem/files/patch-config.diff
===================================================================
--- trunk/dports/devel/lua-luafilesystem/files/patch-config.diff	2012-02-15 20:19:22 UTC (rev 89928)
+++ trunk/dports/devel/lua-luafilesystem/files/patch-config.diff	2012-02-15 21:16:59 UTC (rev 89929)
@@ -1,6 +1,6 @@
---- config.orig	2010-02-01 22:48:44.000000000 +0100
-+++ config	2010-02-01 22:47:55.000000000 +0100
-@@ -1,7 +1,7 @@
+--- config.orig	2012-02-15 20:25:23.000000000 +0100
++++ config	2012-02-15 20:32:30.000000000 +0100
+@@ -1,24 +1,24 @@
  # Installation directories
  
  # Default installation prefix
@@ -8,15 +8,26 @@
 +PREFIX=@@PREFIX@@
  
  # System's libraries directory (where binary libraries are installed)
- LUA_LIBDIR= $(PREFIX)/lib/lua/5.1
-@@ -10,8 +10,8 @@
+-LUA_LIBDIR= $(PREFIX)/lib/lua/5.1
++LUA_LIBDIR= $(DESTDIR)$(PREFIX)/lib/lua/5.1
+ 
+ # Lua includes directory
  LUA_INC= $(PREFIX)/include
  
  # OS dependent
 -LIB_OPTION= -shared #for Linux
 -#LIB_OPTION= -bundle -undefined dynamic_lookup #for MacOS X
 +#LIB_OPTION= -shared #for Linux
-+LIB_OPTION= -bundle -undefined dynamic_lookup #for MacOS X
++LIB_OPTION= $(LDFLAGS) -bundle -undefined dynamic_lookup #for MacOS X
  
  LIBNAME= $T.so.$V
  
+ # Compilation directives
+-WARN= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings -pedantic
++WARN= -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings -pedantic
+ INCS= -I$(LUA_INC)
+-CFLAGS= $(WARN) $(INCS)
++CFLAGS+= $(WARN) $(INCS)
+ CC= gcc
+ 
+ # $Id: config,v 1.21 2007/10/27 22:42:32 carregal Exp $
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120215/36027fe5/attachment-0001.html>


More information about the macports-changes mailing list