Import xfce 4.4

- remove all obsolete ports or plugins
- update all plugins to their latest version to support xfce 4.4
  (otherwise they won't compile with 4.4)

22 files changed, 73 insertions, 312 deletions

diff --git a/deskutils/xfce4-calendar/Makefile b/deskutils/xfce4-calendar/Makefile
deleted file mode 100644
index fb10a498bdad..000000000000
--- a/deskutils/xfce4-calendar/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# New ports collection makefile for:	xfce4-calendar
-# Date created:		2003-01-14
-# Whom:			Matt Lancereau <matt@rimasec.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xfce4-calendar
-PORTVERSION=	4.2.3
-PORTREVISION=	4
-CATEGORIES=	deskutils xfce
-MASTER_SITES=	http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
-		http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
-		http://public.fh-wolfenbuettel.de/~luedickj/xfce4/xfce-${PORTVERSION}/src/ \
-		http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-${PORTVERSION}/src/
-DISTNAME=	xfcalendar-${PORTVERSION}
-DIST_SUBDIR=	xfce4
-
-MAINTAINER=	oliver@FreeBSD.org
-COMMENT=	A calendar application to manage your time with XFce 4
-
-BUILD_DEPENDS=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
-LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
-		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui \
-		dbh-4.5.4:${PORTSDIR}/databases/dbh
-
-USE_GNOME=	gtk20 libxml2
-GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \
-		CPPFLAGS=-I${LOCALBASE}/include \
-		LIBS=-L${LOCALBASE}/lib
-
-post-patch:
-	@${REINPLACE_CMD} 's|dbh-1\.0|dbh|g' ${WRKSRC}/configure
-
-.include <bsd.port.mk>
diff --git a/deskutils/xfce4-calendar/distinfo b/deskutils/xfce4-calendar/distinfo
deleted file mode 100644
index 7c7169369c4a..000000000000
--- a/deskutils/xfce4-calendar/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xfce4/xfcalendar-4.2.3.tar.gz) = d2e2c8e010cca708295aeaf621086205
-SHA256 (xfce4/xfcalendar-4.2.3.tar.gz) = ad8d141d23f48736180d3913a0600d1733d71a341fd1889e69f727a998cfa0a3
-SIZE (xfce4/xfcalendar-4.2.3.tar.gz) = 470490
diff --git a/deskutils/xfce4-calendar/pkg-descr b/deskutils/xfce4-calendar/pkg-descr
deleted file mode 100644
index 100f04679439..000000000000
--- a/deskutils/xfce4-calendar/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-A calendar application to manage your time with XFce 4.
-
-Author: Mickael Graf <korbinus@linux.se>
-
-WWW: http://www.xfce.org/
diff --git a/deskutils/xfce4-calendar/pkg-plist b/deskutils/xfce4-calendar/pkg-plist
deleted file mode 100644
index c82b525d489b..000000000000
--- a/deskutils/xfce4-calendar/pkg-plist
+++ /dev/null
@@ -1,93 +0,0 @@
-bin/xfcalendar
-lib/xfce4/mcs-plugins/xfcalendar_plugin.a
-lib/xfce4/mcs-plugins/xfcalendar_plugin.la
-lib/xfce4/mcs-plugins/xfcalendar_plugin.so
-share/applications/xfcalendar.desktop
-share/applications/xfce-xfcalendar-settings.desktop
-share/icons/hicolor/48x48/apps/xfcalendar.png
-share/icons/hicolor/scalable/apps/xfcalendar.svg
-share/locale/af/LC_MESSAGES/xfcalendar.mo
-share/locale/ar/LC_MESSAGES/xfcalendar.mo
-share/locale/az/LC_MESSAGES/xfcalendar.mo
-share/locale/be/LC_MESSAGES/xfcalendar.mo
-share/locale/bg/LC_MESSAGES/xfcalendar.mo
-share/locale/bn_IN/LC_MESSAGES/xfcalendar.mo
-share/locale/ca/LC_MESSAGES/xfcalendar.mo
-share/locale/cs/LC_MESSAGES/xfcalendar.mo
-share/locale/da/LC_MESSAGES/xfcalendar.mo
-share/locale/de/LC_MESSAGES/xfcalendar.mo
-share/locale/el/LC_MESSAGES/xfcalendar.mo
-share/locale/en_GB/LC_MESSAGES/xfcalendar.mo
-share/locale/eo/LC_MESSAGES/xfcalendar.mo
-share/locale/es/LC_MESSAGES/xfcalendar.mo
-share/locale/et/LC_MESSAGES/xfcalendar.mo
-share/locale/eu/LC_MESSAGES/xfcalendar.mo
-share/locale/fa/LC_MESSAGES/xfcalendar.mo
-share/locale/fi/LC_MESSAGES/xfcalendar.mo
-share/locale/fr/LC_MESSAGES/xfcalendar.mo
-share/locale/gu/LC_MESSAGES/xfcalendar.mo
-share/locale/he/LC_MESSAGES/xfcalendar.mo
-share/locale/hi/LC_MESSAGES/xfcalendar.mo
-share/locale/hu/LC_MESSAGES/xfcalendar.mo
-share/locale/hy/LC_MESSAGES/xfcalendar.mo
-share/locale/it/LC_MESSAGES/xfcalendar.mo
-share/locale/ja/LC_MESSAGES/xfcalendar.mo
-share/locale/ko/LC_MESSAGES/xfcalendar.mo
-share/locale/ku/LC_MESSAGES/xfcalendar.mo
-share/locale/lt/LC_MESSAGES/xfcalendar.mo
-share/locale/mr/LC_MESSAGES/xfcalendar.mo
-share/locale/ms/LC_MESSAGES/xfcalendar.mo
-share/locale/nl/LC_MESSAGES/xfcalendar.mo
-share/locale/nb_NO/LC_MESSAGES/xfcalendar.mo
-share/locale/pa/LC_MESSAGES/xfcalendar.mo
-share/locale/pl/LC_MESSAGES/xfcalendar.mo
-share/locale/pt_BR/LC_MESSAGES/xfcalendar.mo
-share/locale/pt_PT/LC_MESSAGES/xfcalendar.mo
-share/locale/ro/LC_MESSAGES/xfcalendar.mo
-share/locale/ru/LC_MESSAGES/xfcalendar.mo
-share/locale/sk/LC_MESSAGES/xfcalendar.mo
-share/locale/sl/LC_MESSAGES/xfcalendar.mo
-share/locale/sv/LC_MESSAGES/xfcalendar.mo
-share/locale/ta/LC_MESSAGES/xfcalendar.mo
-share/locale/tr/LC_MESSAGES/xfcalendar.mo
-share/locale/uk/LC_MESSAGES/xfcalendar.mo
-share/locale/vi/LC_MESSAGES/xfcalendar.mo
-share/locale/zh_CN/LC_MESSAGES/xfcalendar.mo
-share/locale/zh_TW/LC_MESSAGES/xfcalendar.mo
-@dirrmtry lib/xfce4/mcs-plugins
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/nb_NO/LC_MESSAGES
-@dirrmtry share/locale/nb_NO
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/hy/LC_MESSAGES
-@dirrmtry share/locale/hy
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
diff --git a/deskutils/xfce4-notes-plugin/Makefile b/deskutils/xfce4-notes-plugin/Makefile
index 1be7b2a693a0..592379d2ff0d 100644
--- a/deskutils/xfce4-notes-plugin/Makefile
+++ b/deskutils/xfce4-notes-plugin/Makefile
@@ -6,23 +6,24 @@
 #
 
 PORTNAME=	xfce4-notes-plugin
