UPdate mate and mate-base ports to 1.20.0

15 files changed, 295 insertions, 276 deletions

diff --git a/x11-fm/doublecmd/Makefile b/x11-fm/doublecmd/Makefile
index 751a928417c3..51ed3dd18287 100644
--- a/x11-fm/doublecmd/Makefile
+++ b/x11-fm/doublecmd/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	doublecmd
 PORTVERSION=	0.8.1
+PORTREVISION=	1
 CATEGORIES=	x11-fm
 MASTER_SITES=	SF/${PORTNAME}/Double%20Commander%20Source
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
@@ -21,7 +22,7 @@ BUILD_DEPENDS=	lazbuild:editors/lazarus \
 PORTDOCS=	*
 
 USES=		dos2unix desktop-file-utils
-USE_FPC=	cairo fcl-base fcl-db fcl-image fcl-json fcl-registry \
+USE_FPC=	cairo chm fcl-base fcl-db fcl-image fcl-json fcl-registry \
 		fcl-xml iconvenc pasjpeg rtl-extra x11 regexpr
 USE_XORG=	x11
 DOS2UNIX_FILES=	src/dmhelpmanager.pas
@@ -29,7 +30,7 @@ DOS2UNIX_FILES=	src/dmhelpmanager.pas
 PLIST=		${WRKDIR}/pkg-plist
 
 PROJECT_FILE=	src/doublecmd.lpi
-LAZARUS_VER=	1.6.4
+LAZARUS_VER=	1.8.0
 LAZBUILD_CMD=	${LOCALBASE}/bin/lazbuild -d --pcp=${WRKSRC}/tmppcp
 LAZARUS_DIR=	${LOCALBASE}/share/lazarus-${LAZARUS_VER}
 MAKE_ENV+=	LDVER=ld.bfd # for DragonFly
diff --git a/x11-fm/gnome-commander2/Makefile b/x11-fm/gnome-commander2/Makefile
index d673fcc845e6..eb5dd18d73cb 100644
--- a/x11-fm/gnome-commander2/Makefile
+++ b/x11-fm/gnome-commander2/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	gnome-commander
-PORTVERSION=	1.6.3
-PORTREVISION=	3
+PORTVERSION=	1.8.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	GNOME/sources/gnome-commander/${PORTVERSION:R}
@@ -21,17 +21,21 @@ LIB_DEPENDS=	libunique-1.0.so:x11-toolkits/unique \
 		libpopt.so:devel/popt \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
+BUILD_DEPENDS=	itstool:textproc/itstool
 RUN_DEPENDS=	meld:textproc/meld \
 		yelp:x11/yelp
 
 USES=		compiler:c++11-lang gettext gmake libtool localbase:ldflags pathfix \
 		pkgconfig python:2.7 tar:xz
 USE_GNOME=	cairo gdkpixbuf2 gnomedocutils gnomeprefix gnomevfs2 intltool libgnomeui
+GLIB_SCHEMAS=	org.gnome.gnome-commander.enums.xml \
+		org.gnome.gnome-commander.gschema.xml
 USE_XORG=	ice sm
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
+LDFLAGS+=	-lintl
 
 CONFLICTS=	gnome-commander-[0-9]*
 
diff --git a/x11-fm/gnome-commander2/distinfo b/x11-fm/gnome-commander2/distinfo
index 76c21e62e002..d184ab5f78d5 100644
--- a/x11-fm/gnome-commander2/distinfo
+++ b/x11-fm/gnome-commander2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1488379500
-SHA256 (gnome2/gnome-commander-1.6.3.tar.xz) = 9ac8b0041b0b2648252d461776e2be65e87f2fc52b027815c8c93c9b448f7cb5
-SIZE (gnome2/gnome-commander-1.6.3.tar.xz) = 6653164
+TIMESTAMP = 1520703122
+SHA256 (gnome2/gnome-commander-1.8.1.tar.xz) = 7bea3acab2804dcf3add355a5092d880a417204c333de279fb54a55681640128
+SIZE (gnome2/gnome-commander-1.8.1.tar.xz) = 7298888
diff --git a/x11-fm/gnome-commander2/pkg-plist b/x11-fm/gnome-commander2/pkg-plist
index bd2781bbaacf..cfa6b9a0ca90 100644
--- a/x11-fm/gnome-commander2/pkg-plist
+++ b/x11-fm/gnome-commander2/pkg-plist
@@ -4,22 +4,11 @@ lib/gnome-commander/libgcmd.a
 lib/gnome-commander/libgcmd.so
 lib/gnome-commander/libgcmd.so.0
 lib/gnome-commander/libgcmd.so.0.0.0
-lib/gnome-commander/plugins/apply_patch.py
-lib/gnome-commander/plugins/apply_patch.pyc
-lib/gnome-commander/plugins/apply_patch.pyo
 lib/gnome-commander/plugins/libfileroller.a
 lib/gnome-commander/plugins/libfileroller.so
-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
 man/man1/gnome-commander.1.gz
 share/appdata/gnome-commander.appdata.xml
 share/applications/gnome-commander.desktop
-share/glib-2.0/schemas/org.gnome.gnome-commander.enums.xml
-share/glib-2.0/schemas/org.gnome.gnome-commander.gschema.xml
 %%DATADIR%%/mime/XMLnamespaces
 %%DATADIR%%/mime/aliases
 %%DATADIR%%/mime/generic-icons
@@ -34,230 +23,230 @@ share/glib-2.0/schemas/org.gnome.gnome-commander.gschema.xml
 %%DATADIR%%/mime/treemagic
 %%DATADIR%%/mime/types
 %%DATADIR%%/mime/version
