31 files changed, 273 insertions, 303 deletions

diff --git a/sysutils/garcon/Makefile b/sysutils/garcon/Makefile
index c541fab29355..abda462b4af7 100644
--- a/sysutils/garcon/Makefile
+++ b/sysutils/garcon/Makefile
@@ -17,8 +17,9 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
-USES=		gettext-tools gmake libtool pathfix pkgconfig tar:bzip2 xfce:gtk3
-USE_GNOME=	glib20 gtk20 gtk30 intltool cairo gdkpixbuf2
+USES=		gettext-tools gmake gnome libtool pathfix pkgconfig \
+		tar:bzip2 xfce:gtk3
+USE_GNOME=	cairo gdkpixbuf2 glib20 gtk20 gtk30 intltool
 USE_XFCE=	libmenu
 USE_LDCONFIG=	yes
 
@@ -28,8 +29,9 @@ CONFIGURE_ARGS=	--without-html-dir \
 		--enable-gtk2
 
 OPTIONS_DEFINE=		NLS
-NLS_USES=		gettext-runtime
-NLS_CONFIGURE_ENABLE=	nls
 OPTIONS_SUB=		yes
 
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=		gettext-runtime
+
 .include <bsd.port.mk>
diff --git a/sysutils/garcon/files/patch-configure b/sysutils/garcon/files/patch-configure
deleted file mode 100644
index 59cec1a09d7b..000000000000
--- a/sysutils/garcon/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2017-04-16 04:37:20 UTC
-+++ configure
-@@ -14201,7 +14201,7 @@ $as_echo "#define HAVE_LC_MESSAGES 1" >>
- 
-     fi
-   fi
--     USE_NLS=yes
-+#     USE_NLS=yes
- 
- 
-     gt_cv_have_gettext=no
diff --git a/sysutils/garcon/pkg-descr b/sysutils/garcon/pkg-descr
index 4ff5c4cda19a..8a78a4b7fd33 100644
--- a/sysutils/garcon/pkg-descr
+++ b/sysutils/garcon/pkg-descr
@@ -2,4 +2,4 @@ Garcon is an implementation of the freedesktop.org menu specification
 replacing the former Xfce menu library libxfce4menu. It is based on
 GLib/GIO only and aims at covering the entire specification.
 
-WWW: http://www.xfce.org/
+WWW: https://www.xfce.org/
diff --git a/sysutils/xfburn/Makefile b/sysutils/xfburn/Makefile
index 16092eb5f83a..b6b73013a6d4 100644
--- a/sysutils/xfburn/Makefile
+++ b/sysutils/xfburn/Makefile
@@ -21,21 +21,24 @@ RUN_DEPENDS=	cdrdao:sysutils/cdrdao \
 		${LOCALBASE}/include/libburn/libburn.h:devel/libburn \
 		${LOCALBASE}/include/libisofs/libisofs.h:devel/libisofs
 
-USES=		pkgconfig gmake desktop-file-utils gettext-tools xfce tar:bzip2
-GNU_CONFIGURE=	yes
-USE_GNOME=	cairo intltool intlhack glib20 gtk20
+USES=		desktop-file-utils gettext-tools gmake gnome pkgconfig \
+		tar:bzip2 xfce
+USE_GNOME=	cairo glib20 gtk20 intlhack intltool
 USE_XFCE=	libexo
-INSTALLS_ICONS=	yes
 
-CONFIGURE_ARGS=--disable-gudev
+GNU_CONFIGURE=	yes
+INSTALLS_ICONS=	yes
+CONFIGURE_ARGS=	--disable-gudev
 
 OPTIONS_DEFINE=			GSTREAMER NLS
 OPTIONS_DEFAULT=		GSTREAMER
 OPTIONS_SUB=			yes
-NLS_USES=			gettext-runtime
-NLS_CONFIGURE_ENABLE=		nls
-GSTREAMER_USE=			gstreamer1=yes,faac,flac,lame,vorbis,wavpack
+
 GSTREAMER_CONFIGURE_ENABLE=	gstreamer
+GSTREAMER_USE=			gstreamer1=yes,faac,flac,lame,vorbis,wavpack
+
+NLS_CONFIGURE_ENABLE=		nls
+NLS_USES=			gettext-runtime
 
 post-patch:
 	${REINPLACE_CMD} -e 's|media-cdrom|media-optical|g' \
diff --git a/sysutils/xfburn/files/patch-configure b/sysutils/xfburn/files/patch-configure
deleted file mode 100644
index 652c191f4acd..000000000000
--- a/sysutils/xfburn/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2017-12-14 13:02:43 UTC
-+++ configure
-@@ -12918,7 +12918,7 @@ $as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
- 
-     fi
-   fi
--     USE_NLS=yes
-+     #USE_NLS=yes
- 
- 
-     gt_cv_have_gettext=no
diff --git a/sysutils/xfburn/pkg-descr b/sysutils/xfburn/pkg-descr
index 05848dc03c20..52b2649fafdf 100644
--- a/sysutils/xfburn/pkg-descr
+++ b/sysutils/xfburn/pkg-descr
@@ -2,4 +2,4 @@ Xfburn is a simple CD/DVD burning application based on libburnia libraries,
 which supports erasing, formatting of discs; burning of iso images, audio, and
 data compositions.
 
