Ticket #18801: Portfile.diff

Portfile

@@ -1 +1 @@
 # $Id: Portfile 42046 2008-11-13 21:49:32Z nox@macports.org $
 
 PortSystem 1.0
+PortGroup  muniversal 1.0
 
 name            tiff
 version         3.8.2
-revision    2
+revision    3
 categories      graphics
 maintainers     waqar@macports.org
 description     Library and tools for dealing with Tag Image File Format
@@ -31 +32 @@
             sha1 549e67b6a15b42bfcd72fe17cda7c9a198a393eb \
             rmd160 1b4d825e3be08764e953fc58246d0c25ab4dd17d
 
+# Turn on OpenGL with --with-apple-opengl-framework.
+patchfiles      patch-configure.diff
+
 depends_lib     port:jpeg port:zlib
 
 test.run        yes
@@ -54 +58 @@
 }
 
 platform macosx {
-    configure.args-append   --with-apple-opengl-framework
-    if {[variant_isset universal]} {
-        patchfiles-append patch-universal-pre-configure.diff
-    }
-    post-configure {
-        if {[variant_isset universal]} {
-            system "cd ${worksrcpath} && patch -p0 < ${filespath}/patch-universal-post-configure.diff"
+    if { ![variant_isset universal] } {
+        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
+            }
         }
     }
 }
 
-platform darwin 9 {
-    configure.ldflags-append    -dylib_file \
-                        /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:\
-                        /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
-}
-
 livecheck.check regex
 livecheck.url   http://www.remotesensing.org/libtiff/
 livecheck.regex {v(\d+(?:\.\d+)*)</a>}