13 files changed, 352 insertions, 358 deletions

diff --git a/x11-fm/gnome-commander/Makefile b/x11-fm/gnome-commander/Makefile
index 2271cc19423f..b950f6c1caf5 100644
--- a/x11-fm/gnome-commander/Makefile
+++ b/x11-fm/gnome-commander/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-commander
 PORTVERSION=	1.0.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-commander/1.0/
@@ -28,8 +28,8 @@ USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gnomeprefix gnomehack gnometarget gnomevfs gnomelibs gdkpixbuf
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lintl"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib -lintl"
 
 .include <bsd.port.pre.mk>
 
diff --git a/x11-fm/gnome-commander/files/patch-configure b/x11-fm/gnome-commander/files/patch-configure
deleted file mode 100644
index 7921d595f0c7..000000000000
--- a/x11-fm/gnome-commander/files/patch-configure
+++ /dev/null
@@ -1,18 +0,0 @@
---- configure.orig	Fri Oct 24 00:59:12 2003
-+++ configure	Fri Oct 24 00:59:25 2003
-@@ -9397,13 +9397,13 @@
- if test "x${prefix}" = "xNONE"; then
- 
- cat >>confdefs.h <<_ACEOF
--#define PIXMAPS_DIR "${ac_default_prefix}/share/pixmaps/${PACKAGE}"
-+#define PIXMAPS_DIR "${ac_default_prefix}/share/gnome/pixmaps/${PACKAGE}"
- _ACEOF
- 
- else
- 
- cat >>confdefs.h <<_ACEOF
--#define PIXMAPS_DIR "${prefix}/share/pixmaps/${PACKAGE}"
-+#define PIXMAPS_DIR "${prefix}/share/gnome/pixmaps/${PACKAGE}"
- _ACEOF
- 
- fi
diff --git a/x11-fm/gnome-commander/pkg-plist b/x11-fm/gnome-commander/pkg-plist
index 7014bc0ccfd4..c5b0d20a0ff2 100644
--- a/x11-fm/gnome-commander/pkg-plist
+++ b/x11-fm/gnome-commander/pkg-plist
@@ -1,83 +1,5 @@
 bin/gnome-commander
 share/gnome/apps/Applications/gnome-commander.desktop
-share/gnome/pixmaps/gnome-commander/device-icons/burner.xpm
-share/gnome/pixmaps/gnome-commander/device-icons/camera.xpm
-share/gnome/pixmaps/gnome-commander/device-icons/cdrom.xpm
-share/gnome/pixmaps/gnome-commander/device-icons/floppy.xpm
-share/gnome/pixmaps/gnome-commander/device-icons/zip.xpm
-share/gnome/pixmaps/gnome-commander/exec.xpm
-share/gnome/pixmaps/gnome-commander/file-type-icons/file_type_block_device.xpm
-share/gnome/pixmaps/gnome-commander/file-type-icons/file_type_char_device.xpm
-share/gnome/pixmaps/gnome-commander/file-type-icons/file_type_dir.xpm
-share/gnome/pixmaps/gnome-commander/file-type-icons/file_type_fifo.xpm
-share/gnome/pixmaps/gnome-commander/file-type-icons/file_type_regular.xpm
-share/gnome/pixmaps/gnome-commander/file-type-icons/file_type_socket.xpm
-share/gnome/pixmaps/gnome-commander/file-type-icons/file_type_symlink.xpm
-share/gnome/pixmaps/gnome-commander/ftp.xpm
-share/gnome/pixmaps/gnome-commander/ftp_connect.xpm
-share/gnome/pixmaps/gnome-commander/ftp_disconnect.xpm
-share/gnome/pixmaps/gnome-commander/gcmd-icon1.png
-share/gnome/pixmaps/gnome-commander/gcmd-icon1.xpm
-share/gnome/pixmaps/gnome-commander/gcmd-icon2.png
-share/gnome/pixmaps/gnome-commander/gcmd-icon3.xpm
-share/gnome/pixmaps/gnome-commander/gnome_cmd_arrow_blank.xpm
-share/gnome/pixmaps/gnome-commander/gnome_cmd_arrow_down.xpm
-share/gnome/pixmaps/gnome-commander/gnome_cmd_arrow_up.xpm
-share/gnome/pixmaps/gnome-commander/home.xpm
-share/gnome/pixmaps/gnome-commander/key.xpm
-share/gnome/pixmaps/gnome-commander/lock.xpm
-share/gnome/pixmaps/gnome-commander/menu_bookmark.xpm
-share/gnome/pixmaps/gnome-commander/menu_ftp_connect.xpm
-share/gnome/pixmaps/gnome-commander/menu_ftp_disconnect.xpm
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-msword.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-pdf.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-postscript.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.ms-excel.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.ms-powerpoint.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.calc.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.draw.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.impress.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.writer.math.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.writer.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-anjuta-project.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-arj.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-bzip.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-compressed.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-dia-diagram.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-executable-binary.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-glade.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-gnumeric.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-gzip.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-mrproject.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-ogg.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-rpm.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-zip.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-audio-plain.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-audio-x-mp3.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-compressed.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-image-plain.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-text-html.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-text-plain.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-text-x-c-header.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-text-x-c.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-text-x-sh.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-video-plain.png
-share/gnome/pixmaps/gnome-commander/mime-icons/i-blockdev.png
-share/gnome/pixmaps/gnome-commander/mime-icons/i-chardev.png
-share/gnome/pixmaps/gnome-commander/mime-icons/i-directory.png
-share/gnome/pixmaps/gnome-commander/mime-icons/i-fifo.png
-share/gnome/pixmaps/gnome-commander/mime-icons/i-music.png
-share/gnome/pixmaps/gnome-commander/mime-icons/i-regular.png
-share/gnome/pixmaps/gnome-commander/mime-icons/i-socket.png
-share/gnome/pixmaps/gnome-commander/mime-icons/i-symlink.png
-share/gnome/pixmaps/gnome-commander/mkdir.xpm
-share/gnome/pixmaps/gnome-commander/overlay_symlink.xpm
-share/gnome/pixmaps/gnome-commander/overlay_umount.xpm
-share/gnome/pixmaps/gnome-commander/parent_dir.xpm
-share/gnome/pixmaps/gnome-commander/root_dir.xpm
-share/gnome/pixmaps/gnome-commander/server.xpm
-share/gnome/pixmaps/gnome-commander/smb-computer.xpm
-share/gnome/pixmaps/gnome-commander/smb-network.xpm
 share/locale/de/LC_MESSAGES/gnome-commander.mo
 share/locale/es/LC_MESSAGES/gnome-commander.mo
 share/locale/fr/LC_MESSAGES/gnome-commander.mo