-WWW: http://goodies.xfce.org/projects/applications/xfburn
+WWW: https://goodies.xfce.org/projects/applications/xfburn
diff --git a/sysutils/xfce4-battery-plugin/Makefile b/sysutils/xfce4-battery-plugin/Makefile
index 3986b17d3c64..7d872a0db26c 100644
--- a/sysutils/xfce4-battery-plugin/Makefile
+++ b/sysutils/xfce4-battery-plugin/Makefile
@@ -16,7 +16,7 @@ ONLY_FOR_ARCHS=	amd64 i386
 
 USES=		alias gettext-tools gmake gnome libtool pkgconfig \
 		tar:bzip2 xfce:gtk3
-USE_GNOME=	gtk30 glib20 intltool cairo
+USE_GNOME=	cairo gtk30 glib20 intltool
 USE_XFCE=	panel
 USE_LDCONFIG=	yes
 
@@ -25,9 +25,10 @@ GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 INSTALL_TARGET=	install-strip
 
-OPTIONS_DEFINE=	NLS
-NLS_USES=	gettext-runtime
+OPTIONS_DEFINE=		NLS
+OPTIONS_SUB=		yes
+
 NLS_CONFIGURE_ENABLE=	nls
-OPTIONS_SUB=	yes
+NLS_USES=		gettext-runtime
 
 .include <bsd.port.mk>
diff --git a/sysutils/xfce4-battery-plugin/files/patch-configure b/sysutils/xfce4-battery-plugin/files/patch-configure
deleted file mode 100644
index 78813965a83a..000000000000
--- a/sysutils/xfce4-battery-plugin/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2016-10-31 17:27:48 UTC
-+++ configure
-@@ -13269,7 +13269,7 @@ _ACEOF
- 
-     fi
-   fi
--     USE_NLS=yes
-+#     USE_NLS=yes
- 
- 
-     gt_cv_have_gettext=no
diff --git a/sysutils/xfce4-cpugraph-plugin/Makefile b/sysutils/xfce4-cpugraph-plugin/Makefile
index 50ce5736cb16..2f94bf1c67ac 100644
--- a/sysutils/xfce4-cpugraph-plugin/Makefile
+++ b/sysutils/xfce4-cpugraph-plugin/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xfce4-cpugraph-plugin
 PORTVERSION=	1.0.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
@@ -13,16 +13,22 @@ COMMENT=	Graphical representation of the CPU load
 
 LICENSE=	GPLv2
 
+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 intlhack intltool
+USE_XFCE=	panel
+
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 INSTALL_TARGET=	install-strip
-USES=		gmake libtool pkgconfig gettext-tools xfce tar:bzip2
-USE_GNOME=	gtk20 intltool intlhack
-USE_XFCE=	panel
 
-OPTIONS_DEFINE= NLS
-NLS_USES=	gettext-runtime
+OPTIONS_DEFINE=		NLS
+OPTIONS_SUB=		yes
+
 NLS_CONFIGURE_ENABLE=	nls
-OPTIONS_SUB=	yes
+NLS_USES=		gettext-runtime
 
 .include <bsd.port.mk>
diff --git a/sysutils/xfce4-cpugraph-plugin/files/patch-configure b/sysutils/xfce4-cpugraph-plugin/files/patch-configure
deleted file mode 100644
index ef4645796d7e..000000000000
--- a/sysutils/xfce4-cpugraph-plugin/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./configure.orig	2012-07-04 14:30:00.000000000 +0000
-+++ ./configure	2014-01-30 14:21:45.000000000 +0000
-@@ -14658,7 +14658,7 @@
- 
-     fi
-   fi
--     USE_NLS=yes
-+#     USE_NLS=yes
- 
- 
-     gt_cv_have_gettext=no
diff --git a/sysutils/xfce4-cpugraph-plugin/pkg-descr b/sysutils/xfce4-cpugraph-plugin/pkg-descr
index 6d3947169a7b..ae5ca3e5b7e7 100644
--- a/sysutils/xfce4-cpugraph-plugin/pkg-descr
+++ b/sysutils/xfce4-cpugraph-plugin/pkg-descr
@@ -1,3 +1,3 @@
 Panel plugin to display a graphical representation of the CPU load.
 
-WWW: http://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin
+WWW: https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin
diff --git a/sysutils/xfce4-fsguard-plugin/Makefile b/sysutils/xfce4-fsguard-plugin/Makefile
index 0d5fe87a0914..4b6aa4550eba 100644
--- a/sysutils/xfce4-fsguard-plugin/Makefile
+++ b/sysutils/xfce4-fsguard-plugin/Makefile
@@ -13,20 +13,19 @@ COMMENT=	Panel plugin which displays free space of mountpoint
 # COPYING file is wrong compared to license header
 LICENSE=	BSD2CLAUSE
 
+USES=		gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce:gtk3
+USE_GNOME=	cairo gtk30 intltool
+USE_XFCE=	panel
+USE_XORG=	x11
+
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 INSTALL_TARGET=	install-strip
-USES=		gettext-tools gmake libtool pkgconfig tar:bzip2 xfce:gtk3
-USE_GNOME=	gtk30 intltool cairo
-USE_XFCE=	panel
-USE_XORG=	x11
 
-OPTIONS_DEFINE= NLS
-NLS_USES=	gettext-runtime
-NLS_CONFIGURE_ENABLE=	nls
-OPTIONS_SUB=	yes
+OPTIONS_DEFINE=		NLS
+OPTIONS_SUB=		yes
 
