4 files changed, 47 insertions, 65 deletions

diff --git a/x11-fm/gnome-commander2/Makefile b/x11-fm/gnome-commander2/Makefile
index ba4d58e159f8..37ad57f7473b 100644
--- a/x11-fm/gnome-commander2/Makefile
+++ b/x11-fm/gnome-commander2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnome-commander
-PORTVERSION=	1.2.4
-PORTREVISION=	4
+PORTVERSION=	1.2.7
 PORTEPOCH=	1
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -27,17 +26,15 @@ CONFLICTS=	gnome-commander-*
 USE_BZIP2=	yes
 USE_GNOME=	gnomedocutils gnomehack gnomeprefix gnometarget intlhack libgnomeui
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:15 autoconf:262:env
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 INSTALLS_OMF=	yes
 
 MAN1=		gnome-commander.1
 
-.include <bsd.port.pre.mk>
+pre-configure:
+	cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTORECONF} -W none
 
-.if ${OSVERSION} >= 700000 && ${ARCH} == "amd64"
-IGNORE=		Does not run on amd64 and 7.X or greater
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-fm/gnome-commander2/distinfo b/x11-fm/gnome-commander2/distinfo
index cef5cfc3f195..0b5d94b000e1 100644
--- a/x11-fm/gnome-commander2/distinfo
+++ b/x11-fm/gnome-commander2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-commander-1.2.4.tar.bz2) = 9897237e3d297086d88ddf3c7d0dc560
-SHA256 (gnome2/gnome-commander-1.2.4.tar.bz2) = a99cd22fc528e70e2a54aa3d1f0cefa04b416eee28a9b2c27bb973509c0459bf
-SIZE (gnome2/gnome-commander-1.2.4.tar.bz2) = 1738704
+MD5 (gnome2/gnome-commander-1.2.7.tar.bz2) = 7b0d1d50fda548be6600696bc752b6de
+SHA256 (gnome2/gnome-commander-1.2.7.tar.bz2) = c7e42cc52d3ccb3f3b84b33d837ea6af98801742b7b5bfbaab97a083c7d27ea9
+SIZE (gnome2/gnome-commander-1.2.7.tar.bz2) = 2306018
diff --git a/x11-fm/gnome-commander2/files/patch-gnome-cmd-python-plugin.cc b/x11-fm/gnome-commander2/files/patch-gnome-cmd-python-plugin.cc
deleted file mode 100644
index 53489317e203..000000000000
--- a/x11-fm/gnome-commander2/files/patch-gnome-cmd-python-plugin.cc
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./src/gnome-cmd-python-plugin.cc.orig       2007-09-10 07:38:08.000000000
-+0000
-+++ ./src/gnome-cmd-python-plugin.cc    2007-09-11 00:29:03.000000000 +0000
-@@ -54,6 +54,11 @@
-     }
-
-     long dir_size = pathconf(".", _PC_PATH_MAX);
-+    if( -1 == dir_size )
-+    {
-+        g_warning ( "pathconf(.): %s", strerror(errno) );
-+       return;
-+    }
-     gchar *prev_dir = (gchar *) g_malloc (dir_size);
-
-     if (!prev_dir)
diff --git a/x11-fm/gnome-commander2/pkg-plist b/x11-fm/gnome-commander2/pkg-plist
index fd8a6acaa1d7..6f028c21a636 100644
--- a/x11-fm/gnome-commander2/pkg-plist
+++ b/x11-fm/gnome-commander2/pkg-plist
@@ -24,19 +24,26 @@ share/gnome/help/gnome-commander/C/figures/dev_cd.png
 share/gnome/help/gnome-commander/C/figures/extract_archive.png
 share/gnome/help/gnome-commander/C/figures/gnome-commander_dialog_adv_rename.png
 share/gnome/help/gnome-commander/C/figures/gnome-commander_dialog_bookmark.png
+share/gnome/help/gnome-commander/C/figures/gnome-commander_dialog_file_metadata.png
 share/gnome/help/gnome-commander/C/figures/gnome-commander_dialog_file_permissions.png
 share/gnome/help/gnome-commander/C/figures/gnome-commander_dialog_file_properties.png
-share/gnome/help/gnome-commander/C/figures/gnome-commander_dialog_ftp.png
+share/gnome/help/gnome-commander/C/figures/gnome-commander_dialog_keyboard_shortcuts.png
+share/gnome/help/gnome-commander/C/figures/gnome-commander_dialog_remote_connections.png
+share/gnome/help/gnome-commander/C/figures/gnome-commander_dialog_remote_server.png
 share/gnome/help/gnome-commander/C/figures/gnome-commander_dialog_search.png
