Ticket #19391: Portfile.diff

Portfile

@@ -1 +1 @@
 # $Id: Portfile 47297 2009-02-25 11:59:08Z ryandesign@macports.org $
 
 PortSystem              1.0
+PortGroup               muniversal 1.0
 
 name                    gd2
 version                 2.0.35
-revision                4
+revision                5
 categories              graphics
 maintainers             ryandesign
 homepage                http://www.libgd.org/
@@ -54 +55 @@
     port:xpm
 
 patchfiles \
-    patch-gdft.c.diff \
-    patch-Makefile.in.diff \
-    patch-config-gdlib-config.in.diff
+    patch-gdft.c.diff
 
 post-patch {
     if {[file exists ${prefix}/share/libtool/config/ltmain.sh]} {
@@ -68 +67 @@
 
 use_autoreconf          yes
 
-post-destroot {
+post-build {
     if {[variant_isset universal]} {
-       reinplace "s|${configure.universal_ldflags}||" \
-           ${destroot}${prefix}/bin/gdlib-config
+       foreach arch ${universal_archs_to_use} {
+           reinplace "s| ${configure.universal_ldflags}||" \
+               ${worksrcpath}-${arch}/config/gdlib-config
+           reinplace "s| [muniversal_get_arch_flag ${arch}]||" \
+               ${worksrcpath}-${arch}/config/gdlib-config
+       }
     }
 }
 
@@ -79 +82 @@
     depends_lib lib:libdl:dlcompat
 }
 
-platform darwin {
-    post-configure {
-        reinplace "s/^\\(hardcode_direct=\\)yes/\\1no/" ${worksrcpath}/libtool
+# AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
+# This block helps us link correctly when we are +system_x11 and x11prefix
+# is somewhere non-standard and should cause AC_X_PATH to let us setup our
+# CPPFLAGS and LDFLAGS without interference
+pre-configure {
+    if { ! [variant_isset no_x11] } {
+        configure.args-append  --x-includes=${prefix}/include --x-libraries=${prefix}/lib
+        if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
+            configure.cppflags-append -I${x11prefix}/include
+            configure.ldflags-append  -L${x11prefix}/lib
+        }
     }
 }
 
@@ -89 +100 @@
     depends_lib-delete \
         port:xpm
     configure.args-append \
-        --without-x
+        --without-x \
+        --without-xpm
 }
 
+#platform darwin {
+#    post-configure {
+#        if { ! [variant_isset universal] } {
+#            reinplace "s/^\\(hardcode_direct=\\)yes/\\1no/" ${worksrcpath}/libtool
+#        } else {
+#            foreach arch ${universal_archs_to_use} {
+#                reinplace "s/^\\(hardcode_direct=\\)yes/\\1no/" ${worksrcpath}-${arch}/libtool
+#            }
+#        }
+#    }
+#}
+
 livecheck.check         regex
 livecheck.url           ${homepage}Downloads
 livecheck.regex         gd-(\[0-9.\]+)\\.tar