-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
-share/gnome/help/gnome-commander/C/figures/gnome-commander_dialog_adv_rename.png
-share/gnome/help/gnome-commander/C/figures/gnome-commander_dialog_application.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_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_layout_colors.png
-share/gnome/help/gnome-commander/C/figures/gnome-commander_options_programs.png
-share/gnome/help/gnome-commander/C/figures/gnome-commander_options_tabs.png
-share/gnome/help/gnome-commander/C/figures/gnome-commander_simple_plugins_example.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/gnome/help/gnome-commander/C/releases.xml
-share/gnome/help/gnome-commander/cs/figures/create_archive.png
-share/gnome/help/gnome-commander/cs/figures/dev_cd.png
-share/gnome/help/gnome-commander/cs/figures/extract_archive.png
-share/gnome/help/gnome-commander/cs/figures/gnome-commander_dialog_adv_rename.png
-share/gnome/help/gnome-commander/cs/figures/gnome-commander_dialog_application.png
-share/gnome/help/gnome-commander/cs/figures/gnome-commander_dialog_bookmark.png
-share/gnome/help/gnome-commander/cs/figures/gnome-commander_dialog_file_metadata.png
-share/gnome/help/gnome-commander/cs/figures/gnome-commander_dialog_file_permissions.png
-share/gnome/help/gnome-commander/cs/figures/gnome-commander_dialog_file_properties.png
-share/gnome/help/gnome-commander/cs/figures/gnome-commander_dialog_keyboard_shortcuts.png
-share/gnome/help/gnome-commander/cs/figures/gnome-commander_dialog_remote_connections.png
-share/gnome/help/gnome-commander/cs/figures/gnome-commander_dialog_remote_server.png
-share/gnome/help/gnome-commander/cs/figures/gnome-commander_dialog_search.png
-share/gnome/help/gnome-commander/cs/figures/gnome-commander_options_confirmation.png
-share/gnome/help/gnome-commander/cs/figures/gnome-commander_options_devices.png
-share/gnome/help/gnome-commander/cs/figures/gnome-commander_options_filters.png
-share/gnome/help/gnome-commander/cs/figures/gnome-commander_options_format.png
-share/gnome/help/gnome-commander/cs/figures/gnome-commander_options_general.png
-share/gnome/help/gnome-commander/cs/figures/gnome-commander_options_layout.png
-share/gnome/help/gnome-commander/cs/figures/gnome-commander_options_layout_colors.png
-share/gnome/help/gnome-commander/cs/figures/gnome-commander_options_programs.png
-share/gnome/help/gnome-commander/cs/figures/gnome-commander_options_tabs.png
-share/gnome/help/gnome-commander/cs/figures/gnome-commander_simple_plugins_example.png
-share/gnome/help/gnome-commander/cs/figures/gnome-commander_window.png
-share/gnome/help/gnome-commander/cs/figures/mounting.png
-share/gnome/help/gnome-commander/cs/gnome-commander.xml
-share/gnome/help/gnome-commander/cs/legal.xml
-share/gnome/help/gnome-commander/cs/releases.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_application.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_layout_colors.png
-share/gnome/help/gnome-commander/de/figures/gnome-commander_options_programs.png
-share/gnome/help/gnome-commander/de/figures/gnome-commander_options_tabs.png
-share/gnome/help/gnome-commander/de/figures/gnome-commander_simple_plugins_example.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/de/releases.xml
-share/gnome/help/gnome-commander/el/figures/create_archive.png
-share/gnome/help/gnome-commander/el/figures/dev_cd.png
-share/gnome/help/gnome-commander/el/figures/extract_archive.png
-share/gnome/help/gnome-commander/el/figures/gnome-commander_dialog_adv_rename.png
-share/gnome/help/gnome-commander/el/figures/gnome-commander_dialog_application.png
-share/gnome/help/gnome-commander/el/figures/gnome-commander_dialog_bookmark.png
-share/gnome/help/gnome-commander/el/figures/gnome-commander_dialog_file_metadata.png
-share/gnome/help/gnome-commander/el/figures/gnome-commander_dialog_file_permissions.png
-share/gnome/help/gnome-commander/el/figures/gnome-commander_dialog_file_properties.png
-share/gnome/help/gnome-commander/el/figures/gnome-commander_dialog_keyboard_shortcuts.png
-share/gnome/help/gnome-commander/el/figures/gnome-commander_dialog_remote_connections.png
-share/gnome/help/gnome-commander/el/figures/gnome-commander_dialog_remote_server.png
-share/gnome/help/gnome-commander/el/figures/gnome-commander_dialog_search.png
-share/gnome/help/gnome-commander/el/figures/gnome-commander_options_confirmation.png
-share/gnome/help/gnome-commander/el/figures/gnome-commander_options_devices.png
-share/gnome/help/gnome-commander/el/figures/gnome-commander_options_filters.png
-share/gnome/help/gnome-commander/el/figures/gnome-commander_options_format.png
-share/gnome/help/gnome-commander/el/figures/gnome-commander_options_general.png
-share/gnome/help/gnome-commander/el/figures/gnome-commander_options_layout.png
-share/gnome/help/gnome-commander/el/figures/gnome-commander_options_layout_colors.png
-share/gnome/help/gnome-commander/el/figures/gnome-commander_options_programs.png
-share/gnome/help/gnome-commander/el/figures/gnome-commander_options_tabs.png
-share/gnome/help/gnome-commander/el/figures/gnome-commander_simple_plugins_example.png
-share/gnome/help/gnome-commander/el/figures/gnome-commander_window.png
-share/gnome/help/gnome-commander/el/figures/mounting.png
-share/gnome/help/gnome-commander/el/gnome-commander.xml
-share/gnome/help/gnome-commander/el/legal.xml
-share/gnome/help/gnome-commander/el/releases.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_application.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_layout_colors.png
-share/gnome/help/gnome-commander/es/figures/gnome-commander_options_programs.png
-share/gnome/help/gnome-commander/es/figures/gnome-commander_options_tabs.png
-share/gnome/help/gnome-commander/es/figures/gnome-commander_simple_plugins_example.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/gnome/help/gnome-commander/es/releases.xml
-share/gnome/help/gnome-commander/fr/figures/create_archive.png
-share/gnome/help/gnome-commander/fr/figures/dev_cd.png
-share/gnome/help/gnome-commander/fr/figures/extract_archive.png
-share/gnome/help/gnome-commander/fr/figures/gnome-commander_dialog_adv_rename.png
-share/gnome/help/gnome-commander/fr/figures/gnome-commander_dialog_application.png
-share/gnome/help/gnome-commander/fr/figures/gnome-commander_dialog_bookmark.png
-share/gnome/help/gnome-commander/fr/figures/gnome-commander_dialog_file_metadata.png
-share/gnome/help/gnome-commander/fr/figures/gnome-commander_dialog_file_permissions.png
-share/gnome/help/gnome-commander/fr/figures/gnome-commander_dialog_file_properties.png
-share/gnome/help/gnome-commander/fr/figures/gnome-commander_dialog_keyboard_shortcuts.png
-share/gnome/help/gnome-commander/fr/figures/gnome-commander_dialog_remote_connections.png
-share/gnome/help/gnome-commander/fr/figures/gnome-commander_dialog_remote_server.png
-share/gnome/help/gnome-commander/fr/figures/gnome-commander_dialog_search.png
-share/gnome/help/gnome-commander/fr/figures/gnome-commander_options_confirmation.png
-share/gnome/help/gnome-commander/fr/figures/gnome-commander_options_devices.png
-share/gnome/help/gnome-commander/fr/figures/gnome-commander_options_filters.png
-share/gnome/help/gnome-commander/fr/figures/gnome-commander_options_format.png
-share/gnome/help/gnome-commander/fr/figures/gnome-commander_options_general.png
-share/gnome/help/gnome-commander/fr/figures/gnome-commander_options_layout.png
-share/gnome/help/gnome-commander/fr/figures/gnome-commander_options_layout_colors.png
-share/gnome/help/gnome-commander/fr/figures/gnome-commander_options_programs.png
-share/gnome/help/gnome-commander/fr/figures/gnome-commander_options_tabs.png
-share/gnome/help/gnome-commander/fr/figures/gnome-commander_simple_plugins_example.png
-share/gnome/help/gnome-commander/fr/figures/gnome-commander_window.png
-share/gnome/help/gnome-commander/fr/figures/mounting.png
-share/gnome/help/gnome-commander/fr/gnome-commander.xml
-share/gnome/help/gnome-commander/fr/legal.xml
-share/gnome/help/gnome-commander/fr/releases.xml
-share/gnome/help/gnome-commander/ru/figures/create_archive.png
-share/gnome/help/gnome-commander/ru/figures/dev_cd.png
-share/gnome/help/gnome-commander/ru/figures/extract_archive.png
-share/gnome/help/gnome-commander/ru/figures/gnome-commander_dialog_adv_rename.png
-share/gnome/help/gnome-commander/ru/figures/gnome-commander_dialog_application.png
-share/gnome/help/gnome-commander/ru/figures/gnome-commander_dialog_bookmark.png
-share/gnome/help/gnome-commander/ru/figures/gnome-commander_dialog_file_metadata.png
-share/gnome/help/gnome-commander/ru/figures/gnome-commander_dialog_file_permissions.png
-share/gnome/help/gnome-commander/ru/figures/gnome-commander_dialog_file_properties.png
-share/gnome/help/gnome-commander/ru/figures/gnome-commander_dialog_keyboard_shortcuts.png
-share/gnome/help/gnome-commander/ru/figures/gnome-commander_dialog_remote_connections.png
-share/gnome/help/gnome-commander/ru/figures/gnome-commander_dialog_remote_server.png
-share/gnome/help/gnome-commander/ru/figures/gnome-commander_dialog_search.png
-share/gnome/help/gnome-commander/ru/figures/gnome-commander_options_confirmation.png
-share/gnome/help/gnome-commander/ru/figures/gnome-commander_options_devices.png
-share/gnome/help/gnome-commander/ru/figures/gnome-commander_options_filters.png
-share/gnome/help/gnome-commander/ru/figures/gnome-commander_options_format.png
-share/gnome/help/gnome-commander/ru/figures/gnome-commander_options_general.png
-share/gnome/help/gnome-commander/ru/figures/gnome-commander_options_layout.png
-share/gnome/help/gnome-commander/ru/figures/gnome-commander_options_layout_colors.png
-share/gnome/help/gnome-commander/ru/figures/gnome-commander_options_programs.png
-share/gnome/help/gnome-commander/ru/figures/gnome-commander_options_tabs.png
-share/gnome/help/gnome-commander/ru/figures/gnome-commander_simple_plugins_example.png
-share/gnome/help/gnome-commander/ru/figures/gnome-commander_window.png
-share/gnome/help/gnome-commander/ru/figures/mounting.png
-share/gnome/help/gnome-commander/ru/gnome-commander.xml
-share/gnome/help/gnome-commander/ru/legal.xml
-share/gnome/help/gnome-commander/ru/releases.xml
-share/gnome/help/gnome-commander/sl/figures/create_archive.png
-share/gnome/help/gnome-commander/sl/figures/dev_cd.png
-share/gnome/help/gnome-commander/sl/figures/extract_archive.png
-share/gnome/help/gnome-commander/sl/figures/gnome-commander_dialog_adv_rename.png
-share/gnome/help/gnome-commander/sl/figures/gnome-commander_dialog_application.png
-share/gnome/help/gnome-commander/sl/figures/gnome-commander_dialog_bookmark.png
-share/gnome/help/gnome-commander/sl/figures/gnome-commander_dialog_file_metadata.png
-share/gnome/help/gnome-commander/sl/figures/gnome-commander_dialog_file_permissions.png
-share/gnome/help/gnome-commander/sl/figures/gnome-commander_dialog_file_properties.png
-share/gnome/help/gnome-commander/sl/figures/gnome-commander_dialog_keyboard_shortcuts.png
-share/gnome/help/gnome-commander/sl/figures/gnome-commander_dialog_remote_connections.png
-share/gnome/help/gnome-commander/sl/figures/gnome-commander_dialog_remote_server.png
-share/gnome/help/gnome-commander/sl/figures/gnome-commander_dialog_search.png
-share/gnome/help/gnome-commander/sl/figures/gnome-commander_options_confirmation.png
-share/gnome/help/gnome-commander/sl/figures/gnome-commander_options_devices.png
-share/gnome/help/gnome-commander/sl/figures/gnome-commander_options_filters.png
-share/gnome/help/gnome-commander/sl/figures/gnome-commander_options_format.png
-share/gnome/help/gnome-commander/sl/figures/gnome-commander_options_general.png
-share/gnome/help/gnome-commander/sl/figures/gnome-commander_options_layout.png
-share/gnome/help/gnome-commander/sl/figures/gnome-commander_options_layout_colors.png
-share/gnome/help/gnome-commander/sl/figures/gnome-commander_options_programs.png
-share/gnome/help/gnome-commander/sl/figures/gnome-commander_options_tabs.png
-share/gnome/help/gnome-commander/sl/figures/gnome-commander_simple_plugins_example.png
-share/gnome/help/gnome-commander/sl/figures/gnome-commander_window.png
-share/gnome/help/gnome-commander/sl/figures/mounting.png
-share/gnome/help/gnome-commander/sl/gnome-commander.xml
-share/gnome/help/gnome-commander/sl/legal.xml
-share/gnome/help/gnome-commander/sl/releases.xml
+share/help/C/gnome-commander/figures/create_archive.png
+share/help/C/gnome-commander/figures/dev_cd.png
+share/help/C/gnome-commander/figures/extract_archive.png
+share/help/C/gnome-commander/figures/gnome-commander_dialog_adv_rename.png
+share/help/C/gnome-commander/figures/gnome-commander_dialog_application.png
+share/help/C/gnome-commander/figures/gnome-commander_dialog_bookmark.png
+share/help/C/gnome-commander/figures/gnome-commander_dialog_file_metadata.png
+share/help/C/gnome-commander/figures/gnome-commander_dialog_file_permissions.png
+share/help/C/gnome-commander/figures/gnome-commander_dialog_file_properties.png
+share/help/C/gnome-commander/figures/gnome-commander_dialog_keyboard_shortcuts.png
+share/help/C/gnome-commander/figures/gnome-commander_dialog_remote_connections.png
+share/help/C/gnome-commander/figures/gnome-commander_dialog_remote_server.png
+share/help/C/gnome-commander/figures/gnome-commander_dialog_search.png
+share/help/C/gnome-commander/figures/gnome-commander_options_confirmation.png
+share/help/C/gnome-commander/figures/gnome-commander_options_devices.png
+share/help/C/gnome-commander/figures/gnome-commander_options_filters.png
+share/help/C/gnome-commander/figures/gnome-commander_options_format.png
+share/help/C/gnome-commander/figures/gnome-commander_options_general.png
+share/help/C/gnome-commander/figures/gnome-commander_options_layout.png
+share/help/C/gnome-commander/figures/gnome-commander_options_layout_colors.png
+share/help/C/gnome-commander/figures/gnome-commander_options_programs.png
+share/help/C/gnome-commander/figures/gnome-commander_options_tabs.png
+share/help/C/gnome-commander/figures/gnome-commander_simple_plugins_example.png
+share/help/C/gnome-commander/figures/gnome-commander_window.png
+share/help/C/gnome-commander/figures/mounting.png
+share/help/C/gnome-commander/index.docbook
+share/help/C/gnome-commander/legal.xml
+share/help/C/gnome-commander/releases.xml
+share/help/cs/gnome-commander/figures/create_archive.png
+share/help/cs/gnome-commander/figures/dev_cd.png
+share/help/cs/gnome-commander/figures/extract_archive.png
+share/help/cs/gnome-commander/figures/gnome-commander_dialog_adv_rename.png
+share/help/cs/gnome-commander/figures/gnome-commander_dialog_application.png
+share/help/cs/gnome-commander/figures/gnome-commander_dialog_bookmark.png
+share/help/cs/gnome-commander/figures/gnome-commander_dialog_file_metadata.png
+share/help/cs/gnome-commander/figures/gnome-commander_dialog_file_permissions.png
+share/help/cs/gnome-commander/figures/gnome-commander_dialog_file_properties.png
+share/help/cs/gnome-commander/figures/gnome-commander_dialog_keyboard_shortcuts.png
+share/help/cs/gnome-commander/figures/gnome-commander_dialog_remote_connections.png
+share/help/cs/gnome-commander/figures/gnome-commander_dialog_remote_server.png
+share/help/cs/gnome-commander/figures/gnome-commander_dialog_search.png
+share/help/cs/gnome-commander/figures/gnome-commander_options_confirmation.png
+share/help/cs/gnome-commander/figures/gnome-commander_options_devices.png
+share/help/cs/gnome-commander/figures/gnome-commander_options_filters.png
+share/help/cs/gnome-commander/figures/gnome-commander_options_format.png
+share/help/cs/gnome-commander/figures/gnome-commander_options_general.png
+share/help/cs/gnome-commander/figures/gnome-commander_options_layout.png
+share/help/cs/gnome-commander/figures/gnome-commander_options_layout_colors.png
+share/help/cs/gnome-commander/figures/gnome-commander_options_programs.png
+share/help/cs/gnome-commander/figures/gnome-commander_options_tabs.png
+share/help/cs/gnome-commander/figures/gnome-commander_simple_plugins_example.png
+share/help/cs/gnome-commander/figures/gnome-commander_window.png
+share/help/cs/gnome-commander/figures/mounting.png
+share/help/cs/gnome-commander/index.docbook
+share/help/cs/gnome-commander/legal.xml
+share/help/cs/gnome-commander/releases.xml
+share/help/de/gnome-commander/figures/create_archive.png
+share/help/de/gnome-commander/figures/dev_cd.png
+share/help/de/gnome-commander/figures/extract_archive.png
+share/help/de/gnome-commander/figures/gnome-commander_dialog_adv_rename.png
+share/help/de/gnome-commander/figures/gnome-commander_dialog_application.png
+share/help/de/gnome-commander/figures/gnome-commander_dialog_bookmark.png
+share/help/de/gnome-commander/figures/gnome-commander_dialog_file_metadata.png
+share/help/de/gnome-commander/figures/gnome-commander_dialog_file_permissions.png
+share/help/de/gnome-commander/figures/gnome-commander_dialog_file_properties.png
+share/help/de/gnome-commander/figures/gnome-commander_dialog_keyboard_shortcuts.png
+share/help/de/gnome-commander/figures/gnome-commander_dialog_remote_connections.png
+share/help/de/gnome-commander/figures/gnome-commander_dialog_remote_server.png
+share/help/de/gnome-commander/figures/gnome-commander_dialog_search.png
+share/help/de/gnome-commander/figures/gnome-commander_options_confirmation.png
+share/help/de/gnome-commander/figures/gnome-commander_options_devices.png
+share/help/de/gnome-commander/figures/gnome-commander_options_filters.png
+share/help/de/gnome-commander/figures/gnome-commander_options_format.png
+share/help/de/gnome-commander/figures/gnome-commander_options_general.png
+share/help/de/gnome-commander/figures/gnome-commander_options_layout.png
+share/help/de/gnome-commander/figures/gnome-commander_options_layout_colors.png
+share/help/de/gnome-commander/figures/gnome-commander_options_programs.png
+share/help/de/gnome-commander/figures/gnome-commander_options_tabs.png
+share/help/de/gnome-commander/figures/gnome-commander_simple_plugins_example.png
+share/help/de/gnome-commander/figures/gnome-commander_window.png
+share/help/de/gnome-commander/figures/mounting.png
+share/help/de/gnome-commander/index.docbook
+share/help/de/gnome-commander/legal.xml
+share/help/de/gnome-commander/releases.xml
+share/help/el/gnome-commander/figures/create_archive.png
+share/help/el/gnome-commander/figures/dev_cd.png
+share/help/el/gnome-commander/figures/extract_archive.png
+share/help/el/gnome-commander/figures/gnome-commander_dialog_adv_rename.png
+share/help/el/gnome-commander/figures/gnome-commander_dialog_application.png
+share/help/el/gnome-commander/figures/gnome-commander_dialog_bookmark.png
+share/help/el/gnome-commander/figures/gnome-commander_dialog_file_metadata.png
+share/help/el/gnome-commander/figures/gnome-commander_dialog_file_permissions.png
+share/help/el/gnome-commander/figures/gnome-commander_dialog_file_properties.png
+share/help/el/gnome-commander/figures/gnome-commander_dialog_keyboard_shortcuts.png
+share/help/el/gnome-commander/figures/gnome-commander_dialog_remote_connections.png
+share/help/el/gnome-commander/figures/gnome-commander_dialog_remote_server.png
+share/help/el/gnome-commander/figures/gnome-commander_dialog_search.png
+share/help/el/gnome-commander/figures/gnome-commander_options_confirmation.png
+share/help/el/gnome-commander/figures/gnome-commander_options_devices.png
+share/help/el/gnome-commander/figures/gnome-commander_options_filters.png
+share/help/el/gnome-commander/figures/gnome-commander_options_format.png
+share/help/el/gnome-commander/figures/gnome-commander_options_general.png
+share/help/el/gnome-commander/figures/gnome-commander_options_layout.png
+share/help/el/gnome-commander/figures/gnome-commander_options_layout_colors.png
+share/help/el/gnome-commander/figures/gnome-commander_options_programs.png
+share/help/el/gnome-commander/figures/gnome-commander_options_tabs.png
+share/help/el/gnome-commander/figures/gnome-commander_simple_plugins_example.png
+share/help/el/gnome-commander/figures/gnome-commander_window.png
+share/help/el/gnome-commander/figures/mounting.png
+share/help/el/gnome-commander/index.docbook
+share/help/el/gnome-commander/legal.xml
+share/help/el/gnome-commander/releases.xml
+share/help/es/gnome-commander/figures/create_archive.png
+share/help/es/gnome-commander/figures/dev_cd.png
+share/help/es/gnome-commander/figures/extract_archive.png
+share/help/es/gnome-commander/figures/gnome-commander_dialog_adv_rename.png
+share/help/es/gnome-commander/figures/gnome-commander_dialog_application.png
+share/help/es/gnome-commander/figures/gnome-commander_dialog_bookmark.png
+share/help/es/gnome-commander/figures/gnome-commander_dialog_file_metadata.png
+share/help/es/gnome-commander/figures/gnome-commander_dialog_file_permissions.png
+share/help/es/gnome-commander/figures/gnome-commander_dialog_file_properties.png
+share/help/es/gnome-commander/figures/gnome-commander_dialog_keyboard_shortcuts.png
+share/help/es/gnome-commander/figures/gnome-commander_dialog_remote_connections.png
+share/help/es/gnome-commander/figures/gnome-commander_dialog_remote_server.png
+share/help/es/gnome-commander/figures/gnome-commander_dialog_search.png
+share/help/es/gnome-commander/figures/gnome-commander_options_confirmation.png
+share/help/es/gnome-commander/figures/gnome-commander_options_devices.png
+share/help/es/gnome-commander/figures/gnome-commander_options_filters.png
+share/help/es/gnome-commander/figures/gnome-commander_options_format.png
+share/help/es/gnome-commander/figures/gnome-commander_options_general.png
+share/help/es/gnome-commander/figures/gnome-commander_options_layout.png
+share/help/es/gnome-commander/figures/gnome-commander_options_layout_colors.png
+share/help/es/gnome-commander/figures/gnome-commander_options_programs.png
+share/help/es/gnome-commander/figures/gnome-commander_options_tabs.png
+share/help/es/gnome-commander/figures/gnome-commander_simple_plugins_example.png
+share/help/es/gnome-commander/figures/gnome-commander_window.png
+share/help/es/gnome-commander/figures/mounting.png
+share/help/es/gnome-commander/index.docbook
+share/help/es/gnome-commander/legal.xml
+share/help/es/gnome-commander/releases.xml
+share/help/fr/gnome-commander/figures/create_archive.png
+share/help/fr/gnome-commander/figures/dev_cd.png
+share/help/fr/gnome-commander/figures/extract_archive.png
+share/help/fr/gnome-commander/figures/gnome-commander_dialog_adv_rename.png
+share/help/fr/gnome-commander/figures/gnome-commander_dialog_application.png
+share/help/fr/gnome-commander/figures/gnome-commander_dialog_bookmark.png
+share/help/fr/gnome-commander/figures/gnome-commander_dialog_file_metadata.png
+share/help/fr/gnome-commander/figures/gnome-commander_dialog_file_permissions.png
+share/help/fr/gnome-commander/figures/gnome-commander_dialog_file_properties.png
+share/help/fr/gnome-commander/figures/gnome-commander_dialog_keyboard_shortcuts.png
+share/help/fr/gnome-commander/figures/gnome-commander_dialog_remote_connections.png
+share/help/fr/gnome-commander/figures/gnome-commander_dialog_remote_server.png
+share/help/fr/gnome-commander/figures/gnome-commander_dialog_search.png
+share/help/fr/gnome-commander/figures/gnome-commander_options_confirmation.png
+share/help/fr/gnome-commander/figures/gnome-commander_options_devices.png
+share/help/fr/gnome-commander/figures/gnome-commander_options_filters.png
+share/help/fr/gnome-commander/figures/gnome-commander_options_format.png
+share/help/fr/gnome-commander/figures/gnome-commander_options_general.png
+share/help/fr/gnome-commander/figures/gnome-commander_options_layout.png
+share/help/fr/gnome-commander/figures/gnome-commander_options_layout_colors.png
+share/help/fr/gnome-commander/figures/gnome-commander_options_programs.png
+share/help/fr/gnome-commander/figures/gnome-commander_options_tabs.png
+share/help/fr/gnome-commander/figures/gnome-commander_simple_plugins_example.png
+share/help/fr/gnome-commander/figures/gnome-commander_window.png
+share/help/fr/gnome-commander/figures/mounting.png
+share/help/fr/gnome-commander/index.docbook
+share/help/fr/gnome-commander/legal.xml
+share/help/fr/gnome-commander/releases.xml
+share/help/ru/gnome-commander/figures/create_archive.png
+share/help/ru/gnome-commander/figures/dev_cd.png
+share/help/ru/gnome-commander/figures/extract_archive.png
+share/help/ru/gnome-commander/figures/gnome-commander_dialog_adv_rename.png
+share/help/ru/gnome-commander/figures/gnome-commander_dialog_application.png
+share/help/ru/gnome-commander/figures/gnome-commander_dialog_bookmark.png
+share/help/ru/gnome-commander/figures/gnome-commander_dialog_file_metadata.png
+share/help/ru/gnome-commander/figures/gnome-commander_dialog_file_permissions.png
+share/help/ru/gnome-commander/figures/gnome-commander_dialog_file_properties.png
+share/help/ru/gnome-commander/figures/gnome-commander_dialog_keyboard_shortcuts.png
+share/help/ru/gnome-commander/figures/gnome-commander_dialog_remote_connections.png
+share/help/ru/gnome-commander/figures/gnome-commander_dialog_remote_server.png
+share/help/ru/gnome-commander/figures/gnome-commander_dialog_search.png
+share/help/ru/gnome-commander/figures/gnome-commander_options_confirmation.png
+share/help/ru/gnome-commander/figures/gnome-commander_options_devices.png
+share/help/ru/gnome-commander/figures/gnome-commander_options_filters.png
+share/help/ru/gnome-commander/figures/gnome-commander_options_format.png
+share/help/ru/gnome-commander/figures/gnome-commander_options_general.png
+share/help/ru/gnome-commander/figures/gnome-commander_options_layout.png
+share/help/ru/gnome-commander/figures/gnome-commander_options_layout_colors.png
+share/help/ru/gnome-commander/figures/gnome-commander_options_programs.png
+share/help/ru/gnome-commander/figures/gnome-commander_options_tabs.png
+share/help/ru/gnome-commander/figures/gnome-commander_simple_plugins_example.png
+share/help/ru/gnome-commander/figures/gnome-commander_window.png
+share/help/ru/gnome-commander/figures/mounting.png
+share/help/ru/gnome-commander/index.docbook
+share/help/ru/gnome-commander/legal.xml
+share/help/ru/gnome-commander/releases.xml
+share/help/sl/gnome-commander/figures/create_archive.png
+share/help/sl/gnome-commander/figures/dev_cd.png
+share/help/sl/gnome-commander/figures/extract_archive.png
+share/help/sl/gnome-commander/figures/gnome-commander_dialog_adv_rename.png
+share/help/sl/gnome-commander/figures/gnome-commander_dialog_application.png
+share/help/sl/gnome-commander/figures/gnome-commander_dialog_bookmark.png
+share/help/sl/gnome-commander/figures/gnome-commander_dialog_file_metadata.png
+share/help/sl/gnome-commander/figures/gnome-commander_dialog_file_permissions.png
+share/help/sl/gnome-commander/figures/gnome-commander_dialog_file_properties.png
+share/help/sl/gnome-commander/figures/gnome-commander_dialog_keyboard_shortcuts.png
+share/help/sl/gnome-commander/figures/gnome-commander_dialog_remote_connections.png
+share/help/sl/gnome-commander/figures/gnome-commander_dialog_remote_server.png
+share/help/sl/gnome-commander/figures/gnome-commander_dialog_search.png
+share/help/sl/gnome-commander/figures/gnome-commander_options_confirmation.png
+share/help/sl/gnome-commander/figures/gnome-commander_options_devices.png
+share/help/sl/gnome-commander/figures/gnome-commander_options_filters.png
+share/help/sl/gnome-commander/figures/gnome-commander_options_format.png
+share/help/sl/gnome-commander/figures/gnome-commander_options_general.png
+share/help/sl/gnome-commander/figures/gnome-commander_options_layout.png
+share/help/sl/gnome-commander/figures/gnome-commander_options_layout_colors.png
+share/help/sl/gnome-commander/figures/gnome-commander_options_programs.png
+share/help/sl/gnome-commander/figures/gnome-commander_options_tabs.png
+share/help/sl/gnome-commander/figures/gnome-commander_simple_plugins_example.png
+share/help/sl/gnome-commander/figures/gnome-commander_window.png
+share/help/sl/gnome-commander/figures/mounting.png
+share/help/sl/gnome-commander/index.docbook
+share/help/sl/gnome-commander/legal.xml
+share/help/sl/gnome-commander/releases.xml
 share/locale/ar/LC_MESSAGES/gnome-commander.mo
 share/locale/bg/LC_MESSAGES/gnome-commander.mo
 share/locale/bs/LC_MESSAGES/gnome-commander.mo
