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.)

8 files changed, 202 insertions, 143 deletions

diff --git a/wm/xfce4-wm-themes/Makefile b/wm/xfce4-wm-themes/Makefile
index aee4ee90049..fe2d664655a 100644
--- a/wm/xfce4-wm-themes/Makefile
+++ b/wm/xfce4-wm-themes/Makefile
@@ -1,15 +1,17 @@
-# $NetBSD: Makefile,v 1.20 2009/08/26 19:57:03 sno Exp $
+# $NetBSD: Makefile,v 1.21 2009/09/16 01:15:34 reed Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
+XFCE4_VERSION=	4.6.0
 DISTNAME=	xfwm4-themes-${XFCE4_VERSION}
 PKGNAME=	xfce4-wm-themes-${XFCE4_VERSION}
-PKGREVISION=	2
 CATEGORIES=	wm
 COMMENT=	Xfce window manager themes
 
+USE_LANGUAGES=	#empty
+
+MAKE_DIRS+=	${PREFIX}/share/themes/Xfce
 
-.include "../../wm/xfce4-wm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/xfce4-wm-themes/PLIST b/wm/xfce4-wm-themes/PLIST
index 071c2b09de4..9fddd894b97 100644
--- a/wm/xfce4-wm-themes/PLIST
+++ b/wm/xfce4-wm-themes/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 21:40:05 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2009/09/16 01:15:34 reed Exp $
 share/themes/Adept/xfwm4/README
 share/themes/Adept/xfwm4/bottom-active.xpm
 share/themes/Adept/xfwm4/bottom-inactive.xpm
diff --git a/wm/xfce4-wm-themes/buildlink3.mk b/wm/xfce4-wm-themes/buildlink3.mk
index 40bdd82166f..f03caf3b8f0 100644
--- a/wm/xfce4-wm-themes/buildlink3.mk
+++ b/wm/xfce4-wm-themes/buildlink3.mk
@@ -1,17 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.23 2009/08/26 19:57:03 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.24 2009/09/16 01:15:34 reed Exp $
 
 BUILDLINK_TREE+=	xfce4-wm-themes
 
 .if !defined(XFCE4_WM_THEMES_BUILDLINK3_MK)
 XFCE4_WM_THEMES_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.xfce4-wm-themes+=	xfce4-wm-themes>=4.4.3nb1
-BUILDLINK_ABI_DEPENDS.xfce4-wm-themes?=	xfce4-wm-themes>=4.4.3nb2
+BUILDLINK_API_DEPENDS.xfce4-wm-themes+=	xfce4-wm-themes>=4.6.0
 BUILDLINK_PKGSRCDIR.xfce4-wm-themes?=	../../wm/xfce4-wm-themes
 
-.include "../../wm/xfce4-wm/buildlink3.mk"
-.include "../../devel/xfce4-dev-tools/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
 .endif # XFCE4_WM_THEMES_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-xfce4-wm-themes
diff --git a/wm/xfce4-wm-themes/distinfo b/wm/xfce4-wm-themes/distinfo
index 6ae1b9b44fb..1a525b8eeb9 100644
--- a/wm/xfce4-wm-themes/distinfo
+++ b/wm/xfce4-wm-themes/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.15 2008/12/17 12:50:03 hira Exp $
+$NetBSD: distinfo,v 1.16 2009/09/16 01:15:34 reed Exp $
 
-SHA1 (xfwm4-themes-4.4.3.tar.bz2) = 1fa20a6cc7060b2ff31bc00b1783ddc2d41e5add
-RMD160 (xfwm4-themes-4.4.3.tar.bz2) = 3b34b6b59c5e4bbf4d1fd9faef9177c2be32df0c
-Size (xfwm4-themes-4.4.3.tar.bz2) = 492360 bytes
+SHA1 (xfwm4-themes-4.6.0.tar.bz2) = 7e81d00b2b0a7a2b91071b8c3767171bce738af2
+RMD160 (xfwm4-themes-4.6.0.tar.bz2) = 1f6230cdb7626b48671c170234aa97c28ba2eaf9
+Size (xfwm4-themes-4.6.0.tar.bz2) = 508403 bytes
diff --git a/wm/xfce4-wm/Makefile b/wm/xfce4-wm/Makefile
index f90cf091c23..21e79c3a3cc 100644
--- a/wm/xfce4-wm/Makefile
+++ b/wm/xfce4-wm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2009/08/26 19:57:02 sno Exp $
+# $NetBSD: Makefile,v 1.30 2009/09/16 01:15:34 reed Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -6,15 +6,28 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 DISTNAME=	xfwm4-${XFCE4_VERSION}
 PKGNAME=	xfce4-wm-${XFCE4_VERSION}
-PKGREVISION=	2
 CATEGORIES=	wm
 COMMENT=	Xfce window manager
 
+MAKE_DIRS+=	${PREFIX}/libexec/xfce4 ${PREFIX}/share/themes/Default
+MAKE_DIRS+=	${PREFIX}/share/xfce4 ${PREFIX}/share/xfce4/doc
+MAKE_DIRS+=	${PREFIX}/share/xfce4/doc/C ${PREFIX}/share/xfce4/doc/C/images
+MAKE_DIRS+=	${PREFIX}/share/xfce4/doc/fr ${PREFIX}/share/xfce4/doc/fr/images
+MAKE_DIRS+=	${PREFIX}/share/xfce4/doc/it ${PREFIX}/share/xfce4/doc/it/images
 
