Revision: 89487 http://trac.macports.org/changeset/89487 Author: ryandesign@macports.org Date: 2012-01-31 15:11:51 -0800 (Tue, 31 Jan 2012) Log Message: ----------- zlib: update to 1.2.6 Modified Paths: -------------- trunk/dports/archivers/zlib/Portfile trunk/dports/archivers/zlib/files/clang.patch Removed Paths: ------------- trunk/dports/archivers/zlib/files/patch-Makefile.in.diff Modified: trunk/dports/archivers/zlib/Portfile =================================================================== --- trunk/dports/archivers/zlib/Portfile 2012-01-31 23:10:48 UTC (rev 89486) +++ trunk/dports/archivers/zlib/Portfile 2012-01-31 23:11:51 UTC (rev 89487) @@ -5,7 +5,7 @@ PortGroup xcodeversion 1.0 name zlib -version 1.2.5 +version 1.2.6 categories archivers maintainers landonf ryandesign openmaintainer license zlib @@ -22,13 +22,12 @@ master_sites ${homepage} -checksums md5 be1e89810e66150f5b0327984d8625a0 \ - sha1 543fa9abff0442edca308772d6cef85557677e02 \ - rmd160 c6c4c2a2a205061b21487e69234106f5517b4b32 +checksums rmd160 fb9f9c7e27c0d049d98bff91db0d9cb1ad157562 \ + sha256 fa3e3e4881fa5810b8903f2c7e0dcd5a0a673535f0438021c4bbb5db1b918c8e minimum_xcodeversions {8 2.4.1 9 3.1} -patchfiles patch-Makefile.in.diff clang.patch +patchfiles clang.patch configure.universal_args Modified: trunk/dports/archivers/zlib/files/clang.patch =================================================================== --- trunk/dports/archivers/zlib/files/clang.patch 2012-01-31 23:10:48 UTC (rev 89486) +++ trunk/dports/archivers/zlib/files/clang.patch 2012-01-31 23:11:51 UTC (rev 89487) @@ -1,10 +1,10 @@ ---- configure.orig 2011-06-27 12:15:50.000000000 -0700 -+++ configure 2011-06-27 12:16:07.000000000 -0700 -@@ -101,6 +101,7 @@ cflags=${CFLAGS-"-O3"} +--- configure.orig 2012-01-29 11:48:11.000000000 -0600 ++++ configure 2012-01-31 17:02:16.000000000 -0600 +@@ -149,6 +149,7 @@ # to force the asm version use: CFLAGS="-O3 -DASMV" ./configure case "$cc" in *gcc*) gcc=1 ;; + *clang*) gcc=1 ;; esac - - if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) 2>/dev/null; then + case `$cc -v 2>&1` in + *gcc*) gcc=1 ;; Deleted: trunk/dports/archivers/zlib/files/patch-Makefile.in.diff =================================================================== --- trunk/dports/archivers/zlib/files/patch-Makefile.in.diff 2012-01-31 23:10:48 UTC (rev 89486) +++ trunk/dports/archivers/zlib/files/patch-Makefile.in.diff 2012-01-31 23:11:51 UTC (rev 89487) @@ -1,11 +0,0 @@ ---- Makefile.in.prev 2010-04-22 21:43:16.000000000 -0700 -+++ Makefile.in 2010-04-23 07:22:40.000000000 -0700 -@@ -136,7 +136,7 @@ - $(CC) $(SFLAGS) -DPIC -c -o objs/$*.o $< - -@mv objs/$*.o $@ - --$(SHAREDLIBV): $(PIC_OBJS) -+$(SHAREDLIBV): $(PIC_OBJS) libz.a - $(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) $(LDSHAREDLIBC) $(LDFLAGS) - rm -f $(SHAREDLIB) $(SHAREDLIBM) - ln -s $@ $(SHAREDLIB)