Clenup xfce ports:

- Add missing dependencies
- Remove unneeded patches
- Regenerate and rename legacy patches
- Add NLS option to ports providing such a knob, and missing the
  option
- Add INSTALL_TARGET=install-strip where missing
- Sort things
- Remove unneeded +=
- Cosmetic changes to OPTION related variables to improve readability
- Update WWW
- Silence portlint warnings about variables order
- Bump PORTREVISION where changing dependencies and/or adding
  install-strip

3 files changed, 61 insertions, 50 deletions

diff --git a/archivers/thunar-archive-plugin/Makefile b/archivers/thunar-archive-plugin/Makefile
index 7759bc4b4773..f7e9dac8d837 100644
--- a/archivers/thunar-archive-plugin/Makefile
+++ b/archivers/thunar-archive-plugin/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	thunar-archive-plugin
 PORTVERSION=	0.3.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	archivers xfce
 MASTER_SITES=	XFCE/src/thunar-plugins/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
@@ -11,10 +11,21 @@ DIST_SUBDIR=	xfce4
 MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	Archive plugin for the Thunar File Manager
 
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2
+
+USES=		gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce
+USE_GNOME=	cairo gtk20 intltool
+USE_XFCE=	libexo thunar
+
 GNU_CONFIGURE=	yes
-USE_XFCE=	thunar
-USES=		gettext gmake libtool pkgconfig xfce tar:bzip2
 INSTALLS_ICONS=	yes
-USE_GNOME=	intltool
+INSTALL_TARGET=	install-strip
+
+OPTIONS_DEFINE=		NLS
+OPTIONS_SUB=		yes
+
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=		gettext-runtime
 
 .include <bsd.port.mk>
diff --git a/archivers/thunar-archive-plugin/pkg-descr b/archivers/thunar-archive-plugin/pkg-descr
index c90189472f58..df5469d051e3 100644
--- a/archivers/thunar-archive-plugin/pkg-descr
+++ b/archivers/thunar-archive-plugin/pkg-descr
@@ -3,4 +3,4 @@ adds archive operations to the file context menus. Using this plugin you
 will be able to extract and create archive files from within Thunar using
 a single click.
 
-WWW: http://goodies.xfce.org/projects/thunar-plugins/thunar-archive-plugin
+WWW: https://goodies.xfce.org/projects/thunar-plugins/thunar-archive-plugin
diff --git a/archivers/thunar-archive-plugin/pkg-plist b/archivers/thunar-archive-plugin/pkg-plist
index b9c3dace632d..15b7ddb6a7db 100644
--- a/archivers/thunar-archive-plugin/pkg-plist
+++ b/archivers/thunar-archive-plugin/pkg-plist
@@ -5,48 +5,48 @@ libexec/thunar-archive-plugin/gnome-file-roller.tap
 share/icons/hicolor/16x16/apps/tap-create.png
 share/icons/hicolor/16x16/apps/tap-extract.png
 share/icons/hicolor/16x16/apps/tap-extract-to.png
-share/locale/ar/LC_MESSAGES/thunar-archive-plugin.mo
-share/locale/ast/LC_MESSAGES/thunar-archive-plugin.mo
-share/locale/be/LC_MESSAGES/thunar-archive-plugin.mo
-share/locale/bg/LC_MESSAGES/thunar-archive-plugin.mo
-share/locale/ca/LC_MESSAGES/thunar-archive-plugin.mo
-share/locale/cs/LC_MESSAGES/thunar-archive-plugin.mo
-share/locale/da/LC_MESSAGES/thunar-archive-plugin.mo
-share/locale/de/LC_MESSAGES/thunar-archive-plugin.mo
-share/locale/el/LC_MESSAGES/thunar-archive-plugin.mo
-share/locale/en_GB/LC_MESSAGES/thunar-archive-plugin.mo
-share/locale/eo/LC_MESSAGES/thunar-archive-plugin.mo
-share/locale/es/LC_MESSAGES/thunar-archive-plugin.mo
-share/locale/eu/LC_MESSAGES/thunar-archive-plugin.mo
-share/locale/fi/LC_MESSAGES/thunar-archive-plugin.mo
-share/locale/fr/LC_MESSAGES/thunar-archive-plugin.mo
-share/locale/gl/LC_MESSAGES/thunar-archive-plugin.mo
-share/locale/hr/LC_MESSAGES/thunar-archive-plugin.mo
-share/locale/hu/LC_MESSAGES/thunar-archive-plugin.mo
-share/locale/id/LC_MESSAGES/thunar-archive-plugin.mo
-share/locale/it/LC_MESSAGES/thunar-archive-plugin.mo
-share/locale/ja/LC_MESSAGES/thunar-archive-plugin.mo
-share/locale/kk/LC_MESSAGES/thunar-archive-plugin.mo
-share/locale/ko/LC_MESSAGES/thunar-archive-plugin.mo
-share/locale/lt/LC_MESSAGES/thunar-archive-plugin.mo
-share/locale/lv/LC_MESSAGES/thunar-archive-plugin.mo
-share/locale/nb/LC_MESSAGES/thunar-archive-plugin.mo
-share/locale/nl/LC_MESSAGES/thunar-archive-plugin.mo
-share/locale/pa/LC_MESSAGES/thunar-archive-plugin.mo
-share/locale/pl/LC_MESSAGES/thunar-archive-plugin.mo
-share/locale/pt/LC_MESSAGES/thunar-archive-plugin.mo
-share/locale/pt_BR/LC_MESSAGES/thunar-archive-plugin.mo
-share/locale/ro/LC_MESSAGES/thunar-archive-plugin.mo
-share/locale/ru/LC_MESSAGES/thunar-archive-plugin.mo
-share/locale/sk/LC_MESSAGES/thunar-archive-plugin.mo
-share/locale/sl/LC_MESSAGES/thunar-archive-plugin.mo
-share/locale/sq/LC_MESSAGES/thunar-archive-plugin.mo
-share/locale/sr/LC_MESSAGES/thunar-archive-plugin.mo
-share/locale/sv/LC_MESSAGES/thunar-archive-plugin.mo
-share/locale/tr/LC_MESSAGES/thunar-archive-plugin.mo
-share/locale/ug/LC_MESSAGES/thunar-archive-plugin.mo
-share/locale/uk/LC_MESSAGES/thunar-archive-plugin.mo
-share/locale/ur/LC_MESSAGES/thunar-archive-plugin.mo
-share/locale/ur_PK/LC_MESSAGES/thunar-archive-plugin.mo
-share/locale/zh_CN/LC_MESSAGES/thunar-archive-plugin.mo
-share/locale/zh_TW/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/ast/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/be/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/da/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/de/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/el/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/es/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/id/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/it/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/pa/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/ur_PK/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/thunar-archive-plugin.mo