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

9 files changed, 177 insertions, 153 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
diff --git a/x11-clocks/xfce4-timer-out-plugin/Makefile b/x11-clocks/xfce4-timer-out-plugin/Makefile
index e3ba74505f80..77d30597e00a 100644
--- a/x11-clocks/xfce4-timer-out-plugin/Makefile
+++ b/x11-clocks/xfce4-timer-out-plugin/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xfce4-time-out-plugin
 PORTVERSION=	1.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-clocks xfce
 MASTER_SITES=	XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
@@ -13,12 +13,22 @@ COMMENT=	Timer out plugin for Xfce
 
 LICENSE=	GPLv2
 
+LIB_DEPNDS=	libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2
+
+USES=		gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce
+USE_GNOME=	cairo gtk20 intlhack intltool
+USE_XFCE=	panel
+USE_XORG=	x11
+
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 INSTALL_TARGET=	install-strip
-USES=		gettext gmake libtool pkgconfig xfce tar:bzip2
-USE_GNOME=	gtk20 intltool intlhack
-USE_XFCE=	panel
-USE_XORG=	x11
+
+OPTIONS_DEFINE=		NLS
+OPTIONS_SUB=		yes
+
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=		gettext-runtime
 
 .include <bsd.port.mk>
diff --git a/x11-clocks/xfce4-timer-out-plugin/pkg-descr b/x11-clocks/xfce4-timer-out-plugin/pkg-descr
index 34f50ab19231..7002f9f586c3 100644
--- a/x11-clocks/xfce4-timer-out-plugin/pkg-descr
+++ b/x11-clocks/xfce4-timer-out-plugin/pkg-descr
@@ -2,4 +2,4 @@ This plugin makes it possible to take periodical breaks from the computer every
 X minutes. During breaks it locks your screen. It optionally allows you to
 postpone breaks for a certain time.
 
-WWW: http://goodies.xfce.org/projects/panel-plugins/xfce4-time-out-plugin
+WWW: https://goodies.xfce.org/projects/panel-plugins/xfce4-time-out-plugin
diff --git a/x11-clocks/xfce4-timer-out-plugin/pkg-plist b/x11-clocks/xfce4-timer-out-plugin/pkg-plist
index 19e63236a065..14f7e929f195 100644
--- a/x11-clocks/xfce4-timer-out-plugin/pkg-plist
+++ b/x11-clocks/xfce4-timer-out-plugin/pkg-plist
@@ -1,47 +1,47 @@
 lib/xfce4/panel/plugins/libtime-out.so
 share/icons/hicolor/48x48/apps/xfce4-time-out-plugin.png
 share/icons/hicolor/scalable/apps/xfce4-time-out-plugin.svg
-share/locale/ar/LC_MESSAGES/xfce4-time-out-plugin.mo
-share/locale/ast/LC_MESSAGES/xfce4-time-out-plugin.mo
-share/locale/bg/LC_MESSAGES/xfce4-time-out-plugin.mo
-share/locale/ca/LC_MESSAGES/xfce4-time-out-plugin.mo
-share/locale/cs/LC_MESSAGES/xfce4-time-out-plugin.mo
-share/locale/da/LC_MESSAGES/xfce4-time-out-plugin.mo
-share/locale/de/LC_MESSAGES/xfce4-time-out-plugin.mo
-share/locale/el/LC_MESSAGES/xfce4-time-out-plugin.mo
-share/locale/en_AU/LC_MESSAGES/xfce4-time-out-plugin.mo
-share/locale/es/LC_MESSAGES/xfce4-time-out-plugin.mo
-share/locale/eu/LC_MESSAGES/xfce4-time-out-plugin.mo
-share/locale/fi/LC_MESSAGES/xfce4-time-out-plugin.mo
-share/locale/fr/LC_MESSAGES/xfce4-time-out-plugin.mo
-share/locale/gl/LC_MESSAGES/xfce4-time-out-plugin.mo
-share/locale/he/LC_MESSAGES/xfce4-time-out-plugin.mo
-share/locale/hr/LC_MESSAGES/xfce4-time-out-plugin.mo
-share/locale/hu/LC_MESSAGES/xfce4-time-out-plugin.mo
-share/locale/id/LC_MESSAGES/xfce4-time-out-plugin.mo
-share/locale/is/LC_MESSAGES/xfce4-time-out-plugin.mo
-share/locale/it/LC_MESSAGES/xfce4-time-out-plugin.mo
-share/locale/ja/LC_MESSAGES/xfce4-time-out-plugin.mo
-share/locale/kk/LC_MESSAGES/xfce4-time-out-plugin.mo
-share/locale/ko/LC_MESSAGES/xfce4-time-out-plugin.mo
-share/locale/lt/LC_MESSAGES/xfce4-time-out-plugin.mo
-share/locale/lv/LC_MESSAGES/xfce4-time-out-plugin.mo
-share/locale/ms/LC_MESSAGES/xfce4-time-out-plugin.mo
-share/locale/nb/LC_MESSAGES/xfce4-time-out-plugin.mo
-share/locale/nl/LC_MESSAGES/xfce4-time-out-plugin.mo
-share/locale/oc/LC_MESSAGES/xfce4-time-out-plugin.mo
-share/locale/pl/LC_MESSAGES/xfce4-time-out-plugin.mo
-share/locale/pt/LC_MESSAGES/xfce4-time-out-plugin.mo
-share/locale/pt_BR/LC_MESSAGES/xfce4-time-out-plugin.mo
-share/locale/ru/LC_MESSAGES/xfce4-time-out-plugin.mo
-share/locale/sk/LC_MESSAGES/xfce4-time-out-plugin.mo
-share/locale/sr/LC_MESSAGES/xfce4-time-out-plugin.mo
-share/locale/sv/LC_MESSAGES/xfce4-time-out-plugin.mo
-share/locale/tr/LC_MESSAGES/xfce4-time-out-plugin.mo
-share/locale/ug/LC_MESSAGES/xfce4-time-out-plugin.mo
-share/locale/uk/LC_MESSAGES/xfce4-time-out-plugin.mo
-share/locale/ur/LC_MESSAGES/xfce4-time-out-plugin.mo
-share/locale/ur_PK/LC_MESSAGES/xfce4-time-out-plugin.mo
-share/locale/zh_CN/LC_MESSAGES/xfce4-time-out-plugin.mo
-share/locale/zh_TW/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/ast/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/da/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/de/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/el/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/en_AU/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/es/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/he/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/id/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/is/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/it/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/oc/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-time-out-plugin.mo
 share/xfce4/panel/plugins/xfce4-time-out-plugin.desktop
