diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/archivers/xz/Portfile ports/archivers/xz/Portfile
--- ports.orig/archivers/xz/Portfile	2013-08-02 08:00:22.000000000 -0700
+++ ports/archivers/xz/Portfile	2014-08-17 19:23:51.000000000 -0700
@@ -23,9 +23,9 @@
 checksums       sha1    166b228efae6bfadbbf831e9982510209d74240e \
                 rmd160  16c0a0b4a72023342b1ece8151c8d0bdf8b40968
 
-depends_lib     port:libiconv port:gettext
+depends_lib     port:gettext
 
-configure.args  --with-libiconv-prefix=${prefix} --with-libintl-prefix=${prefix}
+configure.args  --with-libintl-prefix=${prefix}
 
 # document that we always need legacy symlinks now that "lzmautils" refers here
 configure.args-append --enable-lzma-links
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/devel/apr-util/Portfile ports/devel/apr-util/Portfile
--- ports.orig/devel/apr-util/Portfile	2014-01-23 08:00:39.000000000 -0800
+++ ports/devel/apr-util/Portfile	2014-08-17 19:23:51.000000000 -0700
@@ -21,13 +21,13 @@
 		rmd160	ec75523770f5e951c201d65ba313fa746546cc9a
 
 depends_lib	port:apr port:expat \
-		port:libiconv port:db46 \
+		port:db46 \
 		port:sqlite3
 
 use_parallel_build	yes
 configure.ccache	no
 configure.args	--with-apr=${prefix}/bin/apr-1-config --with-expat=${prefix} \
-		--with-iconv=${prefix} --with-berkeley-db=${prefix}/include:${prefix}/lib/db46 \
+		--with-berkeley-db=${prefix}/include:${prefix}/lib/db46 \
 		--without-mysql --without-pgsql --without-sqlite2 --with-sqlite3=${prefix}
 
 test.run	yes
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/devel/atk/Portfile ports/devel/atk/Portfile
--- ports.orig/devel/atk/Portfile	2014-04-02 14:31:05.000000000 -0700
+++ ports/devel/atk/Portfile	2014-08-17 19:23:51.000000000 -0700
@@ -28,7 +28,6 @@
 
 depends_lib             path:lib/pkgconfig/glib-2.0.pc:glib2 \
                         port:gettext \
-                        port:libiconv \
                         port:gobject-introspection
 
 configure.args          --enable-static \
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/devel/gettext/Portfile ports/devel/gettext/Portfile
--- ports.orig/devel/gettext/Portfile	2014-07-15 09:01:13.000000000 -0700
+++ ports/devel/gettext/Portfile	2014-08-17 19:23:51.000000000 -0700
@@ -55,7 +55,6 @@
                         --without-xz
 
 depends_lib             port:expat \
-                        port:libiconv \
                         port:ncurses
 
 test.run                yes
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/devel/glib2/Portfile ports/devel/glib2/Portfile
--- ports.orig/devel/glib2/Portfile	2014-05-18 05:31:06.000000000 -0700
+++ ports/devel/glib2/Portfile	2014-08-17 19:23:51.000000000 -0700
@@ -49,7 +49,6 @@
 depends_build               bin:xmllint:libxml2
 
 depends_lib                 port:gettext \
-                            port:libiconv \
                             port:zlib \
                             port:libffi \
                             path:bin/perl:perl5
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/devel/glib2/work/.macports.glib2.state ports/devel/glib2/work/.macports.glib2.state
--- ports.orig/devel/glib2/work/.macports.glib2.state	1969-12-31 16:00:00.000000000 -0800
+++ ports/devel/glib2/work/.macports.glib2.state	2014-08-17 19:23:51.000000000 -0700
@@ -0,0 +1 @@
+target: org.macports.archivefetch
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/editors/vim/Portfile ports/editors/vim/Portfile
--- ports.orig/editors/vim/Portfile	2014-04-22 09:00:03.000000000 -0700
+++ ports/editors/vim/Portfile	2014-08-17 19:27:39.000000000 -0700
@@ -302,8 +302,7 @@
 
 depends_build       bin:grep:grep
 depends_lib         port:ncurses \