+.include "../../devel/libglade/buildlink3.mk"
+.include "../../devel/libwnck/buildlink3.mk"
+.include "../../devel/xfconf/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
-.include "../../x11/startup-notification/buildlink3.mk"
+.include "../../sysutils/dbus/buildlink3.mk"
+.include "../../sysutils/dbus-glib/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/libXcomposite/buildlink3.mk"
 .include "../../x11/libXdamage/buildlink3.mk"
+.include "../../x11/libXfixes/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/libXrender/buildlink3.mk"
+.include "../../x11/libxfce4gui/buildlink3.mk"
+.include "../../x11/libxfce4util/buildlink3.mk"
+.include "../../x11/startup-notification/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/xfce4-wm/PLIST b/wm/xfce4-wm/PLIST
index 3e0e2fa42d3..9b49177b17d 100644
--- a/wm/xfce4-wm/PLIST
+++ b/wm/xfce4-wm/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.18 2009/06/14 21:40:05 joerg Exp $
+@comment $NetBSD: PLIST,v 1.19 2009/09/16 01:15:34 reed Exp $
 bin/xfwm4
-lib/xfce4/mcs-plugins/wmtweaks_plugin.la
-lib/xfce4/mcs-plugins/workspaces_plugin.la
-lib/xfce4/mcs-plugins/xfwm4_plugin.la
+bin/xfwm4-settings
+bin/xfwm4-tweaks-settings
+bin/xfwm4-workspace-settings
+libexec/xfce4/xfwm4/helper-dialog
 share/applications/xfce-wm-settings.desktop
 share/applications/xfce-wmtweaks-settings.desktop
 share/applications/xfce-workspaces-settings.desktop
@@ -48,15 +49,16 @@ share/locale/lv/LC_MESSAGES/xfwm4.mo
 share/locale/mk/LC_MESSAGES/xfwm4.mo
 share/locale/mr/LC_MESSAGES/xfwm4.mo
 share/locale/ms/LC_MESSAGES/xfwm4.mo
-share/locale/nb_NO/LC_MESSAGES/xfwm4.mo
+share/locale/nb/LC_MESSAGES/xfwm4.mo
 share/locale/nl/LC_MESSAGES/xfwm4.mo
 share/locale/pa/LC_MESSAGES/xfwm4.mo
 share/locale/pl/LC_MESSAGES/xfwm4.mo
+share/locale/pt/LC_MESSAGES/xfwm4.mo
 share/locale/pt_BR/LC_MESSAGES/xfwm4.mo
-share/locale/pt_PT/LC_MESSAGES/xfwm4.mo
 share/locale/ro/LC_MESSAGES/xfwm4.mo
 share/locale/ru/LC_MESSAGES/xfwm4.mo
 share/locale/sk/LC_MESSAGES/xfwm4.mo
+share/locale/sq/LC_MESSAGES/xfwm4.mo
 share/locale/sv/LC_MESSAGES/xfwm4.mo
 share/locale/ta/LC_MESSAGES/xfwm4.mo
 share/locale/tr/LC_MESSAGES/xfwm4.mo
@@ -82,12 +84,16 @@ share/themes/Daloa/xfwm4/close-active.png
 share/themes/Daloa/xfwm4/close-active.xpm
 share/themes/Daloa/xfwm4/close-inactive.png
 share/themes/Daloa/xfwm4/close-inactive.xpm
+share/themes/Daloa/xfwm4/close-prelight.png
+share/themes/Daloa/xfwm4/close-prelight.xpm
 share/themes/Daloa/xfwm4/close-pressed.png
 share/themes/Daloa/xfwm4/close-pressed.xpm
 share/themes/Daloa/xfwm4/hide-active.png
 share/themes/Daloa/xfwm4/hide-active.xpm
 share/themes/Daloa/xfwm4/hide-inactive.png
 share/themes/Daloa/xfwm4/hide-inactive.xpm
+share/themes/Daloa/xfwm4/hide-prelight.png
+share/themes/Daloa/xfwm4/hide-prelight.xpm
 share/themes/Daloa/xfwm4/hide-pressed.png
 share/themes/Daloa/xfwm4/hide-pressed.xpm
 share/themes/Daloa/xfwm4/left-active.png
@@ -98,18 +104,24 @@ share/themes/Daloa/xfwm4/maximize-active.png
 share/themes/Daloa/xfwm4/maximize-active.xpm
 share/themes/Daloa/xfwm4/maximize-inactive.png
 share/themes/Daloa/xfwm4/maximize-inactive.xpm
+share/themes/Daloa/xfwm4/maximize-prelight.png
+share/themes/Daloa/xfwm4/maximize-prelight.xpm
 share/themes/Daloa/xfwm4/maximize-pressed.png
 share/themes/Daloa/xfwm4/maximize-pressed.xpm
 share/themes/Daloa/xfwm4/maximize-toggled-active.png
 share/themes/Daloa/xfwm4/maximize-toggled-active.xpm
 share/themes/Daloa/xfwm4/maximize-toggled-inactive.png
 share/themes/Daloa/xfwm4/maximize-toggled-inactive.xpm