@@ -85,7 +7,85 @@ share/locale/pl/LC_MESSAGES/gnome-commander.mo
 share/locale/ru/LC_MESSAGES/gnome-commander.mo
 share/locale/sk/LC_MESSAGES/gnome-commander.mo
 share/locale/sv/LC_MESSAGES/gnome-commander.mo
-@dirrm share/gnome/pixmaps/gnome-commander/file-type-icons
-@dirrm share/gnome/pixmaps/gnome-commander/device-icons
-@dirrm share/gnome/pixmaps/gnome-commander/mime-icons
-@dirrm share/gnome/pixmaps/gnome-commander
+share/pixmaps/gnome-commander/device-icons/burner.xpm
+share/pixmaps/gnome-commander/device-icons/camera.xpm
+share/pixmaps/gnome-commander/device-icons/cdrom.xpm
+share/pixmaps/gnome-commander/device-icons/floppy.xpm
+share/pixmaps/gnome-commander/device-icons/zip.xpm
+share/pixmaps/gnome-commander/exec.xpm
+share/pixmaps/gnome-commander/file-type-icons/file_type_block_device.xpm
+share/pixmaps/gnome-commander/file-type-icons/file_type_char_device.xpm
+share/pixmaps/gnome-commander/file-type-icons/file_type_dir.xpm
+share/pixmaps/gnome-commander/file-type-icons/file_type_fifo.xpm
+share/pixmaps/gnome-commander/file-type-icons/file_type_regular.xpm
+share/pixmaps/gnome-commander/file-type-icons/file_type_socket.xpm
+share/pixmaps/gnome-commander/file-type-icons/file_type_symlink.xpm
+share/pixmaps/gnome-commander/ftp.xpm
+share/pixmaps/gnome-commander/ftp_connect.xpm
+share/pixmaps/gnome-commander/ftp_disconnect.xpm
+share/pixmaps/gnome-commander/gcmd-icon1.png
+share/pixmaps/gnome-commander/gcmd-icon1.xpm
+share/pixmaps/gnome-commander/gcmd-icon2.png
+share/pixmaps/gnome-commander/gcmd-icon3.xpm
+share/pixmaps/gnome-commander/gnome_cmd_arrow_blank.xpm
+share/pixmaps/gnome-commander/gnome_cmd_arrow_down.xpm
+share/pixmaps/gnome-commander/gnome_cmd_arrow_up.xpm
+share/pixmaps/gnome-commander/home.xpm
+share/pixmaps/gnome-commander/key.xpm
+share/pixmaps/gnome-commander/lock.xpm
+share/pixmaps/gnome-commander/menu_bookmark.xpm
+share/pixmaps/gnome-commander/menu_ftp_connect.xpm
+share/pixmaps/gnome-commander/menu_ftp_disconnect.xpm
+share/pixmaps/gnome-commander/mime-icons/gnome-application-msword.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-pdf.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-postscript.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.ms-excel.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.ms-powerpoint.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.calc.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.draw.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.impress.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.writer.math.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.writer.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-anjuta-project.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-arj.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-bzip.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-compressed.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-dia-diagram.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-executable-binary.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-glade.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-gnumeric.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-gzip.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-mrproject.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-ogg.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-rpm.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-zip.png
+share/pixmaps/gnome-commander/mime-icons/gnome-audio-plain.png
+share/pixmaps/gnome-commander/mime-icons/gnome-audio-x-mp3.png
+share/pixmaps/gnome-commander/mime-icons/gnome-compressed.png
+share/pixmaps/gnome-commander/mime-icons/gnome-image-plain.png
+share/pixmaps/gnome-commander/mime-icons/gnome-text-html.png
+share/pixmaps/gnome-commander/mime-icons/gnome-text-plain.png
+share/pixmaps/gnome-commander/mime-icons/gnome-text-x-c-header.png
+share/pixmaps/gnome-commander/mime-icons/gnome-text-x-c.png
+share/pixmaps/gnome-commander/mime-icons/gnome-text-x-sh.png
+share/pixmaps/gnome-commander/mime-icons/gnome-video-plain.png
+share/pixmaps/gnome-commander/mime-icons/i-blockdev.png
+share/pixmaps/gnome-commander/mime-icons/i-chardev.png
+share/pixmaps/gnome-commander/mime-icons/i-directory.png
+share/pixmaps/gnome-commander/mime-icons/i-fifo.png
+share/pixmaps/gnome-commander/mime-icons/i-music.png
+share/pixmaps/gnome-commander/mime-icons/i-regular.png
+share/pixmaps/gnome-commander/mime-icons/i-socket.png
+share/pixmaps/gnome-commander/mime-icons/i-symlink.png
+share/pixmaps/gnome-commander/mkdir.xpm
+share/pixmaps/gnome-commander/overlay_symlink.xpm
+share/pixmaps/gnome-commander/overlay_umount.xpm
+share/pixmaps/gnome-commander/parent_dir.xpm
+share/pixmaps/gnome-commander/root_dir.xpm
+share/pixmaps/gnome-commander/server.xpm
+share/pixmaps/gnome-commander/smb-computer.xpm
+share/pixmaps/gnome-commander/smb-network.xpm
+@dirrm share/pixmaps/gnome-commander/mime-icons
+@dirrm share/pixmaps/gnome-commander/file-type-icons
+@dirrm share/pixmaps/gnome-commander/device-icons
+@dirrm share/pixmaps/gnome-commander
diff --git a/x11-fm/gnome-commander2/Makefile b/x11-fm/gnome-commander2/Makefile
index b6b5e70c3373..7763255d2b65 100644
--- a/x11-fm/gnome-commander2/Makefile
+++ b/x11-fm/gnome-commander2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnome-commander
 PORTVERSION=	1.2.4