-PORTVERSION=	0.9.7
-PORTREVISION=	8
+PORTVERSION=	1.4.1
 CATEGORIES=	deskutils xfce
-MASTER_SITES=	http://download.berlios.de/xfce-goodies/
+MASTER_SITES=	http://goodies.xfce.org/releases/${PORTNAME}/
 DIST_SUBDIR=	xfce4
+PATCH_SITES=	http://people.freebsd.org/~oliver/xfce/
+PATCHFILES=	gcc295-xfce4-notes-plugin.patch
 
 MAINTAINER=	thorsten.greiner@web.de
 COMMENT=	Sticky notes panel plugin for XFce4
 
-BUILD_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
-		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
-RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-
-USE_GNOME=	gtk20 libxml2
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+USE_BZIP2=	yes
+USE_GETTEXT=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnometarget gtk20 intltool intlhack pkgconfig
+USE_XFCE=	configenv libgui libutil panel
+USE_XLIB=	yes
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
+.include <bsd.port.post.mk>
diff --git a/deskutils/xfce4-notes-plugin/distinfo b/deskutils/xfce4-notes-plugin/distinfo
index 4c2d1ed78aeb..f406e7e92925 100644
--- a/deskutils/xfce4-notes-plugin/distinfo
+++ b/deskutils/xfce4-notes-plugin/distinfo
@@ -1,3 +1,6 @@
-MD5 (xfce4/xfce4-notes-plugin-0.9.7.tar.gz) = d043d4f5b00b4a7f3d5107b65d81de8e
-SHA256 (xfce4/xfce4-notes-plugin-0.9.7.tar.gz) = c86290c6058ce22e56794028ca2b9b3e03063073f4b39a85c967a0d20e236e8f
-SIZE (xfce4/xfce4-notes-plugin-0.9.7.tar.gz) = 326290
+MD5 (xfce4/xfce4-notes-plugin-1.4.1.tar.bz2) = 6f20d84bf3aadd6c974f226c04f33050
+SHA256 (xfce4/xfce4-notes-plugin-1.4.1.tar.bz2) = 7683bb239fea66cd03895504d9311608b00a3e024a568465e84fe52adb35860e
+SIZE (xfce4/xfce4-notes-plugin-1.4.1.tar.bz2) = 157811
+MD5 (xfce4/gcc295-xfce4-notes-plugin.patch) = 415d28a7a121d8df6dcf18a9ce35343d
+SHA256 (xfce4/gcc295-xfce4-notes-plugin.patch) = a0c213dd93f493fd68a85116cff76aa039f7631c1f14e36305679d82e7b3ba7b
+SIZE (xfce4/gcc295-xfce4-notes-plugin.patch) = 1188
diff --git a/deskutils/xfce4-notes-plugin/files/patch-configure b/deskutils/xfce4-notes-plugin/files/patch-configure
deleted file mode 100644
index 53b00d19c534..000000000000
--- a/deskutils/xfce4-notes-plugin/files/patch-configure
+++ /dev/null
@@ -1,21 +0,0 @@
---- configure.orig	Sun Oct  5 02:45:14 2003
-+++ configure	Mon Oct  6 20:22:50 2003
-@@ -19530,7 +19530,8 @@
- 
- 
- # This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+LIBTOOL_DEPS="--disable-ltlibs /usr/local/share/libtool13/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -19824,7 +19825,7 @@
- 
-     echo "$as_me:$LINENO: checking where to install panel plugins" >&5
- echo $ECHO_N "checking where to install panel plugins... $ECHO_C" >&6
--  XFCE4_PANEL_PLUGINSDIR=`$PKG_CONFIG --variable=pluginsdir xfce4-panel-1.0`
-+  XFCE4_PANEL_PLUGINSDIR=${prefix}/lib/xfce4/panel-plugins
- 
-   echo "$as_me:$LINENO: result: $XFCE4_PANEL_PLUGINSDIR" >&5
- echo "${ECHO_T}$XFCE4_PANEL_PLUGINSDIR" >&6
diff --git a/deskutils/xfce4-notes-plugin/pkg-descr b/deskutils/xfce4-notes-plugin/pkg-descr
index b81ce3efe202..a83a3c336c62 100644
--- a/deskutils/xfce4-notes-plugin/pkg-descr
+++ b/deskutils/xfce4-notes-plugin/pkg-descr
@@ -1,3 +1,3 @@
 A sticky notes panel plugin for XFce4.
 
