Updated xfce4 to 4.2.3.1

* Lots of bug fixes
* Translation updates

Official ChangeLog is available at:

http://www.xfce.org/release_notes/4.2.3.1_changelog.html

6 files changed, 43 insertions, 21 deletions

diff --git a/x11/xfce4-desktop/Makefile b/x11/xfce4-desktop/Makefile
index 9d242d581a5..8aca9555afb 100644
--- a/x11/xfce4-desktop/Makefile
+++ b/x11/xfce4-desktop/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.13 2005/08/20 19:16:22 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/11/09 06:42:59 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfdesktop-${XFCE4_VERSION}
 PKGNAME=	xfce4-desktop-${XFCE4_VERSION}
-PKGREVISION=	2
+#PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	XFce4 desktop background manager
 
@@ -13,12 +13,13 @@ USE_PKGINSTALL=		yes
 PKG_SYSCONFSUBDIR=	xdg/xfce4/desktop
 EGDIR=			${XFCE4_EGBASE}/desktop
 CONF_FILES=		${EGDIR}/menu.xml ${PKG_SYSCONFDIR}/menu.xml
-.for _l in cs da de es et fi fr he ja ko nl pt_BR ro ru sk uk vi zh_TW
+.for _l in ca cs da de el es et fi fr he hu ja ko nl pl pt_BR ro ru sk sv \
+	uk vi zh_TW
 CONF_FILES+=		${EGDIR}/menu.xml.${_l} ${PKG_SYSCONFDIR}/menu.xml.${_l}
 .endfor
 CONF_FILES+=		${EGDIR}/xfce-registered-categories.xml \
 			${PKG_SYSCONFDIR}/xfce-registered-categories.xml
-.for _l in cs eu fi hu ja nl pt_BR ro ru sk zh_CN zh_TW
+.for _l in cs eu fi he hu ja nl pl pt_BR ro ru sk sv zh_CN zh_TW
 CONF_FILES+=		${EGDIR}/xfce-registered-categories.xml.${_l} \
 			${PKG_SYSCONFDIR}/xfce-registered-categories.xml.${_l}
 .endfor
diff --git a/x11/xfce4-desktop/PLIST b/x11/xfce4-desktop/PLIST
index 8323ac70096..043e0435e6d 100644
--- a/x11/xfce4-desktop/PLIST
+++ b/x11/xfce4-desktop/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.12 2005/06/15 09:00:15 hira Exp $
+@comment $NetBSD: PLIST,v 1.13 2005/11/09 06:42:59 martti Exp $
+${PKGLOCALEDIR}/locale/af/LC_MESSAGES/xfdesktop.mo
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/xfdesktop.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/xfdesktop.mo
 ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/xfdesktop.mo