+PORTREVISION=	1
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-commander/1.2
@@ -34,8 +35,4 @@ INSTALLS_OMF=	yes
 
 MAN1=		gnome-commander.1
 
-post-patch:
-	@${REINPLACE_CMD} -e \
-		's|share/pixmaps|share/gnome/pixmaps|g' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/x11-fm/gnome-commander2/pkg-plist b/x11-fm/gnome-commander2/pkg-plist
index d91e972528a6..fd8a6acaa1d7 100644
--- a/x11-fm/gnome-commander2/pkg-plist
+++ b/x11-fm/gnome-commander2/pkg-plist
@@ -18,7 +18,7 @@ lib/gnome-commander/plugins/md5sum.pyo
 lib/gnome-commander/plugins/sha1sum.py
 lib/gnome-commander/plugins/sha1sum.pyc
 lib/gnome-commander/plugins/sha1sum.pyo
-share/gnome/applications/gnome-commander.desktop
+share/applications/gnome-commander.desktop
 share/gnome/help/gnome-commander/C/figures/create_archive.png
 share/gnome/help/gnome-commander/C/figures/dev_cd.png
 share/gnome/help/gnome-commander/C/figures/extract_archive.png
@@ -34,107 +34,107 @@ share/gnome/help/gnome-commander/C/figures/gnome-commander_window.png
 share/gnome/help/gnome-commander/C/figures/mounting.png
 share/gnome/help/gnome-commander/C/gnome-commander.xml
 share/gnome/help/gnome-commander/C/legal.xml