-post-patch-NLS-off:
-	@${REINPLACE_CMD} -e 's|	po||' ${WRKSRC}/Makefile.in
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=		gettext-runtime
 
 .include <bsd.port.mk>
diff --git a/sysutils/xfce4-fsguard-plugin/pkg-descr b/sysutils/xfce4-fsguard-plugin/pkg-descr
index ad961d4e0bfa..afbc865d0b0d 100644
--- a/sysutils/xfce4-fsguard-plugin/pkg-descr
+++ b/sysutils/xfce4-fsguard-plugin/pkg-descr
@@ -3,4 +3,4 @@ a message when a limit is reached. There are two limits:
 - a warning limit where only the icon changes
 - an urgent limit that advise the user with a message
 
-WWW: http://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin
+WWW: https://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin
diff --git a/sysutils/xfce4-genmon-plugin/Makefile b/sysutils/xfce4-genmon-plugin/Makefile
index d3dd140454d3..43c99c6dc709 100644
--- a/sysutils/xfce4-genmon-plugin/Makefile
+++ b/sysutils/xfce4-genmon-plugin/Makefile
@@ -12,10 +12,18 @@ COMMENT=	Generic Monitor Xfce4 panel plugin
 
 LICENSE=	LGPL21
 
+USES=		gettext-tools gmake gnome libtool pkgconfig \
+		tar:bzip2 xfce:gtk3
+USE_GNOME=	cairo gdkpixbuf2 glib20 gtk30 intltool
+USE_XFCE=	panel
+
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-USES=		gettext gmake libtool pkgconfig tar:bzip2 xfce:gtk3
-USE_GNOME=	glib20 gtk30 intltool cairo gdkpixbuf2
-USE_XFCE=	panel
+
+OPTIONS_DEFINE=		NLS
+OPTIONS_SUB=		yes
+
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=		gettext-runtime
 
 .include <bsd.port.mk>
diff --git a/sysutils/xfce4-genmon-plugin/pkg-descr b/sysutils/xfce4-genmon-plugin/pkg-descr
index 5605aa19ba78..440689371c55 100644
--- a/sysutils/xfce4-genmon-plugin/pkg-descr
+++ b/sysutils/xfce4-genmon-plugin/pkg-descr
@@ -1,4 +1,4 @@
 The GenMon plugin cyclically spawns the indicated script/program,
 captures its output and displays it as a string into the panel.
 
-WWW: http://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin
+WWW: https://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin
diff --git a/sysutils/xfce4-genmon-plugin/pkg-plist b/sysutils/xfce4-genmon-plugin/pkg-plist
index 47ed3f663ef9..6015cfd9606c 100644
--- a/sysutils/xfce4-genmon-plugin/pkg-plist
+++ b/sysutils/xfce4-genmon-plugin/pkg-plist
@@ -1,49 +1,49 @@
 lib/xfce4/panel/plugins/libgenmon.so
