--- xfce4-genmon-plugin/Makefile	2012-01-05 08:18:51.000000000 +0100
+++ xfce4-genmon-plugin/Makefile	2012-05-15 21:29:21.000000000 +0200
@@ -6,12 +6,14 @@ 
 #
 
 PORTNAME=	xfce4-genmon-plugin
-PORTVERSION=	3.3.1
+PORTVERSION=	3.4.0
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
+WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
+
 MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	Generic Monitor Xfce4 panel plugin
 
@@ -20,8 +22,6 @@ 
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gtk20 intltool intlhack pkgconfig
-USE_XFCE=	configenv libgui panel
-
-CONFIGURE_ENV+=	ac_cv_prog_AWK="${AWK}"
+USE_XFCE=	configenv libmenu panel
 
 .include <bsd.port.mk>
--- xfce4-genmon-plugin/distinfo	2012-01-05 08:18:51.000000000 +0100
+++ xfce4-genmon-plugin/distinfo	2012-05-15 21:01:07.000000000 +0200
@@ -1,2 +1,2 @@ 
-SHA256 (xfce4/xfce4-genmon-plugin-3.3.1.tar.bz2) = fe439d569f9ba3c8bdbfa907022a7c4a697ae4ae7fc5001a5600dfa5e1793471
-SIZE (xfce4/xfce4-genmon-plugin-3.3.1.tar.bz2) = 131376
+SHA256 (xfce4/xfce4-genmon-plugin-3.4.0.tar.bz2) = b0a5337b49c85623dc89f3c9e47c7374b1d466af2418033d2d6dfc57a9790387
+SIZE (xfce4/xfce4-genmon-plugin-3.4.0.tar.bz2) = 307493
--- xfce4-genmon-plugin/pkg-plist	2012-01-05 08:18:51.000000000 +0100
+++ xfce4-genmon-plugin/pkg-plist	2012-05-15 21:01:07.000000000 +0200
@@ -1,4 +1,6 @@ 
-libexec/xfce4/panel-plugins/xfce4-genmon-plugin
+lib/xfce4/panel/plugins/libgenmon.la
+lib/xfce4/panel/plugins/libgenmon.so
+share/locale/ar/LC_MESSAGES/xfce4-genmon-plugin.mo
 share/locale/ast/LC_MESSAGES/xfce4-genmon-plugin.mo
 share/locale/ca/LC_MESSAGES/xfce4-genmon-plugin.mo
 share/locale/cs/LC_MESSAGES/xfce4-genmon-plugin.mo
@@ -16,6 +18,7 @@ 
 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/lv/LC_MESSAGES/xfce4-genmon-plugin.mo
 share/locale/nl/LC_MESSAGES/xfce4-genmon-plugin.mo
 share/locale/pl/LC_MESSAGES/xfce4-genmon-plugin.mo
@@ -31,8 +34,10 @@ 
 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/xfce4/panel-plugins/genmon.desktop
-@dirrmtry share/xfce4/panel-plugins
+share/locale/zh_TW/LC_MESSAGES/xfce4-genmon-plugin.mo
+share/xfce4/panel/plugins/genmon.desktop
+@dirrmtry share/xfce4/panel/plugins
+@dirrmtry share/xfce4/panel
 @dirrmtry share/locale/ur_PK/LC_MESSAGES
 @dirrmtry share/locale/ur_PK
 @dirrmtry share/locale/ur/LC_MESSAGES
@@ -43,5 +48,6 @@ 
 @dirrmtry share/locale/kk
 @dirrmtry share/locale/ast/LC_MESSAGES
 @dirrmtry share/locale/ast
-@dirrmtry libexec/xfce4/panel-plugins
-@dirrmtry libexec/xfce4
+@dirrmtry lib/xfce4/panel/plugins
+@dirrmtry lib/xfce4/panel
+@dirrmtry lib/xfce4