+share/gnome/help/gnome-commander/C/figures/gnome-commander_options_confirmation.png
+share/gnome/help/gnome-commander/C/figures/gnome-commander_options_devices.png
+share/gnome/help/gnome-commander/C/figures/gnome-commander_options_filters.png
+share/gnome/help/gnome-commander/C/figures/gnome-commander_options_format.png
 share/gnome/help/gnome-commander/C/figures/gnome-commander_options_general.png
 share/gnome/help/gnome-commander/C/figures/gnome-commander_options_layout.png
+share/gnome/help/gnome-commander/C/figures/gnome-commander_options_network.png
+share/gnome/help/gnome-commander/C/figures/gnome-commander_options_programs.png
 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/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
@@ -52,30 +59,13 @@ 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_block_device.xpm
+share/pixmaps/gnome-commander/file-type-icons/file_type_fifo.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/file-type-icons/file_type_char_device.xpm
+share/pixmaps/gnome-commander/file-type-icons/file_type_regular.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
@@ -86,6 +76,7 @@ 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/i-fifo.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
@@ -97,6 +88,7 @@ share/pixmaps/gnome-commander/mime-icons/gnome-application-x-executable-binary.p
 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/i-blockdev.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
@@ -113,37 +105,44 @@ 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/copy_file_names.xpm
+share/pixmaps/gnome-commander/exec_wheel.xpm
+share/pixmaps/gnome-commander/flip-horizontal-16.xpm
+share/pixmaps/gnome-commander/flip-vertical-16.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/gnome-commander.xpm
+share/pixmaps/gnome-commander/internal-viewer.xpm
+share/pixmaps/gnome-commander/menu_bookmark.xpm
+share/pixmaps/gnome-commander/nautilus.svg
 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/python.svg
 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/terminal.svg
 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
 share/locale/cs/LC_MESSAGES/gnome-commander.mo
 share/locale/de/LC_MESSAGES/gnome-commander.mo
-share/locale/dz/LC_MESSAGES/gnome-commander.mo
 share/locale/el/LC_MESSAGES/gnome-commander.mo
 share/locale/en_CA/LC_MESSAGES/gnome-commander.mo
 share/locale/en_GB/LC_MESSAGES/gnome-commander.mo
+share/locale/eo/LC_MESSAGES/gnome-commander.mo
 share/locale/es/LC_MESSAGES/gnome-commander.mo
 share/locale/eu/LC_MESSAGES/gnome-commander.mo
 share/locale/fi/LC_MESSAGES/gnome-commander.mo
@@ -161,7 +160,6 @@ share/locale/pt/LC_MESSAGES/gnome-commander.mo
 share/locale/pt_BR/LC_MESSAGES/gnome-commander.mo
 share/locale/ro/LC_MESSAGES/gnome-commander.mo
 share/locale/ru/LC_MESSAGES/gnome-commander.mo
-share/locale/rw/LC_MESSAGES/gnome-commander.mo
 share/locale/sk/LC_MESSAGES/gnome-commander.mo
 share/locale/sl/LC_MESSAGES/gnome-commander.mo
 share/locale/sq/LC_MESSAGES/gnome-commander.mo
@@ -170,19 +168,21 @@ share/locale/sr@Latn/LC_MESSAGES/gnome-commander.mo
 share/locale/sv/LC_MESSAGES/gnome-commander.mo
 share/locale/uk/LC_MESSAGES/gnome-commander.mo
 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
+share/locale/rw/LC_MESSAGES/gnome-commander.mo
+share/locale/dz/LC_MESSAGES/gnome-commander.mo
+share/locale/oc/LC_MESSAGES/gnome-commander.mo
 @dirrmtry share/locale/oc/LC_MESSAGES
 @dirrmtry share/locale/oc
-@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 share/omf/gnome-commander
+@dirrm share/pixmaps/gnome-commander/device-icons
+@dirrm share/pixmaps/gnome-commander/file-type-icons
+@dirrm share/pixmaps/gnome-commander/mime-icons
+@dirrm share/pixmaps/gnome-commander
 @dirrm lib/gnome-commander/plugins
 @dirrm lib/gnome-commander
 @dirrmtry share/applications