[151722] trunk/dports/archivers/pigz

[raimue at macports.org]

Revision: 151722
          https://trac.macports.org/changeset/151722
Author:   raimue at macports.org
Date:     2016-08-21 04:47:19 -0700 (Sun, 21 Aug 2016)
Log Message:
-----------
archivers/pigz:
Update to version 2.3.3, update build patch, use canonical archs for +universal

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

Modified: trunk/dports/archivers/pigz/Portfile
===================================================================
--- trunk/dports/archivers/pigz/Portfile	2016-08-21 07:54:20 UTC (rev 151721)
+++ trunk/dports/archivers/pigz/Portfile	2016-08-21 11:47:19 UTC (rev 151722)
@@ -4,8 +4,7 @@
 PortSystem          1.0
 
 name                pigz
-version             2.3
-revision            0
+version             2.3.3
 categories          archivers
 license             zlib Apache-2
 platforms           darwin
@@ -21,8 +20,9 @@
 homepage            http://www.zlib.net/pigz/
 master_sites        ${homepage}
 
-checksums           rmd160  24a2edefd8661e6cf0e6f940f3674afaed8da21d \
-                    sha256  74bbd5962f9420549fc987ddd1ccda692ec2b29d2d612fbbe26edf3fa348ff21
+checksums           md5 01d7a16cce77929cc1a78aa1bdfb68cb \
+                    rmd160  053a9f2309982ba21a7041288ace4408ffbcbe5e \
+                    sha256  4e8b67b432ce7907575a549f3e1cac4709781ba0f6b48afea9f59369846b509c
 
 depends_lib         port:zlib
 
@@ -30,23 +30,13 @@
 
 use_configure       no
 
+variant universal {}
+
 build.target
-build.args          CC="${configure.cc}" \
-                    CFLAGS="${configure.cflags}" \
-                    CPPFLAGS="${configure.cppflags}" \
-                    LDFLAGS="${configure.ldflags}"
+build.env-append    CC="${configure.cc}" \
+                    CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
+                    LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
 
-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.diff
===================================================================
--- trunk/dports/archivers/pigz/files/patch-Makefile.diff	2016-08-21 07:54:20 UTC (rev 151721)
+++ trunk/dports/archivers/pigz/files/patch-Makefile.diff	2016-08-21 11:47:19 UTC (rev 151722)
@@ -1,38 +1,12 @@
---- Makefile.orig	2013-03-18 17:43:21.000000000 +0400
-+++ Makefile	2013-03-18 17:47:25.000000000 +0400
-@@ -1,9 +1,6 @@
+--- Makefile.orig	2016-08-21 13:31:29.000000000 +0200
++++ Makefile	2016-08-21 13:31:38.000000000 +0200
+@@ -1,6 +1,6 @@
 -CC=cc
 -CFLAGS=-O3 -Wall -Wextra
--
+-LDFLAGS=-lz
++CC?=cc
++CFLAGS+=-O3 -Wall -Wextra
++LDFLAGS+=-lz
+ ZOPFLI=zopfli/src/zopfli/
+ # use gcc and gmake on Solaris
  
- pigz: pigz.o yarn.o zopfli/deflate.o zopfli/blocksplitter.o zopfli/tree.o zopfli/lz77.o zopfli/cache.o zopfli/hash.o zopfli/util.o zopfli/squeeze.o zopfli/katajainen.o
--	$(CC) -o pigz $^ -lpthread -lz
-+	$(CC) ${CFLAGS} ${LDFLAGS} -o pigz $^ -lpthread -lz
- 	ln -f pigz unpigz
- 
- pigz.o: pigz.c yarn.h zopfli/deflate.h zopfli/util.h
-@@ -31,19 +28,19 @@
- dev: pigz pigzt pigzn
- 
- pigzt: pigzt.o yarnt.o
--	$(CC) -o pigzt pigzt.o yarnt.o -lpthread -lz
-+	$(CC) ${CFLAGS} ${LDFLAGS} -o pigzt pigzt.o yarnt.o -lpthread -lz
- 
- pigzt.o: pigz.c yarn.h
--	$(CC) -Wall -O3 -DDEBUG -g -c -o pigzt.o pigz.c
-+	$(CC) ${CFLAGS} ${LDFLAGS} -Wall -O3 -DDEBUG -g -c -o pigzt.o pigz.c
- 
- yarnt.o: yarn.c yarn.h
--	$(CC) -Wall -O3 -DDEBUG -g -c -o yarnt.o yarn.c
-+	$(CC) ${CFLAGS} ${LDFLAGS} -Wall -O3 -DDEBUG -g -c -o yarnt.o yarn.c
- 
- pigzn: pigzn.o
--	$(CC) -o pigzn pigzn.o -lz
-+	$(CC) ${CFLAGS} ${LDFLAGS} -o pigzn pigzn.o -lz
- 
- pigzn.o: pigz.c
--	$(CC) -Wall -O3 -DDEBUG -DNOTHREAD -g -c -o pigzn.o pigz.c
-+	$(CC) ${CFLAGS} ${LDFLAGS} -Wall -O3 -DDEBUG -DNOTHREAD -g -c -o pigzn.o pigz.c
- 
- test: pigz
- 	./pigz -kf pigz.c ; ./pigz -t pigz.c.gz
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160821/874f4f0a/attachment.html>