3 files changed, 61 insertions, 51 deletions

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