diff --git a/x11-clocks/xfce4-timer-plugin/Makefile b/x11-clocks/xfce4-timer-plugin/Makefile
index a73839cdf881..c12f00ec30b6 100644
--- a/x11-clocks/xfce4-timer-plugin/Makefile
+++ b/x11-clocks/xfce4-timer-plugin/Makefile
@@ -13,11 +13,18 @@ COMMENT=	Timer plugin for Xfce
 
 LICENSE=	GPLv2
 
-USES=		libtool pkgconfig gettext gmake xfce:gtk3 tar:bzip2
-INSTALLS_ICONS=	yes
-INSTALL_TARGET=	install-strip
-GNU_CONFIGURE=	yes
+USES=		gettext 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
+
+OPTIONS_DEFINE=		NLS
+OPTIONS_SUB=		yes
+
+NLS_USES=		gettext-runtime
+NLS_CONFIGURE_ENABLE=	nls
+
 .include <bsd.port.mk>
diff --git a/x11-clocks/xfce4-timer-plugin/pkg-descr b/x11-clocks/xfce4-timer-plugin/pkg-descr
index f22c8ccd6a30..8a2cb2187c4e 100644
--- a/x11-clocks/xfce4-timer-plugin/pkg-descr
+++ b/x11-clocks/xfce4-timer-plugin/pkg-descr
@@ -8,4 +8,4 @@ can choose an external command to be run as the alarm and may also choose to
 have this repeated a specified number of times with a given interval between
 repetitions.
 
-WWW: http://goodies.xfce.org/projects/panel-plugins/xfce4-timer-plugin
+WWW: https://goodies.xfce.org/projects/panel-plugins/xfce4-timer-plugin
diff --git a/x11-clocks/xfce4-timer-plugin/pkg-plist b/x11-clocks/xfce4-timer-plugin/pkg-plist
index af47988ebda5..56919988b996 100644
--- a/x11-clocks/xfce4-timer-plugin/pkg-plist
+++ b/x11-clocks/xfce4-timer-plugin/pkg-plist
@@ -2,49 +2,49 @@ lib/xfce4/panel/plugins/libxfcetimer.so
 share/icons/hicolor/32x32/apps/xfce4-timer-plugin.png
 share/icons/hicolor/48x48/apps/xfce4-timer-plugin.png
 share/icons/hicolor/scalable/apps/xfce4-timer-plugin.svg
