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, 79 insertions, 188 deletions

diff --git a/x11/xfce4-panel/Makefile b/x11/xfce4-panel/Makefile
index 7718eadba1b..5be2204abea 100644
--- a/x11/xfce4-panel/Makefile
+++ b/x11/xfce4-panel/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2004/12/04 23:09:07 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/01/17 12:56:14 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce4-panel-${XFCE4_VERSION}
-PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	XFce4 panel
 
diff --git a/x11/xfce4-panel/PLIST b/x11/xfce4-panel/PLIST
index f5cf947200b..deba2e92ff0 100644
--- a/x11/xfce4-panel/PLIST
+++ b/x11/xfce4-panel/PLIST
@@ -1,45 +1,21 @@
-@comment $NetBSD: PLIST,v 1.8 2004/09/22 08:10:08 jlam Exp $
-bin/xfce4-panel
-etc/xfce4/xfce4rc
-etc/xfce4/xfce4rc.ar
-etc/xfce4/xfce4rc.az
-etc/xfce4/xfce4rc.ca
-etc/xfce4/xfce4rc.fr
-etc/xfce4/xfce4rc.hu
-etc/xfce4/xfce4rc.it
-etc/xfce4/xfce4rc.nl
-etc/xfce4/xfce4rc.vi
-include/xfce4/panel/controls.h
-include/xfce4/panel/global.h
-include/xfce4/panel/icons.h
-include/xfce4/panel/item.h
-include/xfce4/panel/item_dialog.h
-include/xfce4/panel/main.h
-include/xfce4/panel/panel.h
-include/xfce4/panel/plugins.h
-include/xfce4/panel/xfce.h
-include/xfce4/panel/xfce_support.h
-lib/pkgconfig/xfce4-panel-1.0.pc
-lib/xfce4/mcs-plugins/libxfce4settings.la
-lib/xfce4/panel-plugins/libclock.la
-lib/xfce4/panel-plugins/libmailcheck.la
-lib/xfce4/panel-plugins/libpager.la
-lib/xfce4/panel-plugins/libseparator.la
-lib/xfce4/panel-plugins/libswitcher.la
-lib/xfce4/panel-plugins/libsystembuttons.la
+@comment $NetBSD: PLIST,v 1.9 2005/01/17 12:56:14 martti Exp $
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/xfce4-panel.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/xfce4-panel.mo
+${PKGLOCALEDIR}/locale/be/LC_MESSAGES/xfce4-panel.mo
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/xfce4-panel.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/xfce4-panel.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/xfce4-panel.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/xfce4-panel.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/xfce4-panel.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/xfce4-panel.mo
 ${PKGLOCALEDIR}/locale/es_MX/LC_MESSAGES/xfce4-panel.mo
 ${PKGLOCALEDIR}/locale/et/LC_MESSAGES/xfce4-panel.mo
 ${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/xfce4-panel.mo
-${PKGLOCALEDIR}/locale/fa_IR/LC_MESSAGES/xfce4-panel.mo
+${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/xfce4-panel.mo
 ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/xfce4-panel.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/xfce4-panel.mo
+${PKGLOCALEDIR}/locale/gu/LC_MESSAGES/xfce4-panel.mo
+${PKGLOCALEDIR}/locale/he/LC_MESSAGES/xfce4-panel.mo
 ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/xfce4-panel.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/xfce4-panel.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/xfce4-panel.mo
@@ -47,19 +23,81 @@ ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/xfce4-panel.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/xfce4-panel.mo
 ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/xfce4-panel.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/xfce4-panel.mo
+${PKGLOCALEDIR}/locale/nb_NO/LC_MESSAGES/xfce4-panel.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/xfce4-panel.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/xfce4-panel.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/xfce4-panel.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/xfce4-panel.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/xfce4-panel.mo
 ${PKGLOCALEDIR}/locale/pt_PT/LC_MESSAGES/xfce4-panel.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/xfce4-panel.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/xfce4-panel.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/xfce4-panel.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/xfce4-panel.mo
 ${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/xfce4-panel.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/xfce4-panel.mo
-${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/xfce4-panel.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/xfce4-panel.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/xfce4-panel.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/xfce4-panel.mo
+bin/xfce4-panel
+etc/xdg/xfce4/panel/contents.xml
+etc/xdg/xfce4/panel/contents.xml.ar
+etc/xdg/xfce4/panel/contents.xml.az
+etc/xdg/xfce4/panel/contents.xml.ca
+etc/xdg/xfce4/panel/contents.xml.eu
+etc/xdg/xfce4/panel/contents.xml.fr
+etc/xdg/xfce4/panel/contents.xml.he
+etc/xdg/xfce4/panel/contents.xml.hu
+etc/xdg/xfce4/panel/contents.xml.it
+etc/xdg/xfce4/panel/contents.xml.ko
+etc/xdg/xfce4/panel/contents.xml.lt
+etc/xdg/xfce4/panel/contents.xml.ms
+etc/xdg/xfce4/panel/contents.xml.nl
+etc/xdg/xfce4/panel/contents.xml.ro
+etc/xdg/xfce4/panel/contents.xml.ru
+etc/xdg/xfce4/panel/contents.xml.sk
+etc/xdg/xfce4/panel/contents.xml.tr
+etc/xdg/xfce4/panel/contents.xml.vi
+etc/xdg/xfce4/panel/contents.xml.zh_TW
+include/xfce4/panel/add-control-dialog.h
+include/xfce4/panel/controls.h
+include/xfce4/panel/global.h
+include/xfce4/panel/icons.h
+include/xfce4/panel/item.h
+include/xfce4/panel/item_dialog.h
+include/xfce4/panel/main.h
+include/xfce4/panel/panel.h
+include/xfce4/panel/plugins.h
+include/xfce4/panel/xfce.h
+include/xfce4/panel/xfce_support.h
+lib/pkgconfig/xfce4-panel-1.0.pc
+lib/xfce4/mcs-plugins/libxfce4settings.la
+lib/xfce4/panel-plugins/libclock.la
+lib/xfce4/panel-plugins/libmailcheck.la
+lib/xfce4/panel-plugins/libpager.la
+lib/xfce4/panel-plugins/libseparator.la
+lib/xfce4/panel-plugins/libswitcher.la
+lib/xfce4/panel-plugins/libsystembuttons.la
+share/applications/xfce-panel-settings.desktop
+share/icons/hicolor/16x16/apps/xfce-system-exit.png
+share/icons/hicolor/16x16/apps/xfce-system-info.png
+share/icons/hicolor/16x16/apps/xfce-system-lock.png
+share/icons/hicolor/16x16/apps/xfce-system-settings.png
+share/icons/hicolor/48x48/apps/xfce-edit.png
+share/icons/hicolor/48x48/apps/xfce-filemanager.png
+share/icons/hicolor/48x48/apps/xfce-games.png
+share/icons/hicolor/48x48/apps/xfce-graphics.png
+share/icons/hicolor/48x48/apps/xfce-internet.png
+share/icons/hicolor/48x48/apps/xfce-mail.png
+share/icons/hicolor/48x48/apps/xfce-man.png
+share/icons/hicolor/48x48/apps/xfce-multimedia.png
+share/icons/hicolor/48x48/apps/xfce-printer.png
+share/icons/hicolor/48x48/apps/xfce-schedule.png
+share/icons/hicolor/48x48/apps/xfce-sound.png
+share/icons/hicolor/48x48/apps/xfce-terminal.png
+share/icons/hicolor/48x48/apps/xfce-unknown.png
+share/icons/hicolor/48x48/apps/xfce-utils.png
+share/icons/hicolor/48x48/apps/xfce4-panel.png
+share/xfce4/doc/C/images/add-item-dialog.png
 share/xfce4/doc/C/images/clock-properties.png
 share/xfce4/doc/C/images/default_panel.png
 share/xfce4/doc/C/images/handle-popup.png
@@ -68,157 +106,11 @@ share/xfce4/doc/C/images/launcher-properties.png
 share/xfce4/doc/C/images/mailcheck-properties.png
 share/xfce4/doc/C/images/menuitem-properties.png
 share/xfce4/doc/C/images/nooptions-properties.png
+share/xfce4/doc/C/images/pager-properties.png
 share/xfce4/doc/C/images/panel-settings.png
 share/xfce4/doc/C/images/systembuttons-properties.png
 share/xfce4/doc/C/xfce4-panel.html
-share/xfce4/doc/fr/images/clock-properties.png
-share/xfce4/doc/fr/images/default_panel.png
-share/xfce4/doc/fr/images/handle-popup.png
-share/xfce4/doc/fr/images/item-popup.png
-share/xfce4/doc/fr/images/launcher-properties.png
-share/xfce4/doc/fr/images/mailcheck-properties.png
-share/xfce4/doc/fr/images/menuitem-properties.png
-share/xfce4/doc/fr/images/nooptions-properties.png
-share/xfce4/doc/fr/images/panel-settings.png
-share/xfce4/doc/fr/images/systembuttons-properties.png
-share/xfce4/doc/fr/xfce4-panel.html
-share/xfce4/themes/Crystal/README
-share/xfce4/themes/Crystal/edit.png
-share/xfce4/themes/Crystal/file1.png
-share/xfce4/themes/Crystal/file2.png
-share/xfce4/themes/Crystal/games.png
-share/xfce4/themes/Crystal/man.png
-share/xfce4/themes/Crystal/miniinfo.png
-share/xfce4/themes/Crystal/minilock.png
-share/xfce4/themes/Crystal/minipalet.png
-share/xfce4/themes/Crystal/minipower.png
-share/xfce4/themes/Crystal/multimedia.png
-share/xfce4/themes/Crystal/network.png
-share/xfce4/themes/Crystal/newmail.png
-share/xfce4/themes/Crystal/nomail.png
-share/xfce4/themes/Crystal/oldmail.png
-share/xfce4/themes/Crystal/paint.png
-share/xfce4/themes/Crystal/print.png
-share/xfce4/themes/Crystal/schedule.png
-share/xfce4/themes/Crystal/sound.png
-share/xfce4/themes/Crystal/terminal.png
-share/xfce4/themes/Crystal/trash_empty.png
-share/xfce4/themes/Crystal/trash_full.png
-share/xfce4/themes/Crystal/unknown.png
-share/xfce4/themes/Curve/README
-share/xfce4/themes/Curve/edit.png
-share/xfce4/themes/Curve/file1.png
-share/xfce4/themes/Curve/file2.png
-share/xfce4/themes/Curve/games.png
-share/xfce4/themes/Curve/man.png
-share/xfce4/themes/Curve/miniinfo.png
-share/xfce4/themes/Curve/minilock.png
-share/xfce4/themes/Curve/minipalet.png
-share/xfce4/themes/Curve/minipower.png
-share/xfce4/themes/Curve/multimedia.png
-share/xfce4/themes/Curve/network.png
-share/xfce4/themes/Curve/newmail.png
-share/xfce4/themes/Curve/nomail.png
-share/xfce4/themes/Curve/oldmail.png
-share/xfce4/themes/Curve/paint.png
-share/xfce4/themes/Curve/print.png
-share/xfce4/themes/Curve/schedule.png
-share/xfce4/themes/Curve/sound.png
-share/xfce4/themes/Curve/terminal.png
-share/xfce4/themes/Curve/trash_empty.png
-share/xfce4/themes/Curve/trash_full.png
-share/xfce4/themes/Curve/unknown.png
-share/xfce4/themes/FreeIcons/README
-share/xfce4/themes/FreeIcons/edit.png
-share/xfce4/themes/FreeIcons/file1.png
-share/xfce4/themes/FreeIcons/file2.png
-share/xfce4/themes/FreeIcons/games.png
-share/xfce4/themes/FreeIcons/man.png
-share/xfce4/themes/FreeIcons/miniinfo.png
-share/xfce4/themes/FreeIcons/minilock.png
-share/xfce4/themes/FreeIcons/minipalet.png
-share/xfce4/themes/FreeIcons/minipower.png
-share/xfce4/themes/FreeIcons/multimedia.png
-share/xfce4/themes/FreeIcons/network.png
-share/xfce4/themes/FreeIcons/newmail.png
-share/xfce4/themes/FreeIcons/nomail.png
-share/xfce4/themes/FreeIcons/oldmail.png
-share/xfce4/themes/FreeIcons/paint.png
-share/xfce4/themes/FreeIcons/print.png
-share/xfce4/themes/FreeIcons/schedule.png
-share/xfce4/themes/FreeIcons/sound.png
-share/xfce4/themes/FreeIcons/terminal.png
-share/xfce4/themes/FreeIcons/unknown.png
-share/xfce4/themes/Gnome/edit.png
-share/xfce4/themes/Gnome/file1.png
-share/xfce4/themes/Gnome/file2.png
-share/xfce4/themes/Gnome/games.png
-share/xfce4/themes/Gnome/man.png
-share/xfce4/themes/Gnome/miniinfo.png
-share/xfce4/themes/Gnome/minilock.png
-share/xfce4/themes/Gnome/minipalet.png
-share/xfce4/themes/Gnome/minipower.png
-share/xfce4/themes/Gnome/multimedia.png
-share/xfce4/themes/Gnome/network.png
-share/xfce4/themes/Gnome/paint.png
-share/xfce4/themes/Gnome/print.png
-share/xfce4/themes/Gnome/schedule.png
-share/xfce4/themes/Gnome/sound.png
-share/xfce4/themes/Gnome/terminal.png
-share/xfce4/themes/Gnome/trash_empty.png
-share/xfce4/themes/Gnome/trash_full.png
-share/xfce4/themes/Gnome/unknown.png
-share/xfce4/themes/Noia/README
-share/xfce4/themes/Noia/edit.png
-share/xfce4/themes/Noia/file1.png
-share/xfce4/themes/Noia/file2.png
-share/xfce4/themes/Noia/games.png
-share/xfce4/themes/Noia/man.png
-share/xfce4/themes/Noia/miniinfo.png
-share/xfce4/themes/Noia/minilock.png
-share/xfce4/themes/Noia/minipalet.png
-share/xfce4/themes/Noia/minipower.png
-share/xfce4/themes/Noia/multimedia.png
-share/xfce4/themes/Noia/network.png
-share/xfce4/themes/Noia/newmail.png
-share/xfce4/themes/Noia/nomail.png
-share/xfce4/themes/Noia/oldmail.png
-share/xfce4/themes/Noia/paint.png
-share/xfce4/themes/Noia/print.png
-share/xfce4/themes/Noia/schedule.png
-share/xfce4/themes/Noia/sound.png
-share/xfce4/themes/Noia/terminal.png
-share/xfce4/themes/Noia/trash_empty.png
-share/xfce4/themes/Noia/trash_full.png
-share/xfce4/themes/Noia/unknown.png
-share/xfce4/themes/XFce/edit.xpm
-share/xfce4/themes/XFce/file1.xpm
-share/xfce4/themes/XFce/file2.xpm
-share/xfce4/themes/XFce/games.xpm
-share/xfce4/themes/XFce/man.xpm
-share/xfce4/themes/XFce/miniinfo.xpm
-share/xfce4/themes/XFce/minilock.xpm
-share/xfce4/themes/XFce/minipalet.xpm
-share/xfce4/themes/XFce/minipower.xpm
-share/xfce4/themes/XFce/multimedia.xpm
-share/xfce4/themes/XFce/network.xpm
-share/xfce4/themes/XFce/newmail.xpm
-share/xfce4/themes/XFce/nomail.xpm
-share/xfce4/themes/XFce/oldmail.xpm
-share/xfce4/themes/XFce/paint.xpm
-share/xfce4/themes/XFce/print.xpm
-share/xfce4/themes/XFce/schedule.xpm
-share/xfce4/themes/XFce/sound.xpm
-share/xfce4/themes/XFce/terminal.xpm
-share/xfce4/themes/XFce/trash_empty.xpm
-share/xfce4/themes/XFce/trash_full.xpm
-share/xfce4/themes/XFce/unknown.xpm
-@dirrm share/xfce4/themes/XFce
-@dirrm share/xfce4/themes/Noia
-@dirrm share/xfce4/themes/Gnome
-@dirrm share/xfce4/themes/FreeIcons
-@dirrm share/xfce4/themes/Curve
-@dirrm share/xfce4/themes/Crystal
-@dirrm share/xfce4/themes
 @dirrm lib/xfce4/panel-plugins
 @dirrm include/xfce4/panel
+@dirrm etc/xdg/xfce4/panel
+@unexec ${RMDIR} %D/etc/xdg/xfce4 2>/dev/null || ${TRUE}
diff --git a/x11/xfce4-panel/buildlink3.mk b/x11/xfce4-panel/buildlink3.mk
index 235a3e0e2c3..c0ba8b888be 100644
--- a/x11/xfce4-panel/buildlink3.mk
+++ b/x11/xfce4-panel/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:14 martti Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_PANEL_BUILDLINK3_MK:=	${XFCE4_PANEL_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-panel}
 BUILDLINK_PACKAGES+=	xfce4-panel
 
 .if !empty(XFCE4_PANEL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-panel+=		xfce4-panel>=4.0.6
+BUILDLINK_DEPENDS.xfce4-panel+=		xfce4-panel>=4.2.0
 BUILDLINK_PKGSRCDIR.xfce4-panel?=	../../x11/xfce4-panel
 .endif	# XFCE4_PANEL_BUILDLINK3_MK
 
diff --git a/x11/xfce4-panel/distinfo b/x11/xfce4-panel/distinfo
index 15fca7a63f2..d8acc610dc5 100644
--- a/x11/xfce4-panel/distinfo
+++ b/x11/xfce4-panel/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:14 martti Exp $
 
-SHA1 (xfce4-panel-4.0.6.tar.gz) = 230de7f05f9ee6e7aedb7b4c09155988f30caf11
-Size (xfce4-panel-4.0.6.tar.gz) = 1277648 bytes
+SHA1 (xfce4-panel-4.2.0.tar.gz) = d4975b117bbe8eafc27eebfe557a423398d35e76
+Size (xfce4-panel-4.2.0.tar.gz) = 871179 bytes