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, 24 insertions, 13 deletions

diff --git a/x11/xfce4-gtk2-engines/Makefile b/x11/xfce4-gtk2-engines/Makefile
index 3bd1cfbd06d..546f8f2cb8b 100644
--- a/x11/xfce4-gtk2-engines/Makefile
+++ b/x11/xfce4-gtk2-engines/Makefile
@@ -1,16 +1,14 @@
-# $NetBSD: Makefile,v 1.15 2004/10/03 00:18:39 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/01/17 12:56:13 martti Exp $
 #
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-XFCE4_VERSION=	2.1.10
+XFCE4_VERSION=	2.2.5
 
 DISTNAME=	gtk-xfce-engine-${XFCE4_VERSION}
 PKGNAME=	xfce4-gtk2-engine-${XFCE4_VERSION}
-PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	XFce4 GTK2 themes
-DIST_SUBDIR=	${PKGNAME_NOREV}
 
 USE_DIRS+=	xdg-1.1
 
diff --git a/x11/xfce4-gtk2-engines/PLIST b/x11/xfce4-gtk2-engines/PLIST
index 2a16e36965d..ecd21e704c7 100644
--- a/x11/xfce4-gtk2-engines/PLIST
+++ b/x11/xfce4-gtk2-engines/PLIST
@@ -1,14 +1,23 @@
-@comment $NetBSD: PLIST,v 1.5 2004/09/22 08:10:07 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2005/01/17 12:56:13 martti Exp $
 lib/gtk-2.0/2.4.0/engines/libxfce.la
+share/themes/Xfce-4.0/ICON.png
+share/themes/Xfce-4.0/README.html
+share/themes/Xfce-4.0/gtk-2.0/gtkrc
 share/themes/Xfce-b5/ICON.png
 share/themes/Xfce-b5/README.html
 share/themes/Xfce-b5/gtk-2.0/gtkrc
 share/themes/Xfce-basic/ICON.png
 share/themes/Xfce-basic/README.html
 share/themes/Xfce-basic/gtk-2.0/gtkrc
+share/themes/Xfce-cadmium/ICON.png
+share/themes/Xfce-cadmium/README.html
+share/themes/Xfce-cadmium/gtk-2.0/gtkrc
 share/themes/Xfce-curve/ICON.png
 share/themes/Xfce-curve/README.html
 share/themes/Xfce-curve/gtk-2.0/gtkrc
+share/themes/Xfce-dawn/ICON.png
+share/themes/Xfce-dawn/README.html
+share/themes/Xfce-dawn/gtk-2.0/gtkrc
 share/themes/Xfce-kde2/ICON.png
 share/themes/Xfce-kde2/README.html
 share/themes/Xfce-kde2/gtk-2.0/gtkrc
@@ -53,12 +62,16 @@ share/themes/Xfce/gtk-2.0/gtkrc
 @dirrm share/themes/Xfce-kolors
 @dirrm share/themes/Xfce-kde2/gtk-2.0
 @dirrm share/themes/Xfce-kde2
+@dirrm share/themes/Xfce-dawn/gtk-2.0
+@dirrm share/themes/Xfce-dawn
 @dirrm share/themes/Xfce-curve/gtk-2.0
 @dirrm share/themes/Xfce-curve
+@dirrm share/themes/Xfce-cadmium/gtk-2.0
+@dirrm share/themes/Xfce-cadmium
 @dirrm share/themes/Xfce-basic/gtk-2.0
 @dirrm share/themes/Xfce-basic
 @dirrm share/themes/Xfce-b5/gtk-2.0
 @dirrm share/themes/Xfce-b5
-@dirrm share/themes/Xfce
-@comment in xdg-dirs: @dirrm share/themes
-@comment in gtk2: @dirrm lib/gtk-2.0/2.4.0/engines
+@dirrm share/themes/Xfce-4.0/gtk-2.0
+@dirrm share/themes/Xfce-4.0
+@unexec ${RMDIR} share/themes/Xfce 2>/dev/null || ${TRUE}
diff --git a/x11/xfce4-gtk2-engines/buildlink3.mk b/x11/xfce4-gtk2-engines/buildlink3.mk
index a0ee8d8e06a..8e5f7515c09 100644
--- a/x11/xfce4-gtk2-engines/buildlink3.mk
+++ b/x11/xfce4-gtk2-engines/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/07/12 08:25:11 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2005/01/17 12:56:13 martti Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_GTK2_ENGINE_BUILDLINK3_MK:=	${XFCE4_GTK2_ENGINE_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-gtk2-engine}
 BUILDLINK_PACKAGES+=	xfce4-gtk2-engine
 
 .if !empty(XFCE4_GTK2_ENGINE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-gtk2-engine+=	xfce4-gtk2-engine>=2.1.10
+BUILDLINK_DEPENDS.xfce4-gtk2-engine+=	xfce4-gtk2-engine>=2.2.5
 BUILDLINK_PKGSRCDIR.xfce4-gtk2-engine?=	../../x11/xfce4-gtk2-engines
 .endif	# XFCE4_GTK2_ENGINE_BUILDLINK3_MK
 
diff --git a/x11/xfce4-gtk2-engines/distinfo b/x11/xfce4-gtk2-engines/distinfo
index 84bb2000b73..8310622353a 100644
--- a/x11/xfce4-gtk2-engines/distinfo
+++ b/x11/xfce4-gtk2-engines/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2004/07/12 08:25:11 martti Exp $
+$NetBSD: distinfo,v 1.9 2005/01/17 12:56:13 martti Exp $
 
-SHA1 (xfce4-gtk2-engine-2.1.10/gtk-xfce-engine-2.1.10.tar.gz) = a5dfa34a34e8703f52b661f7573c81df072b41c8
-Size (xfce4-gtk2-engine-2.1.10/gtk-xfce-engine-2.1.10.tar.gz) = 352524 bytes
+SHA1 (gtk-xfce-engine-2.2.5.tar.gz) = 979cd98f8a06ef8c49379f5c1d0ac089f4424bdd
+Size (gtk-xfce-engine-2.2.5.tar.gz) = 373900 bytes