+share/themes/Daloa/xfwm4/maximize-toggled-prelight.png
+share/themes/Daloa/xfwm4/maximize-toggled-prelight.xpm
 share/themes/Daloa/xfwm4/maximize-toggled-pressed.png
 share/themes/Daloa/xfwm4/maximize-toggled-pressed.xpm
 share/themes/Daloa/xfwm4/menu-active.png
 share/themes/Daloa/xfwm4/menu-active.xpm
 share/themes/Daloa/xfwm4/menu-inactive.png
 share/themes/Daloa/xfwm4/menu-inactive.xpm
+share/themes/Daloa/xfwm4/menu-prelight.png
+share/themes/Daloa/xfwm4/menu-prelight.xpm
 share/themes/Daloa/xfwm4/menu-pressed.png
 share/themes/Daloa/xfwm4/menu-pressed.xpm
 share/themes/Daloa/xfwm4/right-active.png
@@ -120,24 +132,32 @@ share/themes/Daloa/xfwm4/shade-active.png
 share/themes/Daloa/xfwm4/shade-active.xpm
 share/themes/Daloa/xfwm4/shade-inactive.png
 share/themes/Daloa/xfwm4/shade-inactive.xpm
+share/themes/Daloa/xfwm4/shade-prelight.png
+share/themes/Daloa/xfwm4/shade-prelight.xpm
 share/themes/Daloa/xfwm4/shade-pressed.png
 share/themes/Daloa/xfwm4/shade-pressed.xpm
 share/themes/Daloa/xfwm4/shade-toggled-active.png
 share/themes/Daloa/xfwm4/shade-toggled-active.xpm
 share/themes/Daloa/xfwm4/shade-toggled-inactive.png
 share/themes/Daloa/xfwm4/shade-toggled-inactive.xpm
+share/themes/Daloa/xfwm4/shade-toggled-prelight.png
+share/themes/Daloa/xfwm4/shade-toggled-prelight.xpm
 share/themes/Daloa/xfwm4/shade-toggled-pressed.png
 share/themes/Daloa/xfwm4/shade-toggled-pressed.xpm
 share/themes/Daloa/xfwm4/stick-active.png
 share/themes/Daloa/xfwm4/stick-active.xpm
 share/themes/Daloa/xfwm4/stick-inactive.png
 share/themes/Daloa/xfwm4/stick-inactive.xpm
+share/themes/Daloa/xfwm4/stick-prelight.png
+share/themes/Daloa/xfwm4/stick-prelight.xpm
 share/themes/Daloa/xfwm4/stick-pressed.png
 share/themes/Daloa/xfwm4/stick-pressed.xpm
 share/themes/Daloa/xfwm4/stick-toggled-active.png
 share/themes/Daloa/xfwm4/stick-toggled-active.xpm
 share/themes/Daloa/xfwm4/stick-toggled-inactive.png
 share/themes/Daloa/xfwm4/stick-toggled-inactive.xpm
+share/themes/Daloa/xfwm4/stick-toggled-prelight.png
+share/themes/Daloa/xfwm4/stick-toggled-prelight.xpm
 share/themes/Daloa/xfwm4/stick-toggled-pressed.png
 share/themes/Daloa/xfwm4/stick-toggled-pressed.xpm
 share/themes/Daloa/xfwm4/themerc
@@ -308,6 +328,110 @@ share/themes/Default-4.2/xfwm4/top-right-active.png
 share/themes/Default-4.2/xfwm4/top-right-active.xpm
 share/themes/Default-4.2/xfwm4/top-right-inactive.png
 share/themes/Default-4.2/xfwm4/top-right-inactive.xpm