-                    port:gettext \
-                    port:libiconv
+                    port:gettext
 
 patchfiles-append patch-compat-sigaltstack.diff
 
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/gnome/gtk2/Portfile ports/gnome/gtk2/Portfile
--- ports.orig/gnome/gtk2/Portfile	2014-06-23 16:02:21.000000000 -0700
+++ ports/gnome/gtk2/Portfile	2014-08-17 19:23:51.000000000 -0700
@@ -49,14 +49,24 @@
 # indirectly depends on gtk2, so we can not list it as a dependency here.
 #                    port:librsvg
 
-depends_run         port:shared-mime-info \
-                    port:hicolor-icon-theme
+# 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
+depends_run         port:hicolor-icon-theme
 
 # autoreconf to deal with stupid issues during install (install: .libs/libferret.lai: No such file or directory)
 use_autoreconf      yes
 autoreconf.args     -fvi
 
+# Don't have the 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-immodules \
                     --disable-glibtest \
                     --enable-introspection \
                     gio_can_sniff=yes
@@ -101,21 +111,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"
-    ui_debug "Updating immodules.cache..."
-    system "${prefix}/bin/gtk-query-immodules-2.0 --update-cache"
 }
 
 platform darwin 8 {
@@ -136,7 +131,7 @@
 }
 
 if {[variant_isset universal]} {
-    set cups /usr/bin/cups-config
+    set cups /Developer/SDKs/MacOSX10.5.sdk/usr/bin/cups-config
     if {[info exists universal_sysroot]} {
         set cups ${universal_sysroot}${cups}
     }
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/graphics/fontconfig/Portfile ports/graphics/fontconfig/Portfile
--- ports.orig/graphics/fontconfig/Portfile	2014-04-07 20:00:05.000000000 -0700
+++ ports/graphics/fontconfig/Portfile	2014-08-17 19:23:51.000000000 -0700
@@ -26,8 +26,7 @@
 
 depends_build               port:pkgconfig
 
-depends_lib                 port:libiconv \
-                            port:expat \
+depends_lib                 port:expat \
                             port:freetype
 
 if {${os.platform} eq "darwin" && ${os.major} < 9} {
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/graphics/gdk-pixbuf2/Portfile ports/graphics/gdk-pixbuf2/Portfile
--- ports.orig/graphics/gdk-pixbuf2/Portfile	2014-05-27 11:01:19.000000000 -0700
+++ ports/graphics/gdk-pixbuf2/Portfile	2014-08-17 19:23:51.000000000 -0700
@@ -34,7 +34,12 @@
                             port:tiff \
                             port:gobject-introspection
 
+# Don't have the GDK image loaders 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              --with-libjasper \
+                            --with-included-loaders \
                             --enable-introspection=yes
 
 # The rules enabled by gobject-introspection require GNU make 3.81+, #35202
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/mail/libidn/Portfile ports/mail/libidn/Portfile
--- ports.orig/mail/libidn/Portfile	2013-07-15 09:03:03.000000000 -0700
+++ ports/mail/libidn/Portfile	2014-08-17 19:20:10.000000000 -0700
@@ -26,7 +26,7 @@
 checksums           rmd160  a047e5ae640498df810dd32675758d582672ee87 \
                     sha256  0a2f4c71c80f8f389a99d5a26539a9be4a4ac42cd7f375aa41046660f63cc53c
 
-depends_lib		port:libiconv port:gettext
+depends_lib		port:gettext
 
 # nawk: syntax error at source line 1 source file
 conflicts_build         nawk
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/perl/p5-locale-gettext/Portfile ports/perl/p5-locale-gettext/Portfile
--- ports.orig/perl/p5-locale-gettext/Portfile	2014-08-13 16:01:30.000000000 -0700
+++ ports/perl/p5-locale-gettext/Portfile	2014-08-17 19:23:51.000000000 -0700
@@ -24,7 +24,7 @@
                     rmd160 767adfce05b8fe77ddd7d3814951822746cf6e4b
 
 if {${perl5.major} != ""} {
-depends_lib-append  port:gettext port:libiconv
+depends_lib-append  port:gettext
 
 # The first patch below corrects a typo in the documentation. The last two
 # correct a bug discovered by the Debian Project; they come from the CPAN RT
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/python/py-libxml2/files/patch-setup.py.diff ports/python/py-libxml2/files/patch-setup.py.diff
--- ports.orig/python/py-libxml2/files/patch-setup.py.diff	2013-07-15 09:02:01.000000000 -0700
+++ ports/python/py-libxml2/files/patch-setup.py.diff	2014-08-17 19:23:51.000000000 -0700
@@ -13,8 +13,20 @@
  ];
  
  xml_includes=""
-@@ -85,7 +81,7 @@
+@@ -73,19 +69,9 @@
+     print("failed to find headers for libxml2: update includes_dir")
+     sys.exit(1)
  
+-iconv_includes=""
+-for dir in includes_dir:
+-    if not missing(dir + "/iconv.h"):
+-        iconv_includes=dir
+-	break;
+-
+-if iconv_includes == "":
+-    print("failed to find headers for libiconv: update includes_dir")
+-    sys.exit(1)
+-
  # those are added in the linker search path for libraries
  libdirs = [
 -os.path.join(ROOT,'lib'),
@@ -55,3 +67,12 @@
  
  if with_xslt == 1:
      xslt_includes=""
+@@ -166,7 +126,7 @@
+ if WITHDLLS:
+     modules.append('libxmlmods.__init__')
+ c_files = ['libxml2-py.c', 'libxml.c', 'types.c' ]
+-includes= [xml_includes, iconv_includes]
++includes= [xml_includes]
+ libs    = [libraryPrefix + "xml2"] + platformLibs
+ macros  = []
+ if with_threads:
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/textproc/help2man/Portfile ports/textproc/help2man/Portfile
--- ports.orig/textproc/help2man/Portfile	2014-07-27 09:00:45.000000000 -0700
+++ ports/textproc/help2man/Portfile	2014-08-17 19:23:51.000000000 -0700
@@ -24,7 +24,7 @@
                 sha256  3dfd02a026149aad06887c1cb6062471779c100e00aecb79b8f9d01cf1581c47
 
 depends_lib     port:perl5.16 port:p5.16-locale-gettext \
-                port:gettext port:libiconv
+                port:gettext
 
 configure.perl  ${prefix}/bin/perl5.16
 
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/textproc/libxml2/Portfile ports/textproc/libxml2/Portfile
--- ports.orig/textproc/libxml2/Portfile	2014-06-06 14:00:41.000000000 -0700
+++ ports/textproc/libxml2/Portfile	2014-08-17 19:23:51.000000000 -0700
@@ -21,7 +21,7 @@
 checksums             rmd160  257285d9ac070ed9f58666b7bd7c4653651c871b \
                       sha256  fd3c64cb66f2c4ea27e934d275904d92cec494a8e8405613780cbc8a71680fdb
 
-depends_lib           port:libiconv port:zlib port:xz
+depends_lib           port:zlib port:xz
 
 post-extract {
     reinplace -locale C "s|/etc|${prefix}/etc|g" \
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/textproc/libxslt/Portfile ports/textproc/libxslt/Portfile
--- ports.orig/textproc/libxslt/Portfile	2013-12-02 20:30:22.000000000 -0800
+++ ports/textproc/libxslt/Portfile	2014-08-17 19:23:51.000000000 -0700
@@ -38,8 +38,7 @@
 if {${name} eq ${subport}} {
     revision            0
 
-    depends_lib-append  port:libiconv \
-                        port:libxml2 \
+    depends_lib-append  port:libxml2 \
                         port:zlib
 
 pre-configure {
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/x11/pango/Portfile ports/x11/pango/Portfile
--- ports.orig/x11/pango/Portfile	2014-06-25 15:30:27.000000000 -0700
+++ ports/x11/pango/Portfile	2014-08-17 19:23:51.000000000 -0700
@@ -92,6 +92,7 @@
 }
 
 configure.args          --enable-static \
+                        --with-included-modules \
                         --enable-introspection \
                         --disable-silent-rules \
                         --without-x