3 files changed, 133 insertions, 78 deletions

diff --git a/x11-fm/gnome-commander2/Makefile b/x11-fm/gnome-commander2/Makefile
index f7abac5ce83f..c17ff9129cde 100644
--- a/x11-fm/gnome-commander2/Makefile
+++ b/x11-fm/gnome-commander2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnome-commander
-PORTVERSION=	1.2.7
-PORTREVISION=	2
+PORTVERSION=	1.2.8
 PORTEPOCH=	1
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	GNOME
@@ -22,11 +21,12 @@ LIB_DEPENDS=	id3-3.8.3:${PORTSDIR}/audio/id3lib \
 		exif.12:${PORTSDIR}/graphics/libexif \
 		iptcdata.3:${PORTSDIR}/graphics/libiptcdata
 
-CONFLICTS=	gnome-commander-*
+CONFLICTS=	gnome-commander-[0-9]*
 
 USE_BZIP2=	yes
 USE_GNOME=	gnomedocutils gnomehack gnomeprefix gnometarget intlhack libgnomeui
 USE_GMAKE=	yes
+USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:15 autoconf:262:env aclocal:19:env automake:19:env
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -38,4 +38,12 @@ MAN1=		gnome-commander.1
 pre-configure:
 	cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTORECONF} -W none
 
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.else
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.endif
+
 .include <bsd.port.mk>
diff --git a/x11-fm/gnome-commander2/distinfo b/x11-fm/gnome-commander2/distinfo
index 0b5d94b000e1..dcde0bc00151 100644
--- a/x11-fm/gnome-commander2/distinfo
+++ b/x11-fm/gnome-commander2/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (gnome2/gnome-commander-1.2.8.tar.bz2) = 5279bb3825efec3789932663e92fc8d2
+SHA256 (gnome2/gnome-commander-1.2.8.tar.bz2) = 5f7212ad315f46f3887af8bb624a777de7cc58105a01c23790d014f780934a01
+SIZE (gnome2/gnome-commander-1.2.8.tar.bz2) = 3447639
diff --git a/x11-fm/gnome-commander2/pkg-plist b/x11-fm/gnome-commander2/pkg-plist
index cdcd2db4deae..623b97a1f407 100644
--- a/x11-fm/gnome-commander2/pkg-plist
+++ b/x11-fm/gnome-commander2/pkg-plist
@@ -12,12 +12,6 @@ lib/gnome-commander/plugins/libfileroller.a
 lib/gnome-commander/plugins/libfileroller.la
 lib/gnome-commander/plugins/libfileroller.so
 lib/gnome-commander/plugins/libfileroller.so.0
-lib/gnome-commander/plugins/md5sum.py
-lib/gnome-commander/plugins/md5sum.pyc
-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/applications/gnome-commander.desktop
 share/gnome/help/gnome-commander/C/figures/create_archive.png
 share/gnome/help/gnome-commander/C/figures/dev_cd.png