+share/themes/Default-4.4/xfwm4/README
+share/themes/Default-4.4/xfwm4/bottom-active.png
+share/themes/Default-4.4/xfwm4/bottom-active.xpm
+share/themes/Default-4.4/xfwm4/bottom-inactive.png
+share/themes/Default-4.4/xfwm4/bottom-inactive.xpm
+share/themes/Default-4.4/xfwm4/bottom-left-active.png
+share/themes/Default-4.4/xfwm4/bottom-left-active.xpm
+share/themes/Default-4.4/xfwm4/bottom-left-inactive.png
+share/themes/Default-4.4/xfwm4/bottom-left-inactive.xpm
+share/themes/Default-4.4/xfwm4/bottom-right-active.png
+share/themes/Default-4.4/xfwm4/bottom-right-active.xpm
+share/themes/Default-4.4/xfwm4/bottom-right-inactive.png
+share/themes/Default-4.4/xfwm4/bottom-right-inactive.xpm
+share/themes/Default-4.4/xfwm4/close-active.png
+share/themes/Default-4.4/xfwm4/close-active.xpm
+share/themes/Default-4.4/xfwm4/close-inactive.png
+share/themes/Default-4.4/xfwm4/close-inactive.xpm
+share/themes/Default-4.4/xfwm4/close-pressed.png
+share/themes/Default-4.4/xfwm4/close-pressed.xpm
+share/themes/Default-4.4/xfwm4/hide-active.png
+share/themes/Default-4.4/xfwm4/hide-active.xpm
+share/themes/Default-4.4/xfwm4/hide-inactive.png
+share/themes/Default-4.4/xfwm4/hide-inactive.xpm
+share/themes/Default-4.4/xfwm4/hide-pressed.png
+share/themes/Default-4.4/xfwm4/hide-pressed.xpm
+share/themes/Default-4.4/xfwm4/left-active.png
+share/themes/Default-4.4/xfwm4/left-active.xpm
+share/themes/Default-4.4/xfwm4/left-inactive.png
+share/themes/Default-4.4/xfwm4/left-inactive.xpm
+share/themes/Default-4.4/xfwm4/maximize-active.png
+share/themes/Default-4.4/xfwm4/maximize-active.xpm
+share/themes/Default-4.4/xfwm4/maximize-inactive.png
+share/themes/Default-4.4/xfwm4/maximize-inactive.xpm
+share/themes/Default-4.4/xfwm4/maximize-pressed.png
+share/themes/Default-4.4/xfwm4/maximize-pressed.xpm
+share/themes/Default-4.4/xfwm4/maximize-toggled-active.png
+share/themes/Default-4.4/xfwm4/maximize-toggled-active.xpm
+share/themes/Default-4.4/xfwm4/maximize-toggled-inactive.png
+share/themes/Default-4.4/xfwm4/maximize-toggled-inactive.xpm
+share/themes/Default-4.4/xfwm4/maximize-toggled-pressed.png
+share/themes/Default-4.4/xfwm4/maximize-toggled-pressed.xpm
+share/themes/Default-4.4/xfwm4/menu-active.png
+share/themes/Default-4.4/xfwm4/menu-active.xpm
+share/themes/Default-4.4/xfwm4/menu-inactive.png
+share/themes/Default-4.4/xfwm4/menu-inactive.xpm
+share/themes/Default-4.4/xfwm4/menu-pressed.png
+share/themes/Default-4.4/xfwm4/menu-pressed.xpm
+share/themes/Default-4.4/xfwm4/right-active.png
+share/themes/Default-4.4/xfwm4/right-active.xpm
+share/themes/Default-4.4/xfwm4/right-inactive.png
+share/themes/Default-4.4/xfwm4/right-inactive.xpm
+share/themes/Default-4.4/xfwm4/shade-active.png
+share/themes/Default-4.4/xfwm4/shade-active.xpm
+share/themes/Default-4.4/xfwm4/shade-inactive.png
+share/themes/Default-4.4/xfwm4/shade-inactive.xpm
+share/themes/Default-4.4/xfwm4/shade-pressed.png
+share/themes/Default-4.4/xfwm4/shade-pressed.xpm
+share/themes/Default-4.4/xfwm4/shade-toggled-active.png
+share/themes/Default-4.4/xfwm4/shade-toggled-active.xpm
+share/themes/Default-4.4/xfwm4/shade-toggled-inactive.png
+share/themes/Default-4.4/xfwm4/shade-toggled-inactive.xpm
+share/themes/Default-4.4/xfwm4/shade-toggled-pressed.png
+share/themes/Default-4.4/xfwm4/shade-toggled-pressed.xpm
+share/themes/Default-4.4/xfwm4/stick-active.png
+share/themes/Default-4.4/xfwm4/stick-active.xpm
+share/themes/Default-4.4/xfwm4/stick-inactive.png
+share/themes/Default-4.4/xfwm4/stick-inactive.xpm
+share/themes/Default-4.4/xfwm4/stick-pressed.png
+share/themes/Default-4.4/xfwm4/stick-pressed.xpm
+share/themes/Default-4.4/xfwm4/stick-toggled-active.png
+share/themes/Default-4.4/xfwm4/stick-toggled-active.xpm
+share/themes/Default-4.4/xfwm4/stick-toggled-inactive.png
+share/themes/Default-4.4/xfwm4/stick-toggled-inactive.xpm
+share/themes/Default-4.4/xfwm4/stick-toggled-pressed.png
+share/themes/Default-4.4/xfwm4/stick-toggled-pressed.xpm
+share/themes/Default-4.4/xfwm4/themerc
+share/themes/Default-4.4/xfwm4/title-1-active.png
+share/themes/Default-4.4/xfwm4/title-1-active.xpm
+share/themes/Default-4.4/xfwm4/title-1-inactive.png
+share/themes/Default-4.4/xfwm4/title-1-inactive.xpm
+share/themes/Default-4.4/xfwm4/title-2-active.png
+share/themes/Default-4.4/xfwm4/title-2-active.xpm
+share/themes/Default-4.4/xfwm4/title-2-inactive.png
+share/themes/Default-4.4/xfwm4/title-2-inactive.xpm
+share/themes/Default-4.4/xfwm4/title-3-active.png
+share/themes/Default-4.4/xfwm4/title-3-active.xpm
+share/themes/Default-4.4/xfwm4/title-3-inactive.png
+share/themes/Default-4.4/xfwm4/title-3-inactive.xpm
+share/themes/Default-4.4/xfwm4/title-4-active.png
+share/themes/Default-4.4/xfwm4/title-4-active.xpm
+share/themes/Default-4.4/xfwm4/title-4-inactive.png
+share/themes/Default-4.4/xfwm4/title-4-inactive.xpm
+share/themes/Default-4.4/xfwm4/title-5-active.png
+share/themes/Default-4.4/xfwm4/title-5-active.xpm
+share/themes/Default-4.4/xfwm4/title-5-inactive.png
+share/themes/Default-4.4/xfwm4/title-5-inactive.xpm
+share/themes/Default-4.4/xfwm4/top-left-active.png
+share/themes/Default-4.4/xfwm4/top-left-active.xpm
+share/themes/Default-4.4/xfwm4/top-left-inactive.png
+share/themes/Default-4.4/xfwm4/top-left-inactive.xpm
+share/themes/Default-4.4/xfwm4/top-right-active.png
+share/themes/Default-4.4/xfwm4/top-right-active.xpm
+share/themes/Default-4.4/xfwm4/top-right-inactive.png
+share/themes/Default-4.4/xfwm4/top-right-inactive.xpm
 share/themes/Default/xfwm4/README
 share/themes/Default/xfwm4/bottom-active.png
 share/themes/Default/xfwm4/bottom-active.xpm
