- 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, 73 insertions, 14 deletions

diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile
index eaa3235..d2c436f 100644
--- a/print/xfce4-print/Makefile
+++ b/print/xfce4-print/Makefile
@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	xfce4-print
-PORTVERSION=	4.0.6
-PORTREVISION=	1
+PORTVERSION=	4.2.0
+PORTREVISION=	0
 CATEGORIES=	print 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=	xfprint-${PORTVERSION}
 DIST_SUBDIR=	xfce4
 
@@ -18,16 +19,45 @@ MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 graphical frontend for printing
 
 LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
-		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui
+		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
 
 USE_GETTEXT=	yes
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
-USE_INC_LIBTOOL_VER=15
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \
 		CPPFLAGS=-I${LOCALBASE}/include \
 		LIBS=-L${LOCALBASE}/lib
+OPTIONS=	LPR	"Use lpr as printing system"	on\
+		CUPS	"Use cups as printing system"	off
+
+.if defined(WITH_CUPS)
+CONFIGURE_ARGS+=--enable-cups
+LIB_DEPENDS+=	cups.2:${PORTSDIR}/print/cups-base
+PLIST_SUB+=	CUPS=""
+.else
+CONFIGURE_ARGS+=--disable-cups
+PLIST_SUB+=	CUPS="@comment "
+.endif
+
+.if defined(WITHOUT_LPR)
+CONFIGURE_ARGS+=--disable-bsdlpr
+PLIST_SUB+=	LPR="@comment "
+.else
+CONFIGURE_ARGS+=--enable-bsdlpr
+PLIST_SUB+=	LPR=""
+.endif
+
+.if defined(WITH_LETTER)
+CONFIGURE_ARGS+=--enable-letter
+BUILD_DEPENDS=	a2ps:${PORTSDIR}/print/a2ps-letter
+RUN_DEPENDS+=	a2ps:${PORTSDIR}/print/a2ps-letter
+.else
+CONFIGURE_ARGS+=--disable-letter
+BUILD_DEPENDS=	a2ps:${PORTSDIR}/print/a2ps-a4
+RUN_DEPENDS+=	a2ps:${PORTSDIR}/print/a2ps-a4
+.endif
 
 .include <bsd.port.mk>
diff --git a/print/xfce4-print/distinfo b/print/xfce4-print/distinfo
index 2daadab..ef68930 100644
--- a/print/xfce4-print/distinfo
+++ b/print/xfce4-print/distinfo
@@ -1,2 +1,2 @@
-MD5 (xfce4/xfprint-4.0.6.tar.gz) = 3ab525472bab3eb87146d808d3c17df1
-SIZE(xfce4/xfprint-4.0.6.tar.gz) = 447407
+MD5 (xfce4/xfprint-4.2.0.tar.gz) = dce7378c3961122ca20b2518e939e57c
+SIZE(xfce4/xfprint-4.2.0.tar.gz) = 687610
diff --git a/print/xfce4-print/pkg-plist b/print/xfce4-print/pkg-plist
index 2e1ada3..3305f52 100644
--- a/print/xfce4-print/pkg-plist
+++ b/print/xfce4-print/pkg-plist
@@ -1,33 +1,45 @@
 bin/xfprint-manager
 bin/xfprint4
-lib/libxfprint.a
-lib/libxfprint.la
-lib/libxfprint.so
-lib/libxfprint.so.0
+lib/xfce4/mcs-plugins/xfprint_plugin.so
+lib/xfce4/xfprint-plugins/file_plugin.so
+%%LPR%%lib/xfce4/xfprint-plugins/bsdlpr_plugin.so
+%%CUPS%%lib/xfce4/xfprint-plugins/cups_plugin.so
+share/applications/xfprint.desktop
+share/applications/xfprint-manager.desktop
+share/applications/xfce-xfprint-settings.desktop
+share/icons/hicolor/scalable/apps/xfprint.svg
+share/icons/hicolor/48x48/apps/xfprint.png
 share/locale/ar/LC_MESSAGES/xfprint.mo
 share/locale/az/LC_MESSAGES/xfprint.mo
