2 files changed, 109 insertions, 113 deletions

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