@@ -325,15 +449,18 @@ share/themes/Default/xfwm4/close-active.png
 share/themes/Default/xfwm4/close-active.xpm
 share/themes/Default/xfwm4/close-inactive.png
 share/themes/Default/xfwm4/close-inactive.xpm
+share/themes/Default/xfwm4/close-prelight.png
+share/themes/Default/xfwm4/close-prelight.xpm
 share/themes/Default/xfwm4/close-pressed.png
 share/themes/Default/xfwm4/close-pressed.xpm
 share/themes/Default/xfwm4/hide-active.png
 share/themes/Default/xfwm4/hide-active.xpm
 share/themes/Default/xfwm4/hide-inactive.png
 share/themes/Default/xfwm4/hide-inactive.xpm
+share/themes/Default/xfwm4/hide-prelight.png
+share/themes/Default/xfwm4/hide-prelight.xpm
 share/themes/Default/xfwm4/hide-pressed.png
 share/themes/Default/xfwm4/hide-pressed.xpm
-share/themes/Default/xfwm4/keythemerc
 share/themes/Default/xfwm4/left-active.png
 share/themes/Default/xfwm4/left-active.xpm
 share/themes/Default/xfwm4/left-inactive.png
@@ -342,18 +469,24 @@ share/themes/Default/xfwm4/maximize-active.png
 share/themes/Default/xfwm4/maximize-active.xpm
 share/themes/Default/xfwm4/maximize-inactive.png
 share/themes/Default/xfwm4/maximize-inactive.xpm
+share/themes/Default/xfwm4/maximize-prelight.png
+share/themes/Default/xfwm4/maximize-prelight.xpm
 share/themes/Default/xfwm4/maximize-pressed.png
 share/themes/Default/xfwm4/maximize-pressed.xpm
 share/themes/Default/xfwm4/maximize-toggled-active.png
 share/themes/Default/xfwm4/maximize-toggled-active.xpm
 share/themes/Default/xfwm4/maximize-toggled-inactive.png
 share/themes/Default/xfwm4/maximize-toggled-inactive.xpm
+share/themes/Default/xfwm4/maximize-toggled-prelight.png
+share/themes/Default/xfwm4/maximize-toggled-prelight.xpm
 share/themes/Default/xfwm4/maximize-toggled-pressed.png
 share/themes/Default/xfwm4/maximize-toggled-pressed.xpm
 share/themes/Default/xfwm4/menu-active.png
 share/themes/Default/xfwm4/menu-active.xpm
 share/themes/Default/xfwm4/menu-inactive.png
 share/themes/Default/xfwm4/menu-inactive.xpm
+share/themes/Default/xfwm4/menu-prelight.png
+share/themes/Default/xfwm4/menu-prelight.xpm
 share/themes/Default/xfwm4/menu-pressed.png
 share/themes/Default/xfwm4/menu-pressed.xpm
 share/themes/Default/xfwm4/right-active.png
@@ -364,24 +497,32 @@ share/themes/Default/xfwm4/shade-active.png
 share/themes/Default/xfwm4/shade-active.xpm
 share/themes/Default/xfwm4/shade-inactive.png
 share/themes/Default/xfwm4/shade-inactive.xpm
+share/themes/Default/xfwm4/shade-prelight.png
+share/themes/Default/xfwm4/shade-prelight.xpm
 share/themes/Default/xfwm4/shade-pressed.png
 share/themes/Default/xfwm4/shade-pressed.xpm
 share/themes/Default/xfwm4/shade-toggled-active.png
 share/themes/Default/xfwm4/shade-toggled-active.xpm
 share/themes/Default/xfwm4/shade-toggled-inactive.png
 share/themes/Default/xfwm4/shade-toggled-inactive.xpm
+share/themes/Default/xfwm4/shade-toggled-prelight.png
+share/themes/Default/xfwm4/shade-toggled-prelight.xpm
 share/themes/Default/xfwm4/shade-toggled-pressed.png
 share/themes/Default/xfwm4/shade-toggled-pressed.xpm
 share/themes/Default/xfwm4/stick-active.png
 share/themes/Default/xfwm4/stick-active.xpm
 share/themes/Default/xfwm4/stick-inactive.png
 share/themes/Default/xfwm4/stick-inactive.xpm
+share/themes/Default/xfwm4/stick-prelight.png
+share/themes/Default/xfwm4/stick-prelight.xpm
 share/themes/Default/xfwm4/stick-pressed.png
 share/themes/Default/xfwm4/stick-pressed.xpm
 share/themes/Default/xfwm4/stick-toggled-active.png
 share/themes/Default/xfwm4/stick-toggled-active.xpm
 share/themes/Default/xfwm4/stick-toggled-inactive.png
 share/themes/Default/xfwm4/stick-toggled-inactive.xpm
