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, 72 insertions, 36 deletions

diff --git a/x11/xfce4-desktop/Makefile b/x11/xfce4-desktop/Makefile
index 4246712c674..841255b2481 100644
--- a/x11/xfce4-desktop/Makefile
+++ b/x11/xfce4-desktop/Makefile
@@ -1,14 +1,12 @@
-# $NetBSD: Makefile,v 1.10 2004/10/03 00:18:39 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/01/17 12:56:13 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfdesktop-${XFCE4_VERSION}
 PKGNAME=	xfce4-desktop-${XFCE4_VERSION}
-PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	XFce4 desktop background manager
 
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
-.include "../../x11/startup-notification/buildlink3.mk"
+.include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-desktop/PLIST b/x11/xfce4-desktop/PLIST
index d78b5bb2afb..2aa8fd0114a 100644
--- a/x11/xfce4-desktop/PLIST
+++ b/x11/xfce4-desktop/PLIST
@@ -1,33 +1,21 @@
-@comment $NetBSD: PLIST,v 1.8 2004/09/22 08:10:07 jlam Exp $
-bin/xfdesktop
-etc/xfce4/menu.xml
-etc/xfce4/menu.xml.az
-etc/xfce4/menu.xml.ca
-etc/xfce4/menu.xml.de
-etc/xfce4/menu.xml.fr
-etc/xfce4/menu.xml.hu
-etc/xfce4/menu.xml.it
-etc/xfce4/menu.xml.nl
-etc/xfce4/menu.xml.ta
-etc/xfce4/menu.xml.tr
-etc/xfce4/menu.xml.vi
-etc/xfce4/menu.xml.zh_CN
-etc/xfce4/menu.xml.zh_TW
-lib/xfce4/mcs-plugins/backdrop_settings.la
-lib/xfce4/mcs-plugins/workspaces_settings.la
+@comment $NetBSD: PLIST,v 1.9 2005/01/17 12:56:13 martti Exp $
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/xfdesktop.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/xfdesktop.mo
+${PKGLOCALEDIR}/locale/be/LC_MESSAGES/xfdesktop.mo
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/xfdesktop.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/xfdesktop.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/xfdesktop.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/xfdesktop.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/xfdesktop.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/xfdesktop.mo
 ${PKGLOCALEDIR}/locale/es_MX/LC_MESSAGES/xfdesktop.mo
 ${PKGLOCALEDIR}/locale/et/LC_MESSAGES/xfdesktop.mo
 ${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/xfdesktop.mo
-${PKGLOCALEDIR}/locale/fa_IR/LC_MESSAGES/xfdesktop.mo
+${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/xfdesktop.mo
 ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/xfdesktop.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/xfdesktop.mo
+${PKGLOCALEDIR}/locale/gu/LC_MESSAGES/xfdesktop.mo
+${PKGLOCALEDIR}/locale/he/LC_MESSAGES/xfdesktop.mo
 ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/xfdesktop.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/xfdesktop.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/xfdesktop.mo
@@ -35,12 +23,15 @@ ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/xfdesktop.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/xfdesktop.mo
 ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/xfdesktop.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/xfdesktop.mo
+${PKGLOCALEDIR}/locale/nb_NO/LC_MESSAGES/xfdesktop.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/xfdesktop.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/xfdesktop.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/xfdesktop.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/xfdesktop.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/xfdesktop.mo
 ${PKGLOCALEDIR}/locale/pt_PT/LC_MESSAGES/xfdesktop.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/xfdesktop.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/xfdesktop.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/xfdesktop.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/xfdesktop.mo
 ${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/xfdesktop.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/xfdesktop.mo
@@ -48,8 +39,59 @@ ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/xfdesktop.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/xfdesktop.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/xfdesktop.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/xfdesktop.mo
+bin/xfce4-menueditor
+bin/xfdesktop
+etc/xdg/xfce4/desktop/menu.xml
+etc/xdg/xfce4/desktop/menu.xml.az
+etc/xdg/xfce4/desktop/menu.xml.ca
+etc/xdg/xfce4/desktop/menu.xml.de
+etc/xdg/xfce4/desktop/menu.xml.es
+etc/xdg/xfce4/desktop/menu.xml.et
+etc/xdg/xfce4/desktop/menu.xml.eu
+etc/xdg/xfce4/desktop/menu.xml.fa_IR
+etc/xdg/xfce4/desktop/menu.xml.fr
+etc/xdg/xfce4/desktop/menu.xml.he
+etc/xdg/xfce4/desktop/menu.xml.hu
+etc/xdg/xfce4/desktop/menu.xml.ko
+etc/xdg/xfce4/desktop/menu.xml.ms
+etc/xdg/xfce4/desktop/menu.xml.nl
+etc/xdg/xfce4/desktop/menu.xml.pt_BR
+etc/xdg/xfce4/desktop/menu.xml.ro
+etc/xdg/xfce4/desktop/menu.xml.ru
+etc/xdg/xfce4/desktop/menu.xml.sk
+etc/xdg/xfce4/desktop/menu.xml.ta
+etc/xdg/xfce4/desktop/menu.xml.tr
+etc/xdg/xfce4/desktop/menu.xml.uk
+etc/xdg/xfce4/desktop/menu.xml.vi
+etc/xdg/xfce4/desktop/menu.xml.zh_CN
+etc/xdg/xfce4/desktop/menu.xml.zh_TW
+etc/xdg/xfce4/desktop/xfce-registered-categories.xml
+etc/xdg/xfce4/desktop/xfce-registered-categories.xml.nl
+etc/xdg/xfce4/desktop/xfce-registered-categories.xml.pt_BR
+etc/xdg/xfce4/desktop/xfce-registered-categories.xml.ro
+etc/xdg/xfce4/desktop/xfce-registered-categories.xml.ru
+etc/xdg/xfce4/desktop/xfce-registered-categories.xml.zh_TW
+lib/xfce4/mcs-plugins/backdrop_settings.la
+lib/xfce4/modules/xfce4_desktop_menu.la
+lib/xfce4/panel-plugins/libdesktopmenu.la
+man/man1/xfdesktop.1
+share/applications/xfce-backdrop-settings.desktop
+share/applications/xfce-menueditor.desktop
+share/icons/hicolor/32x32/apps/xfce4-backdrop.png
+share/icons/hicolor/32x32/apps/xfce4-menueditor.png
+share/icons/hicolor/48x48/apps/xfce4-backdrop.png
+share/icons/hicolor/48x48/apps/xfce4-menueditor.png
+share/icons/hicolor/scalable/apps/xfce4-backdrop.svg
+share/icons/hicolor/scalable/apps/xfce4-menueditor.svg
+share/pixmaps/xfce4_xicon.png
+share/pixmaps/xfce4_xicon1.png
+share/pixmaps/xfce4_xicon2.png
+share/pixmaps/xfce4_xicon3.png
+share/pixmaps/xfce4_xicon4.png
 share/xfce4/backdrops/flower.png
+share/xfce4/backdrops/xfce-in-a-grid.png
 share/xfce4/backdrops/xfce-in-the-moon.png
+share/xfce4/backdrops/xfce-smoke.png
 share/xfce4/backdrops/xfce-stellar-tile.png
 share/xfce4/backdrops/xfce-stripes.png
 share/xfce4/backdrops/xfce-turbulence.png
@@ -59,14 +101,10 @@ share/xfce4/doc/C/images/root_menu.png
 share/xfce4/doc/C/images/root_menu2.png
 share/xfce4/doc/C/images/select_bg_color.png
 share/xfce4/doc/C/images/xfdesktop-background.png
+share/xfce4/doc/C/images/xfdesktop-editor.png
 share/xfce4/doc/C/images/xfdesktop-list.png
-share/xfce4/doc/C/images/xfdesktop-workspace.png
+share/xfce4/doc/C/images/xfdesktop-menu-tab.png
 share/xfce4/doc/C/xfdesktop.html
-share/xfce4/doc/fr/images/root_menu.png
-share/xfce4/doc/fr/images/root_menu2.png
-share/xfce4/doc/fr/images/select_bg_color.png
-share/xfce4/doc/fr/images/xfdesktop-background.png
-share/xfce4/doc/fr/images/xfdesktop-list.png
-share/xfce4/doc/fr/images/xfdesktop-workspace.png
-share/xfce4/doc/fr/xfdesktop.html
 @dirrm share/xfce4/backdrops
+@dirrm etc/xdg/xfce4/desktop
+@unexec ${RMDIR} %D/etc/xdg/xfce4 2>/dev/null || ${TRUE}
diff --git a/x11/xfce4-desktop/buildlink3.mk b/x11/xfce4-desktop/buildlink3.mk
index 82db0a543fe..9b860a51b79 100644
--- a/x11/xfce4-desktop/buildlink3.mk
+++ b/x11/xfce4-desktop/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_DESKTOP_BUILDLINK3_MK:=	${XFCE4_DESKTOP_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-desktop}
 BUILDLINK_PACKAGES+=	xfce4-desktop
 
 .if !empty(XFCE4_DESKTOP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-desktop+=	xfce4-desktop>=4.0.6
+BUILDLINK_DEPENDS.xfce4-desktop+=	xfce4-desktop>=4.2.0
 BUILDLINK_PKGSRCDIR.xfce4-desktop?=	../../x11/xfce4-desktop
 .endif	# XFCE4_DESKTOP_BUILDLINK3_MK
 
diff --git a/x11/xfce4-desktop/distinfo b/x11/xfce4-desktop/distinfo
index 757a1d35ef9..16f2baf62a3 100644
--- a/x11/xfce4-desktop/distinfo
+++ b/x11/xfce4-desktop/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2004/07/12 08:25:11 martti Exp $
+$NetBSD: distinfo,v 1.8 2005/01/17 12:56:13 martti Exp $
 
-SHA1 (xfdesktop-4.0.6.tar.gz) = 4ee72bb077eefa94bad604d58a0bbeb008e5522a
-Size (xfdesktop-4.0.6.tar.gz) = 2134301 bytes
+SHA1 (xfdesktop-4.2.0.tar.gz) = 25309305ec5e20db4f1537e5e36be7755b55ea1d
+Size (xfdesktop-4.2.0.tar.gz) = 2593021 bytes