@@ -282,6 +271,7 @@ share/locale/it/LC_MESSAGES/gnome-commander.mo
 share/locale/ja/LC_MESSAGES/gnome-commander.mo
 share/locale/ko/LC_MESSAGES/gnome-commander.mo
 share/locale/lt/LC_MESSAGES/gnome-commander.mo
+share/locale/mr/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
@@ -305,14 +295,6 @@ 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-cs.omf
-share/omf/gnome-commander/gnome-commander-de.omf
-share/omf/gnome-commander/gnome-commander-el.omf
-share/omf/gnome-commander/gnome-commander-es.omf
-share/omf/gnome-commander/gnome-commander-fr.omf
-share/omf/gnome-commander/gnome-commander-ru.omf
-share/omf/gnome-commander/gnome-commander-sl.omf
 share/pixmaps/gnome-commander.png
 share/pixmaps/gnome-commander/copy_file_names.xpm
 share/pixmaps/gnome-commander/device-icons/bluetooth.xpm
diff --git a/x11-fm/krusader2/Makefile b/x11-fm/krusader2/Makefile
index b7f4b548d324..7a4a46ded5d6 100644
--- a/x11-fm/krusader2/Makefile
+++ b/x11-fm/krusader2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	krusader
 DISTVERSION=	2.4.0-beta3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-fm kde
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${DISTVERSION}/
 