-share/gnome/omf/gnome-commander/gnome-commander-C.omf
-share/gnome/pixmaps/gnome-commander/copy_file_names.xpm
-share/gnome/pixmaps/gnome-commander/desktop.xpm
-share/gnome/pixmaps/gnome-commander/device-icons/bluetooth.xpm
-share/gnome/pixmaps/gnome-commander/device-icons/burner.xpm
-share/gnome/pixmaps/gnome-commander/device-icons/camera.xpm
-share/gnome/pixmaps/gnome-commander/device-icons/cdrom.xpm
-share/gnome/pixmaps/gnome-commander/device-icons/floppy.xpm
-share/gnome/pixmaps/gnome-commander/device-icons/harddisk.xpm
-share/gnome/pixmaps/gnome-commander/device-icons/ipod.xpm
-share/gnome/pixmaps/gnome-commander/device-icons/pci.xpm
-share/gnome/pixmaps/gnome-commander/device-icons/removable-1394.xpm
-share/gnome/pixmaps/gnome-commander/device-icons/removable-usb.xpm
-share/gnome/pixmaps/gnome-commander/device-icons/removable.xpm
-share/gnome/pixmaps/gnome-commander/device-icons/usb.xpm
-share/gnome/pixmaps/gnome-commander/device-icons/wavelan-encrypted.xpm
-share/gnome/pixmaps/gnome-commander/device-icons/wavelan.xpm
-share/gnome/pixmaps/gnome-commander/device-icons/zip.xpm
-share/gnome/pixmaps/gnome-commander/exec.xpm
-share/gnome/pixmaps/gnome-commander/exec_wheel.xpm
-share/gnome/pixmaps/gnome-commander/file-type-icons/file_type_block_device.xpm
-share/gnome/pixmaps/gnome-commander/file-type-icons/file_type_char_device.xpm
-share/gnome/pixmaps/gnome-commander/file-type-icons/file_type_dir.xpm
-share/gnome/pixmaps/gnome-commander/file-type-icons/file_type_fifo.xpm
-share/gnome/pixmaps/gnome-commander/file-type-icons/file_type_regular.xpm
-share/gnome/pixmaps/gnome-commander/file-type-icons/file_type_socket.xpm
-share/gnome/pixmaps/gnome-commander/file-type-icons/file_type_symlink.xpm
-share/gnome/pixmaps/gnome-commander/flip-horizontal-16.xpm
-share/gnome/pixmaps/gnome-commander/flip-vertical-16.xpm
-share/gnome/pixmaps/gnome-commander/ftp.xpm
-share/gnome/pixmaps/gnome-commander/ftp_connect.xpm
-share/gnome/pixmaps/gnome-commander/ftp_disconnect.xpm
-share/gnome/pixmaps/gnome-commander/gnome-commander.xpm
-share/gnome/pixmaps/gnome-commander/gnome_cmd_arrow_blank.xpm
-share/gnome/pixmaps/gnome-commander/gnome_cmd_arrow_down.xpm
-share/gnome/pixmaps/gnome-commander/gnome_cmd_arrow_up.xpm
-share/gnome/pixmaps/gnome-commander/home.xpm
-share/gnome/pixmaps/gnome-commander/internal-viewer.xpm
-share/gnome/pixmaps/gnome-commander/python-plugin.svg
-share/gnome/pixmaps/gnome-commander/key.xpm
-share/gnome/pixmaps/gnome-commander/lock.xpm
-share/gnome/pixmaps/gnome-commander/menu_bookmark.xpm
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-msword.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-pdf.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-postscript.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.ms-excel.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.ms-powerpoint.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.calc.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.draw.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.impress.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.writer.math.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.writer.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-anjuta-project.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-arj.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-bzip-compressed-tar.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-bzip.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-compressed-tar.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-compressed.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-dia-diagram.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-executable-binary.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-glade.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-gnumeric.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-gzip.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-mrproject.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-ogg.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-rpm.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-zip.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-audio-plain.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-audio-x-mp3.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-compressed.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-image-plain.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-text-html.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-text-plain.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-text-x-c-header.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-text-x-c.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-text-x-sh.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-video-plain.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-x-directory-smb-server.png
-share/gnome/pixmaps/gnome-commander/mime-icons/gnome-x-directory-smb-workgroup.png
-share/gnome/pixmaps/gnome-commander/mime-icons/i-blockdev.png
-share/gnome/pixmaps/gnome-commander/mime-icons/i-chardev.png
-share/gnome/pixmaps/gnome-commander/mime-icons/i-directory.png
-share/gnome/pixmaps/gnome-commander/mime-icons/i-fifo.png
-share/gnome/pixmaps/gnome-commander/mime-icons/i-music.png
-share/gnome/pixmaps/gnome-commander/mime-icons/i-regular.png
-share/gnome/pixmaps/gnome-commander/mime-icons/i-socket.png
-share/gnome/pixmaps/gnome-commander/mime-icons/i-symlink.png
-share/gnome/pixmaps/gnome-commander/mkdir.xpm
-share/gnome/pixmaps/gnome-commander/overlay_symlink.xpm
-share/gnome/pixmaps/gnome-commander/overlay_umount.xpm
-share/gnome/pixmaps/gnome-commander/parent_dir.xpm
-share/gnome/pixmaps/gnome-commander/root_dir.xpm
-share/gnome/pixmaps/gnome-commander/rotate-180-16.xpm
-share/gnome/pixmaps/gnome-commander/rotate-270-16.xpm
-share/gnome/pixmaps/gnome-commander/rotate-90-16.xpm
-share/gnome/pixmaps/gnome-commander/server.xpm
-share/gnome/pixmaps/gnome-commander/smb-computer.xpm
-share/gnome/pixmaps/gnome-commander/smb-network.xpm
-share/gnome/pixmaps/gnome-commander/toggle_horizontal.xpm
-share/gnome/pixmaps/gnome-commander/toggle_vertical.xpm
-share/gnome/pixmaps/gnome-commander.png
+share/omf/gnome-commander/gnome-commander-C.omf
+share/pixmaps/gnome-commander/copy_file_names.xpm
+share/pixmaps/gnome-commander/desktop.xpm
+share/pixmaps/gnome-commander/device-icons/bluetooth.xpm
+share/pixmaps/gnome-commander/device-icons/burner.xpm
+share/pixmaps/gnome-commander/device-icons/camera.xpm
+share/pixmaps/gnome-commander/device-icons/cdrom.xpm
+share/pixmaps/gnome-commander/device-icons/floppy.xpm
+share/pixmaps/gnome-commander/device-icons/harddisk.xpm
+share/pixmaps/gnome-commander/device-icons/ipod.xpm
+share/pixmaps/gnome-commander/device-icons/pci.xpm
+share/pixmaps/gnome-commander/device-icons/removable-1394.xpm
+share/pixmaps/gnome-commander/device-icons/removable-usb.xpm
+share/pixmaps/gnome-commander/device-icons/removable.xpm
+share/pixmaps/gnome-commander/device-icons/usb.xpm
+share/pixmaps/gnome-commander/device-icons/wavelan-encrypted.xpm
+share/pixmaps/gnome-commander/device-icons/wavelan.xpm
+share/pixmaps/gnome-commander/device-icons/zip.xpm
+share/pixmaps/gnome-commander/exec.xpm
+share/pixmaps/gnome-commander/exec_wheel.xpm
+share/pixmaps/gnome-commander/file-type-icons/file_type_block_device.xpm
+share/pixmaps/gnome-commander/file-type-icons/file_type_char_device.xpm
+share/pixmaps/gnome-commander/file-type-icons/file_type_dir.xpm
+share/pixmaps/gnome-commander/file-type-icons/file_type_fifo.xpm
+share/pixmaps/gnome-commander/file-type-icons/file_type_regular.xpm
+share/pixmaps/gnome-commander/file-type-icons/file_type_socket.xpm
+share/pixmaps/gnome-commander/file-type-icons/file_type_symlink.xpm
+share/pixmaps/gnome-commander/flip-horizontal-16.xpm
+share/pixmaps/gnome-commander/flip-vertical-16.xpm
+share/pixmaps/gnome-commander/ftp.xpm
+share/pixmaps/gnome-commander/ftp_connect.xpm
+share/pixmaps/gnome-commander/ftp_disconnect.xpm
+share/pixmaps/gnome-commander/gnome-commander.xpm
+share/pixmaps/gnome-commander/gnome_cmd_arrow_blank.xpm
+share/pixmaps/gnome-commander/gnome_cmd_arrow_down.xpm
+share/pixmaps/gnome-commander/gnome_cmd_arrow_up.xpm
+share/pixmaps/gnome-commander/home.xpm
+share/pixmaps/gnome-commander/internal-viewer.xpm
+share/pixmaps/gnome-commander/python-plugin.svg
+share/pixmaps/gnome-commander/key.xpm
+share/pixmaps/gnome-commander/lock.xpm
+share/pixmaps/gnome-commander/menu_bookmark.xpm
+share/pixmaps/gnome-commander/mime-icons/gnome-application-msword.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-pdf.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-postscript.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.ms-excel.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.ms-powerpoint.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.calc.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.draw.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.impress.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.writer.math.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.writer.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-anjuta-project.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-arj.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-bzip-compressed-tar.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-bzip.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-compressed-tar.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-compressed.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-dia-diagram.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-executable-binary.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-glade.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-gnumeric.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-gzip.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-mrproject.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-ogg.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-x-rpm.png
+share/pixmaps/gnome-commander/mime-icons/gnome-application-zip.png
+share/pixmaps/gnome-commander/mime-icons/gnome-audio-plain.png
+share/pixmaps/gnome-commander/mime-icons/gnome-audio-x-mp3.png
+share/pixmaps/gnome-commander/mime-icons/gnome-compressed.png
+share/pixmaps/gnome-commander/mime-icons/gnome-image-plain.png
+share/pixmaps/gnome-commander/mime-icons/gnome-text-html.png
+share/pixmaps/gnome-commander/mime-icons/gnome-text-plain.png
+share/pixmaps/gnome-commander/mime-icons/gnome-text-x-c-header.png
+share/pixmaps/gnome-commander/mime-icons/gnome-text-x-c.png
+share/pixmaps/gnome-commander/mime-icons/gnome-text-x-sh.png
+share/pixmaps/gnome-commander/mime-icons/gnome-video-plain.png
+share/pixmaps/gnome-commander/mime-icons/gnome-x-directory-smb-server.png
+share/pixmaps/gnome-commander/mime-icons/gnome-x-directory-smb-workgroup.png
+share/pixmaps/gnome-commander/mime-icons/i-blockdev.png
+share/pixmaps/gnome-commander/mime-icons/i-chardev.png
+share/pixmaps/gnome-commander/mime-icons/i-directory.png
+share/pixmaps/gnome-commander/mime-icons/i-fifo.png
+share/pixmaps/gnome-commander/mime-icons/i-music.png
+share/pixmaps/gnome-commander/mime-icons/i-regular.png
+share/pixmaps/gnome-commander/mime-icons/i-socket.png
+share/pixmaps/gnome-commander/mime-icons/i-symlink.png
+share/pixmaps/gnome-commander/mkdir.xpm
+share/pixmaps/gnome-commander/overlay_symlink.xpm
+share/pixmaps/gnome-commander/overlay_umount.xpm
+share/pixmaps/gnome-commander/parent_dir.xpm
+share/pixmaps/gnome-commander/root_dir.xpm
+share/pixmaps/gnome-commander/rotate-180-16.xpm
+share/pixmaps/gnome-commander/rotate-270-16.xpm
+share/pixmaps/gnome-commander/rotate-90-16.xpm
+share/pixmaps/gnome-commander/server.xpm
+share/pixmaps/gnome-commander/smb-computer.xpm
+share/pixmaps/gnome-commander/smb-network.xpm
+share/pixmaps/gnome-commander/toggle_horizontal.xpm
+share/pixmaps/gnome-commander/toggle_vertical.xpm
+share/pixmaps/gnome-commander.png
 share/locale/ar/LC_MESSAGES/gnome-commander.mo
 share/locale/bg/LC_MESSAGES/gnome-commander.mo
 share/locale/ca/LC_MESSAGES/gnome-commander.mo