-share/locale/am/LC_MESSAGES/xfce4-genmon-plugin.mo
-share/locale/ar/LC_MESSAGES/xfce4-genmon-plugin.mo
-share/locale/ast/LC_MESSAGES/xfce4-genmon-plugin.mo
-share/locale/bg/LC_MESSAGES/xfce4-genmon-plugin.mo
-share/locale/ca/LC_MESSAGES/xfce4-genmon-plugin.mo
-share/locale/cs/LC_MESSAGES/xfce4-genmon-plugin.mo
-share/locale/da/LC_MESSAGES/xfce4-genmon-plugin.mo
-share/locale/de/LC_MESSAGES/xfce4-genmon-plugin.mo
-share/locale/el/LC_MESSAGES/xfce4-genmon-plugin.mo
-share/locale/en_AU/LC_MESSAGES/xfce4-genmon-plugin.mo
-share/locale/en_GB/LC_MESSAGES/xfce4-genmon-plugin.mo
-share/locale/es/LC_MESSAGES/xfce4-genmon-plugin.mo
-share/locale/eu/LC_MESSAGES/xfce4-genmon-plugin.mo
-share/locale/fr/LC_MESSAGES/xfce4-genmon-plugin.mo
-share/locale/gl/LC_MESSAGES/xfce4-genmon-plugin.mo
-share/locale/he/LC_MESSAGES/xfce4-genmon-plugin.mo
-share/locale/hr/LC_MESSAGES/xfce4-genmon-plugin.mo
-share/locale/hu/LC_MESSAGES/xfce4-genmon-plugin.mo
-share/locale/id/LC_MESSAGES/xfce4-genmon-plugin.mo
-share/locale/is/LC_MESSAGES/xfce4-genmon-plugin.mo
-share/locale/it/LC_MESSAGES/xfce4-genmon-plugin.mo
-share/locale/ja/LC_MESSAGES/xfce4-genmon-plugin.mo
-share/locale/kk/LC_MESSAGES/xfce4-genmon-plugin.mo
-share/locale/ko/LC_MESSAGES/xfce4-genmon-plugin.mo
-share/locale/lt/LC_MESSAGES/xfce4-genmon-plugin.mo
-share/locale/lv/LC_MESSAGES/xfce4-genmon-plugin.mo
-share/locale/ms/LC_MESSAGES/xfce4-genmon-plugin.mo
-share/locale/nb/LC_MESSAGES/xfce4-genmon-plugin.mo
-share/locale/nl/LC_MESSAGES/xfce4-genmon-plugin.mo
-share/locale/oc/LC_MESSAGES/xfce4-genmon-plugin.mo
-share/locale/pl/LC_MESSAGES/xfce4-genmon-plugin.mo
-share/locale/pt/LC_MESSAGES/xfce4-genmon-plugin.mo
-share/locale/pt_BR/LC_MESSAGES/xfce4-genmon-plugin.mo
-share/locale/ru/LC_MESSAGES/xfce4-genmon-plugin.mo
-share/locale/sk/LC_MESSAGES/xfce4-genmon-plugin.mo
-share/locale/sl/LC_MESSAGES/xfce4-genmon-plugin.mo
-share/locale/sq/LC_MESSAGES/xfce4-genmon-plugin.mo
-share/locale/sr/LC_MESSAGES/xfce4-genmon-plugin.mo
-share/locale/sv/LC_MESSAGES/xfce4-genmon-plugin.mo
-share/locale/th/LC_MESSAGES/xfce4-genmon-plugin.mo
-share/locale/tr/LC_MESSAGES/xfce4-genmon-plugin.mo
-share/locale/ug/LC_MESSAGES/xfce4-genmon-plugin.mo
-share/locale/uk/LC_MESSAGES/xfce4-genmon-plugin.mo
-share/locale/ur/LC_MESSAGES/xfce4-genmon-plugin.mo
-share/locale/ur_PK/LC_MESSAGES/xfce4-genmon-plugin.mo
-share/locale/zh_CN/LC_MESSAGES/xfce4-genmon-plugin.mo
-share/locale/zh_TW/LC_MESSAGES/xfce4-genmon-plugin.mo
+%%NLS%%share/locale/am/LC_MESSAGES/xfce4-genmon-plugin.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/xfce4-genmon-plugin.mo
+%%NLS%%share/locale/ast/LC_MESSAGES/xfce4-genmon-plugin.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/xfce4-genmon-plugin.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/xfce4-genmon-plugin.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/xfce4-genmon-plugin.mo
+%%NLS%%share/locale/da/LC_MESSAGES/xfce4-genmon-plugin.mo
+%%NLS%%share/locale/de/LC_MESSAGES/xfce4-genmon-plugin.mo
+%%NLS%%share/locale/el/LC_MESSAGES/xfce4-genmon-plugin.mo
+%%NLS%%share/locale/en_AU/LC_MESSAGES/xfce4-genmon-plugin.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-genmon-plugin.mo
+%%NLS%%share/locale/es/LC_MESSAGES/xfce4-genmon-plugin.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/xfce4-genmon-plugin.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/xfce4-genmon-plugin.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/xfce4-genmon-plugin.mo
+%%NLS%%share/locale/he/LC_MESSAGES/xfce4-genmon-plugin.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/xfce4-genmon-plugin.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/xfce4-genmon-plugin.mo
+%%NLS%%share/locale/id/LC_MESSAGES/xfce4-genmon-plugin.mo
+%%NLS%%share/locale/is/LC_MESSAGES/xfce4-genmon-plugin.mo
+%%NLS%%share/locale/it/LC_MESSAGES/xfce4-genmon-plugin.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/xfce4-genmon-plugin.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/xfce4-genmon-plugin.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/xfce4-genmon-plugin.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/xfce4-genmon-plugin.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/xfce4-genmon-plugin.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/xfce4-genmon-plugin.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/xfce4-genmon-plugin.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/xfce4-genmon-plugin.mo
+%%NLS%%share/locale/oc/LC_MESSAGES/xfce4-genmon-plugin.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/xfce4-genmon-plugin.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/xfce4-genmon-plugin.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce4-genmon-plugin.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/xfce4-genmon-plugin.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/xfce4-genmon-plugin.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/xfce4-genmon-plugin.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/xfce4-genmon-plugin.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/xfce4-genmon-plugin.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/xfce4-genmon-plugin.mo
+%%NLS%%share/locale/th/LC_MESSAGES/xfce4-genmon-plugin.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/xfce4-genmon-plugin.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/xfce4-genmon-plugin.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/xfce4-genmon-plugin.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/xfce4-genmon-plugin.mo
+%%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce4-genmon-plugin.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-genmon-plugin.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-genmon-plugin.mo
 share/xfce4/panel/plugins/genmon.desktop
diff --git a/sysutils/xfce4-mount-plugin/Makefile b/sysutils/xfce4-mount-plugin/Makefile
index 0af725e2e53e..a3995d54e501 100644
--- a/sysutils/xfce4-mount-plugin/Makefile
+++ b/sysutils/xfce4-mount-plugin/Makefile
@@ -15,18 +15,19 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
+USES=		gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce:gtk3
+USE_GNOME=	cairo gtk30 intltool
+USE_LDCONFIG=	yes
+USE_XFCE=	panel
+
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 INSTALL_TARGET=	install-strip
-USES=		gettext-tools gmake libtool pkgconfig tar:bzip2 xfce:gtk3
-USE_GNOME=	gtk30 cairo intltool
-USE_LDCONFIG=	yes
-USE_XFCE=	panel
 
-OPTIONS_DEFINE=	NLS
-OPTIONS_SUB=	yes
+OPTIONS_DEFINE=		NLS
+OPTIONS_SUB=		yes
 