@@ -10,6 +11,7 @@ ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/xfdesktop.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/xfdesktop.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/xfdesktop.mo
 ${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/xfdesktop.mo
+${PKGLOCALEDIR}/locale/eo/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
@@ -21,9 +23,11 @@ ${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/hy/LC_MESSAGES/xfdesktop.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/xfdesktop.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/xfdesktop.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/xfdesktop.mo
+${PKGLOCALEDIR}/locale/ku/LC_MESSAGES/xfdesktop.mo
 ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/xfdesktop.mo
 ${PKGLOCALEDIR}/locale/mr/LC_MESSAGES/xfdesktop.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/xfdesktop.mo
@@ -36,6 +40,7 @@ ${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/sl/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
@@ -52,21 +57,26 @@ man/man1/xfdesktop.1
 share/applications/xfce-backdrop-settings.desktop
 share/applications/xfce-menueditor.desktop
 share/examples/xfce4/desktop/menu.xml
+share/examples/xfce4/desktop/menu.xml.ca
 share/examples/xfce4/desktop/menu.xml.cs
 share/examples/xfce4/desktop/menu.xml.da
 share/examples/xfce4/desktop/menu.xml.de
+share/examples/xfce4/desktop/menu.xml.el
 share/examples/xfce4/desktop/menu.xml.es
 share/examples/xfce4/desktop/menu.xml.et
 share/examples/xfce4/desktop/menu.xml.fi
 share/examples/xfce4/desktop/menu.xml.fr
 share/examples/xfce4/desktop/menu.xml.he
+share/examples/xfce4/desktop/menu.xml.hu
 share/examples/xfce4/desktop/menu.xml.ja
 share/examples/xfce4/desktop/menu.xml.ko
 share/examples/xfce4/desktop/menu.xml.nl
+share/examples/xfce4/desktop/menu.xml.pl
 share/examples/xfce4/desktop/menu.xml.pt_BR
 share/examples/xfce4/desktop/menu.xml.ro
 share/examples/xfce4/desktop/menu.xml.ru
 share/examples/xfce4/desktop/menu.xml.sk
+share/examples/xfce4/desktop/menu.xml.sv
 share/examples/xfce4/desktop/menu.xml.uk
 share/examples/xfce4/desktop/menu.xml.vi
 share/examples/xfce4/desktop/menu.xml.zh_TW
@@ -74,13 +84,16 @@ share/examples/xfce4/desktop/xfce-registered-categories.xml
 share/examples/xfce4/desktop/xfce-registered-categories.xml.cs
 share/examples/xfce4/desktop/xfce-registered-categories.xml.eu
 share/examples/xfce4/desktop/xfce-registered-categories.xml.fi
+share/examples/xfce4/desktop/xfce-registered-categories.xml.he
 share/examples/xfce4/desktop/xfce-registered-categories.xml.hu
 share/examples/xfce4/desktop/xfce-registered-categories.xml.ja
 share/examples/xfce4/desktop/xfce-registered-categories.xml.nl
+share/examples/xfce4/desktop/xfce-registered-categories.xml.pl
 share/examples/xfce4/desktop/xfce-registered-categories.xml.pt_BR
 share/examples/xfce4/desktop/xfce-registered-categories.xml.ro
 share/examples/xfce4/desktop/xfce-registered-categories.xml.ru
 share/examples/xfce4/desktop/xfce-registered-categories.xml.sk
+share/examples/xfce4/desktop/xfce-registered-categories.xml.sv
 share/examples/xfce4/desktop/xfce-registered-categories.xml.zh_CN
 share/examples/xfce4/desktop/xfce-registered-categories.xml.zh_TW
 share/icons/hicolor/32x32/apps/xfce4-backdrop.png
@@ -119,4 +132,12 @@ share/xfce4/doc/fr/images/xfdesktop-editor.png
 share/xfce4/doc/fr/images/xfdesktop-list.png
 share/xfce4/doc/fr/images/xfdesktop-menu-tab.png
 share/xfce4/doc/fr/xfdesktop.html
+share/xfce4/doc/he/images/root_menu.png
+share/xfce4/doc/he/images/root_menu2.png
+share/xfce4/doc/he/images/select_bg_color.png
+share/xfce4/doc/he/images/xfdesktop-background.png
+share/xfce4/doc/he/images/xfdesktop-editor.png
+share/xfce4/doc/he/images/xfdesktop-list.png
+share/xfce4/doc/he/images/xfdesktop-menu-tab.png
+share/xfce4/doc/he/xfdesktop.html
 @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 b7d8210cefe..ce8740dc067 100644
--- a/x11/xfce4-desktop/buildlink3.mk
+++ b/x11/xfce4-desktop/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2005/05/18 06:10:31 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2005/11/09 06:42:59 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.2
+BUILDLINK_DEPENDS.xfce4-desktop+=	xfce4-desktop>=4.2.3
 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 c5e6a9a8b30..86bec337152 100644
--- a/x11/xfce4-desktop/distinfo
+++ b/x11/xfce4-desktop/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.12 2005/06/15 09:00:15 hira Exp $
+$NetBSD: distinfo,v 1.13 2005/11/09 06:42:59 martti Exp $
 
-SHA1 (xfdesktop-4.2.2.tar.gz) = 5a8bd1fe4541e96f781535ea2a3b8266c3249feb
-RMD160 (xfdesktop-4.2.2.tar.gz) = f4eed52553607b3db14130e529bbe68cb0a5adf2
-Size (xfdesktop-4.2.2.tar.gz) = 2945698 bytes
-SHA1 (patch-aa) = 688161e8361ca83bc30ea71b0f15f044bdcdd045
-SHA1 (patch-ab) = 6a7d204cdafdc9535b6732ed7e6d717ba712eaab
+SHA1 (xfdesktop-4.2.3.tar.gz) = d4b1285947e6f42e6aa1b95a9e7bed645a1f596d
+RMD160 (xfdesktop-4.2.3.tar.gz) = da0adb637503f85d38651953560916ebc141b3ec
+Size (xfdesktop-4.2.3.tar.gz) = 3169283 bytes
+SHA1 (patch-aa) = a04e68bd3c504925a938dab1d97f7ab582f91e5c
+SHA1 (patch-ab) = 8c93b5e45a9d1d74e385c1402057d059b428f035
diff --git a/x11/xfce4-desktop/patches/patch-aa b/x11/xfce4-desktop/patches/patch-aa
index 8858e3bf111..725d6e4e3b6 100644
--- a/x11/xfce4-desktop/patches/patch-aa
+++ b/x11/xfce4-desktop/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1 2005/06/15 09:00:15 hira Exp $
+$NetBSD: patch-aa,v 1.2 2005/11/09 06:42:59 martti Exp $
 
---- Makefile.in.orig	2005-06-13 18:40:55.000000000 +0900
-+++ Makefile.in	2005-06-13 18:41:43.000000000 +0900
+--- Makefile.in.orig	2005-11-06 12:38:13.000000000 +0200
++++ Makefile.in	2005-11-07 08:54:08.000000000 +0200
 @@ -275,7 +275,7 @@
  
  SUBDIRS = backdrops common doc po settings src modules pixmaps \
@@ -10,4 +10,4 @@ $NetBSD: patch-aa,v 1.1 2005/06/15 09:00:15 hira Exp $
 +confdir = $(datadir)/examples/xfce4/desktop
  conf_DATA = \
  	menu.xml 							\
- 	menu.xml.cs							\
+ 	menu.xml.ca							\
diff --git a/x11/xfce4-desktop/patches/patch-ab b/x11/xfce4-desktop/patches/patch-ab
index 815ba6ff9d9..354529bdb49 100644
--- a/x11/xfce4-desktop/patches/patch-ab
+++ b/x11/xfce4-desktop/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2005/06/15 09:00:15 hira Exp $
+$NetBSD: patch-ab,v 1.2 2005/11/09 06:42:59 martti Exp $
 
---- modules/menu/Makefile.in.orig	2005-06-13 18:42:49.000000000 +0900
-+++ modules/menu/Makefile.in	2005-06-13 18:43:10.000000000 +0900
-@@ -292,7 +292,7 @@
+--- modules/menu/Makefile.in.orig	2005-11-06 12:38:12.000000000 +0200
++++ modules/menu/Makefile.in	2005-11-07 08:54:34.000000000 +0200
+@@ -290,7 +290,7 @@
  	@GMODULE_LIBS@ \
  	@LIBXFCEGUI4_LIBS@