@@ -173,17 +173,16 @@ share/locale/vi/LC_MESSAGES/gnome-commander.mo
 share/locale/oc/LC_MESSAGES/gnome-commander.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-commander.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-commander.mo
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
 @dirrmtry share/locale/oc/LC_MESSAGES
 @dirrmtry share/locale/oc
-@dirrm share/gnome/pixmaps/gnome-commander/mime-icons
-@dirrm share/gnome/pixmaps/gnome-commander/file-type-icons
-@dirrm share/gnome/pixmaps/gnome-commander/device-icons
-@dirrm share/gnome/pixmaps/gnome-commander
-@dirrm share/gnome/omf/gnome-commander
+@dirrm share/pixmaps/gnome-commander/mime-icons
+@dirrm share/pixmaps/gnome-commander/file-type-icons
+@dirrm share/pixmaps/gnome-commander/device-icons
+@dirrm share/pixmaps/gnome-commander
+@dirrm share/omf/gnome-commander
 @dirrm share/gnome/help/gnome-commander/C/figures
 @dirrm share/gnome/help/gnome-commander/C
 @dirrm share/gnome/help/gnome-commander
 @dirrm lib/gnome-commander/plugins
 @dirrm lib/gnome-commander
+@dirrmtry share/applications
diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index 89f3216a018e..33dc04835929 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -3,11 +3,11 @@
 # Whom:                 		ade, archie
 #
 # $FreeBSD$
-#   $MCom: ports/x11-fm/nautilus/Makefile,v 1.127 2007/03/16 16:07:42 marcus Exp $
+#   $MCom: ports/x11-fm/nautilus/Makefile,v 1.142 2007/09/18 14:48:10 ahze Exp $
 #
 
 PORTNAME=	nautilus
-PORTVERSION=	2.18.3
+PORTVERSION=	2.20.0
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-fm/nautilus/distinfo b/x11-fm/nautilus/distinfo
index eea3c4ce5b5b..9a778b2a04e2 100644
--- a/x11-fm/nautilus/distinfo
+++ b/x11-fm/nautilus/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/nautilus-2.18.3.tar.bz2) = e027b4e1a925122ef3e7f54323cc3c44
-SHA256 (gnome2/nautilus-2.18.3.tar.bz2) = 8ecc2b27f9e8e7f12ee2a84ae54d71d60c769e559f9952f8d792447e6f657c16
-SIZE (gnome2/nautilus-2.18.3.tar.bz2) = 4331118
+MD5 (gnome2/nautilus-2.20.0.tar.bz2) = 3856ec2ffeba786d12f8f6622e398c33
+SHA256 (gnome2/nautilus-2.20.0.tar.bz2) = 98f9d9f7bc89db67cbcc4c7d08ec72175b8c9b3eb9489f7869c5cec9f16feb08
+SIZE (gnome2/nautilus-2.20.0.tar.bz2) = 4916284
diff --git a/x11-fm/nautilus/files/patch-configure b/x11-fm/nautilus/files/patch-configure
new file mode 100644
index 000000000000..4a9390ced7e9
--- /dev/null
+++ b/x11-fm/nautilus/files/patch-configure
@@ -0,0 +1,22 @@
+--- configure.orig	Mon May 14 20:47:58 2007
++++ configure	Mon May 14 20:52:42 2007
+@@ -23611,9 +23611,7 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #include <unistd.h>
+-  #ifdef HAVE_SYS_PARAM_H
+   #include <sys/param.h>
+-  #endif
+   #ifdef HAVE_SYS_VFS_H
+   #include <sys/vfs.h>
+   #endif
+@@ -23674,9 +23672,7 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #include <unistd.h>
+-  #ifdef HAVE_SYS_PARAM_H
+   #include <sys/param.h>
+-  #endif
+   #ifdef HAVE_SYS_VFS_H
+   #include <sys/vfs.h>
+   #endif
diff --git a/x11-fm/nautilus/files/patch-src_file-manager_fm-properties-window.c b/x11-fm/nautilus/files/patch-src_file-manager_fm-properties-window.c
new file mode 100644
index 000000000000..d709dec1e833
--- /dev/null
+++ b/x11-fm/nautilus/files/patch-src_file-manager_fm-properties-window.c
@@ -0,0 +1,12 @@
+--- src/file-manager/fm-properties-window.c.orig	Mon May 14 20:58:01 2007
++++ src/file-manager/fm-properties-window.c	Mon May 14 20:58:42 2007
+@@ -89,9 +89,7 @@
+ #if HAVE_SYS_VFS_H
+ #include <sys/vfs.h>
+ #elif HAVE_SYS_MOUNT_H
+-#if HAVE_SYS_PARAM_H
+ #include <sys/param.h>
+-#endif
+ #include <sys/mount.h>
+ #endif
+ 
diff --git a/x11-fm/nautilus/pkg-plist b/x11-fm/nautilus/pkg-plist
index 780b573f78db..1e031e1ad977 100644
--- a/x11-fm/nautilus/pkg-plist
+++ b/x11-fm/nautilus/pkg-plist
@@ -18,64 +18,12 @@ lib/libnautilus-extension.so
 lib/libnautilus-extension.so.1
 libdata/bonobo/servers/Nautilus_shell.server
 libdata/pkgconfig/libnautilus-extension.pc