-NLS_USES=	gettext-runtime
 NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=		gettext-runtime
 
 .include <bsd.port.mk>
diff --git a/sysutils/xfce4-mount-plugin/pkg-descr b/sysutils/xfce4-mount-plugin/pkg-descr
index ef136d932266..d2ccb888c7ce 100644
--- a/sysutils/xfce4-mount-plugin/pkg-descr
+++ b/sysutils/xfce4-mount-plugin/pkg-descr
@@ -1,4 +1,4 @@
 Mount plugin allows to mount/umount external devices, cd/dvd-rom and
 networked filesystems listed in your /etc/fstab.
 
-WWW: http://goodies.xfce.org/projects/panel-plugins/xfce4-mount-plugin
+WWW: https://goodies.xfce.org/projects/panel-plugins/xfce4-mount-plugin
diff --git a/sysutils/xfce4-netload-plugin/Makefile b/sysutils/xfce4-netload-plugin/Makefile
index b75faa1999e7..034a97151dad 100644
--- a/sysutils/xfce4-netload-plugin/Makefile
+++ b/sysutils/xfce4-netload-plugin/Makefile
@@ -13,18 +13,19 @@ COMMENT=	Network Load plugin for Xfce4
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-GNU_CONFIGURE=	yes
-USE_GNOME=	gtk30 intltool cairo
+USES=		gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce:gtk3
+USE_GNOME=	cairo gtk30 intltool
 USE_XFCE=	panel
-USES=		gettext-tools gmake libtool pkgconfig tar:bzip2 xfce:gtk3
+
+GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 INSTALL_TARGET=	install-strip
 
-OPTIONS_DEFINE=	NLS
-OPTIONS_SUB=	yes
+OPTIONS_DEFINE=		NLS
+OPTIONS_SUB=		yes
 
 NLS_CONFIGURE_ENABLE=	nls
-NLS_USES=	gettext-runtime
+NLS_USES=		gettext-runtime
 
 post-patch:
 	@${REINPLACE_CMD} -e 's, || __FreeBSD_kernel__,,' \
@@ -32,7 +33,4 @@ post-patch:
 		${WRKSRC}/panel-plugin/net.h \
 		${WRKSRC}/panel-plugin/os.h
 
-post-patch-NLS-off:
-	${REINPLACE_CMD} -e 's|po ||' ${WRKSRC}/Makefile.in
-
 .include <bsd.port.mk>
diff --git a/sysutils/xfce4-netload-plugin/pkg-descr b/sysutils/xfce4-netload-plugin/pkg-descr
index 385eb892a734..0ed649af531a 100644
--- a/sysutils/xfce4-netload-plugin/pkg-descr
+++ b/sysutils/xfce4-netload-plugin/pkg-descr
@@ -1,3 +1,3 @@
 Network Load plugin for the Xfce Desktop.
 
-WWW: http://goodies.xfce.org/projects/panel-plugins/xfce4-netload-plugin
+WWW: https://goodies.xfce.org/projects/panel-plugins/xfce4-netload-plugin
diff --git a/sysutils/xfce4-power-manager/Makefile b/sysutils/xfce4-power-manager/Makefile
index 6f783bd57124..2ba3688d3a5d 100644
--- a/sysutils/xfce4-power-manager/Makefile
+++ b/sysutils/xfce4-power-manager/Makefile
@@ -18,15 +18,22 @@ LIB_DEPENDS=	libnotify.so:devel/libnotify \
 		libpolkit-gobject-1.so:sysutils/polkit \
 		libupower-glib.so:sysutils/upower
 
-GNU_CONFIGURE=	yes
-USES=		gettext gmake libtool pkgconfig tar:bzip2 xfce:gtk3
-USE_GNOME=	cairo glib20 gtk30 intltool intlhack
+USES=		gettext gmake gnome libtool pkgconfig tar:bzip2 xfce:gtk3
+USE_GNOME=	cairo glib20 gtk30 intlhack intltool
 USE_XFCE=	panel
-INSTALLS_ICONS=	yes
 USE_XORG=	ice sm xrandr x11 xext xtst xscrnsaver
+
+GNU_CONFIGURE=	yes
+INSTALLS_ICONS=	yes
 CONFIGURE_ARGS=	--disable-network-manager \
 		--enable-polkit \
 		--enable-xfce4panel
 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/sysutils/xfce4-power-manager/pkg-descr b/sysutils/xfce4-power-manager/pkg-descr
index 3509e9511222..2e5d4fd00968 100644
--- a/sysutils/xfce4-power-manager/pkg-descr
+++ b/sysutils/xfce4-power-manager/pkg-descr
@@ -1,4 +1,4 @@
 Xfce power manager manages the power sources on the computer and the
 devices that can be controlled to reduce their power consumption.
 
-WWW: http://goodies.xfce.org/projects/applications/xfce4-power-manager
+WWW: https://goodies.xfce.org/projects/applications/xfce4-power-manager
diff --git a/sysutils/xfce4-power-manager/pkg-plist b/sysutils/xfce4-power-manager/pkg-plist
index 76469de1c33a..9d3d84a49d07 100644
--- a/sysutils/xfce4-power-manager/pkg-plist
+++ b/sysutils/xfce4-power-manager/pkg-plist
@@ -94,59 +94,59 @@ share/icons/hicolor/scalable/status/tablet.svg
 share/icons/hicolor/scalable/status/uninterruptible-power-supply.svg
 share/icons/hicolor/scalable/status/video-display.svg
 share/icons/hicolor/scalable/status/xfce4-power-manager-settings.svg
