Updated xfce to 4.2.1.1

General:

* Don't use G_INLINE_FUNC in the source code, which fixes several weird
  build errors.

libxfce4util:

* Fix a problem with NFS mounted home directories in Solaris (#724)

xfce4-session:

* Fix RedHat shutdown code (#703)

xfdesktop:

* fix handling of quoted commands in the desktop menu (#776)
* fix handling of .desktop files with no Categories list (#776)
* add "edit menu" button to panel plugin prefs (#554), and ability to change
  the button tooltip (#764)
* fix broken panel plugin behavior when trying to track the default desktop
  menu. there's a new option to either follow the default menu, or use a
  static menu file (#778)
* fix bug where xfdesktop would crash if the windowlist was opened, then a
  window was destroyed, and then that window was selected from the list (#672)
* fix "unique" attribute of system menu inclusion

xffm:

* ensure posix.1-1996 compatibility (#695)
* fix for crash on opening fstab on solaris (#726)
* avoid a showstopper gtk-2.4 bug (scaling gdkpixbufs from svg images).
  This is bugzilla #751 report. Not all gtk showstopper bugs from svg
  can be avoided. In particular with office/mobile_phone_01.svg. This
  file will also crash rox
* allow relative paths for icon resolution (xfce4-modules)
* validate utf error messages (#737)
* don't quote paths that are already quoted.
* change smb-share icon to proper icon
* fix borked overwrite warning dialog message
* bug fixes for keyboardnavigation to close bug #795
* separate remove and paste button in toolbar to avoid confusing the
  remove confirmation dialog with the overwrite confirmation dialog
* fix translation problems in several languages, including
  brazilian-portuguese
* fill in some missing spanish translation strings
* fix for bug #524 (crashing xffm by mounting cdrom and trying to open it
  in the other treeview before mount is complete)

xfcalendar:

* remembering of its position (bug #691 and #789)
* warning box for preventing users to loose their changes (#714 and #738)
* possibility to show/hide xfcalendar in taskbar, pager and systray (#719)
* possibility to choose to either show or hide the calendar window when
  xfcalendar is launched (it remembered before the status when leaving)

xfce4-panel:

* Save configuration file only on exit
* Fix double click on inactive item in dialog (#739)
* 64bit fix
* Clock applet tweak (#716, hopefully)

xfprint:

* remove FILE backend and add a print-to-file entry in the printing dialog
* multiple bugfixes (#816, #817, #818, #820) in the BSD-LPR backend

35 files changed, 127 insertions, 92 deletions

diff --git a/x11/libxfce4gui/PLIST b/x11/libxfce4gui/PLIST
index d335033b1fd..a37188996af 100644
--- a/x11/libxfce4gui/PLIST
+++ b/x11/libxfce4gui/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.8 2005/01/17 12:56:13 martti Exp $
+@comment $NetBSD: PLIST,v 1.9 2005/03/18 07:59:09 martti Exp $
 ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/libxfcegui4.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/libxfcegui4.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/libxfcegui4.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/libxfcegui4.mo
 ${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/libxfcegui4.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/libxfcegui4.mo
@@ -11,6 +12,8 @@ ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/libxfcegui4.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/libxfcegui4.mo
 ${PKGLOCALEDIR}/locale/gu/LC_MESSAGES/libxfcegui4.mo
 ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/libxfcegui4.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/libxfcegui4.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/libxfcegui4.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/libxfcegui4.mo
 ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/libxfcegui4.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/libxfcegui4.mo
@@ -18,6 +21,7 @@ ${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/libxfcegui4.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/libxfcegui4.mo
 ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/libxfcegui4.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/libxfcegui4.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/libxfcegui4.mo
 ${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/libxfcegui4.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/libxfcegui4.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/libxfcegui4.mo
diff --git a/x11/libxfce4gui/buildlink3.mk b/x11/libxfce4gui/buildlink3.mk
index 0298ee3f342..5716bb45ee0 100644
--- a/x11/libxfce4gui/buildlink3.mk
+++ b/x11/libxfce4gui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2005/01/17 12:56:13 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2005/03/18 07:59:09 martti Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBXFCE4GUI_BUILDLINK3_MK:=	${LIBXFCE4GUI_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibxfce4gui}
 BUILDLINK_PACKAGES+=	libxfce4gui
 
 .if !empty(LIBXFCE4GUI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libxfce4gui+=		libxfce4gui>=4.2.0
+BUILDLINK_DEPENDS.libxfce4gui+=		libxfce4gui>=4.2.1
 BUILDLINK_PKGSRCDIR.libxfce4gui?=	../../x11/libxfce4gui
 .endif	# LIBXFCE4GUI_BUILDLINK3_MK
 
diff --git a/x11/libxfce4gui/distinfo b/x11/libxfce4gui/distinfo
index b1fc1cce31b..6c558e171ce 100644
--- a/x11/libxfce4gui/distinfo
+++ b/x11/libxfce4gui/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2005/02/23 17:36:17 wiz Exp $
+$NetBSD: distinfo,v 1.10 2005/03/18 07:59:09 martti Exp $
 
-SHA1 (libxfcegui4-4.2.0.tar.gz) = 89ccadf493bab68b04a38fcf9dcc3c33d9bf7617
-RMD160 (libxfcegui4-4.2.0.tar.gz) = e4590e1ebae74219202143006bbb777a6dd13e7b
-Size (libxfcegui4-4.2.0.tar.gz) = 827660 bytes
+SHA1 (libxfcegui4-4.2.1.tar.gz) = a0aa4673c04254f1f4993e6e5f3f43056073beac
+RMD160 (libxfcegui4-4.2.1.tar.gz) = d4e0b9fc295f10c0f492a5d179f7b5e6bde715ec
+Size (libxfcegui4-4.2.1.tar.gz) = 832328 bytes
diff --git a/x11/libxfce4mcs/buildlink3.mk b/x11/libxfce4mcs/buildlink3.mk
index 58cc67b529d..7ef41afcde0 100644
--- a/x11/libxfce4mcs/buildlink3.mk
+++ b/x11/libxfce4mcs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2005/01/17 12:56:13 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2005/03/18 07:59:09 martti Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBXFCE4MCS_BUILDLINK3_MK:=	${LIBXFCE4MCS_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibxfce4mcs}
 BUILDLINK_PACKAGES+=	libxfce4mcs
 
 .if !empty(LIBXFCE4MCS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libxfce4mcs+=		libxfce4mcs>=4.2.0
+BUILDLINK_DEPENDS.libxfce4mcs+=		libxfce4mcs>=4.2.1
 BUILDLINK_PKGSRCDIR.libxfce4mcs?=	../../x11/libxfce4mcs
 .endif	# LIBXFCE4MCS_BUILDLINK3_MK
 
diff --git a/x11/libxfce4mcs/distinfo b/x11/libxfce4mcs/distinfo
index 20aeef43bd7..e01cfe74ada 100644
--- a/x11/libxfce4mcs/distinfo
+++ b/x11/libxfce4mcs/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2005/02/23 17:36:17 wiz Exp $
+$NetBSD: distinfo,v 1.10 2005/03/18 07:59:09 martti Exp $
 
-SHA1 (libxfce4mcs-4.2.0.tar.gz) = f26d6d6c127b91bcb80246f07a2ba7ecc04c725b
-RMD160 (libxfce4mcs-4.2.0.tar.gz) = ea697dfba69dedc53a6a8695e7168bd641f796e5
-Size (libxfce4mcs-4.2.0.tar.gz) = 369645 bytes
+SHA1 (libxfce4mcs-4.2.1.tar.gz) = 580bcd8f9c26471f612fb30fe07dfc39962aea9b
+RMD160 (libxfce4mcs-4.2.1.tar.gz) = 693a3b94c437aef5649504dd2e916302717d4dac
+Size (libxfce4mcs-4.2.1.tar.gz) = 369471 bytes
diff --git a/x11/libxfce4util/buildlink3.mk b/x11/libxfce4util/buildlink3.mk
index 37a0a6bee41..1a3b05622e3 100644
--- a/x11/libxfce4util/buildlink3.mk
+++ b/x11/libxfce4util/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2005/01/17 12:56:13 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2005/03/18 07:59:09 martti Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBXFCE4UTIL_BUILDLINK3_MK:=	${LIBXFCE4UTIL_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibxfce4util}
 BUILDLINK_PACKAGES+=	libxfce4util
 
 .if !empty(LIBXFCE4UTIL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libxfce4util+=	libxfce4util>=4.2.0
+BUILDLINK_DEPENDS.libxfce4util+=	libxfce4util>=4.2.1
 BUILDLINK_PKGSRCDIR.libxfce4util?=	../../x11/libxfce4util
 .endif	# LIBXFCE4UTIL_BUILDLINK3_MK
 
diff --git a/x11/libxfce4util/distinfo b/x11/libxfce4util/distinfo
index 8884251c545..b25d3afc17c 100644
--- a/x11/libxfce4util/distinfo
+++ b/x11/libxfce4util/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2005/02/23 17:36:17 wiz Exp $
+$NetBSD: distinfo,v 1.10 2005/03/18 07:59:09 martti Exp $
 
-SHA1 (libxfce4util-4.2.0.tar.gz) = 011d4c73c8a6ae9b80dc30e00378768b459c85a1
-RMD160 (libxfce4util-4.2.0.tar.gz) = 3b2f86d9a6e230b586af6857a1d33cf06e93b479
-Size (libxfce4util-4.2.0.tar.gz) = 447408 bytes
+SHA1 (libxfce4util-4.2.1.tar.gz) = 895963bd507a4accf40a2127b9e3f9442953a3a7
+RMD160 (libxfce4util-4.2.1.tar.gz) = 5416db77377e4a4c7764b704e0ba4f52195db41f
+Size (libxfce4util-4.2.1.tar.gz) = 447569 bytes
diff --git a/x11/xfce4-desktop/PLIST b/x11/xfce4-desktop/PLIST
index 2aa8fd0114a..7264bb0df31 100644
--- a/x11/xfce4-desktop/PLIST
+++ b/x11/xfce4-desktop/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.9 2005/01/17 12:56:13 martti Exp $
+@comment $NetBSD: PLIST,v 1.10 2005/03/18 07:59:09 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/da/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
@@ -44,14 +45,17 @@ 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.da
 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.fi
 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.ja
 etc/xdg/xfce4/desktop/menu.xml.ko
 etc/xdg/xfce4/desktop/menu.xml.ms
 etc/xdg/xfce4/desktop/menu.xml.nl
@@ -66,10 +70,15 @@ 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.fi
+etc/xdg/xfce4/desktop/xfce-registered-categories.xml.hu
+etc/xdg/xfce4/desktop/xfce-registered-categories.xml.ja
 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.sk
+etc/xdg/xfce4/desktop/xfce-registered-categories.xml.zh_CN
 etc/xdg/xfce4/desktop/xfce-registered-categories.xml.zh_TW
 lib/xfce4/mcs-plugins/backdrop_settings.la
 lib/xfce4/modules/xfce4_desktop_menu.la
@@ -105,6 +114,6 @@ share/xfce4/doc/C/images/xfdesktop-editor.png
 share/xfce4/doc/C/images/xfdesktop-list.png
 share/xfce4/doc/C/images/xfdesktop-menu-tab.png
 share/xfce4/doc/C/xfdesktop.html
-@dirrm share/xfce4/backdrops
 @dirrm etc/xdg/xfce4/desktop
 @unexec ${RMDIR} %D/etc/xdg/xfce4 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/xfce4/backdrops 2>/dev/null || ${TRUE}
diff --git a/x11/xfce4-desktop/buildlink3.mk b/x11/xfce4-desktop/buildlink3.mk
index 9b860a51b79..56879e6a624 100644
--- a/x11/xfce4-desktop/buildlink3.mk
+++ b/x11/xfce4-desktop/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2005/01/17 12:56:13 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2005/03/18 07:59:09 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.2.0
+BUILDLINK_DEPENDS.xfce4-desktop+=	xfce4-desktop>=4.2.1
 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 11361ab9974..33fcf15eff9 100644
--- a/x11/xfce4-desktop/distinfo
+++ b/x11/xfce4-desktop/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2005/02/23 17:36:22 wiz Exp $
+$NetBSD: distinfo,v 1.10 2005/03/18 07:59:09 martti Exp $
 
-SHA1 (xfdesktop-4.2.0.tar.gz) = 25309305ec5e20db4f1537e5e36be7755b55ea1d
-RMD160 (xfdesktop-4.2.0.tar.gz) = 1b9b902f0ef5d00fe18c8fb2fbfa675cf8841cec
-Size (xfdesktop-4.2.0.tar.gz) = 2593021 bytes
+SHA1 (xfdesktop-4.2.1.tar.gz) = e4af09c213cc5ab5d712ada97196fb3b45415d90
+RMD160 (xfdesktop-4.2.1.tar.gz) = 9ffd9719299ce66474b4e2a940f8c1ff58c87d13
+Size (xfdesktop-4.2.1.tar.gz) = 2605875 bytes
diff --git a/x11/xfce4-gtk2-engines/Makefile b/x11/xfce4-gtk2-engines/Makefile
index 546f8f2cb8b..0866383317b 100644
--- a/x11/xfce4-gtk2-engines/Makefile
+++ b/x11/xfce4-gtk2-engines/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2005/01/17 12:56:13 martti Exp $
+# $NetBSD: Makefile,v 1.17 2005/03/18 07:59:09 martti Exp $
 #
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-XFCE4_VERSION=	2.2.5
+XFCE4_VERSION=	2.2.6
 
 DISTNAME=	gtk-xfce-engine-${XFCE4_VERSION}
 PKGNAME=	xfce4-gtk2-engine-${XFCE4_VERSION}
diff --git a/x11/xfce4-gtk2-engines/PLIST b/x11/xfce4-gtk2-engines/PLIST
index ecd21e704c7..b1cec271e44 100644
--- a/x11/xfce4-gtk2-engines/PLIST
+++ b/x11/xfce4-gtk2-engines/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2005/01/17 12:56:13 martti Exp $
+@comment $NetBSD: PLIST,v 1.7 2005/03/18 07:59:09 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
@@ -74,4 +74,4 @@ share/themes/Xfce/gtk-2.0/gtkrc
 @dirrm share/themes/Xfce-b5
 @dirrm share/themes/Xfce-4.0/gtk-2.0
 @dirrm share/themes/Xfce-4.0
-@unexec ${RMDIR} share/themes/Xfce 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/themes/Xfce 2>/dev/null || ${TRUE}
diff --git a/x11/xfce4-gtk2-engines/buildlink3.mk b/x11/xfce4-gtk2-engines/buildlink3.mk
index 8e5f7515c09..06d0ecb7b24 100644
--- a/x11/xfce4-gtk2-engines/buildlink3.mk
+++ b/x11/xfce4-gtk2-engines/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2005/01/17 12:56:13 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2005/03/18 07:59:09 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.2.5
+BUILDLINK_DEPENDS.xfce4-gtk2-engine+=	xfce4-gtk2-engine>=2.2.6
 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 b6382ceb9a0..a4b205364f1 100644
--- a/x11/xfce4-gtk2-engines/distinfo
+++ b/x11/xfce4-gtk2-engines/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.10 2005/02/23 17:36:22 wiz Exp $
+$NetBSD: distinfo,v 1.11 2005/03/18 07:59:09 martti Exp $
 
-SHA1 (gtk-xfce-engine-2.2.5.tar.gz) = 979cd98f8a06ef8c49379f5c1d0ac089f4424bdd
-RMD160 (gtk-xfce-engine-2.2.5.tar.gz) = 6d6449bdaa0363d01358aa89d19b8193e53e68c7
-Size (gtk-xfce-engine-2.2.5.tar.gz) = 373900 bytes
+SHA1 (gtk-xfce-engine-2.2.6.tar.gz) = a8163b01ab0cd6e0b5e5c8699df2752082a159c4
+RMD160 (gtk-xfce-engine-2.2.6.tar.gz) = 57b256dd20052f55e5b4b0b64bc0e343d42ce770
+Size (gtk-xfce-engine-2.2.6.tar.gz) = 377656 bytes
diff --git a/x11/xfce4-mcs-manager/PLIST b/x11/xfce4-mcs-manager/PLIST
index ce0b59eed64..d8210ccb2ed 100644
--- a/x11/xfce4-mcs-manager/PLIST
+++ b/x11/xfce4-mcs-manager/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.9 2005/01/18 08:19:48 martti Exp $
+@comment $NetBSD: PLIST,v 1.10 2005/03/18 07:59:09 martti Exp $
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/xfce-mcs-manager.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/xfce-mcs-manager.mo
 ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/xfce-mcs-manager.mo
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/xfce-mcs-manager.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/xfce-mcs-manager.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/xfce-mcs-manager.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/xfce-mcs-manager.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/xfce-mcs-manager.mo
 ${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/xfce-mcs-manager.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/xfce-mcs-manager.mo
diff --git a/x11/xfce4-mcs-manager/buildlink3.mk b/x11/xfce4-mcs-manager/buildlink3.mk
index d7008ed2daf..55196753561 100644
--- a/x11/xfce4-mcs-manager/buildlink3.mk
+++ b/x11/xfce4-mcs-manager/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2005/01/17 12:56:13 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2005/03/18 07:59:09 martti Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_MCS_MANAGER_BUILDLINK3_MK:=	${XFCE4_MCS_MANAGER_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-mcs-manager}
 BUILDLINK_PACKAGES+=	xfce4-mcs-manager
 
 .if !empty(XFCE4_MCS_MANAGER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-mcs-manager+=	xfce4-mcs-manager>=4.2.0
+BUILDLINK_DEPENDS.xfce4-mcs-manager+=	xfce4-mcs-manager>=4.2.1
 BUILDLINK_PKGSRCDIR.xfce4-mcs-manager?=	../../x11/xfce4-mcs-manager
 .endif	# XFCE4_MCS_MANAGER_BUILDLINK3_MK
 
diff --git a/x11/xfce4-mcs-manager/distinfo b/x11/xfce4-mcs-manager/distinfo
index 6bf2b35ff64..0ee50ce4164 100644
--- a/x11/xfce4-mcs-manager/distinfo
+++ b/x11/xfce4-mcs-manager/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2005/02/23 17:36:22 wiz Exp $
+$NetBSD: distinfo,v 1.10 2005/03/18 07:59:09 martti Exp $
 
-SHA1 (xfce-mcs-manager-4.2.0.tar.gz) = 7a5bde436dee811c970dacba6b14b01e7ebddee0
-RMD160 (xfce-mcs-manager-4.2.0.tar.gz) = e53cd2f5694bac2b4c2935797a8e24b33b2f1186
-Size (xfce-mcs-manager-4.2.0.tar.gz) = 503492 bytes
+SHA1 (xfce-mcs-manager-4.2.1.tar.gz) = d6e3fa2ed0dd82e006f56b84a38adce27bd251e8
+RMD160 (xfce-mcs-manager-4.2.1.tar.gz) = 9f4e0665680ee50cb1f527b0743e3da51d46ae84
+Size (xfce-mcs-manager-4.2.1.tar.gz) = 503481 bytes
diff --git a/x11/xfce4-mcs-plugins/buildlink3.mk b/x11/xfce4-mcs-plugins/buildlink3.mk
index dba40ff604b..554d8ba51f1 100644
--- a/x11/xfce4-mcs-plugins/buildlink3.mk
+++ b/x11/xfce4-mcs-plugins/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2005/01/17 12:56:13 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2005/03/18 07:59:09 martti Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_MCS_PLUGINS_BUILDLINK3_MK:=	${XFCE4_MCS_PLUGINS_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-mcs-plugins}
 BUILDLINK_PACKAGES+=	xfce4-mcs-plugins
 
 .if !empty(XFCE4_MCS_PLUGINS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-mcs-plugins+=	xfce4-mcs-plugins>=4.2.0
+BUILDLINK_DEPENDS.xfce4-mcs-plugins+=	xfce4-mcs-plugins>=4.2.1
 BUILDLINK_PKGSRCDIR.xfce4-mcs-plugins?=	../../x11/xfce4-mcs-plugins
 .endif	# XFCE4_MCS_PLUGINS_BUILDLINK3_MK
 
diff --git a/x11/xfce4-mcs-plugins/distinfo b/x11/xfce4-mcs-plugins/distinfo
index a84e61f6f01..987cc6fcf82 100644
--- a/x11/xfce4-mcs-plugins/distinfo
+++ b/x11/xfce4-mcs-plugins/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2005/02/23 17:36:22 wiz Exp $
+$NetBSD: distinfo,v 1.10 2005/03/18 07:59:09 martti Exp $
 
-SHA1 (xfce-mcs-plugins-4.2.0.tar.gz) = 896701b1c8746dbbe1035386d8d19b6268d12f73
-RMD160 (xfce-mcs-plugins-4.2.0.tar.gz) = 64fda434f7804f286058bbb0c3736719a5901d15
-Size (xfce-mcs-plugins-4.2.0.tar.gz) = 661118 bytes
+SHA1 (xfce-mcs-plugins-4.2.1.tar.gz) = 6ebfc5838f03a55ba18a8461bfc38cd5e4a07ed0
+RMD160 (xfce-mcs-plugins-4.2.1.tar.gz) = febaf3d83a4ab15708d955e7c5b77caa4c7f14cb
+Size (xfce-mcs-plugins-4.2.1.tar.gz) = 662653 bytes
diff --git a/x11/xfce4-panel/Makefile b/x11/xfce4-panel/Makefile
index 5be2204abea..56807a1de3d 100644
--- a/x11/xfce4-panel/Makefile
+++ b/x11/xfce4-panel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/01/17 12:56:14 martti Exp $
+# $NetBSD: Makefile,v 1.15 2005/03/18 07:59:09 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -6,6 +6,8 @@ DISTNAME=	xfce4-panel-${XFCE4_VERSION}
 CATEGORIES=	x11
 COMMENT=	XFce4 panel
 
+XFCE4_VERSION=	4.2.1.1
+
 PKGCONFIG_OVERRIDE=	panel/xfce4-panel-1.0.pc.in
 PTHREAD_AUTO_VARS=	yes
 
diff --git a/x11/xfce4-panel/PLIST b/x11/xfce4-panel/PLIST
index deba2e92ff0..37cdaad1453 100644
--- a/x11/xfce4-panel/PLIST
+++ b/x11/xfce4-panel/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.9 2005/01/17 12:56:14 martti Exp $
+@comment $NetBSD: PLIST,v 1.10 2005/03/18 07:59:09 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/da/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
@@ -43,11 +44,14 @@ 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.da
 etc/xdg/xfce4/panel/contents.xml.eu
+etc/xdg/xfce4/panel/contents.xml.fi
 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.ja
 etc/xdg/xfce4/panel/contents.xml.ko
 etc/xdg/xfce4/panel/contents.xml.lt
 etc/xdg/xfce4/panel/contents.xml.ms
@@ -57,6 +61,7 @@ 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_CN
 etc/xdg/xfce4/panel/contents.xml.zh_TW
 include/xfce4/panel/add-control-dialog.h
 include/xfce4/panel/controls.h
diff --git a/x11/xfce4-panel/buildlink3.mk b/x11/xfce4-panel/buildlink3.mk
index c0ba8b888be..36a8f535049 100644
--- a/x11/xfce4-panel/buildlink3.mk
+++ b/x11/xfce4-panel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2005/01/17 12:56:14 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2005/03/18 07:59:09 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.2.0
+BUILDLINK_DEPENDS.xfce4-panel+=		xfce4-panel>=4.2.1.1
 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 96d4f491b0a..a857de6ffd5 100644
--- a/x11/xfce4-panel/distinfo
+++ b/x11/xfce4-panel/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2005/02/23 17:36:22 wiz Exp $
+$NetBSD: distinfo,v 1.10 2005/03/18 07:59:09 martti Exp $
 
-SHA1 (xfce4-panel-4.2.0.tar.gz) = d4975b117bbe8eafc27eebfe557a423398d35e76
-RMD160 (xfce4-panel-4.2.0.tar.gz) = 6f3e2e9c6ab28255a72a904c2bcb900853282004
-Size (xfce4-panel-4.2.0.tar.gz) = 871179 bytes
+SHA1 (xfce4-panel-4.2.1.1.tar.gz) = 63db0319212eb58e24ef6d4d812febbcc0fd376a
+RMD160 (xfce4-panel-4.2.1.1.tar.gz) = 51996ed497dbc55c73745dad074a6fe24f1b49f0
+Size (xfce4-panel-4.2.1.1.tar.gz) = 836191 bytes
diff --git a/x11/xfce4-session/PLIST b/x11/xfce4-session/PLIST
index 4a7cb8b7bdb..1f9ca048560 100644
--- a/x11/xfce4-session/PLIST
+++ b/x11/xfce4-session/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/01/17 12:52:48 martti Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/03/18 07:59:09 martti Exp $
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/xfce4-session.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/xfce4-session.mo
 ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/xfce4-session.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/xfce4-session.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/xfce4-session.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/xfce4-session.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/xfce4-session.mo
 ${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/xfce4-session.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/xfce4-session.mo
@@ -73,12 +74,12 @@ share/xfce4/doc/C/images/xfsm-general.png
 share/xfce4/doc/C/images/xfsm-splash.png
 share/xfce4/doc/C/xfce4-session.html
 @dirrm share/themes/Default/balou
-@dirrm share/icons/hicolor/72x72/apps
-@dirrm share/icons/hicolor/72x72
-@dirrm share/icons/hicolor/64x64/apps
-@dirrm share/icons/hicolor/64x64
-@dirrm share/icons/hicolor/128x128/apps
-@dirrm share/icons/hicolor/128x128
+@unexec ${RMDIR} %D/share/icons/hicolor/72x72/apps 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/icons/hicolor/72x72 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/icons/hicolor/64x64/apps 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/icons/hicolor/64x64 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/icons/hicolor/128x128/apps 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/icons/hicolor/128x128 2>/dev/null || ${TRUE}
 @dirrm lib/xfce4/splash/engines
 @dirrm lib/xfce4/splash
 @dirrm include/xfce4/xfce4-session-4.2/libxfsm
diff --git a/x11/xfce4-session/buildlink3.mk b/x11/xfce4-session/buildlink3.mk
index d0af072e8fb..b2fc4aeea1f 100644
--- a/x11/xfce4-session/buildlink3.mk
+++ b/x11/xfce4-session/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/01/17 12:52:48 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2005/03/18 07:59:09 martti Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_SESSION_BUILDLINK3_MK:=	${XFCE4_SESSION_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-session}
 BUILDLINK_PACKAGES+=	xfce4-session
 
 .if !empty(XFCE4_SESSION_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-session+=	xfce4-session>=4.2.0
+BUILDLINK_DEPENDS.xfce4-session+=	xfce4-session>=4.2.1
 BUILDLINK_PKGSRCDIR.xfce4-session?=	../../x11/xfce4-session
 .endif	# XFCE4_SESSION_BUILDLINK3_MK
 
diff --git a/x11/xfce4-session/distinfo b/x11/xfce4-session/distinfo
index 8caad0815de..e40c7ef9097 100644
--- a/x11/xfce4-session/distinfo
+++ b/x11/xfce4-session/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 17:36:23 wiz Exp $
+$NetBSD: distinfo,v 1.3 2005/03/18 07:59:09 martti Exp $
 
-SHA1 (xfce4-session-4.2.0.tar.gz) = a5cc814980161000ebb8e9a084759f0bbe98c25c
-RMD160 (xfce4-session-4.2.0.tar.gz) = 22e4c0abcf480fb4e307c56fe3e2ff76de65c9eb
-Size (xfce4-session-4.2.0.tar.gz) = 1306201 bytes
+SHA1 (xfce4-session-4.2.1.tar.gz) = 344d107672a06d1a58ac7d41c08ec9fce9203e49
+RMD160 (xfce4-session-4.2.1.tar.gz) = ad78f5caa5567c24fcf9b3ab17078362dc00634b
+Size (xfce4-session-4.2.1.tar.gz) = 1316467 bytes
diff --git a/x11/xfce4-toys/PLIST b/x11/xfce4-toys/PLIST
index a47382090d6..f0708493c60 100644
--- a/x11/xfce4-toys/PLIST
+++ b/x11/xfce4-toys/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.9 2005/01/17 12:56:14 martti Exp $
+@comment $NetBSD: PLIST,v 1.10 2005/03/18 07:59:10 martti Exp $
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/xfce4-toys.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/xfce4-toys.mo
 ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/xfce4-toys.mo
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/xfce4-toys.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/xfce4-toys.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/xfce4-toys.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/xfce4-toys.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/xfce4-toys.mo
 ${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/xfce4-toys.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/xfce4-toys.mo
diff --git a/x11/xfce4-toys/buildlink3.mk b/x11/xfce4-toys/buildlink3.mk
index a657b032508..b945a157e5d 100644
--- a/x11/xfce4-toys/buildlink3.mk
+++ b/x11/xfce4-toys/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2005/01/17 12:56:14 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2005/03/18 07:59:10 martti Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_TOYS_BUILDLINK3_MK:=	${XFCE4_TOYS_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-toys}
 BUILDLINK_PACKAGES+=	xfce4-toys
 
 .if !empty(XFCE4_TOYS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-toys+=		xfce4-toys>=4.2.0
+BUILDLINK_DEPENDS.xfce4-toys+=		xfce4-toys>=4.2.1
 BUILDLINK_PKGSRCDIR.xfce4-toys?=	../../x11/xfce4-toys
 .endif	# XFCE4_TOYS_BUILDLINK3_MK
 
diff --git a/x11/xfce4-toys/distinfo b/x11/xfce4-toys/distinfo
index b35877faa1b..80400b36d40 100644
--- a/x11/xfce4-toys/distinfo
+++ b/x11/xfce4-toys/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2005/02/23 17:36:23 wiz Exp $
+$NetBSD: distinfo,v 1.10 2005/03/18 07:59:10 martti Exp $
 
-SHA1 (xfce4-toys-4.2.0.tar.gz) = cfbd42ae8f7b0f6e38ccec6a771961eafd0df8f2
-RMD160 (xfce4-toys-4.2.0.tar.gz) = 081f578dd8b2dc524ca4ee11e0ca799d184fc65b
-Size (xfce4-toys-4.2.0.tar.gz) = 403655 bytes
+SHA1 (xfce4-toys-4.2.1.tar.gz) = ece57ee74eecc9c39e16b315ed02a3b49f56fd2b
+RMD160 (xfce4-toys-4.2.1.tar.gz) = ac81dd73096552d383e732024e3a49cd9d3d01ce
+Size (xfce4-toys-4.2.1.tar.gz) = 403562 bytes
diff --git a/x11/xfce4-trigger-launcher/PLIST b/x11/xfce4-trigger-launcher/PLIST
index 014448a8dea..dda2003e55a 100644
--- a/x11/xfce4-trigger-launcher/PLIST
+++ b/x11/xfce4-trigger-launcher/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.9 2005/01/17 12:56:14 martti Exp $
+@comment $NetBSD: PLIST,v 1.10 2005/03/18 07:59:10 martti Exp $
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/xfce4-trigger-launcher.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/xfce4-trigger-launcher.mo
 ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/xfce4-trigger-launcher.mo
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/xfce4-trigger-launcher.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/xfce4-trigger-launcher.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/xfce4-trigger-launcher.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/xfce4-trigger-launcher.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/xfce4-trigger-launcher.mo
 ${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/xfce4-trigger-launcher.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/xfce4-trigger-launcher.mo
diff --git a/x11/xfce4-trigger-launcher/buildlink3.mk b/x11/xfce4-trigger-launcher/buildlink3.mk
index 4b3c91fb1eb..b38fda3b34a 100644
--- a/x11/xfce4-trigger-launcher/buildlink3.mk
+++ b/x11/xfce4-trigger-launcher/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2005/01/17 12:56:14 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2005/03/18 07:59:10 martti Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK:=	${XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-trigger-launcher}
 BUILDLINK_PACKAGES+=	xfce4-trigger-launcher
 
 .if !empty(XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-trigger-launcher+=	xfce4-trigger-launcher>=4.2.0
+BUILDLINK_DEPENDS.xfce4-trigger-launcher+=	xfce4-trigger-launcher>=4.2.1
 BUILDLINK_PKGSRCDIR.xfce4-trigger-launcher?=	../../x11/xfce4-trigger-launcher
 .endif	# XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK
 
diff --git a/x11/xfce4-trigger-launcher/distinfo b/x11/xfce4-trigger-launcher/distinfo
index 57f36468b5c..a7f7e28e2d0 100644
--- a/x11/xfce4-trigger-launcher/distinfo
+++ b/x11/xfce4-trigger-launcher/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2005/02/23 17:36:23 wiz Exp $
+$NetBSD: distinfo,v 1.10 2005/03/18 07:59:10 martti Exp $
 
-SHA1 (xfce4-trigger-launcher-4.2.0.tar.gz) = a732c7ea0b52cc8400cb1fa38de5a6c12accbe6d
-RMD160 (xfce4-trigger-launcher-4.2.0.tar.gz) = 5a198ef5dd686353058eeb0d097dcdabec032809
-Size (xfce4-trigger-launcher-4.2.0.tar.gz) = 345902 bytes
+SHA1 (xfce4-trigger-launcher-4.2.1.tar.gz) = 51bcb6260d5aa37dd29ae0aa11dd9043fc345141
+RMD160 (xfce4-trigger-launcher-4.2.1.tar.gz) = f5660a0bfef8f3610c41d5f75a0f25eae19c550e
+Size (xfce4-trigger-launcher-4.2.1.tar.gz) = 345483 bytes
diff --git a/x11/xfce4-utils/PLIST b/x11/xfce4-utils/PLIST
index 7c01bc022ed..8114bc9458e 100644
--- a/x11/xfce4-utils/PLIST
+++ b/x11/xfce4-utils/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.9 2005/01/17 12:56:14 martti Exp $
+@comment $NetBSD: PLIST,v 1.10 2005/03/18 07:59:10 martti Exp $
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/xfce-utils.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/xfce-utils.mo
 ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/xfce-utils.mo
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/xfce-utils.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/xfce-utils.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/xfce-utils.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/xfce-utils.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/xfce-utils.mo
 ${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/xfce-utils.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/xfce-utils.mo
@@ -59,18 +60,24 @@ share/xfce4/AUTHORS.de
 share/xfce4/AUTHORS.es
 share/xfce4/AUTHORS.fr
 share/xfce4/AUTHORS.he
+share/xfce4/AUTHORS.ja
 share/xfce4/AUTHORS.html
 share/xfce4/AUTHORS.html.az
 share/xfce4/AUTHORS.html.ca
 share/xfce4/AUTHORS.html.de
 share/xfce4/AUTHORS.html.es
+share/xfce4/AUTHORS.html.eu
+share/xfce4/AUTHORS.html.fi
 share/xfce4/AUTHORS.html.fr
 share/xfce4/AUTHORS.html.it
+share/xfce4/AUTHORS.html.ja
 share/xfce4/AUTHORS.html.lt
 share/xfce4/AUTHORS.html.ro
 share/xfce4/AUTHORS.html.ru
 share/xfce4/AUTHORS.html.sk
 share/xfce4/AUTHORS.html.vi
+share/xfce4/AUTHORS.eu
+share/xfce4/AUTHORS.fi
 share/xfce4/AUTHORS.it
 share/xfce4/AUTHORS.lt
 share/xfce4/AUTHORS.ro
@@ -93,12 +100,16 @@ share/xfce4/INFO.html
 share/xfce4/INFO.html.ca
 share/xfce4/INFO.html.de
 share/xfce4/INFO.html.es
+share/xfce4/INFO.html.fi
 share/xfce4/INFO.html.fr
 share/xfce4/INFO.html.it
+share/xfce4/INFO.html.ja
 share/xfce4/INFO.html.lt
 share/xfce4/INFO.html.ro
 share/xfce4/INFO.html.ru
+share/xfce4/INFO.fi
 share/xfce4/INFO.it
+share/xfce4/INFO.ja
 share/xfce4/INFO.lt
 share/xfce4/INFO.ro
 share/xfce4/INFO.ru
diff --git a/x11/xfce4-utils/buildlink3.mk b/x11/xfce4-utils/buildlink3.mk
index f02b0a27737..bdac1057517 100644
--- a/x11/xfce4-utils/buildlink3.mk
+++ b/x11/xfce4-utils/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2005/01/17 12:56:14 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2005/03/18 07:59:10 martti Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_UTILS_BUILDLINK3_MK:=	${XFCE4_UTILS_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-utils}
 BUILDLINK_PACKAGES+=	xfce4-utils
 
 .if !empty(XFCE4_UTILS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-utils+=		xfce4-utils>=4.2.0
+BUILDLINK_DEPENDS.xfce4-utils+=		xfce4-utils>=4.2.1
 BUILDLINK_PKGSRCDIR.xfce4-utils?=	../../x11/xfce4-utils
 .endif	# XFCE4_UTILS_BUILDLINK3_MK
 
diff --git a/x11/xfce4-utils/distinfo b/x11/xfce4-utils/distinfo
index 3ea912bcbbf..0c4b55ad5ba 100644
--- a/x11/xfce4-utils/distinfo
+++ b/x11/xfce4-utils/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2005/02/23 17:36:23 wiz Exp $
+$NetBSD: distinfo,v 1.10 2005/03/18 07:59:10 martti Exp $
 
-SHA1 (xfce-utils-4.2.0.tar.gz) = bbcf8b5d4e816caf4fd6ae0bd24e32a0e117dbd0
-RMD160 (xfce-utils-4.2.0.tar.gz) = 42591d252740248bf9ea1c0effa2ca205f750846
-Size (xfce-utils-4.2.0.tar.gz) = 740252 bytes
+SHA1 (xfce-utils-4.2.1.tar.gz) = 9b8aee6a2507fef0faeb77e5d62f07d7fe8abdb1
+RMD160 (xfce-utils-4.2.1.tar.gz) = f5f34db3aa6ed8dd29f771daee5dedd8df90c6c2
+Size (xfce-utils-4.2.1.tar.gz) = 748056 bytes