-WWW: http://www.xfce.org
+WWW: http://www.xfce.org/
diff --git a/deskutils/xfce4-notes-plugin/pkg-plist b/deskutils/xfce4-notes-plugin/pkg-plist
index 88a5c98e1089..1f405ebcc41a 100644
--- a/deskutils/xfce4-notes-plugin/pkg-plist
+++ b/deskutils/xfce4-notes-plugin/pkg-plist
@@ -1,8 +1,21 @@
-lib/xfce4/panel-plugins/libnotes.a
-lib/xfce4/panel-plugins/libnotes.la
-lib/xfce4/panel-plugins/libnotes.so
-share/xfce4/notes/note.png
-@dirrmtry lib/xfce4/panel-plugins
-@dirrmtry lib/xfce4
-@dirrmtry share/xfce4/notes
+bin/xfce4-popup-notes
+libexec/xfce4/panel-plugins/xfce4-notes-plugin
+share/icons/hicolor/16x16/apps/xfce4-notes-plugin.png
+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/ca/LC_MESSAGES/xfce4-notes-plugin.mo
+share/locale/cs/LC_MESSAGES/xfce4-notes-plugin.mo
+share/locale/de/LC_MESSAGES/xfce4-notes-plugin.mo
+share/locale/eu/LC_MESSAGES/xfce4-notes-plugin.mo
+share/locale/fr/LC_MESSAGES/xfce4-notes-plugin.mo
+share/locale/hu/LC_MESSAGES/xfce4-notes-plugin.mo
+share/locale/nl/LC_MESSAGES/xfce4-notes-plugin.mo
+share/locale/pl/LC_MESSAGES/xfce4-notes-plugin.mo
+share/locale/zh_TW/LC_MESSAGES/xfce4-notes-plugin.mo
+share/xfce4/panel-plugins/xfce4-notes-plugin.desktop
+@dirrmtry share/xfce4/panel-plugins
 @dirrmtry share/xfce4