-share/gnome/applications/nautilus-computer.desktop
-share/gnome/applications/nautilus-file-management-properties.desktop
-share/gnome/applications/nautilus-folder-handler.desktop
-share/gnome/applications/nautilus-home.desktop
-share/gnome/applications/nautilus.desktop
-share/gnome/applications/network-scheme.desktop
-share/gnome/nautilus/browser.xml
-share/gnome/nautilus/glade/nautilus-bookmarks-window.glade
-share/gnome/nautilus/glade/nautilus-file-management-properties.glade
-share/gnome/nautilus/nautilus-extras.placeholder
-share/gnome/nautilus/nautilus-suggested.placeholder
-share/gnome/nautilus/patterns/blue_gray_rough.png
-share/gnome/nautilus/patterns/blue_ridge.png
-share/gnome/nautilus/patterns/blue_type.png
-share/gnome/nautilus/patterns/brushed_metal.png
-share/gnome/nautilus/patterns/burlap.jpg
-share/gnome/nautilus/patterns/camouflage.png
-share/gnome/nautilus/patterns/chalk.jpg
-share/gnome/nautilus/patterns/cork.png
-share/gnome/nautilus/patterns/countertop.png
-share/gnome/nautilus/patterns/dark-gnome.jpg
-share/gnome/nautilus/patterns/dots.png
-share/gnome/nautilus/patterns/fibers.png
-share/gnome/nautilus/patterns/fleur_de_lis.png
-share/gnome/nautilus/patterns/floral.png
-share/gnome/nautilus/patterns/fossil.png
-share/gnome/nautilus/patterns/gnome.jpg
-share/gnome/nautilus/patterns/green_weave.png
-share/gnome/nautilus/patterns/ice.png
-share/gnome/nautilus/patterns/manila_paper.png
-share/gnome/nautilus/patterns/moss_ridge.png
-share/gnome/nautilus/patterns/numbers.png
-share/gnome/nautilus/patterns/ocean_stripes.png
-share/gnome/nautilus/patterns/purple_marble.png
-share/gnome/nautilus/patterns/reset.png
-share/gnome/nautilus/patterns/ridged_paper.png
-share/gnome/nautilus/patterns/rough_paper.png
-share/gnome/nautilus/patterns/sky_ridge.png
-share/gnome/nautilus/patterns/snow_ridge.png
-share/gnome/nautilus/patterns/stucco.jpg
-share/gnome/nautilus/patterns/terracotta.png
-share/gnome/nautilus/patterns/wavy_white.png
-share/gnome/nautilus/ui/nautilus-desktop-icon-view-ui.xml
-share/gnome/nautilus/ui/nautilus-directory-view-ui.xml
-share/gnome/nautilus/ui/nautilus-icon-view-ui.xml
-share/gnome/nautilus/ui/nautilus-list-view-ui.xml
-share/gnome/nautilus/ui/nautilus-navigation-window-ui.xml
-share/gnome/nautilus/ui/nautilus-shell-ui.xml
-share/gnome/nautilus/ui/nautilus-spatial-window-ui.xml
-share/gnome/pixmaps/nautilus/audio.svg
-share/gnome/pixmaps/nautilus/backgrounds.png
-share/gnome/pixmaps/nautilus/chit_frame.png
-share/gnome/pixmaps/nautilus/colors.png
-share/gnome/pixmaps/nautilus/emblems.png
-share/gnome/pixmaps/nautilus/erase.png
-share/gnome/pixmaps/nautilus/knob.png
-share/gnome/pixmaps/nautilus/note-indicator.png
-share/gnome/pixmaps/nautilus/thumbnail_frame.png
+share/applications/nautilus-computer.desktop
+share/applications/nautilus-file-management-properties.desktop
+share/applications/nautilus-folder-handler.desktop
+share/applications/nautilus-home.desktop
+share/applications/nautilus.desktop
+share/applications/network-scheme.desktop
 share/icons/hicolor/16x16/apps/nautilus.png
 share/icons/hicolor/22x22/apps/nautilus.png
 share/icons/hicolor/24x24/apps/nautilus.png
@@ -84,6 +32,7 @@ share/icons/hicolor/scalable/apps/nautilus.svg
 share/locale/af/LC_MESSAGES/nautilus.mo
 share/locale/am/LC_MESSAGES/nautilus.mo
 share/locale/ar/LC_MESSAGES/nautilus.mo
+share/locale/as/LC_MESSAGES/nautilus.mo
 share/locale/az/LC_MESSAGES/nautilus.mo
 share/locale/be/LC_MESSAGES/nautilus.mo
 share/locale/be@latin/LC_MESSAGES/nautilus.mo
@@ -122,6 +71,7 @@ share/locale/it/LC_MESSAGES/nautilus.mo
 share/locale/ja/LC_MESSAGES/nautilus.mo
 share/locale/ka/LC_MESSAGES/nautilus.mo
 share/locale/km/LC_MESSAGES/nautilus.mo
