- 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, 30 insertions, 9 deletions

diff --git a/x11/libxfce4mcs/Makefile b/x11/libxfce4mcs/Makefile
index b4374140b62a..4c39415a662d 100644
--- a/x11/libxfce4mcs/Makefile
+++ b/x11/libxfce4mcs/Makefile
@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	libxfce4mcs
-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
@@ -25,6 +26,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/libxfce4mcs/distinfo b/x11/libxfce4mcs/distinfo
index c74a084e19ef..603deba488fe 100644
--- a/x11/libxfce4mcs/distinfo
+++ b/x11/libxfce4mcs/distinfo
@@ -1,2 +1,2 @@
-MD5 (xfce4/libxfce4mcs-4.0.6.tar.gz) = ebbe2f4934d79c596d2a48c0cbf6ed33
-SIZE(xfce4/libxfce4mcs-4.0.6.tar.gz) = 330016
+MD5 (xfce4/libxfce4mcs-4.2.0.tar.gz) = fa0ca0a182b90c492d1b62e828c800d6
+SIZE(xfce4/libxfce4mcs-4.2.0.tar.gz) = 369645
diff --git a/x11/libxfce4mcs/pkg-plist b/x11/libxfce4mcs/pkg-plist
index cc7d1a25f5a0..83d858462d6c 100644
--- a/x11/libxfce4mcs/pkg-plist
+++ b/x11/libxfce4mcs/pkg-plist
@@ -2,14 +2,26 @@ include/xfce4/libxfce4mcs/mcs-client.h
 include/xfce4/libxfce4mcs/mcs-common.h
 include/xfce4/libxfce4mcs/mcs-manager.h
 lib/libxfce4mcs-client.a
-lib/libxfce4mcs-client.la
 lib/libxfce4mcs-client.so
-lib/libxfce4mcs-client.so.1
+lib/libxfce4mcs-client.so.2
 lib/libxfce4mcs-manager.a
-lib/libxfce4mcs-manager.la
 lib/libxfce4mcs-manager.so
-lib/libxfce4mcs-manager.so.1
+lib/libxfce4mcs-manager.so.2
 libdata/pkgconfig/libxfce4mcs-manager-1.0.pc
 libdata/pkgconfig/libxfce4mcs-client-1.0.pc
+share/gtk-doc/html/libxfce4mcs/ch01.html
+share/gtk-doc/html/libxfce4mcs/home.png
+share/gtk-doc/html/libxfce4mcs/index.html
+share/gtk-doc/html/libxfce4mcs/index.sgml
+share/gtk-doc/html/libxfce4mcs/left.png
+share/gtk-doc/html/libxfce4mcs/libxfce4mcs-mcs-client.html
+share/gtk-doc/html/libxfce4mcs/libxfce4mcs-mcs-common.html
+share/gtk-doc/html/libxfce4mcs/libxfce4mcs-mcs-manager.html
+share/gtk-doc/html/libxfce4mcs/libxfce4mcs.devhelp
+share/gtk-doc/html/libxfce4mcs/right.png
+share/gtk-doc/html/libxfce4mcs/up.png
 @dirrm include/xfce4/libxfce4mcs
+@dirrm share/gtk-doc/html/libxfce4mcs
+@unexec rmdir %D/share/gtk-doc/html 2>/dev/null || true
+@unexec rmdir %D/share/gtk-doc 2>/dev/null || true
 @unexec rmdir %D/include/xfce4 2>/dev/null || true