@@ -43,7 +37,99 @@ 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/help/gnome-commander/de/figures/create_archive.png
+share/gnome/help/gnome-commander/de/figures/dev_cd.png
+share/gnome/help/gnome-commander/de/figures/extract_archive.png
+share/gnome/help/gnome-commander/de/figures/gnome-commander_dialog_adv_rename.png
+share/gnome/help/gnome-commander/de/figures/gnome-commander_dialog_bookmark.png
+share/gnome/help/gnome-commander/de/figures/gnome-commander_dialog_file_metadata.png
+share/gnome/help/gnome-commander/de/figures/gnome-commander_dialog_file_permissions.png
+share/gnome/help/gnome-commander/de/figures/gnome-commander_dialog_file_properties.png
+share/gnome/help/gnome-commander/de/figures/gnome-commander_dialog_keyboard_shortcuts.png
+share/gnome/help/gnome-commander/de/figures/gnome-commander_dialog_remote_connections.png
+share/gnome/help/gnome-commander/de/figures/gnome-commander_dialog_remote_server.png
+share/gnome/help/gnome-commander/de/figures/gnome-commander_dialog_search.png
+share/gnome/help/gnome-commander/de/figures/gnome-commander_options_confirmation.png
+share/gnome/help/gnome-commander/de/figures/gnome-commander_options_devices.png
+share/gnome/help/gnome-commander/de/figures/gnome-commander_options_filters.png
+share/gnome/help/gnome-commander/de/figures/gnome-commander_options_format.png
+share/gnome/help/gnome-commander/de/figures/gnome-commander_options_general.png
+share/gnome/help/gnome-commander/de/figures/gnome-commander_options_layout.png
+share/gnome/help/gnome-commander/de/figures/gnome-commander_options_network.png
+share/gnome/help/gnome-commander/de/figures/gnome-commander_options_programs.png
+share/gnome/help/gnome-commander/de/figures/gnome-commander_window.png
+share/gnome/help/gnome-commander/de/figures/mounting.png
+share/gnome/help/gnome-commander/de/gnome-commander.xml
+share/gnome/help/gnome-commander/de/legal.xml
+share/gnome/help/gnome-commander/es/figures/create_archive.png
+share/gnome/help/gnome-commander/es/figures/dev_cd.png
+share/gnome/help/gnome-commander/es/figures/extract_archive.png
+share/gnome/help/gnome-commander/es/figures/gnome-commander_dialog_adv_rename.png
+share/gnome/help/gnome-commander/es/figures/gnome-commander_dialog_bookmark.png
+share/gnome/help/gnome-commander/es/figures/gnome-commander_dialog_file_metadata.png
+share/gnome/help/gnome-commander/es/figures/gnome-commander_dialog_file_permissions.png
+share/gnome/help/gnome-commander/es/figures/gnome-commander_dialog_file_properties.png
+share/gnome/help/gnome-commander/es/figures/gnome-commander_dialog_keyboard_shortcuts.png
+share/gnome/help/gnome-commander/es/figures/gnome-commander_dialog_remote_connections.png
+share/gnome/help/gnome-commander/es/figures/gnome-commander_dialog_remote_server.png
+share/gnome/help/gnome-commander/es/figures/gnome-commander_dialog_search.png
+share/gnome/help/gnome-commander/es/figures/gnome-commander_options_confirmation.png
+share/gnome/help/gnome-commander/es/figures/gnome-commander_options_devices.png
+share/gnome/help/gnome-commander/es/figures/gnome-commander_options_filters.png
+share/gnome/help/gnome-commander/es/figures/gnome-commander_options_format.png
+share/gnome/help/gnome-commander/es/figures/gnome-commander_options_general.png
+share/gnome/help/gnome-commander/es/figures/gnome-commander_options_layout.png
+share/gnome/help/gnome-commander/es/figures/gnome-commander_options_network.png
+share/gnome/help/gnome-commander/es/figures/gnome-commander_options_programs.png
+share/gnome/help/gnome-commander/es/figures/gnome-commander_window.png
+share/gnome/help/gnome-commander/es/figures/mounting.png
+share/gnome/help/gnome-commander/es/gnome-commander.xml
+share/gnome/help/gnome-commander/es/legal.xml
+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
+share/locale/fr/LC_MESSAGES/gnome-commander.mo
+share/locale/ga/LC_MESSAGES/gnome-commander.mo
+share/locale/hr/LC_MESSAGES/gnome-commander.mo
+share/locale/hu/LC_MESSAGES/gnome-commander.mo
+share/locale/it/LC_MESSAGES/gnome-commander.mo
+share/locale/ja/LC_MESSAGES/gnome-commander.mo
+share/locale/nb/LC_MESSAGES/gnome-commander.mo
+share/locale/ne/LC_MESSAGES/gnome-commander.mo
+share/locale/nl/LC_MESSAGES/gnome-commander.mo
+share/locale/oc/LC_MESSAGES/gnome-commander.mo
+share/locale/pa/LC_MESSAGES/gnome-commander.mo
+share/locale/pl/LC_MESSAGES/gnome-commander.mo
+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
+share/locale/sr/LC_MESSAGES/gnome-commander.mo
+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/zh_CN/LC_MESSAGES/gnome-commander.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-commander.mo
 share/omf/gnome-commander/gnome-commander-C.omf
+share/omf/gnome-commander/gnome-commander-de.omf
+share/omf/gnome-commander/gnome-commander-es.omf
+share/pixmaps/gnome-commander.png
+share/pixmaps/gnome-commander/copy_file_names.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
@@ -59,13 +145,22 @@ 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/file-type-icons/file_type_dir.xpm
-share/pixmaps/gnome-commander/file-type-icons/file_type_socket.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_fifo.xpm
-share/pixmaps/gnome-commander/file-type-icons/file_type_symlink.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/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/internal-viewer.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
@@ -76,7 +171,6 @@ 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
@@ -88,7 +182,6 @@ 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
@@ -105,85 +198,39 @@ 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/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/terminal.svg
 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/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
-share/locale/fr/LC_MESSAGES/gnome-commander.mo
-share/locale/ga/LC_MESSAGES/gnome-commander.mo
-share/locale/hr/LC_MESSAGES/gnome-commander.mo
-share/locale/hu/LC_MESSAGES/gnome-commander.mo
-share/locale/it/LC_MESSAGES/gnome-commander.mo
-share/locale/ja/LC_MESSAGES/gnome-commander.mo
-share/locale/nb/LC_MESSAGES/gnome-commander.mo
-share/locale/ne/LC_MESSAGES/gnome-commander.mo
-share/locale/nl/LC_MESSAGES/gnome-commander.mo
-share/locale/pa/LC_MESSAGES/gnome-commander.mo
-share/locale/pl/LC_MESSAGES/gnome-commander.mo
-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/sk/LC_MESSAGES/gnome-commander.mo
-share/locale/sl/LC_MESSAGES/gnome-commander.mo
-share/locale/sq/LC_MESSAGES/gnome-commander.mo
-share/locale/sr/LC_MESSAGES/gnome-commander.mo
-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/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
+@dirrmtry share/applications
+@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
+@dirrmtry share/omf
+@dirrm share/gnome/help/gnome-commander/es/figures
+@dirrm share/gnome/help/gnome-commander/es
+@dirrm share/gnome/help/gnome-commander/de/figures
+@dirrm share/gnome/help/gnome-commander/de
 @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