diff --git a/x11-fm/nemo/Makefile b/x11-fm/nemo/Makefile
index c6d987d6c761..6168c2a11d71 100644
--- a/x11-fm/nemo/Makefile
+++ b/x11-fm/nemo/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	nemo
 PORTVERSION=	2.4.5
+PORTREVISION=	1
 CATEGORIES=	x11-fm gnome
 DIST_SUBDIR=	gnome3
 
@@ -22,7 +23,7 @@ RUN_DEPENDS=	gnome-icon-theme>=0:misc/gnome-icon-theme \
 		gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
 
 USES=		autoreconf:build desktop-file-utils gettext gmake libtool pathfix \
-		pkgconfig python:2 shared-mime-info
+		pkgconfig python:2.7 shared-mime-info
 USE_GNOME=	gnomedesktop3 gnomeprefix intlhack introspection:build \
 		libxml2 pygobject3
 USE_GITHUB=	yes
diff --git a/x11-fm/pcmanfm-qt/Makefile b/x11-fm/pcmanfm-qt/Makefile
index 0ee2b230fbf9..a86c7f30e08b 100644
--- a/x11-fm/pcmanfm-qt/Makefile
+++ b/x11-fm/pcmanfm-qt/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	0.12.0
 CATEGORIES=	x11-fm
 MASTER_SITES=	LXQT
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	mbeis@xs4all.nl
 COMMENT=	LXQt file manager
 
 LICENSE=	GPLv2
