- 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, 47 insertions, 8 deletions

diff --git a/x11/libxfce4util/Makefile b/x11/libxfce4util/Makefile
index 2a8ca1950842..b46f691828a9 100644
--- a/x11/libxfce4util/Makefile
+++ b/x11/libxfce4util/Makefile
@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	libxfce4util
-PORTVERSION=	4.0.6
+PORTVERSION=	4.2.0
 PORTREVISION=	0
 CATEGORIES=	x11 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}/
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	oliver@FreeBSD.org
@@ -23,6 +24,14 @@ GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 NO_FILTER_SHLIBS=	yes
+USE_LIBTOOL_VER=15
+
+.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' \
diff --git a/x11/libxfce4util/distinfo b/x11/libxfce4util/distinfo
index 113cdec49d24..2b5af30da70b 100644
--- a/x11/libxfce4util/distinfo
+++ b/x11/libxfce4util/distinfo
@@ -1,2 +1,2 @@
-MD5 (xfce4/libxfce4util-4.0.6.tar.gz) = 4945103c0bd36f53d108bc49b4994f80
-SIZE(xfce4/libxfce4util-4.0.6.tar.gz) = 314842
+MD5 (xfce4/libxfce4util-4.2.0.tar.gz) = b80354f6e68cd63ded05a2026e90c325
+SIZE(xfce4/libxfce4util-4.2.0.tar.gz) = 447408
diff --git a/x11/libxfce4util/pkg-plist b/x11/libxfce4util/pkg-plist
index 86b1f79c827f..b4c5bfa31208 100644
--- a/x11/libxfce4util/pkg-plist
+++ b/x11/libxfce4util/pkg-plist
@@ -4,18 +4,48 @@ include/xfce4/libxfce4util/libxfce4util.h
 include/xfce4/libxfce4util/libxfce4util-config.h
 include/xfce4/libxfce4util/utf8.h
 include/xfce4/libxfce4util/util.h
+include/xfce4/libxfce4util/xfce-desktopentry.h
+include/xfce4/libxfce4util/xfce-fileutils.h
+include/xfce4/libxfce4util/xfce-generics.h
+include/xfce4/libxfce4util/xfce-kiosk.h
+include/xfce4/libxfce4util/xfce-miscutils.h
+include/xfce4/libxfce4util/xfce-rc.h
+include/xfce4/libxfce4util/xfce-resource.h
 lib/libxfce4util.a
-lib/libxfce4util.la
 lib/libxfce4util.so
 lib/libxfce4util.so.1
 libdata/pkgconfig/libxfce4util-1.0.pc
-share/xfce4/i18n/nls.alias
+sbin/xfce4-kiosk-query
+share/gtk-doc/html/libxfce4util/home.png
+share/gtk-doc/html/libxfce4util/index.html
+share/gtk-doc/html/libxfce4util/index.sgml
+share/gtk-doc/html/libxfce4util/left.png
+share/gtk-doc/html/libxfce4util/libxfce4util-Desktop-entries.html
+share/gtk-doc/html/libxfce4util/libxfce4util-File-Utilities.html
+share/gtk-doc/html/libxfce4util/libxfce4util-Internationalisation.html
+share/gtk-doc/html/libxfce4util/libxfce4util-Miscellaneous-Utilities.html
+share/gtk-doc/html/libxfce4util/libxfce4util-Resource-Config-File-Support.html
+share/gtk-doc/html/libxfce4util/libxfce4util-Resource-lookup-functions.html
+share/gtk-doc/html/libxfce4util/libxfce4util-Standard-Macros.html
+share/gtk-doc/html/libxfce4util/libxfce4util-Unicode-Support-Functions.html
+share/gtk-doc/html/libxfce4util/up.png
+share/gtk-doc/html/libxfce4util/libxfce4util-Xfce-Generics.html
+share/gtk-doc/html/libxfce4util/libxfce4util-Xfce-Kiosk-functions.html
+share/gtk-doc/html/libxfce4util/libxfce4util-core.html
+share/gtk-doc/html/libxfce4util/libxfce4util-datatypes.html
+share/gtk-doc/html/libxfce4util/libxfce4util-fundamentals.html
+share/gtk-doc/html/libxfce4util/libxfce4util-utilities.html
+share/gtk-doc/html/libxfce4util/libxfce4util.devhelp
+share/gtk-doc/html/libxfce4util/reference.html
+share/gtk-doc/html/libxfce4util/right.png
 share/xfce4/m4/X11.m4
 share/xfce4/m4/debug.m4
 share/xfce4/m4/depends.m4
 share/xfce4/m4/i18n.m4
 @dirrm include/xfce4/libxfce4util
 @unexec rmdir %D/include/xfce4 2>/dev/null || true
-@dirrm share/xfce4/i18n
+@dirrm share/gtk-doc/html/libxfce4util
+@unexec rmdir %D/share/gtk-doc/html 2>/dev/null || true
+@unexec rmdir %D/share/gtk-doc 2>/dev/null || true
 @dirrm share/xfce4/m4
 @unexec rmdir %D/share/xfce4 2>/dev/null || true