Ticket #24729: pigz++.diff

archivers/pigz/Portfile

@@ -4 +4 @@
 
 name                pigz
 version             2.1.6
+revision            1
 categories          archivers
 platforms           darwin
 maintainers         gmail.com:danchr openmaintainer
@@ -25 +26 @@
 patchfiles          patch-Makefile
 
 use_configure       no
+depends_lib         port:zlib
 
 build.target
-build.args          CC=${configure.cc}
+build.args          CC="${configure.cc}" \
+                    CFLAGS="${configure.cc_archflags}" \
+                    CPPFLAGS="${configure.cppflags}" \
+                    LDFLAGS="${configure.ldflags}"
+
+variant universal {
+    build.args-append \
+                    CFLAGS="${configure.universal_cflags}" \
+                    LDFLAGS+="${configure.universal_ldflags}"
+}
 
 destroot {
     xinstall -m 644 ${worksrcpath}/${name}.1 ${destroot}${prefix}/share/man/man1

archivers/pigz/files/patch-Makefile

@@ -5 +5 @@
  
  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
@@ -14 +14 @@
  
  pigzt: pigzt.o yarnt.o
 -       cc -o pigzt pigzt.o yarnt.o -lpthread -lz
-+       $(CC) -o pigzt pigzt.o yarnt.o -lpthread -lz
++       $(CC) $(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) -Wall -O3 -DDEBUG -g -c -o pigzt.o pigz.c
++       $(CC) $(CPPFLAGS) $(CFLAGS)  -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) -Wall -O3 -DDEBUG -g -c -o yarnt.o yarn.c
++       $(CC) $(CPPFLAGS) $(CFLAGS)  -Wall -O3 -DDEBUG -g -c -o yarnt.o yarn.c
  
  pigzn: pigzn.o
 -       cc -o pigzn pigzn.o -lz
-+       $(CC) -o pigzn pigzn.o -lz
++       $(LDFLAGS) $(CPPFLAGS) $(CFLAGS) -o pigzn pigzn.o -lz
  
  pigzn.o: pigz.c
 -       cc -Wall -O3 -DDEBUG -DNOTHREAD -g -c -o pigzn.o pigz.c
-+       $(CC) -Wall -O3 -DDEBUG -DNOTHREAD -g -c -o pigzn.o pigz.c
++       $(CC) $(CPPFLAGS) $(CFLAGS)  -Wall -O3 -DDEBUG -DNOTHREAD -g -c -o pigzn.o pigz.c
  
  test: pigz
         ./pigz -kf pigz.c ; ./pigz -t pigz.c.gz