+@dirrmtry libexec/xfce4/panel-plugins
+@dirrmtry libexec/xfce4
diff --git a/deskutils/xfce4-taskbar-plugin/Makefile b/deskutils/xfce4-taskbar-plugin/Makefile
deleted file mode 100644
index 6bb37b59d619..000000000000
--- a/deskutils/xfce4-taskbar-plugin/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# New ports collection makefile for:	xfce4-taskbar-plugin
-# Date created:		2003-04-26
-# Whom:			Matt Lancereau <matt@rimasec.net>
-#
-# $FreeBSD$
-#    $MCom: ports/deskutils/xfce4-taskbar-plugin/Makefile,v 1.1 2006/10/02 20:05:39 ahze Exp $
-
-PORTNAME=	xfce4-taskbar-plugin
-PORTVERSION=	0.2.2
-PORTREVISION=	4
-CATEGORIES=	deskutils xfce
-MASTER_SITES=	http://download.berlios.de/xfce-goodies/
-DISTNAME=	xfce4-taskbar-plugin-${PORTVERSION}
-DIST_SUBDIR=	xfce4
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A taskbar plugin for xfce4-panel
-
-BUILD_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
-		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui \
-		startup-notification-1.0:${PORTSDIR}/x11/startup-notification
-RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-
-USE_GNOME=	gtk20 libxml2
-GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-
-.include <bsd.port.mk>
diff --git a/deskutils/xfce4-taskbar-plugin/distinfo b/deskutils/xfce4-taskbar-plugin/distinfo
deleted file mode 100644
index d7f7edc5b3e7..000000000000
--- a/deskutils/xfce4-taskbar-plugin/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xfce4/xfce4-taskbar-plugin-0.2.2.tar.gz) = 06ad356d728cadd8e78a12ec86235593
-SHA256 (xfce4/xfce4-taskbar-plugin-0.2.2.tar.gz) = 5fadc8f7d07a5520e6cfb8b1a423374455d6d5a9db2e01f7784344bee2e0abad
-SIZE (xfce4/xfce4-taskbar-plugin-0.2.2.tar.gz) = 304546
diff --git a/deskutils/xfce4-taskbar-plugin/pkg-descr b/deskutils/xfce4-taskbar-plugin/pkg-descr
deleted file mode 100644
index 7958d26ff545..000000000000
--- a/deskutils/xfce4-taskbar-plugin/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-xfce4-taskbar-plugin is a taskbar plugin for the xfce4-panel.
-The size of the taskbar can be changed via the properties dialog.
-
-Author: Andre Lerche <a.lerche@gmx.net>
-
-WWW: http://xfce-goodies.berlios.de/
diff --git a/deskutils/xfce4-taskbar-plugin/pkg-plist b/deskutils/xfce4-taskbar-plugin/pkg-plist
deleted file mode 100644
index 51a4e477d1bf..000000000000
--- a/deskutils/xfce4-taskbar-plugin/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-lib/xfce4/panel-plugins/libtaskbar.a
-lib/xfce4/panel-plugins/libtaskbar.la
-lib/xfce4/panel-plugins/libtaskbar.so
-@dirrmtry lib/xfce4/panel-plugins
diff --git a/deskutils/xfce4-windowlist-plugin/Makefile b/deskutils/xfce4-windowlist-plugin/Makefile
deleted file mode 100644
index a254b553c19c..000000000000
--- a/deskutils/xfce4-windowlist-plugin/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# New ports collection makefile for:	xfce4-windowlist-plugin
-# Date created:		2003-04-26
-# Whom:			Matt Lancereau <matt@rimasec.net>
-#
-# $FreeBSD$
-#    $MCom: ports/deskutils/xfce4-windowlist-plugin/Makefile,v 1.1 2006/10/02 20:06:45 ahze Exp $
-
-PORTNAME=	xfce4-windowlist-plugin
-PORTVERSION=	0.1.0
-PORTREVISION=	5
-CATEGORIES=	deskutils xfce
-MASTER_SITES=	http://download.berlios.de/xfce-goodies/
-DISTNAME=	xfce4-windowlist-plugin-${PORTVERSION}
-DIST_SUBDIR=	xfce4
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A windowlist plugin for xfce4-panel
-
-BUILD_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
-		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui \
-		startup-notification-1.0:${PORTSDIR}/x11/startup-notification
-RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-
-USE_GNOME=	gtk20 libxml2
-GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
-.include <bsd.port.mk>
diff --git a/deskutils/xfce4-windowlist-plugin/distinfo b/deskutils/xfce4-windowlist-plugin/distinfo
deleted file mode 100644
index 43d789bbfbd8..000000000000
--- a/deskutils/xfce4-windowlist-plugin/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xfce4/xfce4-windowlist-plugin-0.1.0.tar.gz) = 29b1a752003734c0b8171200dfafb733
-SHA256 (xfce4/xfce4-windowlist-plugin-0.1.0.tar.gz) = da4f7c412528aff2e7d0edc63cb347ee6651134feb1192431f9955c6f11276e3
-SIZE (xfce4/xfce4-windowlist-plugin-0.1.0.tar.gz) = 301770
diff --git a/deskutils/xfce4-windowlist-plugin/pkg-descr b/deskutils/xfce4-windowlist-plugin/pkg-descr
deleted file mode 100644
index afbb48e1b9e4..000000000000
--- a/deskutils/xfce4-windowlist-plugin/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-xfce4-windowlist-plugin is a windowlist plugin for the xfce4-panel. 
-
-The menubutton shows the icon of the active window.
-
-Leftclick on the menubutton pops up a configurable window
-list (windows on the current workspace or all windows).
-Leftclick on the window list activates the selected window,
-rightclick pops up a window action menu.
-
-Author: Andre Lerche <a.lerche@gmx.net>
-
-WWW: http://xfce-goodies.berlios.de/
diff --git a/deskutils/xfce4-windowlist-plugin/pkg-plist b/deskutils/xfce4-windowlist-plugin/pkg-plist
deleted file mode 100644
index a690b4f8129a..000000000000
--- a/deskutils/xfce4-windowlist-plugin/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-lib/xfce4/panel-plugins/libwindowlist.so
-lib/xfce4/panel-plugins/libwindowlist.la
-lib/xfce4/panel-plugins/libwindowlist.a
-@dirrmtry lib/xfce4/panel-plugins
diff --git a/deskutils/xfce4-xkb-plugin/Makefile b/deskutils/xfce4-xkb-plugin/Makefile
index 8b289e58a8b0..baf3557ca751 100644
--- a/deskutils/xfce4-xkb-plugin/Makefile
+++ b/deskutils/xfce4-xkb-plugin/Makefile
@@ -6,28 +6,22 @@
 #
 
 PORTNAME=	xfce4-xkb-plugin
