diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/lang/perl5.8/Portfile ports/lang/perl5.8/Portfile
--- ports.orig/lang/perl5.8/Portfile	2010-04-28 18:00:48.000000000 -0600
+++ ports/lang/perl5.8/Portfile	2010-06-23 16:00:39.000000000 -0600
@@ -68,7 +68,7 @@
     configure.args-append "-D inc_version_list=\"5.8.8 5.8.8/${os.platform}-2level\""
 }
 
-set exclude_libs {bind gdbm db}
+set exclude_libs {bind gdbm db util}
 
 post-patch {
     foreach lib ${exclude_libs} {
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/python/py26-gobject/Portfile ports/python/py26-gobject/Portfile
--- ports.orig/python/py26-gobject/Portfile	2009-09-10 02:30:45.000000000 -0600
+++ ports/python/py26-gobject/Portfile	2010-06-23 16:00:39.000000000 -0600
@@ -33,7 +33,6 @@
                 port:libxslt \
                 port:gettext \
                 port:libiconv \
-                port:libffi \
                 port:python26
 
 set python_prefix ${frameworks_dir}/Python.framework/Versions/2.6
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/python/py26-py2app-devel/Portfile ports/python/py26-py2app-devel/Portfile
--- ports.orig/python/py26-py2app-devel/Portfile	2010-04-02 16:30:58.000000000 -0600
+++ ports/python/py26-py2app-devel/Portfile	2010-06-23 16:00:39.000000000 -0600
@@ -29,7 +29,7 @@
 depends_lib-append  port:py26-distribute \
                     port:py26-altgraph \
                     port:py26-macholib \
-                    path:${python.pkgd}/modulegraph/__init__.py:py26-modulegraph-devel \
+                    path:${python.pkgd}/modulegraph/__init__.py:py26-modulegraph \
                     port:py26-bdist_mpkg
 
 post-destroot {
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/x11/gtk2/Portfile ports/x11/gtk2/Portfile
--- ports.orig/x11/gtk2/Portfile	2010-06-15 01:31:03.000000000 -0600
+++ ports/x11/gtk2/Portfile	2010-06-29 08:20:19.000000000 -0600
@@ -40,22 +40,32 @@
 depends_build   port:pkgconfig
 
 depends_lib     port:tiff \
-                port:jasper \
                 port:atk \
                 path:lib/pkgconfig/pango.pc:pango \
                 port:gettext
 
-depends_run     port:shared-mime-info
+# If shared-mime-info is installed it causes GTK+ to use Glib's GIO to
+# do automatic file type guessing and to disable its own internal
+# guessing. The guessing then fails at runtime if the MIME database
+# (/usr/share/mime) isn't present. Avoid using GIO and always use GTK+'s
+# internal guesser.
+# depends_run     port:shared-mime-info
 
 archcheck.files \
     lib/libatk-1.0.dylib \
     lib/libintl.dylib \
-    lib/libjasper.dylib \
     lib/libpango-1.0.dylib \
     lib/libtiff.dylib
 
+# Don't have the GDK pixbuf loaders and immodules as loadable modules.
+# This would require running install_name_tool on the .so files to make
+# the libraries they depend on relative to @executable_path, not the
+# MacPorts installation directory.
 configure.args  --enable-static \
+                --with-included-loaders \
+                --with-included-immodules \
                 --disable-glibtest \
+                --without-libjasper \
                 gio_can_sniff=yes
 
 configure.ccache no
@@ -86,19 +96,6 @@
     xinstall -d ${destroot}${docdir}
     xinstall -m 644 -W ${worksrcpath} AUTHORS COPYING HACKING NEWS README \
         ${destroot}${docdir}
-
-    ui_debug "Creating gtk.immodules..."
-    system "DYLD_LIBRARY_PATH=${destroot}${prefix}/lib \
-        ${destroot}${prefix}/bin/gtk-query-immodules-2.0 \
-        ${destroot}${prefix}/lib/gtk-2.0/2.10.0/immodules/*.so \
-        >${destroot}${prefix}/etc/gtk-2.0/gtk.immodules"
-    reinplace "s|${destroot}||" ${destroot}${prefix}/etc/gtk-2.0/gtk.immodules
-}
-
-post-activate {
-    ui_debug "Updating gdk-pixbuf.loaders..."
-    system "${prefix}/bin/gdk-pixbuf-query-loaders \
-        >${prefix}/etc/gtk-2.0/gdk-pixbuf.loaders"
 }
 
 platform darwin 8 {
@@ -114,11 +111,11 @@
 }
 
 if {[variant_isset universal]} {
-    set cups /usr/bin/cups-config
+    set cups /Developer/SDKs/MacOSX10.4u.sdk/usr/bin/cups-config
     if {[info exists universal_sysroot]} {
         set cups ${universal_sysroot}${cups}
     }
-    configure.env-append CUPS_CONFIG=${cups}
+    configure.env-append CUPS_CONFIG=${cups} NM='/usr/bin/nm -p'
 
     # cups is not 32/64-bit universal on Tiger.
     if {${os.major} == "8"} {
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/x11/pango/Portfile ports/x11/pango/Portfile
--- ports.orig/x11/pango/Portfile	2010-04-08 02:31:04.000000000 -0600
+++ ports/x11/pango/Portfile	2010-06-29 13:01:40.000000000 -0600
@@ -121,6 +121,7 @@
 
 configure.args \
     --enable-static \
+    --with-included-modules \
     --x-include=${prefix}/include --x-lib=${prefix}/lib
 
 if {![variant_isset universal] && $build_arch == "x86_64" || $build_arch == "ppc64"} {
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/x11/pango/files/patch-configure.diff ports/x11/pango/files/patch-configure.diff
--- ports.orig/x11/pango/files/patch-configure.diff	2009-10-21 14:00:56.000000000 -0600
+++ ports/x11/pango/files/patch-configure.diff	2010-06-23 16:00:40.000000000 -0600
@@ -1,6 +1,14 @@
---- configure.orig	2009-07-21 06:59:52.000000000 +1000
-+++ configure	2009-10-22 06:14:52.000000000 +1100
-@@ -19806,12 +19806,14 @@
+--- configure.orig	2009-07-20 14:59:52.000000000 -0600
++++ configure	2010-06-23 11:46:06.000000000 -0600
+@@ -18178,6 +18178,7 @@
+   $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++       X_LIBS="$X_LIBS -R$x_libraries"
+ 	{ $as_echo "$as_me:$LINENO: result: neither works" >&5
+ $as_echo "neither works" >&6; }
+ fi
+@@ -19806,12 +19807,14 @@
  $as_echo "$ac_cv_header_Carbon_Carbon_h" >&6; }
  
  fi