aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormadpilot <madpilot@FreeBSD.org>2019-01-22 22:44:38 +0800
committermadpilot <madpilot@FreeBSD.org>2019-01-22 22:44:38 +0800
commitbba326c0aa28c7d297840792c51b7a2504de369a (patch)
tree0b87a1825693d30844e1b681ab080746ab147896
parent2295fbe73fcb0632fc1753aa5149f612b287ecf5 (diff)
downloadfreebsd-ports-gnome-bba326c0aa28c7d297840792c51b7a2504de369a.tar.gz
freebsd-ports-gnome-bba326c0aa28c7d297840792c51b7a2504de369a.tar.zst
freebsd-ports-gnome-bba326c0aa28c7d297840792c51b7a2504de369a.zip
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
-rw-r--r--archivers/thunar-archive-plugin/Makefile19
-rw-r--r--archivers/thunar-archive-plugin/pkg-descr2
-rw-r--r--archivers/thunar-archive-plugin/pkg-plist90
-rw-r--r--audio/thunar-media-tags-plugin/Makefile20
-rw-r--r--audio/thunar-media-tags-plugin/pkg-descr2
-rw-r--r--audio/thunar-media-tags-plugin/pkg-plist84
-rw-r--r--audio/xfce4-mixer/Makefile23
-rw-r--r--audio/xfce4-mixer/files/patch-configure11
-rw-r--r--audio/xfce4-mixer/pkg-descr2
-rw-r--r--audio/xfce4-mpc-plugin/Makefile8
-rw-r--r--audio/xfce4-mpc-plugin/pkg-descr2
-rw-r--r--audio/xfce4-pulseaudio-plugin/Makefile11
-rw-r--r--audio/xfce4-pulseaudio-plugin/pkg-descr2
-rw-r--r--audio/xfce4-pulseaudio-plugin/pkg-plist76
-rw-r--r--audio/xfmpc/Makefile19
-rw-r--r--audio/xfmpc/pkg-descr2
-rw-r--r--audio/xfmpc/pkg-plist92
-rw-r--r--deskutils/orage/Makefile30
-rw-r--r--deskutils/orage/pkg-descr2
-rw-r--r--deskutils/orage/pkg-plist106
-rw-r--r--deskutils/xfce4-notes-plugin/Makefile22
-rw-r--r--deskutils/xfce4-notes-plugin/pkg-descr2
-rw-r--r--deskutils/xfce4-notes-plugin/pkg-plist96
-rw-r--r--deskutils/xfce4-tumbler/Makefile44
-rw-r--r--deskutils/xfce4-tumbler/files/patch-configure11
-rw-r--r--deskutils/xfce4-volumed-pulse/Makefile13
-rw-r--r--deskutils/xfce4-xkb-plugin/Makefile18
-rw-r--r--deskutils/xfce4-xkb-plugin/pkg-descr2
-rw-r--r--deskutils/xfce4-xkb-plugin/pkg-plist102
-rw-r--r--devel/xfce4-vala/Makefile4
-rw-r--r--devel/xfce4-vala/files/patch-configure8
-rw-r--r--editors/mousepad/Makefile23
-rw-r--r--editors/mousepad/pkg-descr2
-rw-r--r--editors/mousepad/pkg-plist94
-rw-r--r--graphics/ristretto/Makefile11
-rw-r--r--graphics/ristretto/pkg-descr2
-rw-r--r--mail/xfce4-mailwatch-plugin/Makefile24
-rw-r--r--mail/xfce4-mailwatch-plugin/pkg-descr2
-rw-r--r--mail/xfce4-mailwatch-plugin/pkg-plist86
-rw-r--r--math/xfce4-calculator-plugin/Makefile9
-rw-r--r--math/xfce4-calculator-plugin/pkg-descr2
-rw-r--r--misc/xfce4-appfinder/Makefile29
-rw-r--r--misc/xfce4-appfinder/files/patch-configure11
-rw-r--r--misc/xfce4-appfinder/pkg-descr2
-rw-r--r--misc/xfce4-weather-plugin/Makefile18
-rw-r--r--multimedia/xfce4-parole/Makefile5
-rw-r--r--multimedia/xfce4-parole/files/patch-configure9
-rw-r--r--print/xfce4-print/Makefile36
-rw-r--r--print/xfce4-print/files/patch-printing-systems_cups_cups.c (renamed from print/xfce4-print/files/patch-printing-systems__cups__cups.c)8
-rw-r--r--print/xfce4-print/pkg-descr2
-rw-r--r--print/xfce4-print/pkg-plist108
-rw-r--r--science/xfce4-equake-plugin/Makefile11
-rw-r--r--sysutils/garcon/Makefile10
-rw-r--r--sysutils/garcon/files/patch-configure11
-rw-r--r--sysutils/garcon/pkg-descr2
-rw-r--r--sysutils/xfburn/Makefile19
-rw-r--r--sysutils/xfburn/files/patch-configure11
-rw-r--r--sysutils/xfburn/pkg-descr2
-rw-r--r--sysutils/xfce4-battery-plugin/Makefile9
-rw-r--r--sysutils/xfce4-battery-plugin/files/patch-configure11
-rw-r--r--sysutils/xfce4-cpugraph-plugin/Makefile20
-rw-r--r--sysutils/xfce4-cpugraph-plugin/files/patch-configure11
-rw-r--r--sysutils/xfce4-cpugraph-plugin/pkg-descr2
-rw-r--r--sysutils/xfce4-fsguard-plugin/Makefile19
-rw-r--r--sysutils/xfce4-fsguard-plugin/pkg-descr2
-rw-r--r--sysutils/xfce4-genmon-plugin/Makefile14
-rw-r--r--sysutils/xfce4-genmon-plugin/pkg-descr2
-rw-r--r--sysutils/xfce4-genmon-plugin/pkg-plist94
-rw-r--r--sysutils/xfce4-mount-plugin/Makefile15
-rw-r--r--sysutils/xfce4-mount-plugin/pkg-descr2
-rw-r--r--sysutils/xfce4-netload-plugin/Makefile16
-rw-r--r--sysutils/xfce4-netload-plugin/pkg-descr2
-rw-r--r--sysutils/xfce4-power-manager/Makefile15
-rw-r--r--sysutils/xfce4-power-manager/pkg-descr2
-rw-r--r--sysutils/xfce4-power-manager/pkg-plist108
-rw-r--r--sysutils/xfce4-settings/Makefile27
-rw-r--r--sysutils/xfce4-settings/files/patch-configure11
-rw-r--r--sysutils/xfce4-systemload-plugin/Makefile15
-rw-r--r--sysutils/xfce4-systemload-plugin/files/patch-configure11
-rw-r--r--sysutils/xfce4-systemload-plugin/pkg-descr2
-rw-r--r--sysutils/xfce4-wavelan-plugin/Makefile13
-rw-r--r--sysutils/xfce4-wavelan-plugin/pkg-descr2
-rw-r--r--sysutils/xfce4-wavelan-plugin/pkg-plist96
-rw-r--r--textproc/xfce4-dict-plugin/Makefile4
-rw-r--r--textproc/xfce4-dict-plugin/pkg-descr2
-rw-r--r--www/midori/pkg-descr2
-rw-r--r--www/xfce4-smartbookmark-plugin/Makefile14
-rw-r--r--www/xfce4-smartbookmark-plugin/pkg-descr2
-rw-r--r--www/xfce4-smartbookmark-plugin/pkg-plist88
-rw-r--r--x11-clocks/xfce4-datetime-plugin/Makefile13
-rw-r--r--x11-clocks/xfce4-datetime-plugin/pkg-descr2
-rw-r--r--x11-clocks/xfce4-datetime-plugin/pkg-plist100
-rw-r--r--x11-clocks/xfce4-timer-out-plugin/Makefile20
-rw-r--r--x11-clocks/xfce4-timer-out-plugin/pkg-descr2
-rw-r--r--x11-clocks/xfce4-timer-out-plugin/pkg-plist86
-rw-r--r--x11-clocks/xfce4-timer-plugin/Makefile15
-rw-r--r--x11-clocks/xfce4-timer-plugin/pkg-descr2
-rw-r--r--x11-clocks/xfce4-timer-plugin/pkg-plist90
-rw-r--r--x11-fm/thunar-vfs/Makefile48
-rw-r--r--x11-fm/thunar-vfs/files/patch-configure11
-rw-r--r--x11-fm/thunar-vfs/pkg-descr2
-rw-r--r--x11-fm/thunar/Makefile45
-rw-r--r--x11-fm/thunar/files/patch-configure11
-rw-r--r--x11-toolkits/libxfce4gui/Makefile31
-rw-r--r--x11-toolkits/libxfce4gui/files/patch-configure11
-rw-r--r--x11-toolkits/libxfce4gui/files/patch-libxfcegui4_xfce-exec.c (renamed from x11-toolkits/libxfce4gui/files/patch-libxfcegui4__xfce-exec.c)6
-rw-r--r--x11-toolkits/libxfce4gui/pkg-descr2
-rw-r--r--x11-wm/xfce4-desktop/Makefile30
-rw-r--r--x11-wm/xfce4-desktop/pkg-descr2
-rw-r--r--x11-wm/xfce4-panel/Makefile26
-rw-r--r--x11-wm/xfce4-panel/files/patch-configure11
-rw-r--r--x11-wm/xfce4-panel/pkg-descr2
-rw-r--r--x11-wm/xfce4-session/Makefile32
-rw-r--r--x11-wm/xfce4-session/files/patch-configure11
-rw-r--r--x11-wm/xfce4-session/pkg-descr2
-rw-r--r--x11-wm/xfce4-wm/Makefile27
-rw-r--r--x11-wm/xfce4-wm/files/patch-configure11
-rw-r--r--x11/libxfce4menu/Makefile41
-rw-r--r--x11/libxfce4menu/files/patch-configure11
-rw-r--r--x11/libxfce4menu/pkg-descr2
-rw-r--r--x11/libxfce4util/Makefile17
-rw-r--r--x11/libxfce4util/files/patch-configure11
-rw-r--r--x11/libxfce4util/pkg-descr2
-rw-r--r--x11/xfce4-clipman-plugin/Makefile22
-rw-r--r--x11/xfce4-clipman-plugin/pkg-descr2
-rw-r--r--x11/xfce4-clipman-plugin/pkg-plist98
-rw-r--r--x11/xfce4-conf/Makefile26
-rw-r--r--x11/xfce4-conf/files/patch-configure11
-rw-r--r--x11/xfce4-conf/pkg-descr2
-rw-r--r--x11/xfce4-dashboard/Makefile27
-rw-r--r--x11/xfce4-dashboard/files/patch-configure11
-rw-r--r--x11/xfce4-dashboard/pkg-descr2
-rw-r--r--x11/xfce4-embed-plugin/Makefile26
-rw-r--r--x11/xfce4-embed-plugin/files/extra-patch-configure11
-rw-r--r--x11/xfce4-embed-plugin/pkg-descr2
-rw-r--r--x11/xfce4-quicklauncher-plugin/Makefile13
-rw-r--r--x11/xfce4-screensaver/Makefile2
-rw-r--r--x11/xfce4-screenshooter-plugin/Makefile18
-rw-r--r--x11/xfce4-screenshooter-plugin/files/patch-configure11
-rw-r--r--x11/xfce4-taskmanager/Makefile2
-rw-r--r--x11/xfce4-terminal/Makefile23
-rw-r--r--x11/xfce4-terminal/pkg-descr2
-rw-r--r--x11/xfce4-terminal/pkg-plist110
-rw-r--r--x11/xfce4-verve-plugin/Makefile21
-rw-r--r--x11/xfce4-verve-plugin/files/patch-configure11
-rw-r--r--x11/xfce4-whiskermenu-plugin/pkg-descr2
-rw-r--r--x11/xfce4-wmdock-plugin/Makefile20
-rw-r--r--x11/xfce4-wmdock-plugin/pkg-descr2
-rw-r--r--x11/xfce4-wmdock-plugin/pkg-plist50
149 files changed, 1710 insertions, 1659 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
diff --git a/audio/thunar-media-tags-plugin/Makefile b/audio/thunar-media-tags-plugin/Makefile
index 24cd1a764fed..027088f44d74 100644
--- a/audio/thunar-media-tags-plugin/Makefile
+++ b/audio/thunar-media-tags-plugin/Makefile
@@ -3,7 +3,7 @@
PORTNAME= thunar-media-tags-plugin
PORTVERSION= 0.2.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio xfce
MASTER_SITES= XFCE/src/thunar-plugins/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
@@ -14,11 +14,21 @@ COMMENT= Media tags plugin
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libtag.so:audio/taglib
+LIB_DEPENDS= libtag.so:audio/taglib \
+ libfontconfig.so:x11-fonts/fontconfig \
+ libfreetype.so:print/freetype2
+
+USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce
+USE_GNOME= cairo gdkpixbuf2 gtk20 intlhack intltool
+USE_XFCE= libexo thunar
-USES= gmake pkgconfig gettext libtool xfce tar:bzip2
GNU_CONFIGURE= yes
-USE_GNOME= gtk20 intltool intlhack
-USE_XFCE= thunar
+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/audio/thunar-media-tags-plugin/pkg-descr b/audio/thunar-media-tags-plugin/pkg-descr
index 4d669871bf11..58b7917b7ce4 100644
--- a/audio/thunar-media-tags-plugin/pkg-descr
+++ b/audio/thunar-media-tags-plugin/pkg-descr
@@ -9,4 +9,4 @@ Currently, these are:
* and finally, an audio tag editor which is reachable from both,
renamer and the properties page.
-WWW: http://goodies.xfce.org/projects/thunar-plugins/thunar-media-tags-plugin
+WWW: https://goodies.xfce.org/projects/thunar-plugins/thunar-media-tags-plugin
diff --git a/audio/thunar-media-tags-plugin/pkg-plist b/audio/thunar-media-tags-plugin/pkg-plist
index c5d6621d1866..5f4765e1aeb0 100644
--- a/audio/thunar-media-tags-plugin/pkg-plist
+++ b/audio/thunar-media-tags-plugin/pkg-plist
@@ -1,43 +1,43 @@
lib/thunarx-2/thunar-media-tags-plugin.so
-share/locale/ar/LC_MESSAGES/thunar-media-tags-plugin.mo
-share/locale/ast/LC_MESSAGES/thunar-media-tags-plugin.mo
-share/locale/bg/LC_MESSAGES/thunar-media-tags-plugin.mo
-share/locale/ca/LC_MESSAGES/thunar-media-tags-plugin.mo
-share/locale/cs/LC_MESSAGES/thunar-media-tags-plugin.mo
-share/locale/da/LC_MESSAGES/thunar-media-tags-plugin.mo
-share/locale/de/LC_MESSAGES/thunar-media-tags-plugin.mo
-share/locale/el/LC_MESSAGES/thunar-media-tags-plugin.mo
-share/locale/en_GB/LC_MESSAGES/thunar-media-tags-plugin.mo
-share/locale/es/LC_MESSAGES/thunar-media-tags-plugin.mo
-share/locale/eu/LC_MESSAGES/thunar-media-tags-plugin.mo
-share/locale/fi/LC_MESSAGES/thunar-media-tags-plugin.mo
-share/locale/fr/LC_MESSAGES/thunar-media-tags-plugin.mo
-share/locale/gl/LC_MESSAGES/thunar-media-tags-plugin.mo
-share/locale/hr/LC_MESSAGES/thunar-media-tags-plugin.mo
-share/locale/hu/LC_MESSAGES/thunar-media-tags-plugin.mo
-share/locale/id/LC_MESSAGES/thunar-media-tags-plugin.mo
-share/locale/it/LC_MESSAGES/thunar-media-tags-plugin.mo
-share/locale/ja/LC_MESSAGES/thunar-media-tags-plugin.mo
-share/locale/kk/LC_MESSAGES/thunar-media-tags-plugin.mo
-share/locale/ko/LC_MESSAGES/thunar-media-tags-plugin.mo
-share/locale/lt/LC_MESSAGES/thunar-media-tags-plugin.mo
-share/locale/lv/LC_MESSAGES/thunar-media-tags-plugin.mo
-share/locale/nb/LC_MESSAGES/thunar-media-tags-plugin.mo
-share/locale/nl/LC_MESSAGES/thunar-media-tags-plugin.mo
-share/locale/pa/LC_MESSAGES/thunar-media-tags-plugin.mo
-share/locale/pl/LC_MESSAGES/thunar-media-tags-plugin.mo
-share/locale/pt/LC_MESSAGES/thunar-media-tags-plugin.mo
-share/locale/pt_BR/LC_MESSAGES/thunar-media-tags-plugin.mo
-share/locale/ru/LC_MESSAGES/thunar-media-tags-plugin.mo
-share/locale/sk/LC_MESSAGES/thunar-media-tags-plugin.mo
-share/locale/sl/LC_MESSAGES/thunar-media-tags-plugin.mo
-share/locale/sq/LC_MESSAGES/thunar-media-tags-plugin.mo
-share/locale/sr/LC_MESSAGES/thunar-media-tags-plugin.mo
-share/locale/sv/LC_MESSAGES/thunar-media-tags-plugin.mo
-share/locale/tr/LC_MESSAGES/thunar-media-tags-plugin.mo
-share/locale/ug/LC_MESSAGES/thunar-media-tags-plugin.mo
-share/locale/uk/LC_MESSAGES/thunar-media-tags-plugin.mo
-share/locale/ur/LC_MESSAGES/thunar-media-tags-plugin.mo
-share/locale/ur_PK/LC_MESSAGES/thunar-media-tags-plugin.mo
-share/locale/zh_CN/LC_MESSAGES/thunar-media-tags-plugin.mo
-share/locale/zh_TW/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/ast/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/da/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/de/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/el/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/es/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/id/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/it/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/pa/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/ur_PK/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/thunar-media-tags-plugin.mo
diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile
index 6944b324c517..42924acc7a1a 100644
--- a/audio/xfce4-mixer/Makefile
+++ b/audio/xfce4-mixer/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xfce4-mixer
PORTVERSION= 4.11.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio xfce
MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
@@ -14,24 +14,29 @@ COMMENT= Volume control for the Xfce desktop
LICENSE= GPLv2
LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \
- libunique-1.0.so:x11-toolkits/unique
+ libdbus-1.so:devel/dbus \
+ libunique-1.0.so:x11-toolkits/unique \
+ libfontconfig.so:x11-fonts/fontconfig \
+ libfreetype.so:print/freetype2
-GNU_CONFIGURE= yes
-INSTALLS_ICONS= yes
USES= gmake libtool pkgconfig gettext-tools xfce tar:bzip2
-USE_GNOME= glib20 gtk20 intltool intlhack
+USE_GNOME= cairo glib20 gtk20 intlhack intltool libxml2
USE_XFCE= panel
USE_GSTREAMER= good
+GNU_CONFIGURE= yes
+INSTALLS_ICONS= yes
MAKE_JOBS_UNSAFE= yes
-OPTIONS_DEFINE= KEYBIND NLS
-KEYBIND_DESC= Multimedia keyboard shortcuts
+OPTIONS_DEFINE= KEYBIND NLS
+OPTIONS_SUB= yes
+
+KEYBIND_DESC= Multimedia keyboard shortcuts
KEYBIND_LIB_DEPENDS= libkeybinder.so:x11/keybinder
KEYBIND_CONFIGURE_ENABLE= keybinder
-NLS_USES= gettext-runtime
+
+NLS_USES= gettext-runtime
NLS_CONFIGURE_ENABLE= nls
-OPTIONS_SUB= yes
post-patch:
@${FIND} ${WRKSRC} -name 'Makefile.in' -or -name 'xfce-mixer-track.c' \
diff --git a/audio/xfce4-mixer/files/patch-configure b/audio/xfce4-mixer/files/patch-configure
deleted file mode 100644
index 097e42e14a93..000000000000
--- a/audio/xfce4-mixer/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig 2014-04-09 19:40:22 UTC
-+++ configure
-@@ -13405,7 +13405,7 @@ $as_echo "#define HAVE_LC_MESSAGES 1" >>
-
- fi
- fi
-- USE_NLS=yes
-+ #USE_NLS=yes
-
-
- gt_cv_have_gettext=no
diff --git a/audio/xfce4-mixer/pkg-descr b/audio/xfce4-mixer/pkg-descr
index f91dbcc31c80..0b2ef93ce1e1 100644
--- a/audio/xfce4-mixer/pkg-descr
+++ b/audio/xfce4-mixer/pkg-descr
@@ -2,4 +2,4 @@ This is xfce4-mixer, a volume control application for the Xfce Desktop
Environment. This software package contains both a volume control
plugin for the Xfce Panel and a standalone mixer application.
-WWW: http://www.xfce.org/projects/xfce4-mixer/
+WWW: https://git.xfce.org/apps/xfce4-mixer/about/
diff --git a/audio/xfce4-mpc-plugin/Makefile b/audio/xfce4-mpc-plugin/Makefile
index c0e0c0ae6f5c..a7e63f26a9b9 100644
--- a/audio/xfce4-mpc-plugin/Makefile
+++ b/audio/xfce4-mpc-plugin/Makefile
@@ -16,17 +16,17 @@ LIB_DEPENDS= libmpd.so:audio/libmpd
RUN_DEPENDS= musicpd:audio/musicpd
USES= gettext-tools gmake libtool pkgconfig tar:bzip2 xfce:gtk3
-USE_GNOME= gtk30 intltool cairo gdkpixbuf2
+USE_GNOME= cairo gdkpixbuf2 gtk30 intltool
USE_XFCE= panel
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
CONFIGURE_ARGS+= --with-libmpd=${LOCALBASE}
-OPTIONS_DEFINE= NLS
-OPTIONS_SUB= yes
+OPTIONS_DEFINE= NLS
+OPTIONS_SUB= yes
NLS_CONFIGURE_ENABLE= nls
-NLS_USES= gettext-runtime
+NLS_USES= gettext-runtime
.include <bsd.port.mk>
diff --git a/audio/xfce4-mpc-plugin/pkg-descr b/audio/xfce4-mpc-plugin/pkg-descr
index a9f4f38ad528..4885ac6441af 100644
--- a/audio/xfce4-mpc-plugin/pkg-descr
+++ b/audio/xfce4-mpc-plugin/pkg-descr
@@ -1,3 +1,3 @@
Simple client plugin for Music Player Daemon (mpd).
-WWW: http://goodies.xfce.org/projects/panel-plugins/xfce4-mpc-plugin
+WWW: https://goodies.xfce.org/projects/panel-plugins/xfce4-mpc-plugin
diff --git a/audio/xfce4-pulseaudio-plugin/Makefile b/audio/xfce4-pulseaudio-plugin/Makefile
index 0baedf9815b0..d039622b0f7f 100644
--- a/audio/xfce4-pulseaudio-plugin/Makefile
+++ b/audio/xfce4-pulseaudio-plugin/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS= libpulse-mainloop-glib.so:audio/pulseaudio \
libdbus-glib-1.so:devel/dbus-glib
RUN_DEPENDS= pavucontrol>=2.0:audio/pavucontrol
-USES= gettext gmake gnome libtool pkgconfig tar:bzip2 xfce:gtk3
-USE_GNOME= glib20 gtk30 intltool cairo libwnck3
+USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce:gtk3
+USE_GNOME= cairo glib20 gtk30 intltool libwnck3
USE_XFCE= panel
USE_XORG= x11
@@ -32,10 +32,15 @@ CONFIGURE_ARGS=--with-mixer-command=${LOCALBASE}/bin/pavucontrol \
--enable-wnck
CFLAGS+= -Wno-return-type
-OPTIONS_DEFINE= KEYBINDER
+OPTIONS_DEFINE= KEYBINDER NLS
OPTIONS_DEFAULT= KEYBINDER
+OPTIONS_SUB= yes
+
KEYBINDER_DESC= Keyboard shortcuts
KEYBINDER_LIB_DEPENDS= libkeybinder-3.0.so:x11/keybinder-gtk3
KEYBINDER_CONFIGURE_ENABLE= keybinder
+NLS_CONFIGURE_ENABLE= nls
+NLS_USES= gettext-runtime
+
.include <bsd.port.mk>
diff --git a/audio/xfce4-pulseaudio-plugin/pkg-descr b/audio/xfce4-pulseaudio-plugin/pkg-descr
index b5a0eacd5ff7..dfaa2cace415 100644
--- a/audio/xfce4-pulseaudio-plugin/pkg-descr
+++ b/audio/xfce4-pulseaudio-plugin/pkg-descr
@@ -2,4 +2,4 @@ Xfce4-pulseaudio-plugin is a panel plugin for controlling an audio output
volume of the PulseAudio mixer. The volume can be adjusted using keyboard
shortcuts, mouse wheel, or via a linked external audio mixer tool.
-WWW: http://goodies.xfce.org/projects/panel-plugins/xfce4-pulseaudio-plugin
+WWW: https://goodies.xfce.org/projects/panel-plugins/xfce4-pulseaudio-plugin
diff --git a/audio/xfce4-pulseaudio-plugin/pkg-plist b/audio/xfce4-pulseaudio-plugin/pkg-plist
index da4f1b5f882b..35e3d968ecd6 100644
--- a/audio/xfce4-pulseaudio-plugin/pkg-plist
+++ b/audio/xfce4-pulseaudio-plugin/pkg-plist
@@ -9,42 +9,42 @@ share/icons/hicolor/scalable/status/microphone-sensitivity-high-symbolic.svg
share/icons/hicolor/scalable/status/microphone-sensitivity-low-symbolic.svg
share/icons/hicolor/scalable/status/microphone-sensitivity-medium-symbolic.svg
share/icons/hicolor/scalable/status/microphone-sensitivity-muted-symbolic.svg
-share/locale/bg/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
-share/locale/ca/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
-share/locale/cs/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
-share/locale/da/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
-share/locale/de/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
-share/locale/el/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
-share/locale/en_AU/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
-share/locale/es/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
-share/locale/fr/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
-share/locale/ga/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
-share/locale/gl/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
-share/locale/he/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
-share/locale/hr/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
-share/locale/hu/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
-share/locale/id/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
-share/locale/is/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
-share/locale/it/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
-share/locale/ja/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
-share/locale/kk/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
-share/locale/ko/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
-share/locale/lt/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
-share/locale/ms/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
-share/locale/nb/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
-share/locale/nl/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
-share/locale/oc/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
-share/locale/pl/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
-share/locale/pt/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
-share/locale/pt_BR/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
-share/locale/ru/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
-share/locale/sk/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
-share/locale/sl/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
-share/locale/sr/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
-share/locale/sv/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
-share/locale/th/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
-share/locale/tr/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
-share/locale/uk/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
-share/locale/zh_CN/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
-share/locale/zh_TW/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
+%%NLS%%share/locale/da/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
+%%NLS%%share/locale/de/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
+%%NLS%%share/locale/el/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
+%%NLS%%share/locale/en_AU/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
+%%NLS%%share/locale/es/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
+%%NLS%%share/locale/he/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
+%%NLS%%share/locale/id/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
+%%NLS%%share/locale/is/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
+%%NLS%%share/locale/it/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
+%%NLS%%share/locale/oc/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
+%%NLS%%share/locale/th/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
share/xfce4/panel/plugins/pulseaudio.desktop
diff --git a/audio/xfmpc/Makefile b/audio/xfmpc/Makefile
index 5f4ab84abaf4..48e8fe2e4f2e 100644
--- a/audio/xfmpc/Makefile
+++ b/audio/xfmpc/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xfmpc
PORTVERSION= 0.2.3
+PORTREVISION= 1
CATEGORIES= audio xfce
MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
@@ -13,13 +14,23 @@ COMMENT= Graphical MPD client focusing on low footprint
LICENSE= GPLv2
BUILD_DEPENDS= valac:lang/vala
-LIB_DEPENDS= libmpd.so:audio/libmpd
+LIB_DEPENDS= libmpd.so:audio/libmpd \
+ libfontconfig.so:x11-fonts/fontconfig \
+ libfreetype.so:print/freetype2
+
+USES= gettext-tools gmake gnome pkgconfig tar:bzip2 xfce
+USE_GNOME= cairo gtk20 intlhack intltool
+USE_XFCE= libmenu
+USE_XORG= ice sm x11
INSTALLS_ICONS= yes
-USES= gettext gmake pkgconfig tar:bzip2 xfce
GNU_CONFIGURE= yes
-USE_GNOME= gtk20 intltool intlhack
-USE_XFCE= libmenu
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/audio/xfmpc/pkg-descr b/audio/xfmpc/pkg-descr
index ed303ef21776..d28d75bb6424 100644
--- a/audio/xfmpc/pkg-descr
+++ b/audio/xfmpc/pkg-descr
@@ -1,3 +1,3 @@
A graphical GTK+ MPD client focusing on low footprint.
-WWW: http://goodies.xfce.org/projects/applications/xfmpc/
+WWW: https://goodies.xfce.org/projects/applications/xfmpc
diff --git a/audio/xfmpc/pkg-plist b/audio/xfmpc/pkg-plist
index a099717e9d32..74e5273696f3 100644
--- a/audio/xfmpc/pkg-plist
+++ b/audio/xfmpc/pkg-plist
@@ -1,49 +1,49 @@
bin/xfmpc
man/man1/xfmpc.1.gz
share/applications/xfmpc.desktop
-share/locale/am/LC_MESSAGES/xfmpc.mo
-share/locale/ar/LC_MESSAGES/xfmpc.mo
-share/locale/ast/LC_MESSAGES/xfmpc.mo
-share/locale/bg/LC_MESSAGES/xfmpc.mo
-share/locale/ca/LC_MESSAGES/xfmpc.mo
-share/locale/cs/LC_MESSAGES/xfmpc.mo
-share/locale/da/LC_MESSAGES/xfmpc.mo
-share/locale/de/LC_MESSAGES/xfmpc.mo
-share/locale/el/LC_MESSAGES/xfmpc.mo
-share/locale/en_AU/LC_MESSAGES/xfmpc.mo
-share/locale/en_GB/LC_MESSAGES/xfmpc.mo
-share/locale/es/LC_MESSAGES/xfmpc.mo
-share/locale/eu/LC_MESSAGES/xfmpc.mo
-share/locale/fi/LC_MESSAGES/xfmpc.mo
-share/locale/fr/LC_MESSAGES/xfmpc.mo
-share/locale/gl/LC_MESSAGES/xfmpc.mo
-share/locale/he/LC_MESSAGES/xfmpc.mo
-share/locale/hr/LC_MESSAGES/xfmpc.mo
-share/locale/hu/LC_MESSAGES/xfmpc.mo
-share/locale/id/LC_MESSAGES/xfmpc.mo
-share/locale/is/LC_MESSAGES/xfmpc.mo
-share/locale/it/LC_MESSAGES/xfmpc.mo
-share/locale/ja/LC_MESSAGES/xfmpc.mo
-share/locale/ko/LC_MESSAGES/xfmpc.mo
-share/locale/lt/LC_MESSAGES/xfmpc.mo
-share/locale/ms/LC_MESSAGES/xfmpc.mo
-share/locale/nb/LC_MESSAGES/xfmpc.mo
-share/locale/nl/LC_MESSAGES/xfmpc.mo
-share/locale/oc/LC_MESSAGES/xfmpc.mo
-share/locale/pl/LC_MESSAGES/xfmpc.mo
-share/locale/pt/LC_MESSAGES/xfmpc.mo
-share/locale/pt_BR/LC_MESSAGES/xfmpc.mo
-share/locale/ru/LC_MESSAGES/xfmpc.mo
-share/locale/si/LC_MESSAGES/xfmpc.mo
-share/locale/sk/LC_MESSAGES/xfmpc.mo
-share/locale/sl/LC_MESSAGES/xfmpc.mo
-share/locale/sr/LC_MESSAGES/xfmpc.mo
-share/locale/sv/LC_MESSAGES/xfmpc.mo
-share/locale/th/LC_MESSAGES/xfmpc.mo
-share/locale/tr/LC_MESSAGES/xfmpc.mo
-share/locale/ug/LC_MESSAGES/xfmpc.mo
-share/locale/uk/LC_MESSAGES/xfmpc.mo
-share/locale/ur/LC_MESSAGES/xfmpc.mo
-share/locale/ur_PK/LC_MESSAGES/xfmpc.mo
-share/locale/zh_CN/LC_MESSAGES/xfmpc.mo
-share/locale/zh_TW/LC_MESSAGES/xfmpc.mo
+%%NLS%%share/locale/am/LC_MESSAGES/xfmpc.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/xfmpc.mo
+%%NLS%%share/locale/ast/LC_MESSAGES/xfmpc.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/xfmpc.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/xfmpc.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/xfmpc.mo
+%%NLS%%share/locale/da/LC_MESSAGES/xfmpc.mo
+%%NLS%%share/locale/de/LC_MESSAGES/xfmpc.mo
+%%NLS%%share/locale/el/LC_MESSAGES/xfmpc.mo
+%%NLS%%share/locale/en_AU/LC_MESSAGES/xfmpc.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/xfmpc.mo
+%%NLS%%share/locale/es/LC_MESSAGES/xfmpc.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/xfmpc.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/xfmpc.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/xfmpc.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/xfmpc.mo
+%%NLS%%share/locale/he/LC_MESSAGES/xfmpc.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/xfmpc.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/xfmpc.mo
+%%NLS%%share/locale/id/LC_MESSAGES/xfmpc.mo
+%%NLS%%share/locale/is/LC_MESSAGES/xfmpc.mo
+%%NLS%%share/locale/it/LC_MESSAGES/xfmpc.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/xfmpc.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/xfmpc.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/xfmpc.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/xfmpc.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/xfmpc.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/xfmpc.mo
+%%NLS%%share/locale/oc/LC_MESSAGES/xfmpc.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/xfmpc.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/xfmpc.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfmpc.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/xfmpc.mo
+%%NLS%%share/locale/si/LC_MESSAGES/xfmpc.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/xfmpc.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/xfmpc.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/xfmpc.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/xfmpc.mo
+%%NLS%%share/locale/th/LC_MESSAGES/xfmpc.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/xfmpc.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/xfmpc.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/xfmpc.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/xfmpc.mo
+%%NLS%%share/locale/ur_PK/LC_MESSAGES/xfmpc.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfmpc.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfmpc.mo
diff --git a/deskutils/orage/Makefile b/deskutils/orage/Makefile
index 8fa3656d34ba..8112ed4337b4 100644
--- a/deskutils/orage/Makefile
+++ b/deskutils/orage/Makefile
@@ -3,7 +3,7 @@
PORTNAME= orage
PORTVERSION= 4.12.1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= deskutils xfce
MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R}/
DIST_SUBDIR= xfce4
@@ -15,24 +15,32 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libpopt.so:devel/popt \
- libdbus-glib-1.so:devel/dbus-glib \
- libical.so:devel/libical
+ libdbus-glib-1.so:devel/dbus-glib \
+ libdbus-1.so:devel/dbus \
+ libical.so:devel/libical \
+ libfontconfig.so:x11-fonts/fontconfig \
+ libfreetype.so:print/freetype2
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
-USES= pkgconfig libtool gettext desktop-file-utils gmake \
- xfce tar:bzip2
-USE_GNOME= gtk20 intltool intlhack
+USES= desktop-file-utils gettext gmake gnome libtool pkgconfig \
+ tar:bzip2 xfce
+USE_GNOME= cairo gtk20 intlhack intltool
USE_XFCE= panel
+USE_XORG= x11
-OPTIONS_DEFINE= NOTIFY
+CFLAGS+= -I${LOCALBASE}/include/libical
+CONFIGURE_ARGS= --enable-dbus
+
+OPTIONS_DEFINE= NLS NOTIFY
OPTIONS_DEFAULT= NOTIFY
-NOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify
-NOTIFY_CONFIGURE_ENABLE= libnotify
+OPTIONS_SUB= yes
-CFLAGS+= -I${LOCALBASE}/include/libical
+NLS_CONFIGURE_ENABLE= nls
+NLS_USES= gettext-runtime
-CONFIGURE_ARGS= --enable-dbus
+NOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify
+NOTIFY_CONFIGURE_ENABLE=libnotify
post-patch:
@${REINPLACE_CMD} -e 's|(datadir)/orage/doc/C|(datadir)/doc/orage/C|' \
diff --git a/deskutils/orage/pkg-descr b/deskutils/orage/pkg-descr
index d0c4a1bda4b5..1b8ceb49b6a6 100644
--- a/deskutils/orage/pkg-descr
+++ b/deskutils/orage/pkg-descr
@@ -3,4 +3,4 @@ environment. It is highly configurable and supports alerts based on dates.
It warns you with popup or audio alarm. As it is an application kind-of
every day use it launches itself in the background as a daemon.
-WWW: http://www.xfce.org/projects/orage/
+WWW: https://git.xfce.org/apps/orage/about/
diff --git a/deskutils/orage/pkg-plist b/deskutils/orage/pkg-plist
index dcdb3755ae0f..66e692183193 100644
--- a/deskutils/orage/pkg-plist
+++ b/deskutils/orage/pkg-plist
@@ -36,59 +36,59 @@ share/icons/hicolor/48x48/apps/orage_globaltime.png
share/icons/hicolor/48x48/apps/xfcalendar.png
share/icons/hicolor/scalable/apps/orage_globaltime.svg
share/icons/hicolor/scalable/apps/xfcalendar.svg
-share/locale/am/LC_MESSAGES/orage.mo
-share/locale/ar/LC_MESSAGES/orage.mo
-share/locale/ast/LC_MESSAGES/orage.mo
-share/locale/be/LC_MESSAGES/orage.mo
-share/locale/bg/LC_MESSAGES/orage.mo
-share/locale/ca/LC_MESSAGES/orage.mo
-share/locale/cs/LC_MESSAGES/orage.mo
-share/locale/de/LC_MESSAGES/orage.mo
-share/locale/el/LC_MESSAGES/orage.mo
-share/locale/en_AU/LC_MESSAGES/orage.mo
-share/locale/en_GB/LC_MESSAGES/orage.mo
-share/locale/eo/LC_MESSAGES/orage.mo
-share/locale/es/LC_MESSAGES/orage.mo
-share/locale/et/LC_MESSAGES/orage.mo
-share/locale/eu/LC_MESSAGES/orage.mo
-share/locale/fi/LC_MESSAGES/orage.mo
-share/locale/fr/LC_MESSAGES/orage.mo
-share/locale/gl/LC_MESSAGES/orage.mo
-share/locale/he/LC_MESSAGES/orage.mo
-share/locale/hr/LC_MESSAGES/orage.mo
-share/locale/hu/LC_MESSAGES/orage.mo
-share/locale/id/LC_MESSAGES/orage.mo
-share/locale/it/LC_MESSAGES/orage.mo
-share/locale/ja/LC_MESSAGES/orage.mo
-share/locale/kk/LC_MESSAGES/orage.mo
-share/locale/ko/LC_MESSAGES/orage.mo
-share/locale/lt/LC_MESSAGES/orage.mo
-share/locale/lv/LC_MESSAGES/orage.mo
-share/locale/ms/LC_MESSAGES/orage.mo
-share/locale/nb/LC_MESSAGES/orage.mo
-share/locale/nl/LC_MESSAGES/orage.mo
-share/locale/nn/LC_MESSAGES/orage.mo
-share/locale/oc/LC_MESSAGES/orage.mo
-share/locale/pa/LC_MESSAGES/orage.mo
-share/locale/pl/LC_MESSAGES/orage.mo
-share/locale/pt/LC_MESSAGES/orage.mo
-share/locale/pt_BR/LC_MESSAGES/orage.mo
-share/locale/ro/LC_MESSAGES/orage.mo
-share/locale/ru/LC_MESSAGES/orage.mo
-share/locale/si/LC_MESSAGES/orage.mo
-share/locale/sk/LC_MESSAGES/orage.mo
-share/locale/sq/LC_MESSAGES/orage.mo
-share/locale/sr/LC_MESSAGES/orage.mo
-share/locale/sv/LC_MESSAGES/orage.mo
-share/locale/th/LC_MESSAGES/orage.mo
-share/locale/tr/LC_MESSAGES/orage.mo
-share/locale/ug/LC_MESSAGES/orage.mo
-share/locale/uk/LC_MESSAGES/orage.mo
-share/locale/ur/LC_MESSAGES/orage.mo
-share/locale/ur_PK/LC_MESSAGES/orage.mo
-share/locale/vi/LC_MESSAGES/orage.mo
-share/locale/zh_CN/LC_MESSAGES/orage.mo
-share/locale/zh_TW/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/am/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/ast/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/be/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/de/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/el/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/en_AU/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/es/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/et/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/he/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/id/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/it/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/nn/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/oc/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/pa/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/si/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/th/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/ur_PK/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/orage.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/orage.mo
%%DATADIR%%/sounds/Boiling.wav
%%DATADIR%%/sounds/KDE_Beep_Digital_1.ogg
%%DATADIR%%/sounds/KDE_Beep_Digital_2.ogg
diff --git a/deskutils/xfce4-notes-plugin/Makefile b/deskutils/xfce4-notes-plugin/Makefile
index cfd01f79bcf8..00b805447c1d 100644
--- a/deskutils/xfce4-notes-plugin/Makefile
+++ b/deskutils/xfce4-notes-plugin/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xfce4-notes-plugin
PORTVERSION= 1.8.1
+PORTREVISION= 1
CATEGORIES= deskutils xfce
MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
@@ -12,14 +13,25 @@ COMMENT= Notes plugin for the Xfce panel
LICENSE= GPLv2
-LIB_DEPENDS= libunique-1.0.so:x11-toolkits/unique
+LIB_DEPENDS= libunique-1.0.so:x11-toolkits/unique \
+ libfontconfig.so:x11-fonts/fontconfig \
+ libfreetype.so:print/freetype2 \
+ libdbus-glib-1.so:devel/dbus-glib \
+ libdbus-1.so:devel/dbus
-GNU_CONFIGURE= yes
-USES= gettext gmake libtool pkgconfig xfce tar:bzip2
-USE_GNOME= glib20 gtk20 intltool intlhack
+USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce
+USE_GNOME= cairo glib20 gtk20 intlhack intltool
USE_XFCE= panel
+USE_XORG= ice sm x11
+
+GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
-USE_XORG= x11
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/deskutils/xfce4-notes-plugin/pkg-descr b/deskutils/xfce4-notes-plugin/pkg-descr
index b588de273267..4f788571ff61 100644
--- a/deskutils/xfce4-notes-plugin/pkg-descr
+++ b/deskutils/xfce4-notes-plugin/pkg-descr
@@ -2,4 +2,4 @@ The notes plugin provides a quick way to paste text, to write down a
list of things, to leave a note to a friend, or whatever is common to do
with Post-It's.
-WWW: http://goodies.xfce.org/projects/panel-plugins/xfce4-notes-plugin
+WWW: https://goodies.xfce.org/projects/panel-plugins/xfce4-notes-plugin
diff --git a/deskutils/xfce4-notes-plugin/pkg-plist b/deskutils/xfce4-notes-plugin/pkg-plist
index 389663f0c002..708f09ae3ec4 100644
--- a/deskutils/xfce4-notes-plugin/pkg-plist
+++ b/deskutils/xfce4-notes-plugin/pkg-plist
@@ -9,54 +9,54 @@ share/icons/hicolor/22x22/apps/xfce4-notes-plugin.png
share/icons/hicolor/24x24/apps/xfce4-notes-plugin.png
share/icons/hicolor/32x32/apps/xfce4-notes-plugin.png
share/icons/hicolor/scalable/apps/xfce4-notes-plugin.svg
-share/locale/ar/LC_MESSAGES/xfce4-notes-plugin.mo
-share/locale/ast/LC_MESSAGES/xfce4-notes-plugin.mo
-share/locale/bg/LC_MESSAGES/xfce4-notes-plugin.mo
-share/locale/ca/LC_MESSAGES/xfce4-notes-plugin.mo
-share/locale/cs/LC_MESSAGES/xfce4-notes-plugin.mo
-share/locale/da/LC_MESSAGES/xfce4-notes-plugin.mo
-share/locale/de/LC_MESSAGES/xfce4-notes-plugin.mo
-share/locale/el/LC_MESSAGES/xfce4-notes-plugin.mo
-share/locale/en_AU/LC_MESSAGES/xfce4-notes-plugin.mo
-share/locale/en_GB/LC_MESSAGES/xfce4-notes-plugin.mo
-share/locale/es/LC_MESSAGES/xfce4-notes-plugin.mo
-share/locale/eu/LC_MESSAGES/xfce4-notes-plugin.mo
-share/locale/fi/LC_MESSAGES/xfce4-notes-plugin.mo
-share/locale/fr/LC_MESSAGES/xfce4-notes-plugin.mo
-share/locale/gl/LC_MESSAGES/xfce4-notes-plugin.mo
-share/locale/hr/LC_MESSAGES/xfce4-notes-plugin.mo
-share/locale/hu/LC_MESSAGES/xfce4-notes-plugin.mo
-share/locale/id/LC_MESSAGES/xfce4-notes-plugin.mo
-share/locale/is/LC_MESSAGES/xfce4-notes-plugin.mo
-share/locale/it/LC_MESSAGES/xfce4-notes-plugin.mo
-share/locale/ja/LC_MESSAGES/xfce4-notes-plugin.mo
-share/locale/kk/LC_MESSAGES/xfce4-notes-plugin.mo
-share/locale/ko/LC_MESSAGES/xfce4-notes-plugin.mo
-share/locale/lt/LC_MESSAGES/xfce4-notes-plugin.mo
-share/locale/lv/LC_MESSAGES/xfce4-notes-plugin.mo
-share/locale/ms/LC_MESSAGES/xfce4-notes-plugin.mo
-share/locale/nb/LC_MESSAGES/xfce4-notes-plugin.mo
-share/locale/nl/LC_MESSAGES/xfce4-notes-plugin.mo
-share/locale/oc/LC_MESSAGES/xfce4-notes-plugin.mo
-share/locale/pl/LC_MESSAGES/xfce4-notes-plugin.mo
-share/locale/pt/LC_MESSAGES/xfce4-notes-plugin.mo
-share/locale/pt_BR/LC_MESSAGES/xfce4-notes-plugin.mo
-share/locale/ro/LC_MESSAGES/xfce4-notes-plugin.mo
-share/locale/ru/LC_MESSAGES/xfce4-notes-plugin.mo
-share/locale/sk/LC_MESSAGES/xfce4-notes-plugin.mo
-share/locale/sl/LC_MESSAGES/xfce4-notes-plugin.mo
-share/locale/sq/LC_MESSAGES/xfce4-notes-plugin.mo
-share/locale/sr/LC_MESSAGES/xfce4-notes-plugin.mo
-share/locale/sv/LC_MESSAGES/xfce4-notes-plugin.mo
-share/locale/th/LC_MESSAGES/xfce4-notes-plugin.mo
-share/locale/tr/LC_MESSAGES/xfce4-notes-plugin.mo
-share/locale/ug/LC_MESSAGES/xfce4-notes-plugin.mo
-share/locale/uk/LC_MESSAGES/xfce4-notes-plugin.mo
-share/locale/ur/LC_MESSAGES/xfce4-notes-plugin.mo
-share/locale/ur_PK/LC_MESSAGES/xfce4-notes-plugin.mo
-share/locale/vi/LC_MESSAGES/xfce4-notes-plugin.mo
-share/locale/zh_CN/LC_MESSAGES/xfce4-notes-plugin.mo
-share/locale/zh_TW/LC_MESSAGES/xfce4-notes-plugin.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/xfce4-notes-plugin.mo
+%%NLS%%share/locale/ast/LC_MESSAGES/xfce4-notes-plugin.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/xfce4-notes-plugin.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/xfce4-notes-plugin.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/xfce4-notes-plugin.mo
+%%NLS%%share/locale/da/LC_MESSAGES/xfce4-notes-plugin.mo
+%%NLS%%share/locale/de/LC_MESSAGES/xfce4-notes-plugin.mo
+%%NLS%%share/locale/el/LC_MESSAGES/xfce4-notes-plugin.mo
+%%NLS%%share/locale/en_AU/LC_MESSAGES/xfce4-notes-plugin.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-notes-plugin.mo
+%%NLS%%share/locale/es/LC_MESSAGES/xfce4-notes-plugin.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/xfce4-notes-plugin.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/xfce4-notes-plugin.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/xfce4-notes-plugin.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/xfce4-notes-plugin.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/xfce4-notes-plugin.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/xfce4-notes-plugin.mo
+%%NLS%%share/locale/id/LC_MESSAGES/xfce4-notes-plugin.mo
+%%NLS%%share/locale/is/LC_MESSAGES/xfce4-notes-plugin.mo
+%%NLS%%share/locale/it/LC_MESSAGES/xfce4-notes-plugin.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/xfce4-notes-plugin.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/xfce4-notes-plugin.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/xfce4-notes-plugin.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/xfce4-notes-plugin.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/xfce4-notes-plugin.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/xfce4-notes-plugin.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/xfce4-notes-plugin.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/xfce4-notes-plugin.mo
+%%NLS%%share/locale/oc/LC_MESSAGES/xfce4-notes-plugin.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/xfce4-notes-plugin.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/xfce4-notes-plugin.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce4-notes-plugin.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/xfce4-notes-plugin.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/xfce4-notes-plugin.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/xfce4-notes-plugin.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/xfce4-notes-plugin.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/xfce4-notes-plugin.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/xfce4-notes-plugin.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/xfce4-notes-plugin.mo
+%%NLS%%share/locale/th/LC_MESSAGES/xfce4-notes-plugin.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/xfce4-notes-plugin.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/xfce4-notes-plugin.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/xfce4-notes-plugin.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/xfce4-notes-plugin.mo
+%%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce4-notes-plugin.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/xfce4-notes-plugin.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-notes-plugin.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-notes-plugin.mo
%%DATADIR%%/gtk-2.0/gradient.png
%%DATADIR%%/gtk-2.0/notes.gtkrc
%%DATADIR%%/gtk-2.0/scrollbars/slider-horiz-active.png
diff --git a/deskutils/xfce4-tumbler/Makefile b/deskutils/xfce4-tumbler/Makefile
index 468bb835b5ec..01ae61977bd9 100644
--- a/deskutils/xfce4-tumbler/Makefile
+++ b/deskutils/xfce4-tumbler/Makefile
@@ -18,13 +18,14 @@ LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING
LIB_DEPENDS= libpng.so:graphics/png
-USES= gettext-tools gmake libtool localbase:ldflags pathfix \
+USES= gettext-tools gmake gnome libtool localbase:ldflags pathfix \
pkgconfig tar:bzip2 xfce
-GNU_CONFIGURE= yes
-USE_GNOME= glib20 intltool gdkpixbuf2 librsvg2 cairo libgsf
+USE_GNOME= cairo gdkpixbuf2 glib20 intltool libgsf librsvg2
USE_LDCONFIG= yes
-INSTALL_TARGET= install-strip
+GNU_CONFIGURE= yes
+INSTALL_TARGET= install-strip
+SUB_FILES= pkg-message
CONFIGURE_ARGS= --enable-xdg-cache \
--enable-pixbuf-thumbnailer \
--disable-gtk-doc-html \
@@ -33,30 +34,35 @@ CONFIGURE_ARGS= --enable-xdg-cache \
OPTIONS_DEFINE= NLS FONTS JPEG FFMPEG POPPLER \
GSTREAMER ODF COVER
OPTIONS_DEFAULT= FONTS JPEG POPPLER GSTREAMER ODF
+OPTIONS_SUB= yes
FONTS_DESC= Fonts thumbnailer plugin
COVER_DESC= Open Movie Database plugin (check pkg-message)
GSTREAMER_DESC= GStreamer thumbnailer plugin
-NLS_USES= gettext-runtime
-NLS_CONFIGURE_ENABLE= nls
-FONTS_LIB_DEPENDS= libfreetype.so:print/freetype2
+COVER_CONFIGURE_ENABLE= cover-thumbnailer
+COVER_LIB_DEPENDS= libcurl.so:ftp/curl
+
+FFMPEG_CONFIGURE_ENABLE= ffmpeg-thumbnailer
+FFMPEG_LIB_DEPENDS= libffmpegthumbnailer.so:multimedia/ffmpegthumbnailer
+
FONTS_CONFIGURE_ENABLE= font-thumbnailer
+FONTS_LIB_DEPENDS= libfreetype.so:print/freetype2
+
+GSTREAMER_CONFIGURE_ENABLE= gstreamer-thumbnailer
+GSTREAMER_USE= gstreamer1=yes
+
+JPEG_CONFIGURE_ENABLE= jpeg-thumbnailer
JPEG_LIB_DEPENDS= libexif.so:graphics/libexif
JPEG_USES= jpeg
-JPEG_CONFIGURE_ENABLE= jpeg-thumbnailer
-FFMPEG_LIB_DEPENDS= libffmpegthumbnailer.so:multimedia/ffmpegthumbnailer
-FFMPEG_CONFIGURE_ENABLE= ffmpeg-thumbnailer
-POPPLER_LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib
-POPPLER_CONFIGURE_ENABLE= poppler-thumbnailer
-GSTREAMER_USE= gstreamer1=yes
-GSTREAMER_CONFIGURE_ENABLE= gstreamer-thumbnailer
-ODF_USE= gnome=libgsf
+
+NLS_CONFIGURE_ENABLE= nls
+NLS_USES= gettext-runtime
+
ODF_CONFIGURE_ENABLE= odf-thumbnailer
-COVER_LIB_DEPENDS= libcurl.so:ftp/curl
-COVER_CONFIGURE_ENABLE= cover-thumbnailer
-OPTIONS_SUB= yes
+ODF_USE= gnome=libgsf
-SUB_FILES= pkg-message
+POPPLER_CONFIGURE_ENABLE= poppler-thumbnailer
+POPPLER_LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib
.include <bsd.port.mk>
diff --git a/deskutils/xfce4-tumbler/files/patch-configure b/deskutils/xfce4-tumbler/files/patch-configure
deleted file mode 100644
index 60658a7e1bab..000000000000
--- a/deskutils/xfce4-tumbler/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig 2015-02-28 16:28:14 UTC
-+++ configure
-@@ -14427,7 +14427,7 @@ $as_echo "#define HAVE_LC_MESSAGES 1" >>
-
- fi
- fi
-- USE_NLS=yes
-+# USE_NLS=yes
-
-
- gt_cv_have_gettext=no
diff --git a/deskutils/xfce4-volumed-pulse/Makefile b/deskutils/xfce4-volumed-pulse/Makefile
index 7badc808f264..fa49c6ba62e4 100644
--- a/deskutils/xfce4-volumed-pulse/Makefile
+++ b/deskutils/xfce4-volumed-pulse/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xfce4-volumed-pulse
PORTVERSION= 0.2.3
+PORTREVISION= 1
CATEGORIES= deskutils xfce
MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
@@ -15,14 +16,16 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libpulse.so:audio/pulseaudio \
libnotify.so:devel/libnotify \
- libkeybinder-3.0.so:x11/keybinder-gtk3
+ libkeybinder-3.0.so:x11/keybinder-gtk3 \
+ libdbus-glib-1.so:devel/dbus-glib \
+ libdbus-1.so:devel/dbus
-USES= gmake libtool pkgconfig tar:bz2 xfce:gtk3
-GNU_CONFIGURE= yes
-USE_GNOME= glib20 gtk30
+USES= gmake gnome libtool pkgconfig tar:bz2 xfce:gtk3
+USE_GNOME= cairo gdkpixbuf2 glib20 gtk30
USE_XFCE= xfconf
-INSTALL_TARGET= install-strip
+GNU_CONFIGURE= yes
+INSTALL_TARGET= install-strip
CONFIGURE_ARGS= --enable-libnotify
PLIST_FILES= bin/xfce4-volumed-pulse \
diff --git a/deskutils/xfce4-xkb-plugin/Makefile b/deskutils/xfce4-xkb-plugin/Makefile
index 7d0fdc9133e4..939f952a6106 100644
--- a/deskutils/xfce4-xkb-plugin/Makefile
+++ b/deskutils/xfce4-xkb-plugin/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xfce4-xkb-plugin
PORTVERSION= 0.8.1
+PORTREVISION= 1
CATEGORIES= deskutils xfce
MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
@@ -10,15 +11,24 @@ COMMENT= Keyboard layout switching plugin for the Xfce panel
LICENSE= GPLv2
-LIB_DEPENDS= libxklavier.so:x11/libxklavier
+LIB_DEPENDS= libxklavier.so:x11/libxklavier \
+ libdbus-glib-1.so:devel/dbus-glib \
+ libdbus-1.so:devel/dbus
-USES= gettext gmake libtool pkgconfig tar:bzip2 xfce:gtk3
-GNU_CONFIGURE= yes
-USE_GNOME= gtk30 intltool librsvg2 libwnck3 cairo
+USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce:gtk3
+USE_GNOME= cairo gtk30 intltool librsvg2 libwnck3
USE_XFCE= panel
USE_XORG= x11
+
+GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
+OPTIONS_DEFINE= NLS
+OPTIONS_SUB= yes
+
+NLS_CONFIGURE_ENABLE= nls
+NLS_USES= gettext-runtime
+
# Downgrade libxklavier
post-patch:
@${REINPLACE_CMD} -e 's|5.4|5.3|g' ${WRKSRC}/configure
diff --git a/deskutils/xfce4-xkb-plugin/pkg-descr b/deskutils/xfce4-xkb-plugin/pkg-descr
index 3e4f7b0bee4d..b388eb2172f6 100644
--- a/deskutils/xfce4-xkb-plugin/pkg-descr
+++ b/deskutils/xfce4-xkb-plugin/pkg-descr
@@ -9,4 +9,4 @@ This plugin is used along with the XKB extension. For now the keyboard
layouts cannot be configured from the plugin itself, they should be
set in the Xorg file or some other way (e.g. setxkbmap).
-WWW: http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin
+WWW: https://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin
diff --git a/deskutils/xfce4-xkb-plugin/pkg-plist b/deskutils/xfce4-xkb-plugin/pkg-plist
index 591812968ead..7e07b44feee1 100644
--- a/deskutils/xfce4-xkb-plugin/pkg-plist
+++ b/deskutils/xfce4-xkb-plugin/pkg-plist
@@ -1,55 +1,55 @@
lib/xfce4/panel/plugins/libxkb.so
-share/locale/ar/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/ast/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/be/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/bg/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/ca/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/cs/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/da/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/de/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/el/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/en_AU/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/en_GB/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/es/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/eu/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/fi/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/fr/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/gl/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/he/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/hr/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/hu/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/id/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/is/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/it/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/ja/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/kk/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/ko/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/lt/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/lv/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/ms/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/nb/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/nl/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/oc/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/pl/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/pt/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/pt_BR/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/ro/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/ru/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/sk/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/sl/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/sq/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/sr/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/sv/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/th/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/tr/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/ug/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/uk/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/ur/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/ur_PK/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/uz/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/uz@Latn/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/zh_CN/LC_MESSAGES/xfce4-xkb-plugin.mo
-share/locale/zh_TW/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/ast/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/be/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/da/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/de/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/el/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/en_AU/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/es/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/he/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/id/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/is/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/it/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/oc/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/th/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/uz/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/uz@Latn/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-xkb-plugin.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-xkb-plugin.mo
share/xfce4/panel/plugins/xkb.desktop
share/xfce4/xkb/flags/ae.svg
share/xfce4/xkb/flags/al.svg
diff --git a/devel/xfce4-vala/Makefile b/devel/xfce4-vala/Makefile
index f4b46726a2d1..178ce654287c 100644
--- a/devel/xfce4-vala/Makefile
+++ b/devel/xfce4-vala/Makefile
@@ -15,10 +15,10 @@ LICENSE= LGPL21
BUILD_DEPENDS= valac:lang/vala
-GNU_CONFIGURE= yes
-USES= pkgconfig gmake pathfix xfce tar:bzip2
+USES= gmake gnome pathfix pkgconfig tar:bzip2 xfce
USE_XFCE= panel
+GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-vala-api=0.40
.include <bsd.port.mk>
diff --git a/devel/xfce4-vala/files/patch-configure b/devel/xfce4-vala/files/patch-configure
index 7098eff14b44..051dbd4f6fbd 100644
--- a/devel/xfce4-vala/files/patch-configure
+++ b/devel/xfce4-vala/files/patch-configure
@@ -1,6 +1,6 @@
---- ./configure.orig 2013-08-16 20:27:53.000000000 +0000
-+++ ./configure 2013-08-19 19:38:20.000000000 +0000
-@@ -2671,7 +2671,7 @@
+--- configure.orig 2013-08-16 20:27:53 UTC
++++ configure
+@@ -2671,7 +2671,7 @@ VALAGI=`$PKG_CONFIG --variable=vala_gen_introspect lib
@@ -9,7 +9,7 @@
-@@ -2684,7 +2684,7 @@
+@@ -2684,7 +2684,7 @@ else
fi
if test x"$with_default_vapidir" == xno ; then
diff --git a/editors/mousepad/Makefile b/editors/mousepad/Makefile
index 86ea80dcea32..fe0ba1ac14ce 100644
--- a/editors/mousepad/Makefile
+++ b/editors/mousepad/Makefile
@@ -3,6 +3,7 @@
PORTNAME= mousepad
PORTVERSION= 0.4.1
+PORTREVISION= 1
CATEGORIES= editors xfce
MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
@@ -13,18 +14,26 @@ COMMENT= Simple text editor for the Xfce Desktop
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib
+LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \
+ libdbus-1.so:devel/dbus
+
+USES= desktop-file-utils gettext-tools gmake gnome libtool perl5 \
+ pkgconfig tar:bzip2
+USE_GNOME= cairo gdkpixbuf2 glib20 intlhack intltool
GNU_CONFIGURE= yes
-USES= desktop-file-utils gettext gmake libtool perl5 pkgconfig tar:bzip2
-USE_GNOME= glib20 intltool intlhack
-OPTIONS_DEFINE= GTK3
+GLIB_SCHEMAS= org.xfce.mousepad.gschema.xml
+
+OPTIONS_DEFINE= GTK3 NLS
OPTIONS_DEFAULT= GTK3
+OPTIONS_SUB= yes
+
GTK3_CONFIGURE_ENABLE= gtk3
-GTK3_USE= gnome=gtk30,gtksourceview3,dconf
-GTK3_USE_OFF= gnome=gtk20,gtksourceview2
+GTK3_USE= gnome=gtk30,gtksourceview3,dconf
+GTK3_USE_OFF= gnome=gtk20,gtksourceview2
-GLIB_SCHEMAS= org.xfce.mousepad.gschema.xml
+NLS_CONFIGURE_ENABLE= nls
+NLS_USES= gettext-runtime
.include <bsd.port.mk>
diff --git a/editors/mousepad/pkg-descr b/editors/mousepad/pkg-descr
index 8edb21825765..99db56caea06 100644
--- a/editors/mousepad/pkg-descr
+++ b/editors/mousepad/pkg-descr
@@ -1,3 +1,3 @@
Mousepad is a simple text editor for the Xfce desktop environment.
-WWW: http://goodies.xfce.org/projects/applications/mousepad
+WWW: https://git.xfce.org/apps/mousepad/about/
diff --git a/editors/mousepad/pkg-plist b/editors/mousepad/pkg-plist
index 1012a7ae94c5..bc4f290e8f13 100644
--- a/editors/mousepad/pkg-plist
+++ b/editors/mousepad/pkg-plist
@@ -1,49 +1,49 @@
bin/mousepad
share/applications/mousepad.desktop
-share/locale/ar/LC_MESSAGES/mousepad.mo
-share/locale/ast/LC_MESSAGES/mousepad.mo
-share/locale/bg/LC_MESSAGES/mousepad.mo
-share/locale/ca/LC_MESSAGES/mousepad.mo
-share/locale/cs/LC_MESSAGES/mousepad.mo
-share/locale/da/LC_MESSAGES/mousepad.mo
-share/locale/de/LC_MESSAGES/mousepad.mo
-share/locale/el/LC_MESSAGES/mousepad.mo
-share/locale/en_AU/LC_MESSAGES/mousepad.mo
-share/locale/en_GB/LC_MESSAGES/mousepad.mo
-share/locale/es/LC_MESSAGES/mousepad.mo
-share/locale/eu/LC_MESSAGES/mousepad.mo
-share/locale/fi/LC_MESSAGES/mousepad.mo
-share/locale/fr/LC_MESSAGES/mousepad.mo
-share/locale/gl/LC_MESSAGES/mousepad.mo
-share/locale/he/LC_MESSAGES/mousepad.mo
-share/locale/hr/LC_MESSAGES/mousepad.mo
-share/locale/hu/LC_MESSAGES/mousepad.mo
-share/locale/id/LC_MESSAGES/mousepad.mo
-share/locale/is/LC_MESSAGES/mousepad.mo
-share/locale/it/LC_MESSAGES/mousepad.mo
-share/locale/ja/LC_MESSAGES/mousepad.mo
-share/locale/kk/LC_MESSAGES/mousepad.mo
-share/locale/ko/LC_MESSAGES/mousepad.mo
-share/locale/lt/LC_MESSAGES/mousepad.mo
-share/locale/ms/LC_MESSAGES/mousepad.mo
-share/locale/nb/LC_MESSAGES/mousepad.mo
-share/locale/nl/LC_MESSAGES/mousepad.mo
-share/locale/nn/LC_MESSAGES/mousepad.mo
-share/locale/oc/LC_MESSAGES/mousepad.mo
-share/locale/pl/LC_MESSAGES/mousepad.mo
-share/locale/pt/LC_MESSAGES/mousepad.mo
-share/locale/pt_BR/LC_MESSAGES/mousepad.mo
-share/locale/ro/LC_MESSAGES/mousepad.mo
-share/locale/ru/LC_MESSAGES/mousepad.mo
-share/locale/sk/LC_MESSAGES/mousepad.mo
-share/locale/sl/LC_MESSAGES/mousepad.mo
-share/locale/sq/LC_MESSAGES/mousepad.mo
-share/locale/sr/LC_MESSAGES/mousepad.mo
-share/locale/sv/LC_MESSAGES/mousepad.mo
-share/locale/te/LC_MESSAGES/mousepad.mo
-share/locale/th/LC_MESSAGES/mousepad.mo
-share/locale/tr/LC_MESSAGES/mousepad.mo
-share/locale/ug/LC_MESSAGES/mousepad.mo
-share/locale/uk/LC_MESSAGES/mousepad.mo
-share/locale/zh_CN/LC_MESSAGES/mousepad.mo
-share/locale/zh_TW/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/ast/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/da/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/de/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/el/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/en_AU/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/es/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/he/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/id/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/is/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/it/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/nn/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/oc/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/te/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/th/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/mousepad.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/mousepad.mo
diff --git a/graphics/ristretto/Makefile b/graphics/ristretto/Makefile
index e08eef5c97eb..b3ec6885126f 100644
--- a/graphics/ristretto/Makefile
+++ b/graphics/ristretto/Makefile
@@ -19,15 +19,18 @@ LIB_DEPENDS= libexif.so:graphics/libexif \
libfreetype.so:print/freetype2 \
libfontconfig.so:x11-fonts/fontconfig
-USES= desktop-file-utils gettext-tools gmake pkgconfig tar:bzip2 xfce
-GNU_CONFIGURE= yes
-USE_GNOME= gtk20 glib20 intltool intlhack cairo
-INSTALLS_ICONS= yes
+USES= desktop-file-utils gettext-tools gmake gnome pkgconfig \
+ tar:bzip2 xfce
+USE_GNOME= cairo gtk20 glib20 intlhack intltool
USE_XFCE= libmenu
USE_XORG= ice sm x11
+GNU_CONFIGURE= yes
+INSTALLS_ICONS= yes
+
OPTIONS_DEFINE= NLS
OPTIONS_SUB= yes
+
NLS_USES= gettext-runtime
NLS_CONFIGURE_ENABLE= nls
diff --git a/graphics/ristretto/pkg-descr b/graphics/ristretto/pkg-descr
index aee39c8d33f8..5efe485a3adb 100644
--- a/graphics/ristretto/pkg-descr
+++ b/graphics/ristretto/pkg-descr
@@ -1,4 +1,4 @@
Ristretto is a fast and lightweight picture-viewer for the
Xfce desktop environment.
-WWW: http://goodies.xfce.org/projects/applications/ristretto
+WWW: https://goodies.xfce.org/projects/applications/ristretto
diff --git a/mail/xfce4-mailwatch-plugin/Makefile b/mail/xfce4-mailwatch-plugin/Makefile
index 3c1895c12e58..688d549475e2 100644
--- a/mail/xfce4-mailwatch-plugin/Makefile
+++ b/mail/xfce4-mailwatch-plugin/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xfce4-mailwatch-plugin
PORTVERSION= 1.2.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= mail xfce
MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
@@ -12,17 +12,27 @@ MAINTAINER= xfce@FreeBSD.org
COMMENT= Mail notification applet for the Xfce panel
LIB_DEPENDS= libgnutls.so:security/gnutls \
- libgcrypt.so:security/libgcrypt
+ libgcrypt.so:security/libgcrypt \
+ libgpg-error.so:security/libgpg-error \
+ libfontconfig.so:x11-fonts/fontconfig \
+ libfreetype.so:print/freetype2
+
+USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce
+USE_GNOME= cairo glib20 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= glib20 gtk20 intltool intlhack
-USE_XFCE= panel
-USE_XORG= x11
-CONFIGURE_ARGS=--enable-ipv6
+OPTIONS_DEFINE= IPV6 NLS
+OPTIONS_SUB= yes
+
+IPV6_CONFIGURE_ENABLE= ipv6
+
+NLS_CONFIGURE_ENABLE= nls
+NLS_USES= gettext-runtime
post-patch:
${REINPLACE_CMD} -e 's|xfce-mail|mail-send|' \
diff --git a/mail/xfce4-mailwatch-plugin/pkg-descr b/mail/xfce4-mailwatch-plugin/pkg-descr
index 276b27afe181..f333c95c974b 100644
--- a/mail/xfce4-mailwatch-plugin/pkg-descr
+++ b/mail/xfce4-mailwatch-plugin/pkg-descr
@@ -14,4 +14,4 @@ Features
* Ability to run program on new messages or button click
* Informative logger to help track down mail connection problems
-WWW: http://goodies.xfce.org/projects/panel-plugins/xfce4-mailwatch-plugin
+WWW: https://goodies.xfce.org/projects/panel-plugins/xfce4-mailwatch-plugin
diff --git a/mail/xfce4-mailwatch-plugin/pkg-plist b/mail/xfce4-mailwatch-plugin/pkg-plist
index 1d8b2dc5f542..6d196b91d9af 100644
--- a/mail/xfce4-mailwatch-plugin/pkg-plist
+++ b/mail/xfce4-mailwatch-plugin/pkg-plist
@@ -3,47 +3,47 @@ share/icons/hicolor/48x48/apps/xfce-newmail.png
share/icons/hicolor/48x48/apps/xfce-nomail.png
share/icons/hicolor/scalable/apps/xfce-newmail.svg
share/icons/hicolor/scalable/apps/xfce-nomail.svg
-share/locale/ar/LC_MESSAGES/xfce4-mailwatch-plugin.mo
-share/locale/ast/LC_MESSAGES/xfce4-mailwatch-plugin.mo
-share/locale/bg/LC_MESSAGES/xfce4-mailwatch-plugin.mo
-share/locale/ca/LC_MESSAGES/xfce4-mailwatch-plugin.mo
-share/locale/cs/LC_MESSAGES/xfce4-mailwatch-plugin.mo
-share/locale/da/LC_MESSAGES/xfce4-mailwatch-plugin.mo
-share/locale/de/LC_MESSAGES/xfce4-mailwatch-plugin.mo
-share/locale/el/LC_MESSAGES/xfce4-mailwatch-plugin.mo
-share/locale/en_AU/LC_MESSAGES/xfce4-mailwatch-plugin.mo
-share/locale/en_GB/LC_MESSAGES/xfce4-mailwatch-plugin.mo
-share/locale/es/LC_MESSAGES/xfce4-mailwatch-plugin.mo
-share/locale/eu/LC_MESSAGES/xfce4-mailwatch-plugin.mo
-share/locale/fi/LC_MESSAGES/xfce4-mailwatch-plugin.mo
-share/locale/fr/LC_MESSAGES/xfce4-mailwatch-plugin.mo
-share/locale/gl/LC_MESSAGES/xfce4-mailwatch-plugin.mo
-share/locale/he/LC_MESSAGES/xfce4-mailwatch-plugin.mo
-share/locale/hr/LC_MESSAGES/xfce4-mailwatch-plugin.mo
-share/locale/hu/LC_MESSAGES/xfce4-mailwatch-plugin.mo
-share/locale/id/LC_MESSAGES/xfce4-mailwatch-plugin.mo
-share/locale/is/LC_MESSAGES/xfce4-mailwatch-plugin.mo
-share/locale/it/LC_MESSAGES/xfce4-mailwatch-plugin.mo
-share/locale/ja/LC_MESSAGES/xfce4-mailwatch-plugin.mo
-share/locale/ko/LC_MESSAGES/xfce4-mailwatch-plugin.mo
-share/locale/lt/LC_MESSAGES/xfce4-mailwatch-plugin.mo
-share/locale/lv/LC_MESSAGES/xfce4-mailwatch-plugin.mo
-share/locale/nb/LC_MESSAGES/xfce4-mailwatch-plugin.mo
-share/locale/nl/LC_MESSAGES/xfce4-mailwatch-plugin.mo
-share/locale/pl/LC_MESSAGES/xfce4-mailwatch-plugin.mo
-share/locale/pt/LC_MESSAGES/xfce4-mailwatch-plugin.mo
-share/locale/pt_BR/LC_MESSAGES/xfce4-mailwatch-plugin.mo
-share/locale/ru/LC_MESSAGES/xfce4-mailwatch-plugin.mo
-share/locale/sk/LC_MESSAGES/xfce4-mailwatch-plugin.mo
-share/locale/sq/LC_MESSAGES/xfce4-mailwatch-plugin.mo
-share/locale/sr/LC_MESSAGES/xfce4-mailwatch-plugin.mo
-share/locale/sv/LC_MESSAGES/xfce4-mailwatch-plugin.mo
-share/locale/tr/LC_MESSAGES/xfce4-mailwatch-plugin.mo
-share/locale/ug/LC_MESSAGES/xfce4-mailwatch-plugin.mo
-share/locale/uk/LC_MESSAGES/xfce4-mailwatch-plugin.mo
-share/locale/ur/LC_MESSAGES/xfce4-mailwatch-plugin.mo
-share/locale/ur_PK/LC_MESSAGES/xfce4-mailwatch-plugin.mo
-share/locale/vi/LC_MESSAGES/xfce4-mailwatch-plugin.mo
-share/locale/zh_CN/LC_MESSAGES/xfce4-mailwatch-plugin.mo
-share/locale/zh_TW/LC_MESSAGES/xfce4-mailwatch-plugin.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/xfce4-mailwatch-plugin.mo
+%%NLS%%share/locale/ast/LC_MESSAGES/xfce4-mailwatch-plugin.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/xfce4-mailwatch-plugin.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/xfce4-mailwatch-plugin.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/xfce4-mailwatch-plugin.mo
+%%NLS%%share/locale/da/LC_MESSAGES/xfce4-mailwatch-plugin.mo
+%%NLS%%share/locale/de/LC_MESSAGES/xfce4-mailwatch-plugin.mo
+%%NLS%%share/locale/el/LC_MESSAGES/xfce4-mailwatch-plugin.mo
+%%NLS%%share/locale/en_AU/LC_MESSAGES/xfce4-mailwatch-plugin.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-mailwatch-plugin.mo
+%%NLS%%share/locale/es/LC_MESSAGES/xfce4-mailwatch-plugin.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/xfce4-mailwatch-plugin.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/xfce4-mailwatch-plugin.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/xfce4-mailwatch-plugin.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/xfce4-mailwatch-plugin.mo
+%%NLS%%share/locale/he/LC_MESSAGES/xfce4-mailwatch-plugin.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/xfce4-mailwatch-plugin.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/xfce4-mailwatch-plugin.mo
+%%NLS%%share/locale/id/LC_MESSAGES/xfce4-mailwatch-plugin.mo
+%%NLS%%share/locale/is/LC_MESSAGES/xfce4-mailwatch-plugin.mo
+%%NLS%%share/locale/it/LC_MESSAGES/xfce4-mailwatch-plugin.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/xfce4-mailwatch-plugin.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/xfce4-mailwatch-plugin.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/xfce4-mailwatch-plugin.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/xfce4-mailwatch-plugin.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/xfce4-mailwatch-plugin.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/xfce4-mailwatch-plugin.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/xfce4-mailwatch-plugin.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/xfce4-mailwatch-plugin.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce4-mailwatch-plugin.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/xfce4-mailwatch-plugin.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/xfce4-mailwatch-plugin.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/xfce4-mailwatch-plugin.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/xfce4-mailwatch-plugin.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/xfce4-mailwatch-plugin.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/xfce4-mailwatch-plugin.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/xfce4-mailwatch-plugin.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/xfce4-mailwatch-plugin.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/xfce4-mailwatch-plugin.mo
+%%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce4-mailwatch-plugin.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/xfce4-mailwatch-plugin.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-mailwatch-plugin.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-mailwatch-plugin.mo
share/xfce4/panel/plugins/mailwatch.desktop
diff --git a/math/xfce4-calculator-plugin/Makefile b/math/xfce4-calculator-plugin/Makefile
index 78b2b5ab125f..400974301a8f 100644
--- a/math/xfce4-calculator-plugin/Makefile
+++ b/math/xfce4-calculator-plugin/Makefile
@@ -13,13 +13,14 @@ COMMENT= Simple calculator for the Xfce panel
LICENSE= GPLv2
LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
- libfreetype.so:print/freetype2
+ libfreetype.so:print/freetype2
-USES= gmake gettext-tools libtool pkgconfig tar:bz2 xfce
-GNU_CONFIGURE= yes
-USE_GNOME= gtk20 cairo intltool intlhack
+USES= gettext-tools gmake gnome libtool pkgconfig tar:bz2 xfce
+USE_GNOME= cairo gtk20 intlhack intltool
USE_XFCE= panel
USE_XORG= x11
+
+GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
INSTALL_TARGET= install-strip
diff --git a/math/xfce4-calculator-plugin/pkg-descr b/math/xfce4-calculator-plugin/pkg-descr
index c6578236246a..1b2399e505d8 100644
--- a/math/xfce4-calculator-plugin/pkg-descr
+++ b/math/xfce4-calculator-plugin/pkg-descr
@@ -1,4 +1,4 @@
It is a calculator plugin for the Xfce4 panel. The plugin supports common
mathematical operators, constants (pi) and functions.
-WWW: http://goodies.xfce.org/projects/panel-plugins/xfce4-calculator-plugin
+WWW: https://goodies.xfce.org/projects/panel-plugins/xfce4-calculator-plugin
diff --git a/misc/xfce4-appfinder/Makefile b/misc/xfce4-appfinder/Makefile
index b16a0d775f04..c17e76baf3b6 100644
--- a/misc/xfce4-appfinder/Makefile
+++ b/misc/xfce4-appfinder/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xfce4-appfinder
PORTVERSION= 4.12.0
+PORTREVISION= 1
CATEGORIES= misc xfce
MASTER_SITES= XFCE
DIST_SUBDIR= xfce4
@@ -12,22 +13,28 @@ COMMENT= Application launcher and finder
LICENSE= GPLv2
-LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib
+LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \
+ libdbus-1.so:devel/dbus \
+ libfontconfig.so:x11-fonts/fontconfig \
+ libfreetype.so:print/freetype2
-GNU_CONFIGURE= yes
-USES= gmake pkgconfig gettext-tools tar:bzip2
-USE_GNOME= glib20 intltool intlhack
+USES= gettext-tools gmake gnome pkgconfig tar:bzip2 xfce
+USE_GNOME= cairo gdkpixbuf2 glib20 intlhack intltool
USE_XFCE= garcon
-OPTIONS_DEFINE= GTK3 NLS
-GTK3_USES= xfce:gtk3
-GTK3_USE= gnome=gtk30
+GNU_CONFIGURE= yes
+
+OPTIONS_DEFINE= GTK3 NLS
+OPTIONS_SUB= yes
+
GTK3_CONFIGURE_ENABLE= gtk3
-GTK3_USES_OFF= xfce
-GTK3_USE_OFF= gnome=gtk20
-NLS_USES= gettext-runtime
+GTK3_USE_OFF= gnome=gtk20
+GTK3_USE= gnome=gtk30
+GTK3_USES_OFF= xfce
+GTK3_USES= xfce:gtk3
+
NLS_CONFIGURE_ENABLE= nls
-OPTIONS_SUB= yes
+NLS_USES= gettext-runtime
post-patch:
${REINPLACE_CMD} -e 's|=gtk-find|=system-search|' \
diff --git a/misc/xfce4-appfinder/files/patch-configure b/misc/xfce4-appfinder/files/patch-configure
deleted file mode 100644
index 631adba6e08a..000000000000
--- a/misc/xfce4-appfinder/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./configure.orig 2013-05-05 14:56:24.000000000 +0000
-+++ ./configure 2013-05-06 19:40:20.000000000 +0000
-@@ -13282,7 +13282,7 @@
-
- fi
- fi
-- USE_NLS=yes
-+# USE_NLS=yes
-
-
- gt_cv_have_gettext=no
diff --git a/misc/xfce4-appfinder/pkg-descr b/misc/xfce4-appfinder/pkg-descr
index 5700d4320cc3..87dc0f43daf7 100644
--- a/misc/xfce4-appfinder/pkg-descr
+++ b/misc/xfce4-appfinder/pkg-descr
@@ -1,4 +1,4 @@
This application allows you to search, launch and find information about
applications installed on your system.
-WWW: http://www.xfce.org/
+WWW: https://www.xfce.org/
diff --git a/misc/xfce4-weather-plugin/Makefile b/misc/xfce4-weather-plugin/Makefile
index 0d638d41ecc9..ad377e2fa455 100644
--- a/misc/xfce4-weather-plugin/Makefile
+++ b/misc/xfce4-weather-plugin/Makefile
@@ -17,18 +17,24 @@ LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \
libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
-USES= gettext gmake libtool pkgconfig xfce:gtk3 tar:bzip2
-GNU_CONFIGURE= yes
-USE_GNOME= glib20 gtk30 intltool intlhack libxml2 cairo
+USES= gettext-tools gmake gnome libtool pkgconfig xfce:gtk3 tar:bzip2
+USE_GNOME= cairo glib20 gtk30 intlhack intltool libxml2
USE_XFCE= panel
-INSTALLS_ICONS= yes
USE_LDCONFIG= yes
+
+GNU_CONFIGURE= yes
+INSTALLS_ICONS= yes
INSTALL_TARGET= install-strip
-OPTIONS_DEFINE= UPOWER
+OPTIONS_DEFINE= NLS UPOWER
+OPTIONS_SUB= yes
+
UPOWER_DESC= Power management tasks
+NLS_CONFIGURE_ENABLE= nls
+NLS_USES= gettext-runtime
+
UPOWER_LIB_DEPENDS= libupower-glib.so:sysutils/upower
-UPOWER_CONFIGURE_ENABLE= upower
+UPOWER_CONFIGURE_ENABLE=upower
.include <bsd.port.mk>
diff --git a/multimedia/xfce4-parole/Makefile b/multimedia/xfce4-parole/Makefile
index cd468fbb0791..749915f46353 100644
--- a/multimedia/xfce4-parole/Makefile
+++ b/multimedia/xfce4-parole/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS= xdg-screensaver:devel/xdg-utils
USES= compiler:c++11-lang desktop-file-utils gettext-tools \
gmake gnome libtool pkgconfig tar:bzip2 xfce:gtk3
-USE_GNOME= cairo gtk30 glib20 intltool intlhack
+USE_GNOME= cairo gtk30 glib20 intlhack intltool
USE_GSTREAMER1= core faad flac wavpack rtmp x
USE_XFCE= panel
USE_XORG= ice sm x11
@@ -43,9 +43,12 @@ OPTIONS_DEFAULT= HTTP
OPTIONS_SUB= yes
CDDA_USE= gstreamer1=cdparanoia
+
GST_PLUG_DESC= Additional GStreamer plugins
+
HTTP_DESC= HTTP streaming (libsoup)
HTTP_USE= gstreamer1=soup
+
NLS_CONFIGURE_ENABLE= nls
NLS_USES= gettext-runtime
diff --git a/multimedia/xfce4-parole/files/patch-configure b/multimedia/xfce4-parole/files/patch-configure
index 3c41916eaab4..3de498acc539 100644
--- a/multimedia/xfce4-parole/files/patch-configure
+++ b/multimedia/xfce4-parole/files/patch-configure
@@ -1,14 +1,5 @@
--- configure.orig 2018-04-12 00:49:30 UTC
+++ configure
-@@ -19422,7 +19422,7 @@ $as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
-
- fi
- fi
-- USE_NLS=yes
-+ #USE_NLS=yes
-
-
- gt_cv_have_gettext=no
@@ -23916,10 +23916,10 @@ _ACEOF
else
diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile
index d9c2253f363e..73b0ecbd9302 100644
--- a/print/xfce4-print/Makefile
+++ b/print/xfce4-print/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xfce4-print
PORTVERSION= 4.6.1
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= print xfce
MASTER_SITES= XFCE/src/archive/xfprint/${PORTVERSION:R}
DISTNAME= xfprint-${PORTVERSION}
@@ -16,26 +16,40 @@ LICENSE= GPLv2
BUILD_DEPENDS= a2ps:print/a2ps
RUN_DEPENDS= a2ps:print/a2ps
+LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
+ libfreetype.so:print/freetype2 \
+ libdbus-glib-1.so:devel/dbus-glib \
+ libdbus-1.so:devel/dbus
+
+USES= gettext-tools gmake gnome libtool pathfix pkgconfig \
+ tar:bzip2 xfce
+USE_GNOME= cairo glib20 gtk20 intlhack intltool
+USE_LDCONFIG= yes
+USE_XFCE= libgui xfconf
+USE_XORG= x11
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
-USES= gettext gmake libtool pathfix pkgconfig xfce tar:bzip2
-USE_GNOME= glib20 gtk20 intltool intlhack
-USE_LDCONFIG= yes
-USE_XFCE= libgui xfconf
+INSTALL_TARGET= install-strip
-OPTIONS_DEFINE= LETTER
-OPTIONS_DEFAULT= LPR
-OPTIONS_SINGLE= PRINTMETHOD
+OPTIONS_DEFINE= LETTER NLS
+OPTIONS_SINGLE= PRINTMETHOD
OPTIONS_SINGLE_PRINTMETHOD= LPR CUPS
+OPTIONS_DEFAULT= LPR
+OPTIONS_SUB= yes
+
LETTER_DESC= Use letter paper format instead of A4
LPR_DESC= LPR printing system support
-CUPS_LIB_DEPENDS= libcups.so:print/cups
+
CUPS_CONFIGURE_ENABLE= cups
+CUPS_LIB_DEPENDS= libcups.so:print/cups
+
+LETTER_CONFIGURE_ENABLE=letter
LPR_CONFIGURE_ENABLE= bsdlpr
LPR_CONFIGURE_WITH= printcap=/etc/printcap
-LETTER_CONFIGURE_ENABLE= letter
-OPTIONS_SUB= yes
+
+NLS_CONFIGURE_ENABLE= nls
+NLS_USES= gettext-runtime
post-patch:
@${REINPLACE_CMD} '/_LDADD =/s/=/= -lX11/' \
diff --git a/print/xfce4-print/files/patch-printing-systems__cups__cups.c b/print/xfce4-print/files/patch-printing-systems_cups_cups.c
index c598add37ed5..d20d929ff1d2 100644
--- a/print/xfce4-print/files/patch-printing-systems__cups__cups.c
+++ b/print/xfce4-print/files/patch-printing-systems_cups_cups.c
@@ -1,5 +1,5 @@
---- ./printing-systems/cups/cups.c.orig 2009-02-24 21:34:16.000000000 +0000
-+++ ./printing-systems/cups/cups.c 2014-06-03 18:56:42.000000000 +0000
+--- printing-systems/cups/cups.c.orig 2009-02-24 21:34:16 UTC
++++ printing-systems/cups/cups.c
@@ -23,7 +23,9 @@
#include <gmodule.h>
@@ -10,7 +10,7 @@
#include <cups/ppd.h>
#include <cups/cups.h>
#include <cups/language.h>
-@@ -133,8 +135,8 @@
+@@ -133,8 +135,8 @@ cups_request_new (int operation_id)
language = cupsLangDefault ();
request = ippNew ();
@@ -21,7 +21,7 @@
ippAddString (request, IPP_TAG_OPERATION, IPP_TAG_CHARSET, "attributes-charset", NULL, "utf-8");
-@@ -242,7 +244,7 @@
+@@ -242,7 +244,7 @@ get_printers ()
if (!request)
continue;
diff --git a/print/xfce4-print/pkg-descr b/print/xfce4-print/pkg-descr
index 00c7a1d53b15..3480755e4f7a 100644
--- a/print/xfce4-print/pkg-descr
+++ b/print/xfce4-print/pkg-descr
@@ -1,4 +1,4 @@
Xfprint contains a print dialog and a printer manager for the Xfce Desktop
Environment. It supports CUPS, BSD-LPR and file as printing destination.
-WWW: http://www.xfce.org/
+WWW: https://www.xfce.org/
diff --git a/print/xfce4-print/pkg-plist b/print/xfce4-print/pkg-plist
index 481ff2403387..f1127e261634 100644
--- a/print/xfce4-print/pkg-plist
+++ b/print/xfce4-print/pkg-plist
@@ -38,60 +38,60 @@ share/gtk-doc/html/libxfprint/up.png
share/icons/hicolor/24x24/devices/printer.png
share/icons/hicolor/48x48/devices/printer.png
share/icons/hicolor/scalable/devices/printer.svg
-share/locale/am/LC_MESSAGES/xfprint.mo
-share/locale/ar/LC_MESSAGES/xfprint.mo
-share/locale/az/LC_MESSAGES/xfprint.mo
-share/locale/be/LC_MESSAGES/xfprint.mo
-share/locale/bg/LC_MESSAGES/xfprint.mo
-share/locale/bn_IN/LC_MESSAGES/xfprint.mo
-share/locale/ca/LC_MESSAGES/xfprint.mo
-share/locale/cs/LC_MESSAGES/xfprint.mo
-share/locale/da/LC_MESSAGES/xfprint.mo
-share/locale/de/LC_MESSAGES/xfprint.mo
-share/locale/dz/LC_MESSAGES/xfprint.mo
-share/locale/el/LC_MESSAGES/xfprint.mo
-share/locale/eo/LC_MESSAGES/xfprint.mo
-share/locale/en_GB/LC_MESSAGES/xfprint.mo
-share/locale/es/LC_MESSAGES/xfprint.mo
-share/locale/es_MX/LC_MESSAGES/xfprint.mo
-share/locale/et/LC_MESSAGES/xfprint.mo
-share/locale/eu/LC_MESSAGES/xfprint.mo
-share/locale/fa/LC_MESSAGES/xfprint.mo
-share/locale/fi/LC_MESSAGES/xfprint.mo
-share/locale/fr/LC_MESSAGES/xfprint.mo
-share/locale/gl/LC_MESSAGES/xfprint.mo
-share/locale/gu/LC_MESSAGES/xfprint.mo
-share/locale/he/LC_MESSAGES/xfprint.mo
-share/locale/hi/LC_MESSAGES/xfprint.mo
-share/locale/hu/LC_MESSAGES/xfprint.mo
-share/locale/id/LC_MESSAGES/xfprint.mo
-share/locale/it/LC_MESSAGES/xfprint.mo
-share/locale/ja/LC_MESSAGES/xfprint.mo
-share/locale/ka/LC_MESSAGES/xfprint.mo
-share/locale/ko/LC_MESSAGES/xfprint.mo
-share/locale/lt/LC_MESSAGES/xfprint.mo
-share/locale/lv/LC_MESSAGES/xfprint.mo
-share/locale/mk/LC_MESSAGES/xfprint.mo
-share/locale/mr/LC_MESSAGES/xfprint.mo
-share/locale/ms/LC_MESSAGES/xfprint.mo
-share/locale/nl/LC_MESSAGES/xfprint.mo
-share/locale/pa/LC_MESSAGES/xfprint.mo
-share/locale/pl/LC_MESSAGES/xfprint.mo
-share/locale/pt_BR/LC_MESSAGES/xfprint.mo
-share/locale/pt/LC_MESSAGES/xfprint.mo
-share/locale/ro/LC_MESSAGES/xfprint.mo
-share/locale/ru/LC_MESSAGES/xfprint.mo
-share/locale/si/LC_MESSAGES/xfprint.mo
-share/locale/sk/LC_MESSAGES/xfprint.mo
-share/locale/sq/LC_MESSAGES/xfprint.mo
-share/locale/sv/LC_MESSAGES/xfprint.mo
-share/locale/ta/LC_MESSAGES/xfprint.mo
-share/locale/tr/LC_MESSAGES/xfprint.mo
-share/locale/uk/LC_MESSAGES/xfprint.mo
-share/locale/ur/LC_MESSAGES/xfprint.mo
-share/locale/vi/LC_MESSAGES/xfprint.mo
-share/locale/zh_CN/LC_MESSAGES/xfprint.mo
-share/locale/zh_TW/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/am/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/az/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/be/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/bn_IN/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/da/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/de/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/dz/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/el/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/es/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/es_MX/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/et/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/fa/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/gu/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/he/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/hi/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/id/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/it/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/mk/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/mr/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/pa/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/si/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/ta/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfprint.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfprint.mo
share/xfce4/doc/C/images/xfprint_headings.png
share/xfce4/doc/C/images/xfprint_input.png
share/xfce4/doc/C/images/xfprint-manager.png
diff --git a/science/xfce4-equake-plugin/Makefile b/science/xfce4-equake-plugin/Makefile
index 512315088eba..cca365650b0a 100644
--- a/science/xfce4-equake-plugin/Makefile
+++ b/science/xfce4-equake-plugin/Makefile
@@ -14,14 +14,15 @@ LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
- libfreetype.so:print/freetype2 \
- libcurl.so:ftp/curl
+ libfreetype.so:print/freetype2 \
+ libcurl.so:ftp/curl
-GNU_CONFIGURE= yes
-USES= gettext gmake libtool pkgconfig tar:bzip2 xfce
-USE_GNOME= glib20 gtk20 intltool cairo
+USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce
+USE_GNOME= cairo glib20 gtk20 intltool
USE_XFCE= panel
USE_XORG= x11
+
+GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
.include <bsd.port.mk>
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
diff --git a/textproc/xfce4-dict-plugin/Makefile b/textproc/xfce4-dict-plugin/Makefile
index 7a6b2699718e..4b845e0cae97 100644
--- a/textproc/xfce4-dict-plugin/Makefile
+++ b/textproc/xfce4-dict-plugin/Makefile
@@ -14,8 +14,8 @@ COMMENT= Xfce4 plugin to query different dictionaries
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= gettext-tools gmake libtool pkgconfig tar:bzip2 xfce:gtk3
-USE_GNOME= glib20 gtk30 intltool cairo
+USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce:gtk3
+USE_GNOME= cairo glib20 gtk30 intltool
USE_XFCE= panel
USE_XORG= x11
USE_LDCONFIG= yes
diff --git a/textproc/xfce4-dict-plugin/pkg-descr b/textproc/xfce4-dict-plugin/pkg-descr
index c4d7a70b88ac..a4ece0f4232c 100644
--- a/textproc/xfce4-dict-plugin/pkg-descr
+++ b/textproc/xfce4-dict-plugin/pkg-descr
@@ -2,4 +2,4 @@ With xfce4-dict you can query a dictionary server (see RFC 2229) to search for
the translation or explanation of a word. You can also choose a dictionary
offered by the server to improve your search results.
-WWW: http://goodies.xfce.org/projects/applications/xfce4-dict
+WWW: https://goodies.xfce.org/projects/applications/xfce4-dict
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
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
diff --git a/x11-fm/thunar-vfs/Makefile b/x11-fm/thunar-vfs/Makefile
index f80a66853a4b..7fd483ba7eeb 100644
--- a/x11-fm/thunar-vfs/Makefile
+++ b/x11-fm/thunar-vfs/Makefile
@@ -3,7 +3,7 @@
PORTNAME= thunar-vfs
PORTVERSION= 1.2.0
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= x11-fm xfce
MASTER_SITES= XFCE/src/archive/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
@@ -16,31 +16,41 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libpng.so:graphics/png \
libfreetype.so:print/freetype2 \
- libgamin-1.so:devel/gamin
+ libfontconfig.so:x11-fonts/fontconfig \
+ libgamin-1.so:devel/gamin \
+ libdbus-1.so:devel/dbus
-GNU_CONFIGURE= yes
-USE_GNOME= glib20 gtk20 gdkpixbuf2 intltool intlhack
+USES= desktop-file-utils gettext-tools gmake gmake jpeg libtool pathfix \
+ perl5 pkgconfig tar:bzip2 xfce
+USE_GNOME= cairo gdkpixbuf2 glib20 gtk20 intlhack intltool
USE_XFCE= libexo
-USE_XORG= x11
-USES= desktop-file-utils gettext-tools gmake jpeg libtool pathfix perl5 pkgconfig \
- xfce tar:bzip2
+USE_XORG= ice x11 sm
+USE_LDCONFIG= yes
+GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-debug --without-html-dir
+INSTALL_TARGET= install-strip
-OPTIONS_DEFINE= NLS HAL DBUS STARTUP GCONF
+OPTIONS_DEFINE= NLS HAL DBUS STARTUP GCONF
OPTIONS_DEFAULT= HAL DBUS STARTUP
-STARTUP_DESC= Startup notification
-NLS_USES= gettext-runtime
-NLS_CONFIGURE_ENABLE= nls
-HAL_LIB_DEPENDS= libhal.so:sysutils/hal
-HAL_CONFIGURE_WITH= volume-manager=hal
-HAL_CONFIGURE_OFF= --with-volume-manager=freebsd
-DBUS_LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib
+OPTIONS_SUB= yes
+
+STARTUP_DESC= Startup notification
+
DBUS_CONFIGURE_ENABLE= dbus
-STARTUP_LIB_DEPENDS= libstartup-notification-1.so:x11/startup-notification
-STARTUP_CONFIGURE_ENABLE= startup-notification
-GCONF_USE= gnome=gconf2
+DBUS_LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib
+
GCONF_CONFIGURE_ENABLE= gnome-thumbnailers
-OPTIONS_SUB= yes
+GCONF_USE= gnome=gconf2
+
+HAL_CONFIGURE_OFF= --with-volume-manager=freebsd
+HAL_CONFIGURE_WITH= volume-manager=hal
+HAL_LIB_DEPENDS= libhal.so:sysutils/hal
+
+NLS_CONFIGURE_ENABLE= nls
+NLS_USES= gettext-runtime
+
+STARTUP_CONFIGURE_ENABLE= startup-notification
+STARTUP_LIB_DEPENDS= libstartup-notification-1.so:x11/startup-notification
.include <bsd.port.mk>
diff --git a/x11-fm/thunar-vfs/files/patch-configure b/x11-fm/thunar-vfs/files/patch-configure
deleted file mode 100644
index 18cdee7253c8..000000000000
--- a/x11-fm/thunar-vfs/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./configure.orig 2011-01-16 16:48:44.000000000 +0000
-+++ ./configure 2013-10-23 17:09:46.000000000 +0000
-@@ -13877,7 +13877,7 @@
-
- fi
- fi
-- USE_NLS=yes
-+ #USE_NLS=yes
-
-
- gt_cv_have_gettext=no
diff --git a/x11-fm/thunar-vfs/pkg-descr b/x11-fm/thunar-vfs/pkg-descr
index e8f966dca8ba..94e5af0eaad6 100644
--- a/x11-fm/thunar-vfs/pkg-descr
+++ b/x11-fm/thunar-vfs/pkg-descr
@@ -1,4 +1,4 @@
Thunar-VFS is the Virtual filesystem shipped with the thunar 1.0
and earlier releases.
-WWW: http://xfce.org/
+WWW: https://xfce.org/
diff --git a/x11-fm/thunar/Makefile b/x11-fm/thunar/Makefile
index 80438507f8d6..d1c2d85610e7 100644
--- a/x11-fm/thunar/Makefile
+++ b/x11-fm/thunar/Makefile
@@ -22,22 +22,27 @@ LIB_DEPENDS= libtumbler-1.so:deskutils/xfce4-tumbler \
libfreetype.so:print/freetype2
RUN_DEPENDS= pkexec:sysutils/polkit
-PORTSCOUT= limit:^1\.6\.
-
-USES= desktop-file-utils gmake pathfix perl5 libtool pkgconfig \
- gettext-tools xfce tar:bzip2
-GNU_CONFIGURE= yes
-INSTALLS_ICONS= yes
-USE_GNOME= glib20 gtk20 intltool cairo gdkpixbuf2
+USES= desktop-file-utils gettext-tools gmake gnome libtool pathfix \
+ perl5 pkgconfig tar:bzip2 xfce
+USE_GNOME= cairo gdkpixbuf2 glib20 gtk20 intltool
USE_LDCONFIG= yes
USE_XFCE= libexo
USE_XORG= ice sm x11
+
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+=--enable-gio-unix \
+ --disable-gudev \
+ --enable-dbus
+INSTALLS_ICONS= yes
INSTALL_TARGET= install-strip
-OPTIONS_DEFINE= NLS NOTIFY
-OPTIONS_GROUP= PLUGINS
+PORTSCOUT= limit:^1\.6\.
+
+OPTIONS_DEFINE= NLS NOTIFY
+OPTIONS_GROUP= PLUGINS
OPTIONS_GROUP_PLUGINS= PLUG_APR PLUG_SBR PLUG_TPA PLUG_UCA PLUG_WALL
OPTIONS_DEFAULT= NOTIFY PLUG_APR PLUG_SBR PLUG_TPA PLUG_UCA PLUG_WALL
+OPTIONS_SUB= yes
# Override NOTIFY_DESC
NOTIFY_DESC= Display notifications
@@ -47,23 +52,23 @@ PLUG_TPA_DESC= Trash Panel Applet plugin
PLUG_UCA_DESC= User Customizable Actions plugin
PLUG_WALL_DESC= Wallpaper plugin
-NLS_USES= gettext-runtime
-NLS_CONFIGURE_ENABLE= nls
-NOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify
+NLS_CONFIGURE_ENABLE= nls
+NLS_USES= gettext-runtime
+
NOTIFY_CONFIGURE_ENABLE= notifications
-PLUG_APR_LIB_DEPENDS= libexif.so:graphics/libexif
+NOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify
+
PLUG_APR_CONFIGURE_ENABLE= apr-plugin exif
-PLUG_SBR_LIB_DEPENDS= libpcre.so:devel/pcre
+PLUG_APR_LIB_DEPENDS= libexif.so:graphics/libexif
+
PLUG_SBR_CONFIGURE_ENABLE= sbr-plugin pcre
-PLUG_TPA_USE= gnome=gvfs xfce=panel
+PLUG_SBR_LIB_DEPENDS= libpcre.so:devel/pcre
+
PLUG_TPA_CONFIGURE_ENABLE= tpa-plugin
+PLUG_TPA_USE= gnome=gvfs xfce=panel
+
PLUG_UCA_CONFIGURE_ENABLE= uca-plugin
PLUG_WALL_CONFIGURE_ENABLE= wallpaper-plugin
-OPTIONS_SUB= yes
-
-CONFIGURE_ARGS+=--enable-gio-unix \
- --disable-gudev \
- --enable-dbus
post-patch:
@${REINPLACE_CMD} -e 's|internet-mail|emblem-mail|' \
diff --git a/x11-fm/thunar/files/patch-configure b/x11-fm/thunar/files/patch-configure
deleted file mode 100644
index e8685262457d..000000000000
--- a/x11-fm/thunar/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig 2017-06-30 22:28:12 UTC
-+++ configure
-@@ -14452,7 +14452,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/x11-toolkits/libxfce4gui/Makefile b/x11-toolkits/libxfce4gui/Makefile
index 99da5482ea23..4b35ea8624e9 100644
--- a/x11-toolkits/libxfce4gui/Makefile
+++ b/x11-toolkits/libxfce4gui/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libxfce4gui
PORTVERSION= 4.10.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-toolkits xfce
MASTER_SITES= XFCE/src/archive/libxfcegui4/${PORTVERSION:R}
DISTNAME= libxfcegui4-${PORTVERSION}
@@ -14,24 +14,31 @@ COMMENT= Various Gtk widgets for the Xfce Desktop
LICENSE= GPLv2
-GNU_CONFIGURE= yes
-INSTALLS_ICONS= yes
-USES= gmake libtool pathfix pkgconfig gettext-tools xfce tar:bzip2
-USE_GNOME= gtk20 intltool intlhack libglade2
-USE_LDCONFIG= yes
+LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
+ libfreetype.so:print/freetype2
+
+USES= gettext-tools gmake gnome libtool pathfix pkgconfig tar:bzip2 xfce
+USE_GNOME= cairo gtk20 intlhack intltool libglade2
USE_XFCE= libutil
-USE_XORG= sm x11
+USE_XORG= ice sm x11
+USE_LDCONFIG= yes
-CONFIGURE_ARGS+=--disable-gladeui --disable-static \
- --without-html-dir
+GNU_CONFIGURE= yes
+INSTALLS_ICONS= yes
+CONFIGURE_ARGS= --disable-gladeui --disable-static \
+ --without-html-dir
+INSTALL_TARGET= install-strip
OPTIONS_DEFINE= NLS STARTUP
OPTIONS_DEFAULT= STARTUP
-STARTUP_DESC= Startup notification
-NLS_USES= gettext-runtime
+OPTIONS_SUB= yes
+
+STARTUP_DESC= Startup notification
+
+NLS_USES= gettext-runtime
NLS_CONFIGURE_ENABLE= nls
+
STARTUP_LIB_DEPENDS= libstartup-notification-1.so:x11/startup-notification
STARTUP_CONFIGURE_ENABLE= startup-notification
-OPTIONS_SUB= yes
.include <bsd.port.mk>
diff --git a/x11-toolkits/libxfce4gui/files/patch-configure b/x11-toolkits/libxfce4gui/files/patch-configure
deleted file mode 100644
index 413f259e9a8d..000000000000
--- a/x11-toolkits/libxfce4gui/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./configure.orig 2012-04-28 20:10:47.000000000 +0000
-+++ ./configure 2013-10-21 18:18:01.000000000 +0000
-@@ -13165,7 +13165,7 @@
-
- fi
- fi
-- USE_NLS=yes
-+ #USE_NLS=yes
-
-
- gt_cv_have_gettext=no
diff --git a/x11-toolkits/libxfce4gui/files/patch-libxfcegui4__xfce-exec.c b/x11-toolkits/libxfce4gui/files/patch-libxfcegui4_xfce-exec.c
index a8a9e801c545..4cade1299fb6 100644
--- a/x11-toolkits/libxfce4gui/files/patch-libxfcegui4__xfce-exec.c
+++ b/x11-toolkits/libxfce4gui/files/patch-libxfcegui4_xfce-exec.c
@@ -1,6 +1,6 @@
---- ./libxfcegui4/xfce-exec.c.orig 2012-04-28 20:10:43.000000000 +0000
-+++ ./libxfcegui4/xfce-exec.c 2014-03-24 21:25:39.000000000 +0000
-@@ -79,7 +79,7 @@
+--- libxfcegui4/xfce-exec.c.orig 2012-04-28 20:10:43 UTC
++++ libxfcegui4/xfce-exec.c
+@@ -79,7 +79,7 @@ child_setup_sync(gpointer user_data)
#ifndef G_OS_WIN32
gchar *dpyname = user_data;
diff --git a/x11-toolkits/libxfce4gui/pkg-descr b/x11-toolkits/libxfce4gui/pkg-descr
index 05888a7e26b8..4ef2ce3d0213 100644
--- a/x11-toolkits/libxfce4gui/pkg-descr
+++ b/x11-toolkits/libxfce4gui/pkg-descr
@@ -1,3 +1,3 @@
GUI-related extension widgets and libraries for the Xfce Desktop.
-WWW: http://www.xfce.org/
+WWW: https://www.xfce.org/
diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile
index 84b2c2430a94..112070e04868 100644
--- a/x11-wm/xfce4-desktop/Makefile
+++ b/x11-wm/xfce4-desktop/Makefile
@@ -20,26 +20,30 @@ LIB_DEPENDS= libdbus-1.so:devel/dbus \
libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
-USES= gettext-tools gmake pkgconfig tar:bzip2 xfce
-GNU_CONFIGURE= yes
-INSTALLS_ICONS= yes
-USE_GNOME= glib20 gtk20 intltool libwnck cairo
+USES= gettext-tools gmake gnome pkgconfig tar:bzip2 xfce
+USE_GNOME= cairo glib20 gtk20 intltool libwnck
USE_XFCE= garcon libexo
USE_XORG= ice sm x11
+
+GNU_CONFIGURE= yes
+INSTALLS_ICONS= yes
INSTALL_TARGET= install-strip
-CONFIGURE_ARGS+=--enable-gio-unix \
+CONFIGURE_ARGS= --enable-gio-unix \
--enable-notifications
-OPTIONS_DEFINE= NLS THUNAR
-OPTIONS_DEFAULT= THUNAR
-NLS_USES= gettext-runtime
-NLS_CONFIGURE_ENABLE= nls
-THUNAR_USE= xfce=thunar
+OPTIONS_DEFINE= NLS THUNAR
+OPTIONS_DEFAULT= THUNAR
+OPTIONS_SUB= yes
+
+THUNAR_DESC= Thunar file manager support
+
+NLS_CONFIGURE_ENABLE= nls
+NLS_USES= gettext-runtime
+
THUNAR_CONFIGURE_ENABLE= thunarx
-THUNAR_CONFIGURE_WITH= file-manager-fallback=Thunar
-THUNAR_DESC= Thunar file manager support
-OPTIONS_SUB= yes
+THUNAR_CONFIGURE_WITH= file-manager-fallback=Thunar
+THUNAR_USE= xfce=thunar
post-patch-NLS-off:
@${REINPLACE_CMD} -e 's|po ||' ${WRKSRC}/Makefile.in
diff --git a/x11-wm/xfce4-desktop/pkg-descr b/x11-wm/xfce4-desktop/pkg-descr
index 22d53b28d0a8..146c608ec64a 100644
--- a/x11-wm/xfce4-desktop/pkg-descr
+++ b/x11-wm/xfce4-desktop/pkg-descr
@@ -1,4 +1,4 @@
The desktop manager sets the background image, and provides a root
window menu, desktop icons or minimized icons and windows list.
-WWW: http://www.xfce.org/
+WWW: https://www.xfce.org/
diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile
index a460a84e8c1e..f0e403c6a82a 100644
--- a/x11-wm/xfce4-panel/Makefile
+++ b/x11-wm/xfce4-panel/Makefile
@@ -20,28 +20,30 @@ LIB_DEPENDS= libdbus-1.so:devel/dbus \
libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
-PORTSCOUT= limit:^4\.12\.
-
-USES= desktop-file-utils gmake libtool pathfix gettext-tools perl5 \
- pkgconfig tar:bzip2
-GNU_CONFIGURE= yes
-INSTALLS_ICONS= yes
-USE_GNOME= glib20 gtk20 intltool intlhack libwnck cairo
+USES= desktop-file-utils gettext-tools gmake gnome libtool pathfix \
+ perl5 pkgconfig tar:bzip2
+USE_GNOME= cairo glib20 gtk20 intlhack intltool libwnck
USE_LDCONFIG= yes
USE_XFCE= garcon libexo
USE_XORG= ice sm x11 xext
-INSTALL_TARGET= install-strip
+GNU_CONFIGURE= yes
+INSTALLS_ICONS= yes
+INSTALL_TARGET= install-strip
CONFIGURE_ARGS+=--enable-gio-unix --without-html-dir
+PORTSCOUT= limit:^4\.12\.
+
OPTIONS_DEFINE= GTK3 NLS
OPTIONS_DEFAULT= GTK3
-GTK3_USES= xfce:gtk3
-GTK3_USE= gnome=gtk30
+OPTIONS_SUB= yes
+
GTK3_CONFIGURE_ENABLE= gtk3
+GTK3_USE= gnome=gtk30
GTK3_USES_OFF= xfce
-NLS_USES= gettext-runtime
+GTK3_USES= xfce:gtk3
+
NLS_CONFIGURE_ENABLE= nls
-OPTIONS_SUB= yes
+NLS_USES= gettext-runtime
.include <bsd.port.mk>
diff --git a/x11-wm/xfce4-panel/files/patch-configure b/x11-wm/xfce4-panel/files/patch-configure
deleted file mode 100644
index 0e8f87e6633d..000000000000
--- a/x11-wm/xfce4-panel/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig 2017-12-13 23:14:34 UTC
-+++ configure
-@@ -14100,7 +14100,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/x11-wm/xfce4-panel/pkg-descr b/x11-wm/xfce4-panel/pkg-descr
index ecc6a3e0ba7c..58d9370e2908 100644
--- a/x11-wm/xfce4-panel/pkg-descr
+++ b/x11-wm/xfce4-panel/pkg-descr
@@ -1,4 +1,4 @@
The panel supports multiple panels, with many options for their
position, appearance, transparency and behavior.
-WWW: http://docs.xfce.org/xfce/xfce4-panel/start
+WWW: https://docs.xfce.org/xfce/xfce4-panel/start
diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile
index b06abac96ece..ae8a8ebc0a20 100644
--- a/x11-wm/xfce4-session/Makefile
+++ b/x11-wm/xfce4-session/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xfce4-session
PORTVERSION= 4.12.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-wm xfce
MASTER_SITES= XFCE/src/xfce/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
@@ -17,28 +17,32 @@ BUILD_DEPENDS= iceauth:x11/iceauth
RUN_DEPENDS= iceauth:x11/iceauth \
console-kit-daemon:sysutils/consolekit2
LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \
+ libdbus-1.so:devel/dbus \
libupower-glib.so:sysutils/upower \
- libpolkit-gobject-1.so:sysutils/polkit
+ libpolkit-gobject-1.so:sysutils/polkit \
+ libfontconfig.so:x11-fonts/fontconfig \
+ libfreetype.so:print/freetype2
-GNU_CONFIGURE= yes
-INSTALLS_ICONS= yes
-USE_GNOME= gtk20 glib20 intltool intlhack libwnck
-USES= pathfix pkgconfig gmake libtool gettext-tools xfce tar:bzip2
+USES= gettext-tools gmake gnome libtool pathfix pkgconfig \
+ tar:bzip2 xfce
+USE_GNOME= cairo gtk20 glib20 intlhack intltool libwnck
USE_LDCONFIG= yes
USE_XFCE= libmenu
-USE_XORG= x11 sm ice
+USE_XORG= ice sm x11
-CONFIGURE_ARGS+=--enable-legacy-sm \
+GNU_CONFIGURE= yes
+INSTALLS_ICONS= yes
+CONFIGURE_ARGS= --enable-legacy-sm \
--with-xsession-prefix=${PREFIX}
-
SUB_FILES= pkg-message
+PLIST_SUB= VERSION="4.6"
+INSTALL_TARGET= install-strip
-OPTIONS_DEFINE= NLS
-NLS_USES= gettext-runtime
-NLS_CONFIGURE_ENABLE= nls
-OPTIONS_SUB= yes
+OPTIONS_DEFINE= NLS
+OPTIONS_SUB= yes
-PLIST_SUB= VERSION="4.6"
+NLS_CONFIGURE_ENABLE= nls
+NLS_USES= gettext-runtime
post-patch:
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
diff --git a/x11-wm/xfce4-session/files/patch-configure b/x11-wm/xfce4-session/files/patch-configure
deleted file mode 100644
index aa31d0998179..000000000000
--- a/x11-wm/xfce4-session/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./configure.orig 2012-04-28 20:43:34.000000000 +0000
-+++ ./configure 2013-04-24 23:04:07.000000000 +0000
-@@ -14200,7 +14200,7 @@
-
- fi
- fi
-- USE_NLS=yes
-+# USE_NLS=yes
-
-
- gt_cv_have_gettext=no
diff --git a/x11-wm/xfce4-session/pkg-descr b/x11-wm/xfce4-session/pkg-descr
index e38b77ededea..1c90b569402c 100644
--- a/x11-wm/xfce4-session/pkg-descr
+++ b/x11-wm/xfce4-session/pkg-descr
@@ -2,4 +2,4 @@ The Xfce session manager controls the loading of applications when
Xfce is started. It also handles logging out, shutting down, and
rebooting.
-WWW: http://www.xfce.org/
+WWW: https://www.xfce.org/
diff --git a/x11-wm/xfce4-wm/Makefile b/x11-wm/xfce4-wm/Makefile
index a1f5ddab2e39..1e7cbe6b6590 100644
--- a/x11-wm/xfce4-wm/Makefile
+++ b/x11-wm/xfce4-wm/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xfce4-wm
PORTVERSION= 4.12.5
+PORTREVISION= 1
CATEGORIES= x11-wm xfce
MASTER_SITES= XFCE/src/xfce/xfwm4/${PORTVERSION:R}
DISTNAME= xfwm4-${PORTVERSION}
@@ -18,6 +19,12 @@ LIB_DEPENDS= libdbus-1.so:devel/dbus \
libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
+USES= gettext-tools gmake gnome pkgconfig tar:bzip2 xfce
+USE_GNOME= cairo gtk20 intltool libwnck
+USE_XFCE= libmenu
+USE_XORG= ice sm x11 xcomposite xdamage xext xfixes xinerama \
+ xrandr xrender
+
CONFIGURE_ARGS= --enable-xsync \
--enable-render \
--enable-randr \
@@ -25,22 +32,22 @@ CONFIGURE_ARGS= --enable-xsync \
--disable-kde-systray
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
-USES= gettext-tools gmake pkgconfig tar:bzip2 xfce
-USE_GNOME= gtk20 intltool libwnck cairo
-USE_XFCE= libmenu
-USE_XORG= ice sm x11 xcomposite xdamage xext xfixes xrandr xrender
DATADIR= ${PREFIX}/share/xfwm4
OPTIONS_DEFINE= DRM NLS STARTUP
OPTIONS_DEFAULT= STARTUP
-DRM_DESC= Direct Rendering Module service
-STARTUP_DESC= Startup notification
-DRM_LIB_DEPENDS= libdrm.so:graphics/libdrm
+OPTIONS_SUB= yes
+
+DRM_DESC= Direct Rendering Module service
+STARTUP_DESC= Startup notification
+
DRM_CONFIGURE_ENABLE= libdrm
-NLS_USES= gettext-runtime
+DRM_LIB_DEPENDS= libdrm.so:graphics/libdrm
+
NLS_CONFIGURE_ENABLE= nls
-STARTUP_LIB_DEPENDS= libstartup-notification-1.so:x11/startup-notification
+NLS_USES= gettext-runtime
+
STARTUP_CONFIGURE_ENABLE= startup-notification
-OPTIONS_SUB= yes
+STARTUP_LIB_DEPENDS= libstartup-notification-1.so:x11/startup-notification
.include <bsd.port.mk>
diff --git a/x11-wm/xfce4-wm/files/patch-configure b/x11-wm/xfce4-wm/files/patch-configure
deleted file mode 100644
index 5faf072d744f..000000000000
--- a/x11-wm/xfce4-wm/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig 2018-07-29 12:57:35 UTC
-+++ configure
-@@ -14015,7 +14015,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/x11/libxfce4menu/Makefile b/x11/libxfce4menu/Makefile
index 0102808be868..47d8e9fdaac3 100644
--- a/x11/libxfce4menu/Makefile
+++ b/x11/libxfce4menu/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libxfce4menu
PORTVERSION= 4.12.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 xfce
MASTER_SITES= XFCE/src/xfce/libxfce4ui/${PORTVERSION:R}
DISTNAME= libxfce4ui-${PORTVERSION}
@@ -14,29 +14,40 @@ COMMENT= Widgets library for the Xfce desktop environment
LICENSE= GPLv2
-PORTSCOUT= limit:^4\.12\.
+LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
+ libfreetype.so:print/freetype2 \
+ libdbus-glib-1.so:devel/dbus-glib \
+ libdbus-1.so:devel/dbus
-USES= gmake libtool pathfix pkgconfig gettext-tools \
- xfce tar:bzip2
-GNU_CONFIGURE= yes
-USE_GNOME= glib20 gtk20 intltool intlhack
+USES= gettext-tools gmake gnome libtool pathfix pkgconfig \
+ tar:bzip2 xfce
+USE_GNOME= cairo glib20 gtk20 intlhack intltool
USE_LDCONFIG= yes
USE_XFCE= xfconf
-INSTALLS_ICONS= yes
+USE_XORG= ice sm x11
+GNU_CONFIGURE= yes
+INSTALLS_ICONS= yes
CONFIGURE_ARGS= --with-vendor-info=${OPSYS} --without-html-dir
+INSTALL_TARGET= install-strip
+
+PORTSCOUT= limit:^4\.12\.
OPTIONS_DEFINE= GLADE GTK3 NLS STARTUP
OPTIONS_DEFAULT= GTK3 STARTUP
-STARTUP_DESC= Startup notification
-STARTUP_LIB_DEPENDS= libstartup-notification-1.so:x11/startup-notification
-STARTUP_CONFIGURE_ENABLE= startup-notification
-NLS_USES= gettext-runtime
-NLS_CONFIGURE_ENABLE= nls
-GLADE_LIB_DEPENDS= libgladeui-1.so:devel/glade3
+OPTIONS_SUB= yes
+
GLADE_CONFIGURE_ENABLE= gladeui
-GTK3_USE= gnome=gtk30
+GLADE_LIB_DEPENDS= libgladeui-1.so:devel/glade3
+
GTK3_CONFIGURE_ENABLE= gtk3
-OPTIONS_SUB= yes
+GTK3_USE= gnome=gtk30
+
+NLS_CONFIGURE_ENABLE= nls
+NLS_USES= gettext-runtime
+
+STARTUP_CONFIGURE_ENABLE= startup-notification
+STARTUP_DESC= Startup notification
+STARTUP_LIB_DEPENDS= libstartup-notification-1.so:x11/startup-notification
.include <bsd.port.mk>
diff --git a/x11/libxfce4menu/files/patch-configure b/x11/libxfce4menu/files/patch-configure
deleted file mode 100644
index cf0deee23b75..000000000000
--- a/x11/libxfce4menu/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig 2015-03-15 18:14:47 UTC
-+++ configure
-@@ -14128,7 +14128,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/x11/libxfce4menu/pkg-descr b/x11/libxfce4menu/pkg-descr
index 35ac0f7cc331..afe817530c63 100644
--- a/x11/libxfce4menu/pkg-descr
+++ b/x11/libxfce4menu/pkg-descr
@@ -1,4 +1,4 @@
libxfce4ui is used to share commonly used Xfce widgets amoung the Xfce
applications.
-WWW: http://www.xfce.org/
+WWW: https://www.xfce.org/
diff --git a/x11/libxfce4util/Makefile b/x11/libxfce4util/Makefile
index 5cf4c72abbbf..5246e449d317 100644
--- a/x11/libxfce4util/Makefile
+++ b/x11/libxfce4util/Makefile
@@ -12,18 +12,19 @@ COMMENT= Extension library for the Xfce desktop environment
LICENSE= GPLv2
+USES= gettext-tools gmake gnome libtool pathfix perl5 pkgconfig \
+ tar:bzip2 xfce
+USE_GNOME= glib20 intlhack intltool
+USE_LDCONFIG= yes
+
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
-USES= gmake libtool pathfix perl5 pkgconfig gettext-tools \
- xfce tar:bzip2
-USE_GNOME= glib20 intltool intlhack
-USE_LDCONFIG= yes
+CONFIGURE_ARGS= --without-html-dir
-CONFIGURE_ARGS=--without-html-dir
+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/x11/libxfce4util/files/patch-configure b/x11/libxfce4util/files/patch-configure
deleted file mode 100644
index 8e4186dd57c6..000000000000
--- a/x11/libxfce4util/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./configure.orig 2013-05-05 14:40:55.000000000 +0000
-+++ ./configure 2013-05-05 19:29:12.000000000 +0000
-@@ -13361,7 +13361,7 @@
-
- fi
- fi
-- USE_NLS=yes
-+# USE_NLS=yes
-
-
- gt_cv_have_gettext=no
diff --git a/x11/libxfce4util/pkg-descr b/x11/libxfce4util/pkg-descr
index 630eb2defdd8..19d51e017f8f 100644
--- a/x11/libxfce4util/pkg-descr
+++ b/x11/libxfce4util/pkg-descr
@@ -1,3 +1,3 @@
Xfce 4 library providing basic utilities.
-WWW: http://www.xfce.org/
+WWW: https://www.xfce.org/
diff --git a/x11/xfce4-clipman-plugin/Makefile b/x11/xfce4-clipman-plugin/Makefile
index 6504ed33e721..0784784c9725 100644
--- a/x11/xfce4-clipman-plugin/Makefile
+++ b/x11/xfce4-clipman-plugin/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xfce4-clipman-plugin
PORTVERSION= 1.4.3
+PORTREVISION= 1
CATEGORIES= x11 xfce
MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
@@ -12,18 +13,27 @@ COMMENT= Clipboard manager for the Xfce panel
LICENSE= GPLv2
-USES= gettext gmake libtool pkgconfig tar:bzip2 xfce:gtk3
-USE_GNOME= gtk30 intltool glib20 cairo
+LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \
+ libdbus-1.so:devel/dbus
+
+USES= gettext gmake gnome libtool pkgconfig tar:bzip2 xfce:gtk3
+USE_GNOME= cairo glib20 gtk30 intltool
USE_XFCE= panel
-USE_XORG= ice sm x11 xtst xorgproto
+USE_XORG= ice sm x11 xorgproto xtst
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
INSTALL_TARGET= install-strip
-OPTIONS_DEFINE= QRCODE
-QRCODE_DESC= QR Code support
+OPTIONS_DEFINE= NLS QRCODE
+OPTIONS_SUB= yes
+
+QRCODE_DESC= QR Code support
+
+NLS_USES= gettext-runtime
+NLS_CONFIGURE_ENABLE= nls
+
QRCODE_LIB_DEPENDS= libqrencode.so:graphics/libqrencode
-QRCODE_CONFIGURE_ENABLE= libqrencode
+QRCODE_CONFIGURE_ENABLE=libqrencode
.include <bsd.port.mk>
diff --git a/x11/xfce4-clipman-plugin/pkg-descr b/x11/xfce4-clipman-plugin/pkg-descr
index d4c757bc13df..a192239450be 100644
--- a/x11/xfce4-clipman-plugin/pkg-descr
+++ b/x11/xfce4-clipman-plugin/pkg-descr
@@ -3,4 +3,4 @@ the clipboard contents around (even after an application quits), it is able
to handle text and images, and has a feature to execute actions on specific
text selection by matching them against regexes.
-WWW: http://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin
+WWW: https://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin
diff --git a/x11/xfce4-clipman-plugin/pkg-plist b/x11/xfce4-clipman-plugin/pkg-plist
index b70f832c4a3e..6d249dccaeb8 100644
--- a/x11/xfce4-clipman-plugin/pkg-plist
+++ b/x11/xfce4-clipman-plugin/pkg-plist
@@ -14,53 +14,53 @@ share/icons/hicolor/32x32/apps/xfce4-clipman-plugin.png
share/icons/hicolor/48x48/apps/xfce4-clipman-plugin.png
share/icons/hicolor/64x64/apps/xfce4-clipman-plugin.png
share/icons/hicolor/scalable/apps/xfce4-clipman-plugin.svg
-share/locale/ar/LC_MESSAGES/xfce4-clipman-plugin.mo
-share/locale/ast/LC_MESSAGES/xfce4-clipman-plugin.mo
-share/locale/be/LC_MESSAGES/xfce4-clipman-plugin.mo
-share/locale/bg/LC_MESSAGES/xfce4-clipman-plugin.mo
-share/locale/ca/LC_MESSAGES/xfce4-clipman-plugin.mo
-share/locale/cs/LC_MESSAGES/xfce4-clipman-plugin.mo
-share/locale/da/LC_MESSAGES/xfce4-clipman-plugin.mo
-share/locale/de/LC_MESSAGES/xfce4-clipman-plugin.mo
-share/locale/el/LC_MESSAGES/xfce4-clipman-plugin.mo
-share/locale/en_AU/LC_MESSAGES/xfce4-clipman-plugin.mo
-share/locale/en_GB/LC_MESSAGES/xfce4-clipman-plugin.mo
-share/locale/es/LC_MESSAGES/xfce4-clipman-plugin.mo
-share/locale/eu/LC_MESSAGES/xfce4-clipman-plugin.mo
-share/locale/fi/LC_MESSAGES/xfce4-clipman-plugin.mo
-share/locale/fr/LC_MESSAGES/xfce4-clipman-plugin.mo
-share/locale/gl/LC_MESSAGES/xfce4-clipman-plugin.mo
-share/locale/he/LC_MESSAGES/xfce4-clipman-plugin.mo
-share/locale/hr/LC_MESSAGES/xfce4-clipman-plugin.mo
-share/locale/hu/LC_MESSAGES/xfce4-clipman-plugin.mo
-share/locale/id/LC_MESSAGES/xfce4-clipman-plugin.mo
-share/locale/is/LC_MESSAGES/xfce4-clipman-plugin.mo
-share/locale/it/LC_MESSAGES/xfce4-clipman-plugin.mo
-share/locale/ja/LC_MESSAGES/xfce4-clipman-plugin.mo
-share/locale/kk/LC_MESSAGES/xfce4-clipman-plugin.mo
-share/locale/ko/LC_MESSAGES/xfce4-clipman-plugin.mo
-share/locale/lt/LC_MESSAGES/xfce4-clipman-plugin.mo
-share/locale/lv/LC_MESSAGES/xfce4-clipman-plugin.mo
-share/locale/ms/LC_MESSAGES/xfce4-clipman-plugin.mo
-share/locale/nb/LC_MESSAGES/xfce4-clipman-plugin.mo
-share/locale/nl/LC_MESSAGES/xfce4-clipman-plugin.mo
-share/locale/oc/LC_MESSAGES/xfce4-clipman-plugin.mo
-share/locale/pl/LC_MESSAGES/xfce4-clipman-plugin.mo
-share/locale/pt/LC_MESSAGES/xfce4-clipman-plugin.mo
-share/locale/pt_BR/LC_MESSAGES/xfce4-clipman-plugin.mo
-share/locale/ru/LC_MESSAGES/xfce4-clipman-plugin.mo
-share/locale/sk/LC_MESSAGES/xfce4-clipman-plugin.mo
-share/locale/sl/LC_MESSAGES/xfce4-clipman-plugin.mo
-share/locale/sq/LC_MESSAGES/xfce4-clipman-plugin.mo
-share/locale/sr/LC_MESSAGES/xfce4-clipman-plugin.mo
-share/locale/sv/LC_MESSAGES/xfce4-clipman-plugin.mo
-share/locale/th/LC_MESSAGES/xfce4-clipman-plugin.mo
-share/locale/tr/LC_MESSAGES/xfce4-clipman-plugin.mo
-share/locale/ug/LC_MESSAGES/xfce4-clipman-plugin.mo
-share/locale/uk/LC_MESSAGES/xfce4-clipman-plugin.mo
-share/locale/ur/LC_MESSAGES/xfce4-clipman-plugin.mo
-share/locale/ur_PK/LC_MESSAGES/xfce4-clipman-plugin.mo
-share/locale/vi/LC_MESSAGES/xfce4-clipman-plugin.mo
-share/locale/zh_CN/LC_MESSAGES/xfce4-clipman-plugin.mo
-share/locale/zh_TW/LC_MESSAGES/xfce4-clipman-plugin.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/xfce4-clipman-plugin.mo
+%%NLS%%share/locale/ast/LC_MESSAGES/xfce4-clipman-plugin.mo
+%%NLS%%share/locale/be/LC_MESSAGES/xfce4-clipman-plugin.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/xfce4-clipman-plugin.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/xfce4-clipman-plugin.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/xfce4-clipman-plugin.mo
+%%NLS%%share/locale/da/LC_MESSAGES/xfce4-clipman-plugin.mo
+%%NLS%%share/locale/de/LC_MESSAGES/xfce4-clipman-plugin.mo
+%%NLS%%share/locale/el/LC_MESSAGES/xfce4-clipman-plugin.mo
+%%NLS%%share/locale/en_AU/LC_MESSAGES/xfce4-clipman-plugin.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-clipman-plugin.mo
+%%NLS%%share/locale/es/LC_MESSAGES/xfce4-clipman-plugin.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/xfce4-clipman-plugin.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/xfce4-clipman-plugin.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/xfce4-clipman-plugin.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/xfce4-clipman-plugin.mo
+%%NLS%%share/locale/he/LC_MESSAGES/xfce4-clipman-plugin.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/xfce4-clipman-plugin.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/xfce4-clipman-plugin.mo
+%%NLS%%share/locale/id/LC_MESSAGES/xfce4-clipman-plugin.mo
+%%NLS%%share/locale/is/LC_MESSAGES/xfce4-clipman-plugin.mo
+%%NLS%%share/locale/it/LC_MESSAGES/xfce4-clipman-plugin.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/xfce4-clipman-plugin.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/xfce4-clipman-plugin.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/xfce4-clipman-plugin.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/xfce4-clipman-plugin.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/xfce4-clipman-plugin.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/xfce4-clipman-plugin.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/xfce4-clipman-plugin.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/xfce4-clipman-plugin.mo
+%%NLS%%share/locale/oc/LC_MESSAGES/xfce4-clipman-plugin.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/xfce4-clipman-plugin.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/xfce4-clipman-plugin.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce4-clipman-plugin.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/xfce4-clipman-plugin.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/xfce4-clipman-plugin.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/xfce4-clipman-plugin.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/xfce4-clipman-plugin.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/xfce4-clipman-plugin.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/xfce4-clipman-plugin.mo
+%%NLS%%share/locale/th/LC_MESSAGES/xfce4-clipman-plugin.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/xfce4-clipman-plugin.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/xfce4-clipman-plugin.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/xfce4-clipman-plugin.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/xfce4-clipman-plugin.mo
+%%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce4-clipman-plugin.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/xfce4-clipman-plugin.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-clipman-plugin.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-clipman-plugin.mo
share/xfce4/panel/plugins/xfce4-clipman-plugin.desktop
diff --git a/x11/xfce4-conf/Makefile b/x11/xfce4-conf/Makefile
index 9b74074f56a5..482b494b0947 100644
--- a/x11/xfce4-conf/Makefile
+++ b/x11/xfce4-conf/Makefile
@@ -15,28 +15,30 @@ LICENSE= GPLv2
BUILD_DEPENDS= p5-XML-Parser>=2.44:textproc/p5-XML-Parser
LIB_DEPENDS= libdbus-1.so:devel/dbus \
- libdbus-glib-1.so:devel/dbus-glib
+ libdbus-glib-1.so:devel/dbus-glib
-GNU_CONFIGURE= yes
-USE_GNOME= glib20 gtk20 intltool intlhack
+USES= gettext-tools gmake gnome libtool pathfix perl5 pkgconfig \
+ tar:bzip2 xfce
+USE_GNOME= glib20 gtk20 intlhack intltool
USE_LDCONFIG= yes
USE_PERL5= build
USE_XFCE= libutil
USE_XORG= x11
-USES= gmake libtool pathfix pkgconfig perl5 gettext-tools \
- xfce tar:bzip2
-INSTALL_TARGET= install-strip
-CONFIGURE_ARGS=--without-html-dir
+GNU_CONFIGURE= yes
+INSTALL_TARGET= install-strip
+CONFIGURE_ARGS= --without-html-dir
OPTIONS_DEFINE= PERL NLS
-NLS_USES= gettext-runtime
+OPTIONS_SUB= yes
+
NLS_CONFIGURE_ENABLE= nls
+NLS_USES= gettext-runtime
+
PERL_BUILD_DEPENDS= p5-ExtUtils-Depends>=0.405:devel/p5-ExtUtils-Depends \
- p5-ExtUtils-PkgConfig>=1.15:devel/p5-ExtUtils-PkgConfig \
- p5-Glib2>=1.321:devel/p5-Glib2
-PERL_USE= perl5=run
+ p5-ExtUtils-PkgConfig>=1.15:devel/p5-ExtUtils-PkgConfig \
+ p5-Glib2>=1.321:devel/p5-Glib2
PERL_CONFIGURE_ENABLE= perl-bindings
-OPTIONS_SUB= yes
+PERL_USE= perl5=run
.include <bsd.port.mk>
diff --git a/x11/xfce4-conf/files/patch-configure b/x11/xfce4-conf/files/patch-configure
deleted file mode 100644
index 25f0b91e7622..000000000000
--- a/x11/xfce4-conf/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./configure.orig 2012-04-28 19:51:52.000000000 +0000
-+++ ./configure 2013-05-05 19:52:07.000000000 +0000
-@@ -13500,7 +13500,7 @@
-
- fi
- fi
-- USE_NLS=yes
-+# USE_NLS=yes
-
-
- gt_cv_have_gettext=no
diff --git a/x11/xfce4-conf/pkg-descr b/x11/xfce4-conf/pkg-descr
index 9ac1ebecd375..fc1eacf7d85e 100644
--- a/x11/xfce4-conf/pkg-descr
+++ b/x11/xfce4-conf/pkg-descr
@@ -1,3 +1,3 @@
D-Bus-based configuration storage system.
-WWW: http://www.xfce.org/projects
+WWW: https://www.xfce.org/projects
diff --git a/x11/xfce4-dashboard/Makefile b/x11/xfce4-dashboard/Makefile
index 5720dfc13190..70725db3068f 100644
--- a/x11/xfce4-dashboard/Makefile
+++ b/x11/xfce4-dashboard/Makefile
@@ -16,26 +16,29 @@ COMMENT= GNOME shell like dashboard for the Xfce desktop
LICENSE= GPLv2
LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \
- libdbus-1.so:devel/dbus \
- libjson-glib-1.0.so:devel/json-glib \
- libcogl.so:graphics/cogl \
- libclutter-1.0.so:graphics/clutter
-
-GNU_CONFIGURE= yes
-USES= gettext-tools gmake localbase libtool pathfix perl5 pkgconfig \
- tar:bzip2 xfce:gtk3
-USE_GNOME= glib20 gtk30 libwnck3 cairo intltool intlhack
+ libdbus-1.so:devel/dbus \
+ libjson-glib-1.0.so:devel/json-glib \
+ libcogl.so:graphics/cogl \
+ libclutter-1.0.so:graphics/clutter
+
+USES= gettext-tools gmake gnome localbase libtool pathfix perl5 pkgconfig \
+ tar:bzip2 xfce:gtk3
+USE_GNOME= cairo glib20 gtk30 intlhack intltool libwnck3
USE_XFCE= garcon
USE_XORG= x11 xcomposite xdamage xext xfixes xi xinerama xrandr
-USE_GL= egl gl
+USE_GL= egl gl
+USE_LDCONFIG= yes
+
+GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
INSTALL_TARGET= install-strip
OPTIONS_DEFINE= NLS
-NLS_USES= gettext-runtime
-NLS_CONFIGURE_ENABLE= nls
OPTIONS_SUB= yes
+NLS_CONFIGURE_ENABLE= nls
+NLS_USES= gettext-runtime
+
post-patch:
# Decrease default value of desaturation factor (0.0 -> no desaturation)
# With some graphics cards, quick launch icons are totally black with
diff --git a/x11/xfce4-dashboard/files/patch-configure b/x11/xfce4-dashboard/files/patch-configure
deleted file mode 100644
index c060a55a7bcf..000000000000
--- a/x11/xfce4-dashboard/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig 2016-05-20 19:36:31 UTC
-+++ configure
-@@ -14443,7 +14443,7 @@ $as_echo "#define HAVE_LC_MESSAGES 1" >>
-
- fi
- fi
-- USE_NLS=yes
-+ #USE_NLS=yes
-
-
- gt_cv_have_gettext=no
diff --git a/x11/xfce4-dashboard/pkg-descr b/x11/xfce4-dashboard/pkg-descr
index 0b4d3179bd58..a99c566e697d 100644
--- a/x11/xfce4-dashboard/pkg-descr
+++ b/x11/xfce4-dashboard/pkg-descr
@@ -3,4 +3,4 @@ the Xfce desktop. It can be configured to run any keyboard shortcut and
when executed provides an overview of applications currently open enabling
the user to switch between different applications.
-WWW: http://goodies.xfce.org/projects/applications/xfdashboard/
+WWW: https://goodies.xfce.org/projects/applications/xfdashboard/start
diff --git a/x11/xfce4-embed-plugin/Makefile b/x11/xfce4-embed-plugin/Makefile
index a116ec2605a4..510e38a3d917 100644
--- a/x11/xfce4-embed-plugin/Makefile
+++ b/x11/xfce4-embed-plugin/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xfce4-embed-plugin
PORTVERSION= 1.6.0
+PORTREVISION= 1
CATEGORIES= x11 xfce
MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
@@ -12,22 +13,21 @@ COMMENT= Embed arbitrary windows into the Xfce panel
LICENSE= GPLv2
-GNU_CONFIGURE= yes
-INSTALL_TARGET= install-strip
-USES= gettext-tools gmake libtool pkgconfig tar:bzip2 xfce
-USE_XORG= x11
-USE_GNOME= glib20 gtk20 intltool intlhack
+LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
+ libfreetype.so:print/freetype2
+
+USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce
+USE_GNOME= cairo gdkpixbuf2 glib20 gtk20 intlhack intltool
USE_XFCE= panel
+USE_XORG= ice sm x11
-OPTIONS_DEFINE= NLS
-NLS_USES= gettext-runtime
-NLS_CONFIGURE_ENABLE= nls
-OPTIONS_SUB= yes
+GNU_CONFIGURE= yes
+INSTALL_TARGET= install-strip
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE= NLS
+OPTIONS_SUB= yes
-.if !${PORT_OPTIONS:MNLS}
-EXTRA_PATCHES= ${FILESDIR}/extra-patch-configure
-.endif
+NLS_CONFIGURE_ENABLE= nls
+NLS_USES= gettext-runtime
.include <bsd.port.mk>
diff --git a/x11/xfce4-embed-plugin/files/extra-patch-configure b/x11/xfce4-embed-plugin/files/extra-patch-configure
deleted file mode 100644
index af10454e02c8..000000000000
--- a/x11/xfce4-embed-plugin/files/extra-patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./configure.orig 2013-06-01 18:40:34.000000000 +0000
-+++ ./configure 2013-06-02 09:32:46.000000000 +0000
-@@ -13340,7 +13340,7 @@
-
- fi
- fi
-- USE_NLS=yes
-+# USE_NLS=yes
-
-
- gt_cv_have_gettext=no
diff --git a/x11/xfce4-embed-plugin/pkg-descr b/x11/xfce4-embed-plugin/pkg-descr
index e058a494e773..c1e3469e3608 100644
--- a/x11/xfce4-embed-plugin/pkg-descr
+++ b/x11/xfce4-embed-plugin/pkg-descr
@@ -3,4 +3,4 @@ application window into the Xfce panel. The window is resized into the
panel space available, and the associated program can be automatically
launched if it is not open.
-WWW: http://goodies.xfce.org/projects/panel-plugins/xfce4-embed-plugin
+WWW: https://goodies.xfce.org/projects/panel-plugins/xfce4-embed-plugin
diff --git a/x11/xfce4-quicklauncher-plugin/Makefile b/x11/xfce4-quicklauncher-plugin/Makefile
index c98af71f546e..b0719ac558ef 100644
--- a/x11/xfce4-quicklauncher-plugin/Makefile
+++ b/x11/xfce4-quicklauncher-plugin/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xfce4-quicklauncher-plugin
PORTVERSION= 1.9.4
-PORTREVISION= 17
+PORTREVISION= 18
CATEGORIES= x11 xfce
MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
@@ -13,10 +13,15 @@ COMMENT= Quicklauncher plugin for Xfce
LICENSE= GPLv2
+LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
+ libfreetype.so:print/freetype2
+
+USES= gettext gmake gnome libtool pkgconfig tar:bzip2 xfce
+USE_GNOME= cairo gdkpixbuf2 gtk20 intlhack intltool
+USE_XFCE= libgui panel
+
SSP_UNSAFE= yes
GNU_CONFIGURE= yes
-USES= gettext gmake libtool pkgconfig xfce tar:bzip2
-USE_GNOME= gtk20 intltool intlhack
-USE_XFCE= libgui panel
+INSTALL_TARGET= install-strip
.include <bsd.port.mk>
diff --git a/x11/xfce4-screensaver/Makefile b/x11/xfce4-screensaver/Makefile
index 5bd0f6b744cb..001c32f489e0 100644
--- a/x11/xfce4-screensaver/Makefile
+++ b/x11/xfce4-screensaver/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= libdbus-1.so:devel/dbus \
libstartup-notification-1.so:x11/startup-notification \
libxklavier.so:x11/libxklavier
-USES= gettext-tools gmake pkgconfig tar:bzip2 xfce:gtk3
+USES= gettext-tools gmake gnome pkgconfig tar:bzip2 xfce:gtk3
USE_GL= gl
USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 intltool
USE_XFCE= garcon libexo libutil
diff --git a/x11/xfce4-screenshooter-plugin/Makefile b/x11/xfce4-screenshooter-plugin/Makefile
index aea94c04956c..6a8e735107a0 100644
--- a/x11/xfce4-screenshooter-plugin/Makefile
+++ b/x11/xfce4-screenshooter-plugin/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xfce4-screenshooter-plugin
PORTVERSION= 1.9.3
+PORTREVISION= 1
CATEGORIES= x11 xfce
MASTER_SITES= XFCE/src/apps/xfce4-screenshooter/${PORTVERSION:R}
DISTNAME= xfce4-screenshooter-${PORTVERSION}
@@ -16,16 +17,19 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libsoup-2.4.so:devel/libsoup
-USES= pkgconfig gmake libtool gettext-tools xfce:gtk3 tar:bzip2
-GNU_CONFIGURE= yes
-INSTALLS_ICONS= yes
-USE_GNOME= cairo glib20 gtk30 intltool intlhack libxml2
+USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce:gtk3
+USE_GNOME= cairo glib20 gtk30 intlhack intltool libxml2
USE_XFCE= panel
USE_XORG= ice sm x11 xfixes xext
-OPTIONS_DEFINE= NLS
+GNU_CONFIGURE= yes
+INSTALLS_ICONS= yes
+INSTALL_TARGET= install-strip
+
+OPTIONS_DEFINE= NLS
+OPTIONS_SUB= yes
+
NLS_CONFIGURE_ENABLE= nls
-NLS_USES= gettext-runtime
-OPTIONS_SUB= yes
+NLS_USES= gettext-runtime
.include <bsd.port.mk>
diff --git a/x11/xfce4-screenshooter-plugin/files/patch-configure b/x11/xfce4-screenshooter-plugin/files/patch-configure
deleted file mode 100644
index 8eb4147309ad..000000000000
--- a/x11/xfce4-screenshooter-plugin/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig 2018-05-01 14:43:50 UTC
-+++ configure
-@@ -16036,7 +16036,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/x11/xfce4-taskmanager/Makefile b/x11/xfce4-taskmanager/Makefile
index cf3d2f7b8957..9b39e13de81b 100644
--- a/x11/xfce4-taskmanager/Makefile
+++ b/x11/xfce4-taskmanager/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
USES= gettext-tools gmake gnome localbase pkgconfig tar:bzip2
-USE_GNOME= gtk30 glib20 cairo gdkpixbuf2 intltool libwnck
+USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 intltool libwnck
USE_XORG= ice sm x11 xmu xt
GNU_CONFIGURE= yes
diff --git a/x11/xfce4-terminal/Makefile b/x11/xfce4-terminal/Makefile
index ea46aad9ee17..34709614ce3f 100644
--- a/x11/xfce4-terminal/Makefile
+++ b/x11/xfce4-terminal/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xfce4-terminal
PORTVERSION= 0.8.7.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 xfce
MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R:R}
DIST_SUBDIR= xfce4
@@ -14,16 +14,25 @@ COMMENT= Terminal emulator for the X windowing system
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib
+LIB_DEPENDS= libpcre2-8.so:devel/pcre2 \
+ libgnutls.so:security/gnutls
-USES= gettext gmake pkgconfig tar:bzip2 xfce:gtk3
-GNU_CONFIGURE= yes
-USE_GNOME= gtk30 glib20 cairo gdkpixbuf2 intltool vte3 libxml2
+#libdbus-glib-1.so:devel/dbus-glib XXX check
+
+USES= gettext-tools gmake gnome pkgconfig tar:bzip2 xfce:gtk3
+USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 intltool libxml2 vte3
USE_XFCE= libmenu
-USE_XORG= x11
+USE_XORG= ice sm x11
+
+GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
SUB_FILES= pkg-message
-
CONFIGURE_ARGS= --without-gnome-default-appsdir
+OPTIONS_DEFINE= NLS
+OPTIONS_SUB= yes
+
+NLS_USES= gettext-runtime
+NLS_CONFIGURE_ENABLE= nls
+
.include <bsd.port.mk>
diff --git a/x11/xfce4-terminal/pkg-descr b/x11/xfce4-terminal/pkg-descr
index 5ca7f9f7dbde..3683ff093643 100644
--- a/x11/xfce4-terminal/pkg-descr
+++ b/x11/xfce4-terminal/pkg-descr
@@ -3,4 +3,4 @@ primarily for the Xfce desktop environment. It's a lightweight emulator
based on the VTE widget, easy to use and provides an optional drop-down
window.
-WWW: http://www.xfce.org/
+WWW: https://www.xfce.org/
diff --git a/x11/xfce4-terminal/pkg-plist b/x11/xfce4-terminal/pkg-plist
index 0d90aba1e9d6..e48654bbf1bc 100644
--- a/x11/xfce4-terminal/pkg-plist
+++ b/x11/xfce4-terminal/pkg-plist
@@ -2,61 +2,61 @@ bin/xfce4-terminal
man/man1/xfce4-terminal.1.gz
share/applications/xfce4-terminal-settings.desktop
share/applications/xfce4-terminal.desktop
-share/locale/ar/LC_MESSAGES/xfce4-terminal.mo
-share/locale/ast/LC_MESSAGES/xfce4-terminal.mo
-share/locale/be/LC_MESSAGES/xfce4-terminal.mo
-share/locale/bg/LC_MESSAGES/xfce4-terminal.mo
-share/locale/ca/LC_MESSAGES/xfce4-terminal.mo
-share/locale/cs/LC_MESSAGES/xfce4-terminal.mo
-share/locale/da/LC_MESSAGES/xfce4-terminal.mo
-share/locale/de/LC_MESSAGES/xfce4-terminal.mo
-share/locale/el/LC_MESSAGES/xfce4-terminal.mo
-share/locale/en_AU/LC_MESSAGES/xfce4-terminal.mo
-share/locale/en_GB/LC_MESSAGES/xfce4-terminal.mo
-share/locale/eo/LC_MESSAGES/xfce4-terminal.mo
-share/locale/es/LC_MESSAGES/xfce4-terminal.mo
-share/locale/et/LC_MESSAGES/xfce4-terminal.mo
-share/locale/eu/LC_MESSAGES/xfce4-terminal.mo
-share/locale/fi/LC_MESSAGES/xfce4-terminal.mo
-share/locale/fr/LC_MESSAGES/xfce4-terminal.mo
-share/locale/gl/LC_MESSAGES/xfce4-terminal.mo
-share/locale/he/LC_MESSAGES/xfce4-terminal.mo
-share/locale/hr/LC_MESSAGES/xfce4-terminal.mo
-share/locale/hu/LC_MESSAGES/xfce4-terminal.mo
-share/locale/id/LC_MESSAGES/xfce4-terminal.mo
-share/locale/is/LC_MESSAGES/xfce4-terminal.mo
-share/locale/it/LC_MESSAGES/xfce4-terminal.mo
-share/locale/ja/LC_MESSAGES/xfce4-terminal.mo
-share/locale/kk/LC_MESSAGES/xfce4-terminal.mo
-share/locale/ko/LC_MESSAGES/xfce4-terminal.mo
-share/locale/lt/LC_MESSAGES/xfce4-terminal.mo
-share/locale/lv/LC_MESSAGES/xfce4-terminal.mo
-share/locale/ms/LC_MESSAGES/xfce4-terminal.mo
-share/locale/nb/LC_MESSAGES/xfce4-terminal.mo
-share/locale/nl/LC_MESSAGES/xfce4-terminal.mo
-share/locale/oc/LC_MESSAGES/xfce4-terminal.mo
-share/locale/pa/LC_MESSAGES/xfce4-terminal.mo
-share/locale/pl/LC_MESSAGES/xfce4-terminal.mo
-share/locale/pt/LC_MESSAGES/xfce4-terminal.mo
-share/locale/pt_BR/LC_MESSAGES/xfce4-terminal.mo
-share/locale/ro/LC_MESSAGES/xfce4-terminal.mo
-share/locale/ru/LC_MESSAGES/xfce4-terminal.mo
-share/locale/si/LC_MESSAGES/xfce4-terminal.mo
-share/locale/sk/LC_MESSAGES/xfce4-terminal.mo
-share/locale/sl/LC_MESSAGES/xfce4-terminal.mo
-share/locale/sq/LC_MESSAGES/xfce4-terminal.mo
-share/locale/sr/LC_MESSAGES/xfce4-terminal.mo
-share/locale/sv/LC_MESSAGES/xfce4-terminal.mo
-share/locale/te/LC_MESSAGES/xfce4-terminal.mo
-share/locale/th/LC_MESSAGES/xfce4-terminal.mo
-share/locale/tr/LC_MESSAGES/xfce4-terminal.mo
-share/locale/ug/LC_MESSAGES/xfce4-terminal.mo
-share/locale/uk/LC_MESSAGES/xfce4-terminal.mo
-share/locale/ur/LC_MESSAGES/xfce4-terminal.mo
-share/locale/ur_PK/LC_MESSAGES/xfce4-terminal.mo
-share/locale/vi/LC_MESSAGES/xfce4-terminal.mo
-share/locale/zh_CN/LC_MESSAGES/xfce4-terminal.mo
-share/locale/zh_TW/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/ast/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/be/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/da/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/de/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/el/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/en_AU/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/es/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/et/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/he/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/id/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/is/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/it/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/oc/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/pa/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/si/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/te/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/th/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-terminal.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-terminal.mo
share/xfce4/terminal/colorschemes/black-on-white.theme
share/xfce4/terminal/colorschemes/dark-pastels.theme
share/xfce4/terminal/colorschemes/green-on-black.theme
diff --git a/x11/xfce4-verve-plugin/Makefile b/x11/xfce4-verve-plugin/Makefile
index af7c1ecd6cdf..35a33f1c8933 100644
--- a/x11/xfce4-verve-plugin/Makefile
+++ b/x11/xfce4-verve-plugin/Makefile
@@ -3,6 +3,7 @@
PORTNAME= verve-plugin
PORTVERSION= 1.1.1
+PORTREVISION= 1
CATEGORIES= x11 xfce
MASTER_SITES= XFCE/src/panel-plugins/${PKGNAMEPREFIX}${PORTNAME}/${PORTVERSION:R}
PKGNAMEPREFIX= xfce4-
@@ -15,19 +16,23 @@ COMMENT= Command line plugin for the Xfce Desktop
LICENSE= GPLv2
LIB_DEPENDS= libpcre.so:devel/pcre \
- libdbus-glib-1.so:devel/dbus-glib
+ libdbus-glib-1.so:devel/dbus-glib \
+ libdbus-1.so:devel/dbus \
+ libfontconfig.so:x11-fonts/fontconfig \
+ libfreetype.so:print/freetype2
-GNU_CONFIGURE= yes
-USES= gettext-tools gmake libtool pkgconfig tar:bzip2 xfce
-USE_GNOME= glib20 intltool intlhack
+USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce
+USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk20 intlhack intltool pango
USE_XFCE= panel
+
+GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
+CONFIGURE_ARGS= --enable-dbus
-CONFIGURE_ARGS=--enable-dbus
+OPTIONS_DEFINE= NLS
+OPTIONS_SUB= yes
-OPTIONS_DEFINE= NLS
NLS_CONFIGURE_ENABLE= nls
-NLS_USES= gettext-runtime
-OPTIONS_SUB= yes
+NLS_USES= gettext-runtime
.include <bsd.port.mk>
diff --git a/x11/xfce4-verve-plugin/files/patch-configure b/x11/xfce4-verve-plugin/files/patch-configure
deleted file mode 100644
index 173219abcbc6..000000000000
--- a/x11/xfce4-verve-plugin/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig 2018-04-15 19:25:29 UTC
-+++ configure
-@@ -13658,7 +13658,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/x11/xfce4-whiskermenu-plugin/pkg-descr b/x11/xfce4-whiskermenu-plugin/pkg-descr
index 684659d27f1b..332aa46a4c07 100644
--- a/x11/xfce4-whiskermenu-plugin/pkg-descr
+++ b/x11/xfce4-whiskermenu-plugin/pkg-descr
@@ -1,3 +1,3 @@
Whisker Menu is an alternate application launcher for the Xfce Desktop.
-WWW: http://goodies.xfce.org/projects/panel-plugins/xfce4-whiskermenu-plugin
+WWW: https://goodies.xfce.org/projects/panel-plugins/xfce4-whiskermenu-plugin
diff --git a/x11/xfce4-wmdock-plugin/Makefile b/x11/xfce4-wmdock-plugin/Makefile
index ebbdb0766ebd..0a657232f926 100644
--- a/x11/xfce4-wmdock-plugin/Makefile
+++ b/x11/xfce4-wmdock-plugin/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xfce4-wmdock-plugin
PORTVERSION= 0.6.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 xfce
MASTER_SITES= XFCE/src/panel-plugins/xfce4-wmdock-plugin/0.6
DIST_SUBDIR= xfce4
@@ -11,11 +11,21 @@ DIST_SUBDIR= xfce4
MAINTAINER= xfce@FreeBSD.org
COMMENT= WMdock plugin for Xfce
-GNU_CONFIGURE= yes
-USES= gettext gmake gnome libtool pkgconfig xfce tar:bzip2
-USE_GNOME= gtk20 intltool intlhack libwnck
+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 libwnck
USE_XFCE= libgui panel
-INSTALLS_ICONS= yes
USE_XORG= x11
+GNU_CONFIGURE= yes
+INSTALLS_ICONS= yes
+
+OPTIONS_DEFINE= NLS
+OPTIONS_SUB= yes
+
+NLS_CONFIGURE_ENABLE= nls
+NLS_USES= gettext-runtime
+
.include <bsd.port.mk>
diff --git a/x11/xfce4-wmdock-plugin/pkg-descr b/x11/xfce4-wmdock-plugin/pkg-descr
index 75ab1bfb9d53..71eede1337bf 100644
--- a/x11/xfce4-wmdock-plugin/pkg-descr
+++ b/x11/xfce4-wmdock-plugin/pkg-descr
@@ -2,4 +2,4 @@ The WMdock plugin is a compatibility layer for running WindowMaker dockapps
on the Xfce desktop. It integrates the dockapps into a panel, closely
resembling the look and feel of the WindowMaker dock or clip, respectively.
-WWW: http://www.ibh.de/~ellguth/xfce4-wmdock-plugin.html
+WWW: https://goodies.xfce.org/projects/panel-plugins/xfce4-wmdock-plugin
diff --git a/x11/xfce4-wmdock-plugin/pkg-plist b/x11/xfce4-wmdock-plugin/pkg-plist
index aa4f577731c4..6a1e6f9cee9f 100644
--- a/x11/xfce4-wmdock-plugin/pkg-plist
+++ b/x11/xfce4-wmdock-plugin/pkg-plist
@@ -1,28 +1,28 @@
libexec/xfce4/panel-plugins/xfce4-wmdock-plugin
share/icons/hicolor/48x48/apps/xfce4-wmdock.png
-share/locale/ast/LC_MESSAGES/xfce4-wmdock-plugin.mo
-share/locale/ca/LC_MESSAGES/xfce4-wmdock-plugin.mo
-share/locale/cs/LC_MESSAGES/xfce4-wmdock-plugin.mo
-share/locale/da/LC_MESSAGES/xfce4-wmdock-plugin.mo
-share/locale/de/LC_MESSAGES/xfce4-wmdock-plugin.mo
-share/locale/el/LC_MESSAGES/xfce4-wmdock-plugin.mo
-share/locale/en_GB/LC_MESSAGES/xfce4-wmdock-plugin.mo
-share/locale/eu/LC_MESSAGES/xfce4-wmdock-plugin.mo
-share/locale/fr/LC_MESSAGES/xfce4-wmdock-plugin.mo
-share/locale/gl/LC_MESSAGES/xfce4-wmdock-plugin.mo
-share/locale/hu/LC_MESSAGES/xfce4-wmdock-plugin.mo
-share/locale/id/LC_MESSAGES/xfce4-wmdock-plugin.mo
-share/locale/it/LC_MESSAGES/xfce4-wmdock-plugin.mo
-share/locale/ja/LC_MESSAGES/xfce4-wmdock-plugin.mo
-share/locale/kk/LC_MESSAGES/xfce4-wmdock-plugin.mo
-share/locale/lv/LC_MESSAGES/xfce4-wmdock-plugin.mo
-share/locale/pt/LC_MESSAGES/xfce4-wmdock-plugin.mo
-share/locale/pt_BR/LC_MESSAGES/xfce4-wmdock-plugin.mo
-share/locale/ru/LC_MESSAGES/xfce4-wmdock-plugin.mo
-share/locale/sv/LC_MESSAGES/xfce4-wmdock-plugin.mo
-share/locale/ug/LC_MESSAGES/xfce4-wmdock-plugin.mo
-share/locale/uk/LC_MESSAGES/xfce4-wmdock-plugin.mo
-share/locale/ur/LC_MESSAGES/xfce4-wmdock-plugin.mo
-share/locale/ur_PK/LC_MESSAGES/xfce4-wmdock-plugin.mo
-share/locale/zh_CN/LC_MESSAGES/xfce4-wmdock-plugin.mo
+%%NLS%%share/locale/ast/LC_MESSAGES/xfce4-wmdock-plugin.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/xfce4-wmdock-plugin.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/xfce4-wmdock-plugin.mo
+%%NLS%%share/locale/da/LC_MESSAGES/xfce4-wmdock-plugin.mo
+%%NLS%%share/locale/de/LC_MESSAGES/xfce4-wmdock-plugin.mo
+%%NLS%%share/locale/el/LC_MESSAGES/xfce4-wmdock-plugin.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-wmdock-plugin.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/xfce4-wmdock-plugin.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/xfce4-wmdock-plugin.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/xfce4-wmdock-plugin.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/xfce4-wmdock-plugin.mo
+%%NLS%%share/locale/id/LC_MESSAGES/xfce4-wmdock-plugin.mo
+%%NLS%%share/locale/it/LC_MESSAGES/xfce4-wmdock-plugin.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/xfce4-wmdock-plugin.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/xfce4-wmdock-plugin.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/xfce4-wmdock-plugin.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/xfce4-wmdock-plugin.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce4-wmdock-plugin.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/xfce4-wmdock-plugin.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/xfce4-wmdock-plugin.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/xfce4-wmdock-plugin.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/xfce4-wmdock-plugin.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/xfce4-wmdock-plugin.mo
+%%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce4-wmdock-plugin.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-wmdock-plugin.mo
share/xfce4/panel-plugins/wmdock.desktop