Updated XFce to 4.2.0

Too many changes to list here, please read the Changelog from www.xfce.org
(http://www.xfce.org/release_notes/4.2.0_changelog.html)

4 files changed, 25 insertions, 27 deletions

diff --git a/meta-pkgs/xfce4-extras/Makefile b/meta-pkgs/xfce4-extras/Makefile
index 8c01ffdb4f3..a9e31c42beb 100644
--- a/meta-pkgs/xfce4-extras/Makefile
+++ b/meta-pkgs/xfce4-extras/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2004/10/03 00:12:58 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/01/17 12:56:13 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce4-extras-${XFCE4_VERSION}
-PKGREVISION=	1
 DISTFILES=	# empty
 CATEGORIES=	meta-pkgs
 COMMENT=	XFce4 extras
@@ -29,7 +28,6 @@ do-install:	# empty
 .include "../../sysutils/xfce4-systemload-plugin/buildlink3.mk"
 .include "../../sysutils/xfce4-xkb-plugin/buildlink3.mk"
 .include "../../x11/xfce4-clipman-plugin/buildlink3.mk"
-.include "../../x11/xfce4-menueditor/buildlink3.mk"
 .include "../../x11/xfce4-notes-plugin/buildlink3.mk"
 .include "../../x11/xfce4-taskbar-plugin/buildlink3.mk"
 .include "../../x11/xfce4-windowlist-plugin/buildlink3.mk"
diff --git a/meta-pkgs/xfce4/Makefile b/meta-pkgs/xfce4/Makefile
index 680debdd20a..216d1a87d7f 100644
--- a/meta-pkgs/xfce4/Makefile
+++ b/meta-pkgs/xfce4/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2004/10/03 00:12:58 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/01/17 12:56:13 martti Exp $
 
 .include "Makefile.common"
 
 DISTNAME=	xfce4-${XFCE4_VERSION}
-PKGREVISION=	1
 DISTFILES=	# empty
 CATEGORIES=	meta-pkgs
 COMMENT=	XFce4
@@ -15,23 +14,22 @@ NO_MTREE=	# defined
 
 do-install:	# empty
 
-# Basic stuff
+.include "../../audio/xfce4-mixer/buildlink3.mk"
+.include "../../graphics/xfce4-icon-theme/buildlink3.mk"
 .include "../../graphics/xfce4-iconbox/buildlink3.mk"
 .include "../../print/xfce4-print/buildlink3.mk"
+.include "../../sysutils/xfce4-appfinder/buildlink3.mk"
 .include "../../sysutils/xfce4-fm/buildlink3.mk"
+.include "../../sysutils/xfce4-systray/buildlink3.mk"
+.include "../../time/xfce4-calendar/buildlink3.mk"
+.include "../../wm/xfce4-wm-themes/buildlink3.mk"
 .include "../../wm/xfce4-wm/buildlink3.mk"
 .include "../../x11/xfce4-desktop/buildlink3.mk"
 .include "../../x11/xfce4-gtk2-engines/buildlink3.mk"
-.include "../../x11/xfce4-utils/buildlink3.mk"
 .include "../../x11/xfce4-panel/buildlink3.mk"
-
-# Extras
-.include "../../audio/xfce4-mixer/buildlink3.mk"
-.include "../../sysutils/xfce4-fm-icons/buildlink3.mk"
-.include "../../sysutils/xfce4-systray/buildlink3.mk"
-.include "../../wm/xfce4-wm-themes/buildlink3.mk"
-.include "../../x11/xfce4-themes/buildlink3.mk"
+.include "../../x11/xfce4-session/buildlink3.mk"
 .include "../../x11/xfce4-toys/buildlink3.mk"
 .include "../../x11/xfce4-trigger-launcher/buildlink3.mk"
+.include "../../x11/xfce4-utils/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/xfce4/Makefile.common b/meta-pkgs/xfce4/Makefile.common
index bbbea1db242..7200cc600ba 100644
--- a/meta-pkgs/xfce4/Makefile.common
+++ b/meta-pkgs/xfce4/Makefile.common
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile.common,v 1.16 2004/07/12 08:25:11 martti Exp $
+# $NetBSD: Makefile.common,v 1.17 2005/01/17 12:56:13 martti Exp $
 
-MASTER_SITES=		http://www.xfce.org/archive/xfce-4.0.6/src/ \
-			http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-4.0.6/src/ \
-			http://linux.imp.mx/xfce4/xfce_4.0.6/src/
+MASTER_SITES=		http://www.xfce.org/archive/xfce-4.2.0/src/ \
+			http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-4.2.0/src/ \
+			http://linux.imp.mx/xfce4/xfce_4.2.0/src/
 
 MAINTAINER=		martti@NetBSD.org
 HOMEPAGE=		http://www.xfce.org/
 
-XFCE4_VERSION=		4.0.6
+XFCE4_VERSION=		4.2.0
 
 # Do NOT put a PKGREVISION statement in this file!
 
diff --git a/meta-pkgs/xfce4/buildlink3.mk b/meta-pkgs/xfce4/buildlink3.mk
index 123ca16ef2d..44f519497ee 100644
--- a/meta-pkgs/xfce4/buildlink3.mk
+++ b/meta-pkgs/xfce4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/07/12 08:25:11 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2005/01/17 12:56:13 martti Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XFCE4_BUILDLINK3_MK:=	${XFCE4_BUILDLINK3_MK}+
@@ -11,25 +11,27 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4}
 BUILDLINK_PACKAGES+=	xfce4
 
 .if !empty(XFCE4_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4+=	xfce4>=4.0.6
+BUILDLINK_DEPENDS.xfce4+=	xfce4>=4.2.0
 BUILDLINK_PKGSRCDIR.xfce4?=	../../meta-pkgs/xfce4
 .endif	# XFCE4_BUILDLINK3_MK
 
+.include "../../audio/xfce4-mixer/buildlink3.mk"
+.include "../../graphics/xfce4-icon-theme/buildlink3.mk"
 .include "../../graphics/xfce4-iconbox/buildlink3.mk"
 .include "../../print/xfce4-print/buildlink3.mk"
+.include "../../sysutils/xfce4-appfinder/buildlink3.mk"
 .include "../../sysutils/xfce4-fm/buildlink3.mk"
+.include "../../sysutils/xfce4-systray/buildlink3.mk"
+.include "../../time/xfce4-calendar/buildlink3.mk"
+.include "../../wm/xfce4-wm-themes/buildlink3.mk"
 .include "../../wm/xfce4-wm/buildlink3.mk"
 .include "../../x11/xfce4-desktop/buildlink3.mk"
 .include "../../x11/xfce4-gtk2-engines/buildlink3.mk"
-.include "../../x11/xfce4-utils/buildlink3.mk"
 .include "../../x11/xfce4-panel/buildlink3.mk"
-.include "../../audio/xfce4-mixer/buildlink3.mk"
-.include "../../sysutils/xfce4-fm-icons/buildlink3.mk"
-.include "../../sysutils/xfce4-systray/buildlink3.mk"
-.include "../../wm/xfce4-wm-themes/buildlink3.mk"
-.include "../../x11/xfce4-themes/buildlink3.mk"
+.include "../../x11/xfce4-session/buildlink3.mk"
 .include "../../x11/xfce4-toys/buildlink3.mk"
 .include "../../x11/xfce4-trigger-launcher/buildlink3.mk"
+.include "../../x11/xfce4-utils/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}