- 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]

3 files changed, 78 insertions, 10 deletions

diff --git a/x11-toolkits/libxfce4gui/Makefile b/x11-toolkits/libxfce4gui/Makefile
index e6ceb34..8b0ea94 100644
--- a/x11-toolkits/libxfce4gui/Makefile
+++ b/x11-toolkits/libxfce4gui/Makefile
@@ -6,27 +6,36 @@
 #
 
 PORTNAME=	libxfce4gui
-PORTVERSION=	4.0.6
-PORTREVISION=	1
+PORTVERSION=	4.2.0
+PORTREVISION=	0
 CATEGORIES=	x11-toolkits xfce
-MASTER_SITES=	ftp://ftp.berlios.de/pub/xfce-goodies/${PORTVERSION}/ \
-		http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-${PORTVERSION}/src/
+MASTER_SITES=	http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
+		http://spuriousinterrupt.org/projects/xfce4/files/mirror/xfce-${PORTVERSION}/ \
+		http://public.fh-wolfenbuettel.de/~luedickj/xfce4/xfce-${PORTVERSION}/
 DISTNAME=	libxfcegui4-${PORTVERSION}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 widget library required by xfce4 and xfwm4
 
-LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util
+LIB_DEPENDS=	dbh-1.0.1:${PORTSDIR}/databases/dbh \
+		xfce4util.1:${PORTSDIR}/x11/libxfce4util
 
 USE_GNOME=	gtk20
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
-USE_INC_LIBTOOL_VER=15
+USE_LIBTOOL_VER=15
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-xinerama
 INSTALLS_SHLIB=	yes
 
+.if defined(WITH_GTKDOC)
+BUILD_DEPENDS+=	gtkdocize:${PORTSDIR}/textproc/gtk-doc
+CONFIGURE_ARGS+=--enable-gtk-doc
+.else
+CONFIGURE_ARGS+=--disable-gtk-doc
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
 		${WRKSRC}/libxfcegui4/Makefile.in
diff --git a/x11-toolkits/libxfce4gui/distinfo b/x11-toolkits/libxfce4gui/distinfo
index 28f6a59..e4f24fc 100644
--- a/x11-toolkits/libxfce4gui/distinfo
+++ b/x11-toolkits/libxfce4gui/distinfo
@@ -1,2 +1,2 @@
-MD5 (xfce4/libxfcegui4-4.0.6.tar.gz) = e6b5ebef17fc990e6f7af0684c70d00d
-SIZE(xfce4/libxfcegui4-4.0.6.tar.gz) = 443253
+MD5 (xfce4/libxfcegui4-4.2.0.tar.gz) = dc81bd65d4df9f99953c63ead67a316e
+SIZE(xfce4/libxfcegui4-4.2.0.tar.gz) = 827660
diff --git a/x11-toolkits/libxfce4gui/pkg-plist b/x11-toolkits/libxfce4gui/pkg-plist
index a8c9674..2d03788 100644
--- a/x11-toolkits/libxfce4gui/pkg-plist
+++ b/x11-toolkits/libxfce4gui/pkg-plist
@@ -4,6 +4,7 @@ include/xfce4/libxfcegui4/gtktoxevent.h
 include/xfce4/libxfcegui4/icons.h
 include/xfce4/libxfcegui4/libnetk.h
 include/xfce4/libxfcegui4/libxfcegui4.h
+include/xfce4/libxfcegui4/libxfcegui4-config.h
 include/xfce4/libxfcegui4/netk-application.h
 include/xfce4/libxfcegui4/netk-enum-types.h
 include/xfce4/libxfcegui4/netk-marshal.h
@@ -17,6 +18,7 @@ include/xfce4/libxfcegui4/netk-window.h
 include/xfce4/libxfcegui4/netk-workspace.h
 include/xfce4/libxfcegui4/preview_filesel.h
 include/xfce4/libxfcegui4/session-client.h
+include/xfce4/libxfcegui4/xfce_aboutdialog.h
 include/xfce4/libxfcegui4/xfce_clock.h
 include/xfce4/libxfcegui4/xfce_decorbutton.h
 include/xfce4/libxfcegui4/xfce_decortoggle.h
@@ -28,12 +30,69 @@ include/xfce4/libxfcegui4/xfce_movehandler.h
 include/xfce4/libxfcegui4/xfce_scaled_image.h
 include/xfce4/libxfcegui4/xfce_systemtray.h
 include/xfce4/libxfcegui4/xfce_togglebutton.h