+share/locale/kn/LC_MESSAGES/nautilus.mo
 share/locale/ko/LC_MESSAGES/nautilus.mo
 share/locale/ku/LC_MESSAGES/nautilus.mo
 share/locale/li/LC_MESSAGES/nautilus.mo
@@ -147,6 +97,7 @@ share/locale/pt_BR/LC_MESSAGES/nautilus.mo
 share/locale/ro/LC_MESSAGES/nautilus.mo
 share/locale/ru/LC_MESSAGES/nautilus.mo
 share/locale/rw/LC_MESSAGES/nautilus.mo
+share/locale/si/LC_MESSAGES/nautilus.mo
 share/locale/sk/LC_MESSAGES/nautilus.mo
 share/locale/sl/LC_MESSAGES/nautilus.mo
 share/locale/sq/LC_MESSAGES/nautilus.mo
@@ -170,16 +121,68 @@ share/locale/zh_TW/LC_MESSAGES/nautilus.mo
 share/locale/zu/LC_MESSAGES/nautilus.mo
 share/mime/application/x-gnome-saved-search.xml
 share/mime/packages/nautilus.xml
-@dirrm share/gnome/pixmaps/nautilus
-@dirrm share/gnome/nautilus/ui
-@dirrm share/gnome/nautilus/patterns
-@dirrm share/gnome/nautilus/glade
-@dirrm share/gnome/nautilus
-@dirrm include/nautilus/libnautilus-extension
-@dirrm include/nautilus
+%%DATADIR%%/browser.xml
+%%DATADIR%%/glade/nautilus-bookmarks-window.glade
+%%DATADIR%%/glade/nautilus-file-management-properties.glade
+%%DATADIR%%/nautilus-extras.placeholder
+%%DATADIR%%/nautilus-suggested.placeholder
+%%DATADIR%%/patterns/blue_gray_rough.png
+%%DATADIR%%/patterns/blue_ridge.png
+%%DATADIR%%/patterns/blue_type.png
+%%DATADIR%%/patterns/brushed_metal.png
+%%DATADIR%%/patterns/burlap.jpg
+%%DATADIR%%/patterns/camouflage.png
+%%DATADIR%%/patterns/chalk.jpg
+%%DATADIR%%/patterns/cork.png
+%%DATADIR%%/patterns/countertop.png
+%%DATADIR%%/patterns/dark-gnome.jpg
+%%DATADIR%%/patterns/dots.png
+%%DATADIR%%/patterns/fibers.png
+%%DATADIR%%/patterns/fleur_de_lis.png
+%%DATADIR%%/patterns/floral.png
+%%DATADIR%%/patterns/fossil.png
+%%DATADIR%%/patterns/gnome.jpg
+%%DATADIR%%/patterns/green_weave.png
+%%DATADIR%%/patterns/ice.png
+%%DATADIR%%/patterns/manila_paper.png
+%%DATADIR%%/patterns/moss_ridge.png
+%%DATADIR%%/patterns/numbers.png
+%%DATADIR%%/patterns/ocean_stripes.png
+%%DATADIR%%/patterns/purple_marble.png
+%%DATADIR%%/patterns/reset.png
+%%DATADIR%%/patterns/ridged_paper.png
+%%DATADIR%%/patterns/rough_paper.png
+%%DATADIR%%/patterns/sky_ridge.png
+%%DATADIR%%/patterns/snow_ridge.png
+%%DATADIR%%/patterns/stucco.jpg
+%%DATADIR%%/patterns/terracotta.png
+%%DATADIR%%/patterns/wavy_white.png
+%%DATADIR%%/ui/nautilus-desktop-icon-view-ui.xml
+%%DATADIR%%/ui/nautilus-directory-view-ui.xml
+%%DATADIR%%/ui/nautilus-icon-view-ui.xml
+%%DATADIR%%/ui/nautilus-list-view-ui.xml
+%%DATADIR%%/ui/nautilus-navigation-window-ui.xml
+%%DATADIR%%/ui/nautilus-shell-ui.xml
+%%DATADIR%%/ui/nautilus-spatial-window-ui.xml
+share/pixmaps/nautilus/audio.svg
+share/pixmaps/nautilus/backgrounds.png
+share/pixmaps/nautilus/chit_frame.png
+share/pixmaps/nautilus/colors.png
+share/pixmaps/nautilus/emblems.png
+share/pixmaps/nautilus/erase.png
+share/pixmaps/nautilus/knob.png
+share/pixmaps/nautilus/note-indicator.png
+share/pixmaps/nautilus/thumbnail_frame.png
+@dirrm share/pixmaps/nautilus
+@dirrm %%DATADIR%%/ui
+@dirrm %%DATADIR%%/patterns
+@dirrm %%DATADIR%%/glade
+@dirrm %%DATADIR%%
 @exec /bin/mkdir -p %D/lib/nautilus/extensions-1.0
 @dirrmtry lib/nautilus/extensions-1.0
 @dirrmtry lib/nautilus
+@dirrm include/nautilus/libnautilus-extension
+@dirrm include/nautilus
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@@ -196,6 +199,8 @@ share/mime/packages/nautilus.xml
 @dirrmtry share/locale/te
 @dirrmtry share/locale/sr@ije/LC_MESSAGES
 @dirrmtry share/locale/sr@ije
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/oc/LC_MESSAGES
@@ -218,3 +223,6 @@ share/mime/packages/nautilus.xml
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
+@dirrmtry share/applications
diff --git a/x11-fm/velocity/Makefile b/x11-fm/velocity/Makefile
index 46ff339a8bd0..bab45304a560 100644
--- a/x11-fm/velocity/Makefile
+++ b/x11-fm/velocity/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	velocity
 PORTVERSION=	0.1.0b
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	x11-fm
 MASTER_SITES=	http://www.jarrodkoehler.com/velocity/
 DISTNAME=	velocity-0.1.0beta
