Ticket #25585: tiff-3.9.4.diff

Portfile

@@ -2 +2 @@
 # $Id$
 
 PortSystem 1.0
-PortGroup  muniversal 1.0
 PortGroup  xcodeversion 1.0
 
 name            tiff
-version         3.9.2
-revision        3
+version         3.9.4
 categories      graphics
 maintainers     waqar
 description     Library and tools for dealing with Tag Image File Format
@@ -26 +24 @@
         esoteric portions of the 6.0 TIFF spec.
 homepage        http://www.remotesensing.org/libtiff
 platforms       darwin
-master_sites    ftp://ftp.remotesensing.org/pub/libtiff/ \
+master_sites    http://download.osgeo.org/libtiff/ \
+                ftp://ftp.remotesensing.org/pub/libtiff/ \
                 http://dl.maptools.org/dl/libtiff/ \
                 freebsd
 
-checksums           md5     93e56e421679c591de7552db13384cb8 \
-                    sha1    5c054d31e350e53102221b7760c3700cf70b4327 \
-                    rmd160  22716e0bcee93a654a704900f3e19f41600f3d18
+checksums           md5     2006c1bdd12644dbf02956955175afd6 \
+                    sha1    a4e32d55afbbcabd0391a9c89995e8e8a19961de \
+                    rmd160  3e0a74b6294297c16fb983ad68056a1dfbbdb1de
 
-# Turn on OpenGL with --with-apple-opengl-framework.
-patchfiles      patch-configure.diff
-
 depends_lib     port:jpeg port:zlib
 
 test.run        yes
@@ -50 +46 @@
                 --with-zlib-include-dir=${prefix}/include \
                 --with-zlib-lib-dir=${prefix}/lib
 
+post-configure {
+    if {[variant_isset universal]} {
+        system "cd ${worksrcpath}/libtiff \
+                && ed - tif_config.h < ${filespath}/libtiff__tif_config.h.ed \
+                && ed - tiffconf.h < ${filespath}/libtiff__tiffconf.h.ed \
+                && touch stamp-h1 && touch stamp-h2"
+    }
+}
+
 use_parallel_build  yes
 
 post-destroot {
@@ -61 +66 @@
 }
 
 platform macosx {
-    if { ![variant_isset universal] } {
+    # Tiger does not have 64-bit OpenGL.
+    if {${os.major} > 8 || (![variant_isset universal] && ![string match *64* $build_arch])
+        || ([variant_isset universal] && ![string match *64* $universal_archs])} {
         configure.args-append   --with-apple-opengl-framework
-    } else {
-        # Tiger does not have 64-bit OpenGL.
-        if { ${os.major} > 8 } {
-            configure.args-append   --with-apple-opengl-framework
-        } else {
-            global merger_configure_args
-            array set merger_configure_args {
-                ppc  --with-apple-opengl-framework
-               i386  --with-apple-opengl-framework
-            }
-        }
     }
 }