-PORTVERSION=	0.3.5
+PORTVERSION=	0.4.3
 CATEGORIES=	deskutils xfce
-MASTER_SITES=	http://download.berlios.de/xfce-goodies/
+MASTER_SITES=	http://goodies.xfce.org/releases/${PORTNAME}/
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	des@FreeBSD.org
 COMMENT=	Keyboard layout switching plugin for XFce4
 
-BUILD_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
-		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
-RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-
-USE_GNOME=	gtk20 libxml2
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+USE_BZIP2=	yes
+USE_GETTEXT=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnometarget gtk20 intltool intlhack pkgconfig
+USE_XFCE=	configenv panel
+USE_XLIB=	yes
 
 .include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-BROKEN=		does not compile
-.endif
-
+.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
 .include <bsd.port.post.mk>
diff --git a/deskutils/xfce4-xkb-plugin/distinfo b/deskutils/xfce4-xkb-plugin/distinfo
index 073afdc3ea2f..33e2d8120bed 100644
--- a/deskutils/xfce4-xkb-plugin/distinfo
+++ b/deskutils/xfce4-xkb-plugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfce4-xkb-plugin-0.3.5.tar.gz) = 0c92dd17579e102b40289c4bc83c5505
-SHA256 (xfce4/xfce4-xkb-plugin-0.3.5.tar.gz) = 769d4b337200b2dead8fc23d4fb394bacde551cb07a504acc68e160891cd8c18
-SIZE (xfce4/xfce4-xkb-plugin-0.3.5.tar.gz) = 353851
+MD5 (xfce4/xfce4-xkb-plugin-0.4.3.tar.bz2) = e0375158339672f49c9e48a8b4669592
+SHA256 (xfce4/xfce4-xkb-plugin-0.4.3.tar.bz2) = e72983cf53450caa0a755838b61e867b599f2302d08d3ad28662ed6391152f7e
+SIZE (xfce4/xfce4-xkb-plugin-0.4.3.tar.bz2) = 231843
diff --git a/deskutils/xfce4-xkb-plugin/files/patch-panel-plugin::xkb.c b/deskutils/xfce4-xkb-plugin/files/patch-panel-plugin::xkb.c
deleted file mode 100644
index 7d72d7b174c1..000000000000
--- a/deskutils/xfce4-xkb-plugin/files/patch-panel-plugin::xkb.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- panel-plugin/xkb.c.orig	Wed Jun 30 11:46:49 2004
-+++ panel-plugin/xkb.c	Sun Feb  6 12:51:04 2005
-@@ -264,12 +264,12 @@
-   char *group;
-   
-   group = strdup(get_symbol_name_by_res_no(current_group_xkb_no));
-+  to_lower(group);
-   strcpy(filename, FLAGSDIR);
-   strcat(filename, "/");
-   strcat(filename, group);
-   strcat(filename, ".png");
--  to_lower(filename);
-   
-   free(group);
-   
diff --git a/deskutils/xfce4-xkb-plugin/pkg-descr b/deskutils/xfce4-xkb-plugin/pkg-descr
index 9b7a77210aad..a879e01abe9d 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 XF86Config file or some other way (e.g. setxkbmap).
 