+share/themes/Default/xfwm4/stick-toggled-prelight.png
+share/themes/Default/xfwm4/stick-toggled-prelight.xpm
 share/themes/Default/xfwm4/stick-toggled-pressed.png
 share/themes/Default/xfwm4/stick-toggled-pressed.xpm
 share/themes/Default/xfwm4/themerc
@@ -413,110 +554,6 @@ share/themes/Default/xfwm4/top-right-active.png
 share/themes/Default/xfwm4/top-right-active.xpm
 share/themes/Default/xfwm4/top-right-inactive.png
 share/themes/Default/xfwm4/top-right-inactive.xpm
-share/themes/Katiola/xfwm4/README
-share/themes/Katiola/xfwm4/bottom-active.png
-share/themes/Katiola/xfwm4/bottom-active.xpm
-share/themes/Katiola/xfwm4/bottom-inactive.png
-share/themes/Katiola/xfwm4/bottom-inactive.xpm
-share/themes/Katiola/xfwm4/bottom-left-active.png
-share/themes/Katiola/xfwm4/bottom-left-active.xpm
-share/themes/Katiola/xfwm4/bottom-left-inactive.png
-share/themes/Katiola/xfwm4/bottom-left-inactive.xpm
-share/themes/Katiola/xfwm4/bottom-right-active.png
-share/themes/Katiola/xfwm4/bottom-right-active.xpm
-share/themes/Katiola/xfwm4/bottom-right-inactive.png
-share/themes/Katiola/xfwm4/bottom-right-inactive.xpm
-share/themes/Katiola/xfwm4/close-active.png
-share/themes/Katiola/xfwm4/close-active.xpm
-share/themes/Katiola/xfwm4/close-inactive.png
-share/themes/Katiola/xfwm4/close-inactive.xpm
-share/themes/Katiola/xfwm4/close-pressed.png
-share/themes/Katiola/xfwm4/close-pressed.xpm
-share/themes/Katiola/xfwm4/hide-active.png
-share/themes/Katiola/xfwm4/hide-active.xpm
-share/themes/Katiola/xfwm4/hide-inactive.png
-share/themes/Katiola/xfwm4/hide-inactive.xpm
-share/themes/Katiola/xfwm4/hide-pressed.png
-share/themes/Katiola/xfwm4/hide-pressed.xpm
-share/themes/Katiola/xfwm4/left-active.png
-share/themes/Katiola/xfwm4/left-active.xpm
-share/themes/Katiola/xfwm4/left-inactive.png
-share/themes/Katiola/xfwm4/left-inactive.xpm
-share/themes/Katiola/xfwm4/maximize-active.png
-share/themes/Katiola/xfwm4/maximize-active.xpm
-share/themes/Katiola/xfwm4/maximize-inactive.png
-share/themes/Katiola/xfwm4/maximize-inactive.xpm
-share/themes/Katiola/xfwm4/maximize-pressed.png
-share/themes/Katiola/xfwm4/maximize-pressed.xpm
-share/themes/Katiola/xfwm4/maximize-toggled-active.png
-share/themes/Katiola/xfwm4/maximize-toggled-active.xpm
-share/themes/Katiola/xfwm4/maximize-toggled-inactive.png
-share/themes/Katiola/xfwm4/maximize-toggled-inactive.xpm
-share/themes/Katiola/xfwm4/maximize-toggled-pressed.png
-share/themes/Katiola/xfwm4/maximize-toggled-pressed.xpm
-share/themes/Katiola/xfwm4/menu-active.png
-share/themes/Katiola/xfwm4/menu-active.xpm
-share/themes/Katiola/xfwm4/menu-inactive.png
-share/themes/Katiola/xfwm4/menu-inactive.xpm
-share/themes/Katiola/xfwm4/menu-pressed.png
-share/themes/Katiola/xfwm4/menu-pressed.xpm
-share/themes/Katiola/xfwm4/right-active.png
-share/themes/Katiola/xfwm4/right-active.xpm
-share/themes/Katiola/xfwm4/right-inactive.png
-share/themes/Katiola/xfwm4/right-inactive.xpm
-share/themes/Katiola/xfwm4/shade-active.png
-share/themes/Katiola/xfwm4/shade-active.xpm
-share/themes/Katiola/xfwm4/shade-inactive.png
-share/themes/Katiola/xfwm4/shade-inactive.xpm
-share/themes/Katiola/xfwm4/shade-pressed.png
-share/themes/Katiola/xfwm4/shade-pressed.xpm
-share/themes/Katiola/xfwm4/shade-toggled-active.png
-share/themes/Katiola/xfwm4/shade-toggled-active.xpm
-share/themes/Katiola/xfwm4/shade-toggled-inactive.png
-share/themes/Katiola/xfwm4/shade-toggled-inactive.xpm
-share/themes/Katiola/xfwm4/shade-toggled-pressed.png
-share/themes/Katiola/xfwm4/shade-toggled-pressed.xpm
-share/themes/Katiola/xfwm4/stick-active.png
-share/themes/Katiola/xfwm4/stick-active.xpm
-share/themes/Katiola/xfwm4/stick-inactive.png
-share/themes/Katiola/xfwm4/stick-inactive.xpm
-share/themes/Katiola/xfwm4/stick-pressed.png
-share/themes/Katiola/xfwm4/stick-pressed.xpm
-share/themes/Katiola/xfwm4/stick-toggled-active.png
-share/themes/Katiola/xfwm4/stick-toggled-active.xpm
-share/themes/Katiola/xfwm4/stick-toggled-inactive.png
-share/themes/Katiola/xfwm4/stick-toggled-inactive.xpm
-share/themes/Katiola/xfwm4/stick-toggled-pressed.png
-share/themes/Katiola/xfwm4/stick-toggled-pressed.xpm
-share/themes/Katiola/xfwm4/themerc
-share/themes/Katiola/xfwm4/title-1-active.png
-share/themes/Katiola/xfwm4/title-1-active.xpm
-share/themes/Katiola/xfwm4/title-1-inactive.png
-share/themes/Katiola/xfwm4/title-1-inactive.xpm
-share/themes/Katiola/xfwm4/title-2-active.png
-share/themes/Katiola/xfwm4/title-2-active.xpm
-share/themes/Katiola/xfwm4/title-2-inactive.png
-share/themes/Katiola/xfwm4/title-2-inactive.xpm
-share/themes/Katiola/xfwm4/title-3-active.png
-share/themes/Katiola/xfwm4/title-3-active.xpm
-share/themes/Katiola/xfwm4/title-3-inactive.png
-share/themes/Katiola/xfwm4/title-3-inactive.xpm
-share/themes/Katiola/xfwm4/title-4-active.png
-share/themes/Katiola/xfwm4/title-4-active.xpm
-share/themes/Katiola/xfwm4/title-4-inactive.png
-share/themes/Katiola/xfwm4/title-4-inactive.xpm
-share/themes/Katiola/xfwm4/title-5-active.png
-share/themes/Katiola/xfwm4/title-5-active.xpm
-share/themes/Katiola/xfwm4/title-5-inactive.png
-share/themes/Katiola/xfwm4/title-5-inactive.xpm
-share/themes/Katiola/xfwm4/top-left-active.png
-share/themes/Katiola/xfwm4/top-left-active.xpm
-share/themes/Katiola/xfwm4/top-left-inactive.png
-share/themes/Katiola/xfwm4/top-left-inactive.xpm
-share/themes/Katiola/xfwm4/top-right-active.png
-share/themes/Katiola/xfwm4/top-right-active.xpm
-share/themes/Katiola/xfwm4/top-right-inactive.png
-share/themes/Katiola/xfwm4/top-right-inactive.xpm
 share/themes/Kokodi/xfwm4/README
 share/themes/Kokodi/xfwm4/bottom-active.png
 share/themes/Kokodi/xfwm4/bottom-active.xpm
