Upgrading Xfce to 4.6.1.

This is for PR #40984. This is based on work from
dieter roelants. Thank you Dieter.
Also I had done some work independently on this.
Hopefully, I am getting this all committed at one time.

The changelogs are at
http://www.xfce.org/documentation/changelogs/4.6.1
http://www.xfce.org/documentation/changelogs/4.6.0

Also don't need the xfce4-dev-tools for building. (It is only
needed when building from SVN source.)

3 files changed, 36 insertions, 14 deletions

diff --git a/meta-pkgs/xfce4/Makefile b/meta-pkgs/xfce4/Makefile
index 9a812d37474..28721366fda 100644
--- a/meta-pkgs/xfce4/Makefile
+++ b/meta-pkgs/xfce4/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.37 2009/08/26 19:56:53 sno Exp $
+# $NetBSD: Makefile,v 1.38 2009/09/16 01:15:33 reed Exp $
 
 META_PACKAGE=	yes
 
 .include "Makefile.common"
 
 DISTNAME=	xfce4-${XFCE4_VERSION}
-PKGREVISION=	4
 CATEGORIES=	meta-pkgs
 COMMENT=	Xfce
 
 .include "../../audio/xfce4-mixer/buildlink3.mk"
 .include "../../editors/xfce4-mousepad/buildlink3.mk"
+.include "../../graphics/gnome-icon-theme/buildlink3.mk"
 .include "../../graphics/xfce4-icon-theme/buildlink3.mk"
 .include "../../print/xfce4-print/buildlink3.mk"
 .include "../../sysutils/xfce4-appfinder/buildlink3.mk"
@@ -22,6 +22,7 @@ COMMENT=	Xfce
 .include "../../x11/xfce4-gtk2-engine/buildlink3.mk"
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../x11/xfce4-session/buildlink3.mk"
+.include "../../x11/xfce4-settings/buildlink3.mk"
 .include "../../x11/xfce4-terminal/buildlink3.mk"
 .include "../../x11/xfce4-utils/buildlink3.mk"
 
diff --git a/meta-pkgs/xfce4/Makefile.common b/meta-pkgs/xfce4/Makefile.common
index e0be07c36c8..5dd1a240675 100644
--- a/meta-pkgs/xfce4/Makefile.common
+++ b/meta-pkgs/xfce4/Makefile.common
@@ -1,13 +1,36 @@
-# $NetBSD: Makefile.common,v 1.41 2009/05/19 08:59:23 wiz Exp $
-
-MASTER_SITES=		http://www.xfce.org/archive/xfce-4.4.3/src/
+# $NetBSD: Makefile.common,v 1.42 2009/09/16 01:15:33 reed Exp $
+
+# used by audio/xfce4-mixer/Makefile
+# used by devel/xfce4-dev-tools/Makefile
+# used by devel/xfconf/Makefile
+# used by editors/xfce4-mousepad/Makefile
+# used by graphics/xfce4-icon-theme/Makefile
+# used by print/xfce4-print/Makefile
+# used by sysutils/xfce4-appfinder/Makefile
+# used by sysutils/xfce4-thunar/Makefile
+# used by time/xfce4-orage/Makefile
+# used by wm/xfce4-wm-themes/Makefile
+# used by wm/xfce4-wm/Makefile
+# used by x11/xfce4-desktop/Makefile
+# used by x11/xfce4-exo/Makefile
+# used by x11/xfce4-gtk2-engine/Makefile
+# used by x11/xfce4-panel/Makefile
+# used by x11/libxfce4gui/Makefile
+# used by x11/libxfce4menu/Makefile
+# used by x11/libxfce4util/Makefile
+# used by x11/xfce4-session/Makefile
+# used by x11/xfce4-settings/Makefile
+# used by x11/xfce4-terminal/Makefile
+# used by x11/xfce4-utils/Makefile
+
+MASTER_SITES=		http://www.xfce.org/archive/xfce-4.6.1/src/
 EXTRACT_SUFX=		.tar.bz2
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
+MAINTAINER=		dieter.NetBSD@pandora.be
 HOMEPAGE=		http://www.xfce.org/
 LICENSE=		gnu-gpl-v2
 
-XFCE4_VERSION=		4.4.3
+XFCE4_VERSION=		4.6.1
 
 # Do NOT put a PKGREVISION statement in this file!
 
@@ -22,10 +45,9 @@ GCC_REQD+=		3.0
 
 XFCE4_EGBASE=		${PREFIX}/share/examples/xfce4
 
-.include "../../devel/xfce4-dev-tools/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
 
 ## # Use the latest GNU tar when the native tar is buggy
 ## .if !empty(MACHINE_PLATFORM:MNetBSD-1.6*)
diff --git a/meta-pkgs/xfce4/buildlink3.mk b/meta-pkgs/xfce4/buildlink3.mk
index 98ed6221002..bf77abe100d 100644
--- a/meta-pkgs/xfce4/buildlink3.mk
+++ b/meta-pkgs/xfce4/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.22 2009/08/26 19:56:53 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2009/09/16 01:15:33 reed Exp $
 
 BUILDLINK_TREE+=	xfce4
 
 .if !defined(XFCE4_BUILDLINK3_MK)
 XFCE4_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.xfce4+=	xfce4>=4.4.1
-BUILDLINK_ABI_DEPENDS.xfce4?=	xfce4>=4.4.3nb4
+BUILDLINK_API_DEPENDS.xfce4+=	xfce4>=4.6.0
+BUILDLINK_ABI_DEPENDS.xfce4+=	xfce4>=4.6.0
 BUILDLINK_PKGSRCDIR.xfce4?=	../../meta-pkgs/xfce4
 
 .include "../../audio/xfce4-mixer/buildlink3.mk"
@@ -24,7 +24,6 @@ BUILDLINK_PKGSRCDIR.xfce4?=	../../meta-pkgs/xfce4
 .include "../../x11/xfce4-session/buildlink3.mk"
 .include "../../x11/xfce4-terminal/buildlink3.mk"
 .include "../../x11/xfce4-utils/buildlink3.mk"
-.include "../../devel/xfce4-dev-tools/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"