+include/xfce4/libxfcegui4/xfce-appmenuitem.h
+include/xfce4/libxfcegui4/xfce-colorbutton.h
+include/xfce4/libxfcegui4/xfce-exec.h
+include/xfce4/libxfcegui4/xfce-filechooser.h
+include/xfce4/libxfcegui4/xfce-gdk-extensions.h
+include/xfce4/libxfcegui4/xfce-gtk-extensions.h
+include/xfce4/libxfcegui4/xfce-icontheme.h
+include/xfce4/libxfcegui4/netk-class-group.h
+include/xfce4/libxfcegui4/netk-window-action-menu.h
 include/xfce4/libxfcegui4/xinerama.h
+include/xfce4/xfce4-modules/constants.h
+include/xfce4/xfce4-modules/mime_icons.h
+include/xfce4/xfce4-modules/combo.h
+include/xfce4/xfce4-modules/mime.h
 lib/libxfcegui4.a
-lib/libxfcegui4.la
 lib/libxfcegui4.so
-lib/libxfcegui4.so.1
+lib/libxfcegui4.so.3
+lib/xfce4/modules/libxfce4_combo.so.0
+lib/xfce4/modules/libxfce4_combo.so
+lib/xfce4/modules/libxfce4_combo.a
+lib/xfce4/modules/libxfce4_mime.so.0
+lib/xfce4/modules/libxfce4_mime.so
+lib/xfce4/modules/libxfce4_mime_icons.so.0
+lib/xfce4/modules/libxfce4_mime_icons.so
+lib/xfce4/modules/libxfce4_mime_icons.a
 libdata/pkgconfig/libxfcegui4-1.0.pc
+share/xfce4/mime/applications.xml
+share/xfce4/mime/freedesktop.org.xml
+share/xfce4/mime/gnome.mime.xml
+share/xfce4/mime/hicolor.mime.xml
+share/xfce4/mime/types.xml
+share/xfce4/mime/xfce.org.xml
+share/xfce4/xfce-svg-test.svg
+share/gtk-doc/html/libxfcegui4/XfceAboutDialog.html
+share/gtk-doc/html/libxfcegui4/XfceAppMenuItem.html
+share/gtk-doc/html/libxfcegui4/XfceFramebox.html
+share/gtk-doc/html/libxfcegui4/XfceIconTheme.html
+share/gtk-doc/html/libxfcegui4/home.png
+share/gtk-doc/html/libxfcegui4/index.html
+share/gtk-doc/html/libxfcegui4/index.sgml
+share/gtk-doc/html/libxfcegui4/left.png
+share/gtk-doc/html/libxfcegui4/libxfcegui4-Standard-Macros.html
+share/gtk-doc/html/libxfcegui4/libxfcegui4-Xfce-Gdk-extensions.html
+share/gtk-doc/html/libxfcegui4/libxfcegui4-Xfce-Gtk+-extensions.html
+share/gtk-doc/html/libxfcegui4/libxfcegui4-XfceFileChooser.html
+share/gtk-doc/html/libxfcegui4/libxfcegui4-core.html
+share/gtk-doc/html/libxfcegui4/libxfcegui4-dialogs.html
+share/gtk-doc/html/libxfcegui4/libxfcegui4-netk.html
+share/gtk-doc/html/libxfcegui4/libxfcegui4-fundamentals.html
+share/gtk-doc/html/libxfcegui4/libxfcegui4-xfce-exec.html
+share/gtk-doc/html/libxfcegui4/libxfcegui4.devhelp
+share/gtk-doc/html/libxfcegui4/reference.html
+share/gtk-doc/html/libxfcegui4/right.png
+share/gtk-doc/html/libxfcegui4/up.png
+share/xfce4/hicolor-index.theme
 @dirrm include/xfce4/libxfcegui4
+@unexec rmdir %D/include/xfce4/xfce4-modules 2>/dev/null || true
 @unexec rmdir %D/include/xfce4 2>/dev/null || true
+@unexec rmdir %D/lib/xfce4/modules 2>/dev/null || true
+@unexec rmdir %D/lib/xfce4 2>/dev/null || true
 @unexec rmdir %D/libdata/pkgconfig 2>/dev/null || true
+@unexec rmdir %D/share/xfce4/mime 2>/dev/null || true
+@unexec rmdir %D/share/xfce4 2>/dev/null || true
+@dirrm share/gtk-doc/html/libxfcegui4
+@unexec rmdir %D/share/gtk-doc/html 2>/dev/null || true
+@unexec rmdir %D/share/gtk-doc 2>/dev/null || true