-share/locale/ar/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/ast/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/bg/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/ca/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/cs/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/da/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/de/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/el/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/en_AU/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/en_GB/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/es/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/et/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/eu/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/fi/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/fr/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/gl/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/he/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/hr/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/hu/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/id/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/is/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/it/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/ja/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/kk/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/kn/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/ko/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/lt/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/ms/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/nb/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/nl/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/nn/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/oc/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/pa/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/pl/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/pt/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/pt_BR/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/ro/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/ru/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/si/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/sk/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/sl/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/sr/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/sv/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/te/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/th/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/tr/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/ug/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/uk/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/ur/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/ur_PK/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/vi/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/zh_CN/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/zh_HK/LC_MESSAGES/xfce4-power-manager.mo
-share/locale/zh_TW/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/ast/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/da/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/de/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/el/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/en_AU/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/es/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/et/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/he/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/id/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/is/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/it/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/kn/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/nn/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/oc/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/pa/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/si/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/te/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/th/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/zh_HK/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-power-manager.mo
 share/polkit-1/actions/org.xfce.power.policy
 share/xfce4/panel/plugins/power-manager-plugin.desktop
diff --git a/sysutils/xfce4-settings/Makefile b/sysutils/xfce4-settings/Makefile
index 0bf852ce98b0..61a17076e74c 100644
--- a/sysutils/xfce4-settings/Makefile
+++ b/sysutils/xfce4-settings/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xfce4-settings
 PORTVERSION=	4.12.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	XFCE/src/xfce/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
@@ -17,32 +17,35 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libdbus-1.so:devel/dbus \
 		libdbus-glib-1.so:devel/dbus-glib \
 		libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
 		libxklavier.so:x11/libxklavier
 
-PORTSCOUT=	limit:^4\.12\.
-
-USES=		gettext-tools gmake libtool pkgconfig tar:bzip2 xfce
-GNU_CONFIGURE=	yes
-INSTALLS_ICONS=	yes
-USE_GNOME=	glib20 gtk20 cairo intltool intlhack
+USES=		gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce
+USE_GNOME=	cairo glib20 gtk20 intlhack intltool
 USE_XFCE=	garcon libexo
 USE_XORG=	xorgproto x11 xcursor xi xrandr
 
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-debug=yes \
 		--disable-xorg-libinput
+INSTALLS_ICONS=	yes
+
+PORTSCOUT=	limit:^4\.12\.
 
 OPTIONS_DEFINE=		NOTIFY NLS UPOWER
 OPTIONS_DEFAULT=	NOTIFY
+OPTIONS_SUB=		yes
 
 UPOWER_DESC=		Power management tasks
 
-NOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
+NLS_CONFIGURE_ENABLE=		nls
+NLS_USES=			gettext-runtime
+
 NOTIFY_CONFIGURE_ENABLE=	libnotify
-NLS_CONFIGURE_ENABLE=	nls
-NLS_USES=		gettext-runtime
-UPOWER_LIB_DEPENDS=	libupower-glib.so:sysutils/upower
+NOTIFY_LIB_DEPENDS=		libnotify.so:devel/libnotify
+
 UPOWER_CONFIGURE_ENABLE=	upower-glib
-OPTIONS_SUB=		yes
+UPOWER_LIB_DEPENDS=		libupower-glib.so:sysutils/upower
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|Rodent|Adwaita|g' \
diff --git a/sysutils/xfce4-settings/files/patch-configure b/sysutils/xfce4-settings/files/patch-configure
deleted file mode 100644
index 3448bc4bce4d..000000000000
--- a/sysutils/xfce4-settings/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2018-03-18 20:52:52 UTC
-+++ configure
-@@ -13868,7 +13868,7 @@ $as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
- 
-     fi
-   fi
--     USE_NLS=yes
-+#     USE_NLS=yes
- 
- 
-     gt_cv_have_gettext=no
diff --git a/sysutils/xfce4-systemload-plugin/Makefile b/sysutils/xfce4-systemload-plugin/Makefile
index 0a119c4288a2..79d1ddf64f05 100644
--- a/sysutils/xfce4-systemload-plugin/Makefile
+++ b/sysutils/xfce4-systemload-plugin/Makefile
@@ -12,21 +12,22 @@ COMMENT=	System Load plugin for Xfce4 panel
 
 LICENSE=	BSD2CLAUSE
 
-USES=		gettext-tools gmake libtool pkgconfig tar:bzip2 xfce:gtk3
-USE_GNOME=	gtk30 intltool cairo gdkpixbuf2
+USES=		gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce:gtk3
+USE_GNOME=	cairo gdkpixbuf2 gtk30 intltool
 USE_XFCE=	panel
 
 SSP_UNSAFE=	yes
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 
-OPTIONS_DEFINE= NLS UPOWER
-OPTIONS_DEFAULT=UPOWER
-UPOWER_DESC=	Use upower for adapting update interval to power state
-OPTIONS_SUB=	yes
+OPTIONS_DEFINE=		NLS UPOWER
+OPTIONS_DEFAULT=	UPOWER
+OPTIONS_SUB=		yes
+
+UPOWER_DESC=		Use upower for adapting update interval to power state
 
 NLS_CONFIGURE_ENABLE=	nls
