[67156] trunk/dports/archivers/pigz

[ryandesign at macports.org]

Revision: 67156
          http://trac.macports.org/changeset/67156
Author:   ryandesign at macports.org
Date:     2010-04-30 04:23:28 -0700 (Fri, 30 Apr 2010)
Log Message:
-----------
pigz: link with MacPorts zlib (#24727); support changing build_arch (#24728); add universal variant (#24729)

Modified Paths:
--------------
    trunk/dports/archivers/pigz/Portfile
    trunk/dports/archivers/pigz/files/patch-Makefile

Modified: trunk/dports/archivers/pigz/Portfile
===================================================================
--- trunk/dports/archivers/pigz/Portfile	2010-04-30 11:21:53 UTC (rev 67155)
+++ trunk/dports/archivers/pigz/Portfile	2010-04-30 11:23:28 UTC (rev 67156)
@@ -4,6 +4,7 @@
 
 name                pigz
 version             2.1.6
+revision            1
 categories          archivers
 platforms           darwin
 maintainers         gmail.com:danchr openmaintainer
@@ -22,13 +23,29 @@
                     sha1    df05bdcc7b08246a3c1e6a2ab2edc7d0a45c0369 \
                     rmd160  715a90eefbb9d2f6dbd94ec7ee196a0ea7b32e7f
 
+depends_lib         port:zlib
+
 patchfiles          patch-Makefile
 
 use_configure       no
 
 build.target
-build.args          CC=${configure.cc}
+build.args          CC="${configure.cc}" \
+                    CFLAGS="${configure.cflags}" \
+                    CPPFLAGS="${configure.cppflags}" \
+                    LDFLAGS="${configure.ldflags}"
 
+variant universal {
+    build.args-append \
+                    CFLAGS+="${configure.universal_cflags}" \
+                    LDFLAGS+="${configure.universal_ldflags}"
+}
+if {![variant_isset universal]} {
+    build.args-append \
+                    CFLAGS+="${configure.cc_archflags}" \
+                    LDFLAGS+="${configure.cc_archflags}"
+}
+
 destroot {
     xinstall -m 644 ${worksrcpath}/${name}.1 ${destroot}${prefix}/share/man/man1
     xinstall ${worksrcpath}/${name} ${destroot}${prefix}/bin

Modified: trunk/dports/archivers/pigz/files/patch-Makefile
===================================================================
--- trunk/dports/archivers/pigz/files/patch-Makefile	2010-04-30 11:21:53 UTC (rev 67155)
+++ trunk/dports/archivers/pigz/files/patch-Makefile	2010-04-30 11:23:28 UTC (rev 67156)
@@ -5,7 +5,7 @@
  
  pigz: pigz.o yarn.o
 -	cc -o pigz pigz.o yarn.o -lpthread -lz
-+	$(CC) -o pigz pigz.o yarn.o -lpthread -lz
++	$(CC) $(LDFLAGS) -o pigz pigz.o yarn.o -lpthread -lz
  	ln -f pigz unpigz
  
  pigz.o: pigz.c yarn.h
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100430/3a3b565d/attachment.html>