+share/locale/be/LC_MESSAGES/xfprint.mo
 share/locale/bg/LC_MESSAGES/xfprint.mo
 share/locale/ca/LC_MESSAGES/xfprint.mo
 share/locale/cs/LC_MESSAGES/xfprint.mo
 share/locale/de/LC_MESSAGES/xfprint.mo
+share/locale/en_GB/LC_MESSAGES/xfprint.mo
 share/locale/es/LC_MESSAGES/xfprint.mo
 share/locale/es_MX/LC_MESSAGES/xfprint.mo
 share/locale/et/LC_MESSAGES/xfprint.mo
 share/locale/eu/LC_MESSAGES/xfprint.mo
-share/locale/fa_IR/LC_MESSAGES/xfprint.mo
+share/locale/fa/LC_MESSAGES/xfprint.mo
+share/locale/fi/LC_MESSAGES/xfprint.mo
 share/locale/fr/LC_MESSAGES/xfprint.mo
+share/locale/gu/LC_MESSAGES/xfprint.mo
+share/locale/he/LC_MESSAGES/xfprint.mo
 share/locale/hi/LC_MESSAGES/xfprint.mo
 share/locale/hu/LC_MESSAGES/xfprint.mo
 share/locale/it/LC_MESSAGES/xfprint.mo
 share/locale/ja/LC_MESSAGES/xfprint.mo
+share/locale/ko/LC_MESSAGES/xfprint.mo
 share/locale/lt/LC_MESSAGES/xfprint.mo
 share/locale/ms/LC_MESSAGES/xfprint.mo
 share/locale/nl/LC_MESSAGES/xfprint.mo
-share/locale/no/LC_MESSAGES/xfprint.mo
+share/locale/pa/LC_MESSAGES/xfprint.mo
 share/locale/pl/LC_MESSAGES/xfprint.mo
 share/locale/pt_BR/LC_MESSAGES/xfprint.mo
 share/locale/pt_PT/LC_MESSAGES/xfprint.mo
 share/locale/ru/LC_MESSAGES/xfprint.mo
+share/locale/sk/LC_MESSAGES/xfprint.mo
 share/locale/sv/LC_MESSAGES/xfprint.mo
 share/locale/ta/LC_MESSAGES/xfprint.mo
 share/locale/tr/LC_MESSAGES/xfprint.mo
@@ -35,3 +47,20 @@ share/locale/uk/LC_MESSAGES/xfprint.mo
 share/locale/vi/LC_MESSAGES/xfprint.mo
 share/locale/zh_CN/LC_MESSAGES/xfprint.mo
 share/locale/zh_TW/LC_MESSAGES/xfprint.mo
+share/xfce4/doc/C/images/xfprint_headings.png
+share/xfce4/doc/C/images/xfprint_input.png
+share/xfce4/doc/C/images/xfprint-manager.png
+share/xfce4/doc/C/images/xfprint-manager-queue.png
+share/xfce4/doc/C/images/xfprint_mcs_plugin.png
+share/xfce4/doc/C/images/xfprint_prettyprinting.png
+share/xfce4/doc/C/images/xfprint_sheets.png
+share/xfce4/doc/C/images/xfprint_virtualpages.png
+share/xfce4/doc/C/xfprint.html
+@unexec rmdir %D/lib/xfce4/mcs-plugins 2>/dev/null || true
+@unexec rmdir %D/lib/xfce4/xfprint-plugins 2>/dev/null || true
+@unexec rmdir %D/lib/xfce4 2>/dev/null || true 
+@unexec rmdir %D/share/applications 2>/dev/null || true
+@unexec rmdir %D/share/xfce4/doc/C/images 2>/dev/null || true
+@unexec rmdir %D/share/xfce4/doc/C 2>/dev/null || true
+@unexec rmdir %D/share/xfce4/doc 2>/dev/null || true
+@unexec rmdir %D/share/xfce4 2>/dev/null || true