- bring xfce4 to 4.2

- remove x11-fm/xfce4-fm-icons misc/xfce4-panel-themes (obsoleted by that update)
- take maintainership of x11-wm/xfce4-session [1]
- bump PORTREVISION of all plugins because they need to be linked against the new xfce4 libs

Approved by:	maintainer [1]

7 files changed, 12 insertions, 17 deletions

diff --git a/deskutils/xfce4-calendar/Makefile b/deskutils/xfce4-calendar/Makefile
index 267e3fd937c7..6effa24b493f 100644
--- a/deskutils/xfce4-calendar/Makefile
+++ b/deskutils/xfce4-calendar/Makefile
@@ -19,7 +19,7 @@ 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.1:${PORTSDIR}/x11-toolkits/libxfce4gui \
+		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui \
 		dbh-1.0.1:${PORTSDIR}/databases/dbh
 
 USE_GNOME=	gtk20 libxml2
diff --git a/deskutils/xfce4-notes-plugin/Makefile b/deskutils/xfce4-notes-plugin/Makefile
index 515d6de447d5..cd13507a1fdc 100644
--- a/deskutils/xfce4-notes-plugin/Makefile
+++ b/deskutils/xfce4-notes-plugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-notes-plugin
 PORTVERSION=	0.9.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	deskutils xfce
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
 DIST_SUBDIR=	xfce4
@@ -17,7 +17,7 @@ COMMENT=	Sticky notes panel plugin for XFce4
 
 BUILD_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
-		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui
+		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
 RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 
 USE_GNOME=	gtk20 libxml2
diff --git a/deskutils/xfce4-taskbar-plugin/Makefile b/deskutils/xfce4-taskbar-plugin/Makefile
index bcce5e152638..602aff58946f 100644
--- a/deskutils/xfce4-taskbar-plugin/Makefile
+++ b/deskutils/xfce4-taskbar-plugin/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xfce4-taskbar-plugin
-PORTVERSION=	0.1.0
-PORTREVISION=	1
+PORTVERSION=	0.2.2
 CATEGORIES=	deskutils xfce
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/ \
 		http://matt.nerim.net/xfce-goodies/ \
@@ -20,15 +19,13 @@ COMMENT=	A taskbar plugin for xfce4-panel
 
 BUILD_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
-		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui \
+		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
 USE_X_PREFIX=	yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
 .include <bsd.port.mk>
diff --git a/deskutils/xfce4-taskbar-plugin/distinfo b/deskutils/xfce4-taskbar-plugin/distinfo
index dc335c0b93f6..03603b367bd3 100644
--- a/deskutils/xfce4-taskbar-plugin/distinfo
+++ b/deskutils/xfce4-taskbar-plugin/distinfo
@@ -1,2 +1,2 @@
-MD5 (xfce4/xfce4-taskbar-plugin-0.1.0.tar.gz) = 02eb7fe6f1b1b944a60643f61b4fdd38
-SIZE (xfce4/xfce4-taskbar-plugin-0.1.0.tar.gz) = 300008
+MD5 (xfce4/xfce4-taskbar-plugin-0.2.2.tar.gz) = 06ad356d728cadd8e78a12ec86235593
+SIZE(xfce4/xfce4-taskbar-plugin-0.2.2.tar.gz) = 304546
diff --git a/deskutils/xfce4-taskbar-plugin/pkg-plist b/deskutils/xfce4-taskbar-plugin/pkg-plist
index ef20fd209481..c704068fe82b 100644
--- a/deskutils/xfce4-taskbar-plugin/pkg-plist
+++ b/deskutils/xfce4-taskbar-plugin/pkg-plist
@@ -1,4 +1,2 @@
 lib/xfce4/panel-plugins/libtaskbar.so
-lib/xfce4/panel-plugins/libtaskbar.la
-lib/xfce4/panel-plugins/libtaskbar.a
 @unexec rmdir %D/lib/xfce4/panel-plugins 2>/dev/null || true
diff --git a/deskutils/xfce4-windowlist-plugin/Makefile b/deskutils/xfce4-windowlist-plugin/Makefile
index 775ba2069c79..2081fa4ab903 100644
--- a/deskutils/xfce4-windowlist-plugin/Makefile
+++ b/deskutils/xfce4-windowlist-plugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-windowlist-plugin
 PORTVERSION=	0.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils xfce
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/ \
 		http://matt.nerim.net/xfce-goodies/ \
@@ -20,7 +20,7 @@ COMMENT=	A windowlist plugin for xfce4-panel
 
 BUILD_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
-		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui \
+		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui \
 		startup-notification-1.0:${PORTSDIR}/x11/startup-notification
 RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 
diff --git a/deskutils/xfce4-xkb-plugin/Makefile b/deskutils/xfce4-xkb-plugin/Makefile
index 25fae8cee134..e31133ad9b01 100644
--- a/deskutils/xfce4-xkb-plugin/Makefile
+++ b/deskutils/xfce4-xkb-plugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-xkb-plugin
 PORTVERSION=	0.3.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils xfce
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
 DIST_SUBDIR=	xfce4
@@ -17,7 +17,7 @@ COMMENT=	Keyboard layout switching plugin for XFce4
 
 BUILD_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
-		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui
+		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
 RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 
 USE_GNOME=	gtk20 libxml2