-NLS_USES=	gettext-runtime
+NLS_USES=		gettext-runtime
 
 UPOWER_CONFIGURE_ENABLE=upower
 UPOWER_LIB_DEPENDS=	libupower-glib.so:sysutils/upower
diff --git a/sysutils/xfce4-systemload-plugin/files/patch-configure b/sysutils/xfce4-systemload-plugin/files/patch-configure
deleted file mode 100644
index 6110845a0913..000000000000
--- a/sysutils/xfce4-systemload-plugin/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2016-11-01 14:41:34 UTC
-+++ configure
-@@ -13214,7 +13214,7 @@ _ACEOF
- 
-     fi
-   fi
--     USE_NLS=yes
-+#     USE_NLS=yes
- 
- 
-     gt_cv_have_gettext=no
diff --git a/sysutils/xfce4-systemload-plugin/pkg-descr b/sysutils/xfce4-systemload-plugin/pkg-descr
index 40f5a6da297c..cd15b6f5c65f 100644
--- a/sysutils/xfce4-systemload-plugin/pkg-descr
+++ b/sysutils/xfce4-systemload-plugin/pkg-descr
@@ -1,4 +1,4 @@
 System Load plugin for XFce4.
 
 Author: Riccardo Persichetti <riccardo.persichetti@tin.it>
-WWW: http://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin
+WWW: https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin
diff --git a/sysutils/xfce4-wavelan-plugin/Makefile b/sysutils/xfce4-wavelan-plugin/Makefile
index 8d2613f922f6..6404c6d8acd3 100644
--- a/sysutils/xfce4-wavelan-plugin/Makefile
+++ b/sysutils/xfce4-wavelan-plugin/Makefile
@@ -13,10 +13,17 @@ COMMENT=	Displays various information about a WaveLAN device
 
 LICENSE=	BSD3CLAUSE
 
-GNU_CONFIGURE=	yes
-USES=		gettext gmake libtool pkgconfig tar:bzip2 xfce:gtk3
-USE_GNOME=	gtk30 glib20 intltool cairo gdkpixbuf2
+USES=		gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce:gtk3
+USE_GNOME=	cairo gdkpixbuf2 gtk30 glib20 intltool
 USE_XFCE=	panel
+
+GNU_CONFIGURE=	yes
 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/sysutils/xfce4-wavelan-plugin/pkg-descr b/sysutils/xfce4-wavelan-plugin/pkg-descr
index cdc388b247a6..12a4b9dc8890 100644
--- a/sysutils/xfce4-wavelan-plugin/pkg-descr
+++ b/sysutils/xfce4-wavelan-plugin/pkg-descr
@@ -6,4 +6,4 @@ Displays various information about a WaveLAN device:
 * Signal quality (current quality of the carrier signal)
 * Network name (current SSID of the WaveLAN network)
 
-WWW: http://goodies.xfce.org/projects/panel-plugins/xfce4-wavelan-plugin
+WWW: https://goodies.xfce.org/projects/panel-plugins/xfce4-wavelan-plugin
diff --git a/sysutils/xfce4-wavelan-plugin/pkg-plist b/sysutils/xfce4-wavelan-plugin/pkg-plist
index c0b9f8890b3a..c2e3bb776155 100644
--- a/sysutils/xfce4-wavelan-plugin/pkg-plist
+++ b/sysutils/xfce4-wavelan-plugin/pkg-plist
@@ -1,50 +1,50 @@
 lib/xfce4/panel/plugins/libwavelan.so
