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

4 files changed, 57 insertions, 49 deletions

diff --git a/www/midori/pkg-descr b/www/midori/pkg-descr
index 5494d8dd971f..897432a5c09d 100644
--- a/www/midori/pkg-descr
+++ b/www/midori/pkg-descr
@@ -9,4 +9,4 @@ Midori is a lightweight web browser.
 * User scripts and customized keyboard support.
 * Extensible via Vala scripts.
 
-WWW: http://www.midori-browser.org/
+WWW: https://www.midori-browser.org/
diff --git a/www/xfce4-smartbookmark-plugin/Makefile b/www/xfce4-smartbookmark-plugin/Makefile
index 25afeeee5736..436f82e4298d 100644
--- a/www/xfce4-smartbookmark-plugin/Makefile
+++ b/www/xfce4-smartbookmark-plugin/Makefile
@@ -13,10 +13,18 @@ COMMENT=	Query search engines from the Xfce panel
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-GNU_CONFIGURE=	yes
-USE_GNOME=	gtk30 intltool cairo gdkpixbuf2
-USES=		gettext gmake libtool pkgconfig tar:bzip2 xfce:gtk3
+USES=		gettext-tools gmake gnome libtool pkgconfig tar:bzip2 \
+		xfce:gtk3
+USE_GNOME=	cairo gdkpixbuf2 gtk30 intltool 
 USE_XFCE=	panel
+
+GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 
+OPTIONS_DEFINE=		NLS
+OPTIONS_SUB=		yes
+
+NLS_USES=		gettext-runtime
+NLS_CONFIGURE_ENABLE=	nls
+
 .include <bsd.port.mk>
diff --git a/www/xfce4-smartbookmark-plugin/pkg-descr b/www/xfce4-smartbookmark-plugin/pkg-descr
index e3d957d93d78..eae76fc4e260 100644
--- a/www/xfce4-smartbookmark-plugin/pkg-descr
+++ b/www/xfce4-smartbookmark-plugin/pkg-descr
@@ -1,4 +1,4 @@
 Smartbookmark send requests directly to your browser and perform a custom
 search.
 
-WWW: http://goodies.xfce.org/projects/panel-plugins/xfce4-smartbookmark-plugin
+WWW: https://goodies.xfce.org/projects/panel-plugins/xfce4-smartbookmark-plugin
diff --git a/www/xfce4-smartbookmark-plugin/pkg-plist b/www/xfce4-smartbookmark-plugin/pkg-plist
index 9e2e5e7eed78..47ecd403d4ea 100644
--- a/www/xfce4-smartbookmark-plugin/pkg-plist
+++ b/www/xfce4-smartbookmark-plugin/pkg-plist
@@ -1,46 +1,46 @@
 lib/xfce4/panel/plugins/libsmartbookmark.so
-share/locale/ar/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
-share/locale/ast/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
-share/locale/bg/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
-share/locale/ca/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
-share/locale/cs/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
-share/locale/da/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
-share/locale/de/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
-share/locale/el/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
-share/locale/en_AU/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
-share/locale/en_GB/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
-share/locale/es/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
-share/locale/eu/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
-share/locale/fr/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
-share/locale/gl/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
-share/locale/he/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
-share/locale/hr/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
-share/locale/hu/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
-share/locale/id/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
-share/locale/is/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
-share/locale/it/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
-share/locale/ja/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
-share/locale/ko/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
-share/locale/lt/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
-share/locale/lv/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
-share/locale/ms/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
-share/locale/nb/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
-share/locale/nl/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
-share/locale/oc/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
-share/locale/pl/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
-share/locale/pt/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
-share/locale/pt_BR/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
-share/locale/ru/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
-share/locale/sk/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
-share/locale/sq/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
-share/locale/sr/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
-share/locale/sv/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
-share/locale/th/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
-share/locale/tr/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
-share/locale/ug/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
-share/locale/uk/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
-share/locale/ur/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
-share/locale/ur_PK/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
-share/locale/zh_CN/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
-share/locale/zh_TW/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/ast/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/da/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/de/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/el/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/en_AU/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/es/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/he/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/id/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/is/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/it/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/oc/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/th/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
 share/xfce4/panel/plugins/smartbookmark.desktop