diff --git a/x11-fm/pcmanfm/Makefile b/x11-fm/pcmanfm/Makefile
index 06aae12dc428..46691c0f4c78 100644
--- a/x11-fm/pcmanfm/Makefile
+++ b/x11-fm/pcmanfm/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	1.2.5
 CATEGORIES=	x11-fm
 MASTER_SITES=	SF/${PORTNAME}/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/PCManFM/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	portmaster@BSDforge.com
 COMMENT=	PCMan File Manager
 
 LICENSE=	GPLv2
diff --git a/x11-fm/sushi/Makefile b/x11-fm/sushi/Makefile
index 5432c505d16c..edd9688e91df 100644
--- a/x11-fm/sushi/Makefile
+++ b/x11-fm/sushi/Makefile
@@ -21,7 +21,8 @@ RUN_DEPENDS=	nautilus:x11-fm/nautilus
 
 PORTSCOUT=	limitw:1,even
 
-USES=		gettext gmake gnome libtool pathfix pkgconfig tar:xz
+USES=		compiler:c11 gettext gmake gnome libtool pathfix pkgconfig tar:xz
+USE_CSTD=	c11
 INSTALLS_ICONS=	yes
 USE_GNOME=	gnomeprefix gtksourceview3 intlhack introspection:build
 USE_LDCONFIG=	yes
