[59193] trunk/dports/devel/lua-luazip

and.damore at macports.org and.damore at macports.org
Sun Oct 11 03:00:53 PDT 2009


Revision: 59193
          http://trac.macports.org/changeset/59193
Author:   and.damore at macports.org
Date:     2009-10-11 03:00:52 -0700 (Sun, 11 Oct 2009)
Log Message:
-----------
patched luazip Makefile, closes #21978

Modified Paths:
--------------
    trunk/dports/devel/lua-luazip/Portfile

Added Paths:
-----------
    trunk/dports/devel/lua-luazip/files/Makefile-patch.diff
    trunk/dports/devel/lua-luazip/files/config-patch.diff

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

Modified: trunk/dports/devel/lua-luazip/Portfile
===================================================================
--- trunk/dports/devel/lua-luazip/Portfile	2009-10-11 09:54:50 UTC (rev 59192)
+++ trunk/dports/devel/lua-luazip/Portfile	2009-10-11 10:00:52 UTC (rev 59193)
@@ -15,28 +15,10 @@
 checksums           md5  8129ba93a8df6ebd324fee9adca23fae \
                     sha1  40d2589d5060582ce5dc1dd87604114eb42067ea \
                     rmd160  035d290488a7d67efe9df461e6c790ea67c908dd
-patchfiles          patch-luazip.diff
-patch.pre_args      -p1
+patchfiles          config-patch.diff \
+					Makefile-patch.diff
+post-patch {
+   reinplace "s|%PREFIX%|${prefix}|g" ${worksrcpath}/config
+}
 depends_lib         port:libzzip
 build.target