-WWW: http://xfce-goodies.berlios.de/
+WWW: http://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 cecce9621b1c..3433f87c2ddd 100644
--- a/deskutils/xfce4-xkb-plugin/pkg-plist
+++ b/deskutils/xfce4-xkb-plugin/pkg-plist
@@ -1,6 +1,18 @@
-lib/xfce4/panel-plugins/libxkb.a
-lib/xfce4/panel-plugins/libxkb.la
-lib/xfce4/panel-plugins/libxkb.so
+libexec/xfce4/panel-plugins/xfce4-xkb-plugin
+share/locale/bg/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/locale/de/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/locale/eu/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/locale/fr/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/locale/hu/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/locale/ru/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/el/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/locale/gl/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/locale/ja/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/locale/pl/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/locale/zh_TW/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/xfce4/panel-plugins/xkb-plugin.desktop
 share/xfce4/xkb/flags/ae.png
 share/xfce4/xkb/flags/am.png
 share/xfce4/xkb/flags/ar.png
@@ -21,12 +33,12 @@ share/xfce4/xkb/flags/dk.png
 share/xfce4/xkb/flags/dz.png
 share/xfce4/xkb/flags/ee.png
 share/xfce4/xkb/flags/eg.png
-share/xfce4/xkb/flags/el.png
 share/xfce4/xkb/flags/es.png
 share/xfce4/xkb/flags/eu.png
 share/xfce4/xkb/flags/fi.png
 share/xfce4/xkb/flags/fr.png
 share/xfce4/xkb/flags/ge.png
+share/xfce4/xkb/flags/gr.png
 share/xfce4/xkb/flags/hr.png
 share/xfce4/xkb/flags/hu.png
 share/xfce4/xkb/flags/il.png
@@ -75,6 +87,10 @@ share/xfce4/xkb/flags/uy.png
 share/xfce4/xkb/flags/vn.png
 share/xfce4/xkb/flags/ye.png
 share/xfce4/xkb/flags/yu.png
+@dirrmtry libexec/xfce4/panel-plugins
+@dirrmtry libexec/xfce4
+@dirrmtry share/xfce4/panel-plugins
+@dirrmtry share/xfce4
 @dirrm share/xfce4/xkb/flags
 @dirrm share/xfce4/xkb
 @dirrmtry share/xfce4