-share/locale/ar/LC_MESSAGES/xfce4-wavelan-plugin.mo
-share/locale/ast/LC_MESSAGES/xfce4-wavelan-plugin.mo
-share/locale/be/LC_MESSAGES/xfce4-wavelan-plugin.mo
-share/locale/bg/LC_MESSAGES/xfce4-wavelan-plugin.mo
-share/locale/ca/LC_MESSAGES/xfce4-wavelan-plugin.mo
-share/locale/cs/LC_MESSAGES/xfce4-wavelan-plugin.mo
-share/locale/da/LC_MESSAGES/xfce4-wavelan-plugin.mo
-share/locale/de/LC_MESSAGES/xfce4-wavelan-plugin.mo
-share/locale/el/LC_MESSAGES/xfce4-wavelan-plugin.mo
-share/locale/en_AU/LC_MESSAGES/xfce4-wavelan-plugin.mo
-share/locale/en_GB/LC_MESSAGES/xfce4-wavelan-plugin.mo
-share/locale/es/LC_MESSAGES/xfce4-wavelan-plugin.mo
-share/locale/eu/LC_MESSAGES/xfce4-wavelan-plugin.mo
-share/locale/fi/LC_MESSAGES/xfce4-wavelan-plugin.mo
-share/locale/fr/LC_MESSAGES/xfce4-wavelan-plugin.mo
-share/locale/gl/LC_MESSAGES/xfce4-wavelan-plugin.mo
-share/locale/he/LC_MESSAGES/xfce4-wavelan-plugin.mo
-share/locale/hr/LC_MESSAGES/xfce4-wavelan-plugin.mo
-share/locale/hu/LC_MESSAGES/xfce4-wavelan-plugin.mo
-share/locale/id/LC_MESSAGES/xfce4-wavelan-plugin.mo
-share/locale/is/LC_MESSAGES/xfce4-wavelan-plugin.mo
-share/locale/it/LC_MESSAGES/xfce4-wavelan-plugin.mo
-share/locale/ja/LC_MESSAGES/xfce4-wavelan-plugin.mo
-share/locale/kk/LC_MESSAGES/xfce4-wavelan-plugin.mo
-share/locale/ko/LC_MESSAGES/xfce4-wavelan-plugin.mo
-share/locale/lt/LC_MESSAGES/xfce4-wavelan-plugin.mo
-share/locale/lv/LC_MESSAGES/xfce4-wavelan-plugin.mo
-share/locale/ms/LC_MESSAGES/xfce4-wavelan-plugin.mo
-share/locale/nb/LC_MESSAGES/xfce4-wavelan-plugin.mo
-share/locale/nl/LC_MESSAGES/xfce4-wavelan-plugin.mo
-share/locale/oc/LC_MESSAGES/xfce4-wavelan-plugin.mo
-share/locale/pl/LC_MESSAGES/xfce4-wavelan-plugin.mo
-share/locale/pt/LC_MESSAGES/xfce4-wavelan-plugin.mo
-share/locale/pt_BR/LC_MESSAGES/xfce4-wavelan-plugin.mo
-share/locale/ru/LC_MESSAGES/xfce4-wavelan-plugin.mo
-share/locale/sk/LC_MESSAGES/xfce4-wavelan-plugin.mo
-share/locale/sq/LC_MESSAGES/xfce4-wavelan-plugin.mo
-share/locale/sr/LC_MESSAGES/xfce4-wavelan-plugin.mo
-share/locale/sv/LC_MESSAGES/xfce4-wavelan-plugin.mo
-share/locale/th/LC_MESSAGES/xfce4-wavelan-plugin.mo
-share/locale/tr/LC_MESSAGES/xfce4-wavelan-plugin.mo
-share/locale/ug/LC_MESSAGES/xfce4-wavelan-plugin.mo
-share/locale/uk/LC_MESSAGES/xfce4-wavelan-plugin.mo
-share/locale/ur/LC_MESSAGES/xfce4-wavelan-plugin.mo
-share/locale/ur_PK/LC_MESSAGES/xfce4-wavelan-plugin.mo
-share/locale/vi/LC_MESSAGES/xfce4-wavelan-plugin.mo
-share/locale/zh_CN/LC_MESSAGES/xfce4-wavelan-plugin.mo
-share/locale/zh_TW/LC_MESSAGES/xfce4-wavelan-plugin.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/xfce4-wavelan-plugin.mo
+%%NLS%%share/locale/ast/LC_MESSAGES/xfce4-wavelan-plugin.mo
+%%NLS%%share/locale/be/LC_MESSAGES/xfce4-wavelan-plugin.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/xfce4-wavelan-plugin.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/xfce4-wavelan-plugin.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/xfce4-wavelan-plugin.mo
+%%NLS%%share/locale/da/LC_MESSAGES/xfce4-wavelan-plugin.mo
+%%NLS%%share/locale/de/LC_MESSAGES/xfce4-wavelan-plugin.mo
+%%NLS%%share/locale/el/LC_MESSAGES/xfce4-wavelan-plugin.mo
+%%NLS%%share/locale/en_AU/LC_MESSAGES/xfce4-wavelan-plugin.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-wavelan-plugin.mo
+%%NLS%%share/locale/es/LC_MESSAGES/xfce4-wavelan-plugin.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/xfce4-wavelan-plugin.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/xfce4-wavelan-plugin.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/xfce4-wavelan-plugin.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/xfce4-wavelan-plugin.mo
+%%NLS%%share/locale/he/LC_MESSAGES/xfce4-wavelan-plugin.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/xfce4-wavelan-plugin.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/xfce4-wavelan-plugin.mo
+%%NLS%%share/locale/id/LC_MESSAGES/xfce4-wavelan-plugin.mo
+%%NLS%%share/locale/is/LC_MESSAGES/xfce4-wavelan-plugin.mo
+%%NLS%%share/locale/it/LC_MESSAGES/xfce4-wavelan-plugin.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/xfce4-wavelan-plugin.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/xfce4-wavelan-plugin.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/xfce4-wavelan-plugin.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/xfce4-wavelan-plugin.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/xfce4-wavelan-plugin.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/xfce4-wavelan-plugin.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/xfce4-wavelan-plugin.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/xfce4-wavelan-plugin.mo
+%%NLS%%share/locale/oc/LC_MESSAGES/xfce4-wavelan-plugin.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/xfce4-wavelan-plugin.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/xfce4-wavelan-plugin.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce4-wavelan-plugin.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/xfce4-wavelan-plugin.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/xfce4-wavelan-plugin.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/xfce4-wavelan-plugin.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/xfce4-wavelan-plugin.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/xfce4-wavelan-plugin.mo
+%%NLS%%share/locale/th/LC_MESSAGES/xfce4-wavelan-plugin.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/xfce4-wavelan-plugin.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/xfce4-wavelan-plugin.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/xfce4-wavelan-plugin.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/xfce4-wavelan-plugin.mo
+%%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce4-wavelan-plugin.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/xfce4-wavelan-plugin.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-wavelan-plugin.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-wavelan-plugin.mo
 share/xfce4/panel/plugins/wavelan.desktop