-destroot    {
-    # Docs
-    xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
-    file copy ${worksrcpath}/README ${destroot}${prefix}/share/doc/${name}
-    foreach doc [glob doc/us/*] {
-        xinstall -m 0644 ${doc} ${destroot}${prefix}/share/doc/${name}
-    }
-    
-    # Binaries
-    xinstall -m 755 -d ${destroot}${prefix}/lib/lua/5.1
-    foreach lib [glob src/*.so.*] {
-        xinstall -m 0644 ${lib} ${destroot}${prefix}/lib/lua/5.1
-    }
-
-    # Lua includes
-    xinstall -m 755 -d ${destroot}${prefix}/include/lua5.1
-    foreach inc [glob src/*.h] {
-        xinstall -m 0644 ${inc} ${destroot}${prefix}/include/lua5.1
-    }
-}
-

Added: trunk/dports/devel/lua-luazip/files/Makefile-patch.diff
===================================================================
--- trunk/dports/devel/lua-luazip/files/Makefile-patch.diff	                        (rev 0)
+++ trunk/dports/devel/lua-luazip/files/Makefile-patch.diff	2009-10-11 10:00:52 UTC (rev 59193)
@@ -0,0 +1,15 @@
+--- Makefile.orig	2009-10-11 11:37:23.000000000 +0200
++++ Makefile	2009-10-11 11:37:44.000000000 +0200
+@@ -23,9 +23,9 @@
+ 	$(CC) -c $(CFLAGS) -o $@ $(COMPAT_DIR)/compat-5.1.c
+ 
+ install: src/$(LIBNAME)
+-	mkdir -p $(LUA_LIBDIR)
+-	cp src/$(LIBNAME) $(LUA_LIBDIR)
+-	cd $(LUA_LIBDIR); ln -f -s $(LIBNAME) $T.so
++	mkdir -p $(DESTDIR)/$(LUA_LIBDIR)
++	cp src/$(LIBNAME) $(DESTDIR)/$(LUA_LIBDIR)
++	cd $(DESTDIR)/$(LUA_LIBDIR); ln -f -s $(LIBNAME) $T.so
+ 
+ clean:
+ 	rm -f $L src/$(LIBNAME) $(OBJS)

Copied: trunk/dports/devel/lua-luazip/files/config-patch.diff (from rev 59182, trunk/dports/devel/lua-luazip/files/patch-luazip.diff)
===================================================================
--- trunk/dports/devel/lua-luazip/files/config-patch.diff	                        (rev 0)
+++ trunk/dports/devel/lua-luazip/files/config-patch.diff	2009-10-11 10:00:52 UTC (rev 59193)
@@ -0,0 +1,37 @@
+--- config.orig	2006-07-24 03:24:36.000000000 +0200
++++ config	2008-05-22 10:54:15.000000000 +0200
+@@ -1,26 +1,26 @@
+ # Installation directories
+ # System's libraries directory (where binary libraries are installed)
+-LUA_LIBDIR= /usr/local/lib/lua/5.0
++LUA_LIBDIR= %PREFIX%/lib/lua/5.1
+ # System's lua directory (where Lua libraries are installed)
+-LUA_DIR= /usr/local/share/lua/5.0
++LUA_DIR= %PREFIX%/share/lua/5.1
+ # Lua includes directory
+-LUA_INC= /usr/local/include/lua5
++LUA_INC= %PREFIX%/include/lua5
+ # Zziplib includes directory
+-ZZLIB_INC= /usr/local/include
++ZZLIB_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
+ 
+ # Lua version number (first and second digits of target version)
+-LUA_VERSION_NUM= 500
++LUA_VERSION_NUM= 513
+ LIBNAME= $T.so.$V
+ COMPAT_DIR= ../compat/src
+ 
+ # Compilation directives
+ WARN= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings
+ INCS= -I$(LUA_INC) -I$(ZZLIB_INC) -I$(COMPAT_DIR)
+-CFLAGS= $(WARN) $(INCS)
++CFLAGS= $(WARN) $(INCS) -L%PREFIX%/lib
+ CC= gcc
+ 
+ # $Id: config,v 1.6 2006/07/24 01:24:36 tomas Exp $

Deleted: trunk/dports/devel/lua-luazip/files/patch-luazip.diff
===================================================================
--- trunk/dports/devel/lua-luazip/files/patch-luazip.diff	2009-10-11 09:54:50 UTC (rev 59192)
+++ trunk/dports/devel/lua-luazip/files/patch-luazip.diff	2009-10-11 10:00:52 UTC (rev 59193)
@@ -1,38 +0,0 @@
-diff -ru luazip-1.2.3-orig/config luazip-1.2.3/config
---- luazip-1.2.3-orig/config	2006-07-24 03:24:36.000000000 +0200
-+++ luazip-1.2.3/config	2008-05-22 10:54:15.000000000 +0200
-@@ -1,26 +1,26 @@
- # Installation directories
- # System's libraries directory (where binary libraries are installed)
--LUA_LIBDIR= /usr/local/lib/lua/5.0
-+LUA_LIBDIR= /opt/local/lib/lua/5.1
- # System's lua directory (where Lua libraries are installed)
--LUA_DIR= /usr/local/share/lua/5.0
-+LUA_DIR= /opt/local/share/lua/5.1
- # Lua includes directory
--LUA_INC= /usr/local/include/lua5
-+LUA_INC= /opt/local/include/lua5
- # Zziplib includes directory
--ZZLIB_INC= /usr/local/include
-+ZZLIB_INC= /opt/local/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
- 
- # Lua version number (first and second digits of target version)
--LUA_VERSION_NUM= 500
-+LUA_VERSION_NUM= 513
- LIBNAME= $T.so.$V
- COMPAT_DIR= ../compat/src
- 
- # Compilation directives
- WARN= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings
- INCS= -I$(LUA_INC) -I$(ZZLIB_INC) -I$(COMPAT_DIR)
--CFLAGS= $(WARN) $(INCS)
-+CFLAGS= $(WARN) $(INCS) -L/opt/local/lib
- CC= gcc
- 
- # $Id: config,v 1.6 2006/07/24 01:24:36 tomas Exp $
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091011/7aecea1b/attachment.html>


More information about the macports-changes mailing list