--- Portfile.orig	2008-10-18 13:06:19.000000000 -0400
+++ Portfile	2008-11-01 22:20:58.000000000 -0400
@@ -54,24 +54,24 @@
                             --with-gif \
                             --with-png
     depends_lib-append      lib:libX11:XFree86 \
-                            lib:libXpm:XFree86 \
-                            lib:libjpeg:jpeg \
-                            lib:libtiff:tiff \
-                            lib:libungif:libungif \
-                            lib:libpng:libpng
+                            port:libpixman \
+                            port:jpeg \
+                            port:tiff \
+                            port:giflib \
+                            port:libpng
 }
 
 variant motif requires x11 description {Builds emacs as an X11 program with Motif widgets} {
     configure.args-delete   --with-x-toolkit=lucid
     configure.args-append   --with-x-toolkit=motif
-    depends_lib-append      lib:libXm:openmotif
+    depends_lib-append      port:openmotif
 }
 
 variant gtk requires x11 description {Builds emacs as an X11 program with GTK+2 widgets} {
     configure.args-delete   --with-x-toolkit=lucid
     configure.args-append   --with-x-toolkit=gtk
-    depends_lib-append      lib:libgtk.2:gtk2 \
-                            lib:libglib.2:glib2
+    depends_lib-append      port:gtk2 \
+                            port:glib2
 }
 
 variant carbon conflicts x11 description {Adds a Mac (Carbon) version of Emacs} {