4 files changed, 53 insertions, 50 deletions

diff --git a/mail/xfce4-mailwatch-plugin/Makefile b/mail/xfce4-mailwatch-plugin/Makefile
index fff95a11319b..89a44c5f6361 100644
--- a/mail/xfce4-mailwatch-plugin/Makefile
+++ b/mail/xfce4-mailwatch-plugin/Makefile
@@ -2,34 +2,26 @@
 # $FreeBSD$
 
 PORTNAME=	xfce4-mailwatch-plugin
-PORTVERSION=	1.1.0
-PORTREVISION=	18
+PORTVERSION=	1.2.0
 CATEGORIES=	mail xfce
-MASTER_SITES=	http://spuriousinterrupt.org/files/mailwatch/ \
-		http://freebsd.unixfreunde.de/sources/
+MASTER_SITES=	${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=	src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	A mailwatch plugin for Xfce
+COMMENT=	Mail notification applet for the Xfce panel
 
-LIB_DEPENDS=	gnutls.26:${PORTSDIR}/security/gnutls \
-		gcrypt:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls \
+		libgcrypt.so:${PORTSDIR}/security/libgcrypt
 
 USE_BZIP2=	yes
 INSTALLS_ICONS=	yes
-USES=		gettext pathfix gmake pkgconfig
+USES=		gettext gmake pkgconfig
 GNU_CONFIGURE=	yes
-USE_GNOME=	gtk20 intltool intlhack
-USE_XFCE=	configenv libgui libutil panel
-USE_XORG=	x11 xt xaw
+USE_GNOME=	glib20 gtk20 intltool intlhack
+USE_XFCE=	configenv libexo libmenu libutil panel
+USE_XORG=	x11
 
-NO_STAGE=	yes
-post-patch:
-	@${REINPLACE_CMD} -e 's|--libs "libxfce4panel-1.0"|& "libxfcegui4-1.0"|g; \
-		s|--cflags "libxfce4panel-1.0"|& "libxfcegui4-1.0"|g' \
-		${WRKSRC}/configure
-post-configure:
-	@${REINPLACE_CMD} -e 's|-lgnutls|-lgnutls -lgcrypt|g' \
-		${WRKSRC}/panel-plugin/Makefile
+CONFIGURE_ARGS=--enable-ipv6
 
 .include <bsd.port.mk>
diff --git a/mail/xfce4-mailwatch-plugin/distinfo b/mail/xfce4-mailwatch-plugin/distinfo
index aff371ae3003..8dcd979be999 100644
--- a/mail/xfce4-mailwatch-plugin/distinfo
+++ b/mail/xfce4-mailwatch-plugin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/xfce4-mailwatch-plugin-1.1.0.tar.bz2) = ba6fe9fc8d20f317b968369bbc2802c91c4c7838823faee9304767db9f1a3799
-SIZE (xfce4/xfce4-mailwatch-plugin-1.1.0.tar.bz2) = 662624
+SHA256 (xfce4/xfce4-mailwatch-plugin-1.2.0.tar.bz2) = 624acc8229a8593c0dfeb28f883f4958119a715cc81cecdbaf29efc8ab1edcad
+SIZE (xfce4/xfce4-mailwatch-plugin-1.2.0.tar.bz2) = 509649
diff --git a/mail/xfce4-mailwatch-plugin/pkg-descr b/mail/xfce4-mailwatch-plugin/pkg-descr
index 4c267751dd22..d0f66e205962 100644
--- a/mail/xfce4-mailwatch-plugin/pkg-descr
+++ b/mail/xfce4-mailwatch-plugin/pkg-descr
@@ -1,4 +1,5 @@
-Mailwatch is a plugin for the Xfce 4 panel.
+Xfce4 Mailwatch Plugin is a multi-protocol, multi-mailbox mail watcher for 
+the Xfce4 panel.
 
 Features
 
@@ -13,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://spuriousinterrupt.org/projects/mailwatch
+WWW: http://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 52531881b1e0..0d45124ce981 100644
--- a/mail/xfce4-mailwatch-plugin/pkg-plist
+++ b/mail/xfce4-mailwatch-plugin/pkg-plist
@@ -1,54 +1,64 @@
-libexec/xfce4/panel-plugins/xfce4-mailwatch-plugin
+lib/xfce4/panel/plugins/libmailwatch.la
+lib/xfce4/panel/plugins/libmailwatch.so
 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/gu/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/nb_NO/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/pt_PT/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
-share/xfce4/doc/C/images/mailwatch-gmail-settings.png
-share/xfce4/doc/C/images/mailwatch-imap-advanced.png
-share/xfce4/doc/C/images/mailwatch-imap-new-folders.png
-share/xfce4/doc/C/images/mailwatch-imap-settings.png
-share/xfce4/doc/C/images/mailwatch-log-window.png
-share/xfce4/doc/C/images/mailwatch-mailbox-type.png
-share/xfce4/doc/C/images/mailwatch-maildir-settings.png
-share/xfce4/doc/C/images/mailwatch-mbox-settings.png
-share/xfce4/doc/C/images/mailwatch-mh-settings.png
-share/xfce4/doc/C/images/mailwatch-panel-indicator.png
-share/xfce4/doc/C/images/mailwatch-pop3-advanced.png
-share/xfce4/doc/C/images/mailwatch-pop3-settings.png
-share/xfce4/doc/C/images/mailwatch-properties.png
-share/xfce4/doc/C/xfce4-mailwatch-plugin.html
-share/xfce4/panel-plugins/mailwatch.desktop
-@dirrmtry share/xfce4/panel-plugins
-@dirrmtry share/xfce4/doc/C/images
-@dirrmtry share/xfce4/doc/C
-@dirrmtry share/xfce4/doc
+share/xfce4/panel/plugins/mailwatch.desktop
+@dirrmtry share/xfce4/panel/plugins
+@dirrmtry share/xfce4/panel
 @dirrmtry share/xfce4
-@dirrmtry share/locale/nb_NO/LC_MESSAGES
-@dirrmtry share/locale/nb_NO
-@dirrmtry libexec/xfce4/panel-plugins
-@dirrmtry libexec/xfce4
+@dirrmtry share/locale/ur_PK/LC_MESSAGES
+@dirrmtry share/locale/ur_PK
+@dirrmtry share/locale/ur/LC_MESSAGES
+@dirrmtry share/locale/ur
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
+@dirrmtry lib/xfce4/panel/plugins
+@dirrmtry lib/xfce4/panel
+@dirrmtry lib/xfce4