@@ -534,12 +571,16 @@ share/themes/Kokodi/xfwm4/close-active.png
 share/themes/Kokodi/xfwm4/close-active.xpm
 share/themes/Kokodi/xfwm4/close-inactive.png
 share/themes/Kokodi/xfwm4/close-inactive.xpm
+share/themes/Kokodi/xfwm4/close-prelight.png
+share/themes/Kokodi/xfwm4/close-prelight.xpm
 share/themes/Kokodi/xfwm4/close-pressed.png
 share/themes/Kokodi/xfwm4/close-pressed.xpm
 share/themes/Kokodi/xfwm4/hide-active.png
 share/themes/Kokodi/xfwm4/hide-active.xpm
 share/themes/Kokodi/xfwm4/hide-inactive.png
 share/themes/Kokodi/xfwm4/hide-inactive.xpm
+share/themes/Kokodi/xfwm4/hide-prelight.png
+share/themes/Kokodi/xfwm4/hide-prelight.xpm
 share/themes/Kokodi/xfwm4/hide-pressed.png
 share/themes/Kokodi/xfwm4/hide-pressed.xpm
 share/themes/Kokodi/xfwm4/left-active.png
@@ -550,18 +591,24 @@ share/themes/Kokodi/xfwm4/maximize-active.png
 share/themes/Kokodi/xfwm4/maximize-active.xpm
 share/themes/Kokodi/xfwm4/maximize-inactive.png
 share/themes/Kokodi/xfwm4/maximize-inactive.xpm
+share/themes/Kokodi/xfwm4/maximize-prelight.png
+share/themes/Kokodi/xfwm4/maximize-prelight.xpm
 share/themes/Kokodi/xfwm4/maximize-pressed.png
 share/themes/Kokodi/xfwm4/maximize-pressed.xpm
 share/themes/Kokodi/xfwm4/maximize-toggled-active.png
 share/themes/Kokodi/xfwm4/maximize-toggled-active.xpm
 share/themes/Kokodi/xfwm4/maximize-toggled-inactive.png
 share/themes/Kokodi/xfwm4/maximize-toggled-inactive.xpm
+share/themes/Kokodi/xfwm4/maximize-toggled-prelight.png
+share/themes/Kokodi/xfwm4/maximize-toggled-prelight.xpm
 share/themes/Kokodi/xfwm4/maximize-toggled-pressed.png
 share/themes/Kokodi/xfwm4/maximize-toggled-pressed.xpm
 share/themes/Kokodi/xfwm4/menu-active.png
 share/themes/Kokodi/xfwm4/menu-active.xpm
 share/themes/Kokodi/xfwm4/menu-inactive.png
 share/themes/Kokodi/xfwm4/menu-inactive.xpm