-share/locale/ar/LC_MESSAGES/xfce4-timer-plugin.mo
-share/locale/ast/LC_MESSAGES/xfce4-timer-plugin.mo
-share/locale/bg/LC_MESSAGES/xfce4-timer-plugin.mo
-share/locale/ca/LC_MESSAGES/xfce4-timer-plugin.mo
-share/locale/cs/LC_MESSAGES/xfce4-timer-plugin.mo
-share/locale/da/LC_MESSAGES/xfce4-timer-plugin.mo
-share/locale/de/LC_MESSAGES/xfce4-timer-plugin.mo
-share/locale/el/LC_MESSAGES/xfce4-timer-plugin.mo
-share/locale/en_AU/LC_MESSAGES/xfce4-timer-plugin.mo
-share/locale/en_GB/LC_MESSAGES/xfce4-timer-plugin.mo
-share/locale/es/LC_MESSAGES/xfce4-timer-plugin.mo
-share/locale/eu/LC_MESSAGES/xfce4-timer-plugin.mo
-share/locale/fi/LC_MESSAGES/xfce4-timer-plugin.mo
-share/locale/fr/LC_MESSAGES/xfce4-timer-plugin.mo
-share/locale/gl/LC_MESSAGES/xfce4-timer-plugin.mo
-share/locale/he/LC_MESSAGES/xfce4-timer-plugin.mo
-share/locale/hr/LC_MESSAGES/xfce4-timer-plugin.mo
-share/locale/hu/LC_MESSAGES/xfce4-timer-plugin.mo
-share/locale/id/LC_MESSAGES/xfce4-timer-plugin.mo
-share/locale/is/LC_MESSAGES/xfce4-timer-plugin.mo
-share/locale/it/LC_MESSAGES/xfce4-timer-plugin.mo
-share/locale/ja/LC_MESSAGES/xfce4-timer-plugin.mo
-share/locale/ko/LC_MESSAGES/xfce4-timer-plugin.mo
-share/locale/lt/LC_MESSAGES/xfce4-timer-plugin.mo
-share/locale/lv/LC_MESSAGES/xfce4-timer-plugin.mo
-share/locale/ms/LC_MESSAGES/xfce4-timer-plugin.mo
-share/locale/nb/LC_MESSAGES/xfce4-timer-plugin.mo
-share/locale/nl/LC_MESSAGES/xfce4-timer-plugin.mo
-share/locale/oc/LC_MESSAGES/xfce4-timer-plugin.mo
-share/locale/pl/LC_MESSAGES/xfce4-timer-plugin.mo
-share/locale/pt/LC_MESSAGES/xfce4-timer-plugin.mo
-share/locale/pt_BR/LC_MESSAGES/xfce4-timer-plugin.mo
-share/locale/ru/LC_MESSAGES/xfce4-timer-plugin.mo
-share/locale/sk/LC_MESSAGES/xfce4-timer-plugin.mo
-share/locale/sq/LC_MESSAGES/xfce4-timer-plugin.mo
-share/locale/sr/LC_MESSAGES/xfce4-timer-plugin.mo
-share/locale/sv/LC_MESSAGES/xfce4-timer-plugin.mo
-share/locale/th/LC_MESSAGES/xfce4-timer-plugin.mo
-share/locale/tr/LC_MESSAGES/xfce4-timer-plugin.mo
-share/locale/ug/LC_MESSAGES/xfce4-timer-plugin.mo
-share/locale/uk/LC_MESSAGES/xfce4-timer-plugin.mo
-share/locale/ur/LC_MESSAGES/xfce4-timer-plugin.mo
-share/locale/ur_PK/LC_MESSAGES/xfce4-timer-plugin.mo
-share/locale/zh_CN/LC_MESSAGES/xfce4-timer-plugin.mo
-share/locale/zh_TW/LC_MESSAGES/xfce4-timer-plugin.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/xfce4-timer-plugin.mo
+%%NLS%%share/locale/ast/LC_MESSAGES/xfce4-timer-plugin.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/xfce4-timer-plugin.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/xfce4-timer-plugin.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/xfce4-timer-plugin.mo
+%%NLS%%share/locale/da/LC_MESSAGES/xfce4-timer-plugin.mo
+%%NLS%%share/locale/de/LC_MESSAGES/xfce4-timer-plugin.mo
+%%NLS%%share/locale/el/LC_MESSAGES/xfce4-timer-plugin.mo
+%%NLS%%share/locale/en_AU/LC_MESSAGES/xfce4-timer-plugin.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-timer-plugin.mo
+%%NLS%%share/locale/es/LC_MESSAGES/xfce4-timer-plugin.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/xfce4-timer-plugin.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/xfce4-timer-plugin.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/xfce4-timer-plugin.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/xfce4-timer-plugin.mo
+%%NLS%%share/locale/he/LC_MESSAGES/xfce4-timer-plugin.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/xfce4-timer-plugin.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/xfce4-timer-plugin.mo
+%%NLS%%share/locale/id/LC_MESSAGES/xfce4-timer-plugin.mo
+%%NLS%%share/locale/is/LC_MESSAGES/xfce4-timer-plugin.mo
+%%NLS%%share/locale/it/LC_MESSAGES/xfce4-timer-plugin.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/xfce4-timer-plugin.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/xfce4-timer-plugin.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/xfce4-timer-plugin.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/xfce4-timer-plugin.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/xfce4-timer-plugin.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/xfce4-timer-plugin.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/xfce4-timer-plugin.mo
+%%NLS%%share/locale/oc/LC_MESSAGES/xfce4-timer-plugin.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/xfce4-timer-plugin.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/xfce4-timer-plugin.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce4-timer-plugin.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/xfce4-timer-plugin.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/xfce4-timer-plugin.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/xfce4-timer-plugin.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/xfce4-timer-plugin.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/xfce4-timer-plugin.mo
+%%NLS%%share/locale/th/LC_MESSAGES/xfce4-timer-plugin.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/xfce4-timer-plugin.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/xfce4-timer-plugin.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/xfce4-timer-plugin.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/xfce4-timer-plugin.mo
+%%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce4-timer-plugin.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-timer-plugin.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-timer-plugin.mo
 share/xfce4/panel/plugins/xfce4-timer-plugin.desktop