diff --git a/x11-fm/thunar/Makefile b/x11-fm/thunar/Makefile
index dac874d9b889..0e6f255fd643 100644
--- a/x11-fm/thunar/Makefile
+++ b/x11-fm/thunar/Makefile
@@ -2,7 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	Thunar
-DISTVERSION=	1.6.13
+DISTVERSION=	1.6.14
+PORTREVISION=	1
 CATEGORIES=	x11-fm xfce
 MASTER_SITES=	XFCE/src/xfce/${PORTNAME:tl}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
diff --git a/x11-fm/thunar/distinfo b/x11-fm/thunar/distinfo
index 007bf685b9d1..a7422bd1d735 100644
--- a/x11-fm/thunar/distinfo
+++ b/x11-fm/thunar/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1511727916
-SHA256 (xfce4/Thunar-1.6.13.tar.bz2) = a2900acfa92f965aff86cd7728d88a3836b3d21fb85d3355a8c5119c9975f93f
-SIZE (xfce4/Thunar-1.6.13.tar.bz2) = 1937341
+TIMESTAMP = 1518728776
+SHA256 (xfce4/Thunar-1.6.14.tar.bz2) = d6112133a1c43494e3b1cb75e775e1d05988805a06fd1e11253e9a29b8ebe59a
+SIZE (xfce4/Thunar-1.6.14.tar.bz2) = 1964822
diff --git a/x11-fm/thunar/files/patch-thunar_thunar-file.c b/x11-fm/thunar/files/patch-thunar_thunar-file.c
new file mode 100644
index 000000000000..baa23b7c7bb5
--- /dev/null
+++ b/x11-fm/thunar/files/patch-thunar_thunar-file.c
@@ -0,0 +1,27 @@
+--- thunar/thunar-file.c.orig	2017-11-25 16:54:56 UTC
++++ thunar/thunar-file.c
+@@ -3966,7 +3966,9 @@ thunar_file_unwatch (ThunarFile *file)
+ gboolean
+ thunar_file_reload (ThunarFile *file)
+ {
+-  _thunar_return_val_if_fail (THUNAR_IS_FILE (file), FALSE);
++  /* if the file has already been destroyed, break here */
++  if (!THUNAR_IS_FILE (file))
++      return FALSE;
+ 
+   /* clear file pxmap cache */
+   thunar_icon_factory_clear_pixmap_cache (file);
+@@ -4090,11 +4092,11 @@ thunar_file_compare_by_name (const ThunarFile *file_a,
+ 
+   /* case insensitive checking */
+   if (G_LIKELY (!case_sensitive))
+-    result = strcmp (file_a->collate_key_nocase, file_b->collate_key_nocase);
++    result = g_strcmp0 (file_a->collate_key_nocase, file_b->collate_key_nocase);
+ 
+   /* fall-back to case sensitive */
+   if (result == 0)
+-    result = strcmp (file_a->collate_key, file_b->collate_key);
++    result = g_strcmp0 (file_a->collate_key, file_b->collate_key);
+ 
+   /* this happens in the trash */
+   if (result == 0)
diff --git a/x11-fm/twander/Makefile b/x11-fm/twander/Makefile
index fac991ec721c..81b7c366c7fe 100644
--- a/x11-fm/twander/Makefile
+++ b/x11-fm/twander/Makefile
@@ -3,32 +3,31 @@
 
 PORTNAME=	twander
 PORTVERSION=	3.231
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fm
 MASTER_SITES=	http://www.tundraware.com/Software/twander/
 
 MAINTAINER=	twander@tundraware.com
 COMMENT=	Better Filesystem Browser
 
+LICENSE=	TundraWare
+LICENSE_NAME=	TundraWare license
+LICENSE_FILE=	${WRKSRC}/twander-license.txt
+LICENSE_PERMS=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell no-auto-accept
+
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR}
 
-USES=		python:2.7
+USES=		python:2.7 shebangfix
+SHEBANG_FILES=	twander.py
+MAKE_ENV=	PYTHON_CMD="${PYTHON_CMD}"
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	DOCS
 
-post-patch:
-	@${REINPLACE_CMD} \
-		-e 's|/usr/bin/env python|${PYTHON_CMD}|' \
-		${WRKSRC}/twander.py
-	@${REINPLACE_CMD} \
-		-e 's|python |${PYTHON_CMD} |' \
-		${WRKSRC}/Makefile
-
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for f in READ-1ST.txt WHATSNEW.txt .twander twander-license.txt twander.html twander.pdf twander.ps twander.txt
+.for f in READ-1ST.txt WHATSNEW.txt .twander twander.html twander.pdf twander.ps twander.txt
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 
diff --git a/x11-fm/twander/files/patch-Makefile b/x11-fm/twander/files/patch-Makefile
index f4d274c935a2..ced9ead6831d 100644
--- a/x11-fm/twander/files/patch-Makefile
+++ b/x11-fm/twander/files/patch-Makefile
@@ -1,13 +1,17 @@
---- Makefile.orig	2014-07-01 21:05:14.490108757 +0800
-+++ Makefile	2014-07-01 21:05:33.578108694 +0800
-@@ -6,7 +6,7 @@ all: # Just need to create the compiled 
- 	@python -OOOO -c"import py_compile;py_compile.compile('twander.py')"
+--- Makefile.orig	2009-07-14 17:12:38 UTC
++++ Makefile
+@@ -3,10 +3,10 @@
+ 
+ 
+ all: # Just need to create the compiled image
+-	@python -OOOO -c"import py_compile;py_compile.compile('twander.py')"
++	@${PYTHON_CMD} -OOOO -c"import py_compile;py_compile.compile('twander.py')"
  
  install:
 -	${BSD_INSTALL_SCRIPT} ./twander.py   ${PREFIX}/bin
 -	${BSD_INSTALL_SCRIPT} ./twander.pyo  ${PREFIX}/bin
 -	${BSD_INSTALL_MAN}    ./twander.1.gz ${PREFIX}/man/man1
 +	${BSD_INSTALL_SCRIPT} ./twander.py   $(DESTDIR)${PREFIX}/bin
-+	${BSD_INSTALL_SCRIPT} ./twander.pyo  $(DESTDIR)${PREFIX}/bin
++	${BSD_INSTALL_DATA}   ./twander.pyo  $(DESTDIR)${PREFIX}/bin
 +	${BSD_INSTALL_MAN}    ./twander.1.gz $(DESTDIR)${PREFIX}/man/man1
  
diff --git a/x11-fm/twander/pkg-plist b/x11-fm/twander/pkg-plist
index b046c67f395e..8dc817aadb3b 100644
--- a/x11-fm/twander/pkg-plist
+++ b/x11-fm/twander/pkg-plist
@@ -3,7 +3,6 @@ bin/twander.pyo
 man/man1/twander.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/READ-1ST.txt
 %%PORTDOCS%%%%DOCSDIR%%/WHATSNEW.txt
-%%PORTDOCS%%%%DOCSDIR%%/twander-license.txt
 %%PORTDOCS%%%%DOCSDIR%%/.twander
 %%PORTDOCS%%%%DOCSDIR%%/twander.html
 %%PORTDOCS%%%%DOCSDIR%%/twander.pdf