+share/themes/Kokodi/xfwm4/menu-prelight.png
+share/themes/Kokodi/xfwm4/menu-prelight.xpm
 share/themes/Kokodi/xfwm4/menu-pressed.png
 share/themes/Kokodi/xfwm4/menu-pressed.xpm
 share/themes/Kokodi/xfwm4/right-active.png
@@ -572,24 +619,32 @@ share/themes/Kokodi/xfwm4/shade-active.png
 share/themes/Kokodi/xfwm4/shade-active.xpm
 share/themes/Kokodi/xfwm4/shade-inactive.png
 share/themes/Kokodi/xfwm4/shade-inactive.xpm
+share/themes/Kokodi/xfwm4/shade-prelight.png
+share/themes/Kokodi/xfwm4/shade-prelight.xpm
 share/themes/Kokodi/xfwm4/shade-pressed.png
 share/themes/Kokodi/xfwm4/shade-pressed.xpm
 share/themes/Kokodi/xfwm4/shade-toggled-active.png
 share/themes/Kokodi/xfwm4/shade-toggled-active.xpm
 share/themes/Kokodi/xfwm4/shade-toggled-inactive.png
 share/themes/Kokodi/xfwm4/shade-toggled-inactive.xpm
+share/themes/Kokodi/xfwm4/shade-toggled-prelight.png
+share/themes/Kokodi/xfwm4/shade-toggled-prelight.xpm
 share/themes/Kokodi/xfwm4/shade-toggled-pressed.png
 share/themes/Kokodi/xfwm4/shade-toggled-pressed.xpm
 share/themes/Kokodi/xfwm4/stick-active.png
 share/themes/Kokodi/xfwm4/stick-active.xpm
 share/themes/Kokodi/xfwm4/stick-inactive.png
 share/themes/Kokodi/xfwm4/stick-inactive.xpm
+share/themes/Kokodi/xfwm4/stick-prelight.png
+share/themes/Kokodi/xfwm4/stick-prelight.xpm
 share/themes/Kokodi/xfwm4/stick-pressed.png
 share/themes/Kokodi/xfwm4/stick-pressed.xpm
 share/themes/Kokodi/xfwm4/stick-toggled-active.png
 share/themes/Kokodi/xfwm4/stick-toggled-active.xpm
 share/themes/Kokodi/xfwm4/stick-toggled-inactive.png
 share/themes/Kokodi/xfwm4/stick-toggled-inactive.xpm
+share/themes/Kokodi/xfwm4/stick-toggled-prelight.png
+share/themes/Kokodi/xfwm4/stick-toggled-prelight.xpm
 share/themes/Kokodi/xfwm4/stick-toggled-pressed.png
 share/themes/Kokodi/xfwm4/stick-toggled-pressed.xpm
 share/themes/Kokodi/xfwm4/themerc
diff --git a/wm/xfce4-wm/buildlink3.mk b/wm/xfce4-wm/buildlink3.mk
index 2757d28b1eb..9eb1f07cd20 100644
--- a/wm/xfce4-wm/buildlink3.mk
+++ b/wm/xfce4-wm/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.26 2009/08/26 19:57:02 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.27 2009/09/16 01:15:34 reed Exp $
 
 BUILDLINK_TREE+=	xfce4-wm
 
 .if !defined(XFCE4_WM_BUILDLINK3_MK)
 XFCE4_WM_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.xfce4-wm+=	xfce4-wm>=4.4.3nb1
-BUILDLINK_ABI_DEPENDS.xfce4-wm?=	xfce4-wm>=4.4.3nb2
+BUILDLINK_API_DEPENDS.xfce4-wm+=	xfce4-wm>=4.6.0
 BUILDLINK_PKGSRCDIR.xfce4-wm?=	../../wm/xfce4-wm
 
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
-.include "../../x11/startup-notification/buildlink3.mk"
-.include "../../devel/xfce4-dev-tools/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
 .endif # XFCE4_WM_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-xfce4-wm
diff --git a/wm/xfce4-wm/distinfo b/wm/xfce4-wm/distinfo
index 2b76793829b..5625ad8cb74 100644
--- a/wm/xfce4-wm/distinfo
+++ b/wm/xfce4-wm/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.19 2008/12/17 12:50:03 hira Exp $
+$NetBSD: distinfo,v 1.20 2009/09/16 01:15:34 reed Exp $
 
-SHA1 (xfwm4-4.4.3.tar.bz2) = f8581f278d4496b03f4dc279dc7e2b9b68caf30e
-RMD160 (xfwm4-4.4.3.tar.bz2) = 794c6ebbe35ae956b253363f38a2e90fbd3980a4
-Size (xfwm4-4.4.3.tar.bz2) = 1590866 bytes
+SHA1 (xfwm4-4.6.1.tar.bz2) = 236622ffddd4618b94eaba8f402c0c48bdcef929
+RMD160 (xfwm4-4.6.1.tar.bz2) = facd0a6b6db036a066468747a757fd5f391a8f6f
+Size (xfwm4-4.6.1.tar.bz2) = 1765862 bytes