diff --git a/x11-fm/velocity/files/patch-configure b/x11-fm/velocity/files/patch-configure
deleted file mode 100644
index b90722cd34ba..000000000000
--- a/x11-fm/velocity/files/patch-configure
+++ /dev/null
@@ -1,27 +0,0 @@
---- configure.orig	Tue Aug 26 03:15:17 2003
-+++ configure	Wed Dec 10 20:50:34 2003
-@@ -7156,16 +7156,16 @@
-   packageprefix=${prefix}
- fi
- 
--packagedatadir=share/${PACKAGE}
--packagedocdir=doc/${PACKAGE}
-+packagedatadir=share/gnome/${PACKAGE}
-+packagedocdir=share/doc/${PACKAGE}
- 
--packagepixmapsdir=share/pixmaps/${PACKAGE}
-+packagepixmapsdir=share/gnome/pixmaps/${PACKAGE}
- packagehelpdir=share/gnome/help/${PACKAGE}
--packagemenudir=share/applications
--packagescriptsdir=share/${PACKAGE}/scripts
--packagetemplatesdir=share/${PACKAGE}/templates
--packagepluginsdir=share/${PACKAGE}/plugins
--packagesendtodir=share/${PACKAGE}/sendto
-+packagemenudir=share/gnome/applications
-+packagescriptsdir=share/gnome/${PACKAGE}/scripts
-+packagetemplatesdir=share/gnome/${PACKAGE}/templates
-+packagepluginsdir=share/gnome/${PACKAGE}/plugins
-+packagesendtodir=share/gnome/${PACKAGE}/sendto
- 
- NO_PREFIX_PACKAGE_DATA_DIR="${packagedatadir}"
- 
diff --git a/x11-fm/velocity/pkg-plist b/x11-fm/velocity/pkg-plist
index 1b5e70d0d9c5..39b9e8b8fdfd 100644
--- a/x11-fm/velocity/pkg-plist
+++ b/x11-fm/velocity/pkg-plist
@@ -1,45 +1,46 @@
 bin/velocity
-share/gnome/applications/velocity.desktop
-share/gnome/pixmaps/velocity/advanced.png
-share/gnome/pixmaps/velocity/behavior.png
-share/gnome/pixmaps/velocity/bin.png
-share/gnome/pixmaps/velocity/desktop.png
-share/gnome/pixmaps/velocity/druid-left.png
-share/gnome/pixmaps/velocity/druid-top.png
-share/gnome/pixmaps/velocity/puzzle-piece.png
-share/gnome/pixmaps/velocity/puzzle.png
-share/gnome/pixmaps/velocity/themes.png
-share/gnome/pixmaps/velocity/velocity.png
-share/gnome/velocity/plugins/audio.so
-share/gnome/velocity/plugins/burn.so
-share/gnome/velocity/scripts/audio-to-mp3
-share/gnome/velocity/scripts/audio-to-ogg
-share/gnome/velocity/scripts/create-tarball
-share/gnome/velocity/scripts/line-word-count
-share/gnome/velocity/scripts/pdf-to-postscript
-share/gnome/velocity/scripts/postscript-to-pdf
-share/gnome/velocity/scripts/terminal-here
-share/gnome/velocity/scripts/uncompress
-share/gnome/velocity/templates/abiword-document
-share/gnome/velocity/templates/data/abiword-document
-share/gnome/velocity/templates/data/dia-document
-share/gnome/velocity/templates/data/gimp-image
-share/gnome/velocity/templates/data/gnumeric-document
-share/gnome/velocity/templates/data/html-document
-share/gnome/velocity/templates/data/shell-script
-share/gnome/velocity/templates/data/velocity-script
-share/gnome/velocity/templates/data/word-document
-share/gnome/velocity/templates/dia-document
-share/gnome/velocity/templates/gimp-image
-share/gnome/velocity/templates/gnumeric-document
-share/gnome/velocity/templates/html-document
-share/gnome/velocity/templates/plain-text
-share/gnome/velocity/templates/shell-script
-share/gnome/velocity/templates/velocity-script
-share/gnome/velocity/templates/word-document
-@dirrm share/gnome/velocity/templates/data
-@dirrm share/gnome/velocity/templates
-@dirrm share/gnome/velocity/scripts
-@dirrm share/gnome/velocity/plugins
-@dirrm share/gnome/velocity
-@dirrm share/gnome/pixmaps/velocity
+share/applications/velocity.desktop
+share/pixmaps/velocity/advanced.png
+share/pixmaps/velocity/behavior.png
+share/pixmaps/velocity/bin.png
+share/pixmaps/velocity/desktop.png
+share/pixmaps/velocity/druid-left.png
+share/pixmaps/velocity/druid-top.png
+share/pixmaps/velocity/puzzle-piece.png
+share/pixmaps/velocity/puzzle.png
+share/pixmaps/velocity/themes.png
+share/pixmaps/velocity/velocity.png
+share/velocity/plugins/audio.so
+share/velocity/plugins/burn.so
+share/velocity/scripts/audio-to-mp3
+share/velocity/scripts/audio-to-ogg
+share/velocity/scripts/create-tarball
+share/velocity/scripts/line-word-count
+share/velocity/scripts/pdf-to-postscript
+share/velocity/scripts/postscript-to-pdf
+share/velocity/scripts/terminal-here
+share/velocity/scripts/uncompress
+share/velocity/templates/abiword-document
+share/velocity/templates/data/abiword-document
+share/velocity/templates/data/dia-document
+share/velocity/templates/data/gimp-image
+share/velocity/templates/data/gnumeric-document
+share/velocity/templates/data/html-document
+share/velocity/templates/data/shell-script
+share/velocity/templates/data/velocity-script
+share/velocity/templates/data/word-document
+share/velocity/templates/dia-document
+share/velocity/templates/gimp-image
+share/velocity/templates/gnumeric-document
+share/velocity/templates/html-document
+share/velocity/templates/plain-text
+share/velocity/templates/shell-script
+share/velocity/templates/velocity-script
+share/velocity/templates/word-document
+@dirrm share/velocity/templates/data
+@dirrm share/velocity/templates
+@dirrm share/velocity/scripts
+@dirrm share/velocity/plugins
+@dirrm share/velocity
+@dirrm share/pixmaps/velocity
+@dirrmtry share/applications