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, 54 deletions

diff --git a/x11-clocks/xfce4-datetime-plugin/Makefile b/x11-clocks/xfce4-datetime-plugin/Makefile
index 24de9ec3991d..12b015ddedca 100644
--- a/x11-clocks/xfce4-datetime-plugin/Makefile
+++ b/x11-clocks/xfce4-datetime-plugin/Makefile
@@ -12,11 +12,18 @@ COMMENT=	Datetime panel plugin for the Xfce desktop
 
 LICENSE=	GPLv2
 
+USES=		gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce:gtk3
+USE_GNOME=	cairo gtk30 intltool
+USE_XFCE=	panel
+
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 INSTALL_TARGET=	install-strip
-USES=		gettext gmake libtool pkgconfig tar:bzip2 xfce:gtk3
-USE_GNOME=	gtk30 intltool cairo
-USE_XFCE=	panel
+
+OPTIONS_DEFINE=		NLS
+OPTIONS_SUB=		yes
+
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=		gettext-runtime
 
 .include <bsd.port.mk>
diff --git a/x11-clocks/xfce4-datetime-plugin/pkg-descr b/x11-clocks/xfce4-datetime-plugin/pkg-descr
index 748cd1e754c2..1a51cc75094e 100644
--- a/x11-clocks/xfce4-datetime-plugin/pkg-descr
+++ b/x11-clocks/xfce4-datetime-plugin/pkg-descr
@@ -1,4 +1,4 @@
 This plugin shows the date and time in the Xfce panel, and a calendar
 appears (left-click).
 
-WWW: http://goodies.xfce.org/projects/panel-plugins/xfce4-datetime-plugin
+WWW: https://goodies.xfce.org/projects/panel-plugins/xfce4-datetime-plugin
diff --git a/x11-clocks/xfce4-datetime-plugin/pkg-plist b/x11-clocks/xfce4-datetime-plugin/pkg-plist
index c1db31971c04..1bf334aca622 100644
--- a/x11-clocks/xfce4-datetime-plugin/pkg-plist
+++ b/x11-clocks/xfce4-datetime-plugin/pkg-plist
@@ -1,52 +1,52 @@
 lib/xfce4/panel/plugins/libdatetime.so
-share/locale/am/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/ar/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/ast/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/bg/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/ca/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/cs/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/da/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/de/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/el/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/en_AU/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/en_GB/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/es/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/eu/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/fr/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/gl/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/he/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/hr/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/hu/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/id/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/is/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/it/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/ja/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/kk/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/ko/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/lt/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/lv/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/ms/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/nb/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/nl/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/nn/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/oc/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/pa/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/pl/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/pt/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/pt_BR/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/ro/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/ru/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/sk/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/sl/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/sr/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/sv/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/th/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/tr/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/ug/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/uk/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/ur/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/ur_PK/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/uz/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/zh_CN/LC_MESSAGES/xfce4-datetime-plugin.mo
-share/locale/zh_TW/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/am/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/ast/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/da/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/de/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/el/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/en_AU/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/es/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/he/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/id/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/is/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/it/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/nn/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/oc/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/pa/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/th/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/uz/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-datetime-plugin.mo
 share/xfce4/panel/plugins/datetime.desktop