Update to 4.6.3. Changes:

- Avoid causing xfce4-session to time out on startup.
- Fix type in xfconf property name.
- Fix mnemonic widgets in accessibility dialog.
- Fix translation macros in settings helper.
- Always restore the default display scheme on startup.
- Make sure --verbose is simmilar to --debug instead of --version
- Fix compile-issue with libxklavier >= 4

4 files changed, 16 insertions, 22 deletions

diff --git a/x11/xfce4-settings/Makefile b/x11/xfce4-settings/Makefile
index 044503594d6..af783d84639 100644
--- a/x11/xfce4-settings/Makefile
+++ b/x11/xfce4-settings/Makefile
@@ -1,13 +1,17 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/09/16 01:04:02 reed Exp $
+# $NetBSD: Makefile,v 1.2 2009/11/29 22:19:07 snj Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
+XFCE4_VERSION=		4.6.3
+
 DISTNAME=		xfce4-settings-${XFCE4_VERSION}
 CATEGORIES=		x11
 COMMENT=		Xfce settings manager
 
+MASTER_SITES+=		http://archive.xfce.org/src/xfce/xfce4-settings/4.6/
+
 BUILD_DEFS+=		PKG_SYSCONFBASE
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE}
diff --git a/x11/xfce4-settings/PLIST b/x11/xfce4-settings/PLIST
index 403991e66c9..19673807eac 100644
--- a/x11/xfce4-settings/PLIST
+++ b/x11/xfce4-settings/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/09/16 01:04:02 reed Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/11/29 22:19:07 snj Exp $
 bin/xfce4-accessibility-settings
 bin/xfce4-appearance-settings
 bin/xfce4-display-settings
@@ -17,6 +17,7 @@ share/applications/xfce4-accessibility-settings.desktop
 share/applications/xfce4-settings-editor.desktop
 share/examples/xfce4/autostart/xfce4-settings-helper-autostart.desktop
 share/examples/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
+share/locale/ast/LC_MESSAGES/xfce4-settings.mo
 share/locale/ca/LC_MESSAGES/xfce4-settings.mo
 share/locale/cs/LC_MESSAGES/xfce4-settings.mo
 share/locale/da/LC_MESSAGES/xfce4-settings.mo
@@ -31,13 +32,18 @@ share/locale/hu/LC_MESSAGES/xfce4-settings.mo
 share/locale/id/LC_MESSAGES/xfce4-settings.mo
 share/locale/it/LC_MESSAGES/xfce4-settings.mo
 share/locale/ja/LC_MESSAGES/xfce4-settings.mo
+share/locale/lv/LC_MESSAGES/xfce4-settings.mo
 share/locale/nb/LC_MESSAGES/xfce4-settings.mo
 share/locale/nl/LC_MESSAGES/xfce4-settings.mo
 share/locale/pl/LC_MESSAGES/xfce4-settings.mo
 share/locale/pt/LC_MESSAGES/xfce4-settings.mo
 share/locale/pt_BR/LC_MESSAGES/xfce4-settings.mo
+share/locale/ro/LC_MESSAGES/xfce4-settings.mo
 share/locale/ru/LC_MESSAGES/xfce4-settings.mo
+share/locale/sk/LC_MESSAGES/xfce4-settings.mo
 share/locale/sv/LC_MESSAGES/xfce4-settings.mo
 share/locale/tr/LC_MESSAGES/xfce4-settings.mo
 share/locale/uk/LC_MESSAGES/xfce4-settings.mo
+share/locale/ur/LC_MESSAGES/xfce4-settings.mo
+share/locale/ur_PK/LC_MESSAGES/xfce4-settings.mo
 share/locale/zh_CN/LC_MESSAGES/xfce4-settings.mo
diff --git a/x11/xfce4-settings/distinfo b/x11/xfce4-settings/distinfo
index 0863f8ffefd..416e06c363f 100644
--- a/x11/xfce4-settings/distinfo
+++ b/x11/xfce4-settings/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/09/16 01:04:02 reed Exp $
+$NetBSD: distinfo,v 1.2 2009/11/29 22:19:07 snj Exp $
 
-SHA1 (xfce4-settings-4.6.1.tar.bz2) = ab117c3923571e2437095fd165ac4bf392e658e0
-RMD160 (xfce4-settings-4.6.1.tar.bz2) = 6ecfa08d6ad528d43988c5fe128b2fcd6db6f0d3
-Size (xfce4-settings-4.6.1.tar.bz2) = 501587 bytes
+SHA1 (xfce4-settings-4.6.3.tar.bz2) = 8a7f114ae5cab071668937351a0b3b4be1b9b51c
+RMD160 (xfce4-settings-4.6.3.tar.bz2) = 732c19f0e6258a9ea2583eddd57d4953817a206d
+Size (xfce4-settings-4.6.3.tar.bz2) = 534204 bytes
 SHA1 (patch-aa) = 104e459ab5b7bd4ac821cacada43f2aa4da23f10
 SHA1 (patch-ab) = 4f23e05cacd765b5be2e101dec29d3c6f5cd839f
-SHA1 (patch-ac) = 13f09513dbcdc13c11ac92471c34896a3c16d17c
diff --git a/x11/xfce4-settings/patches/patch-ac b/x11/xfce4-settings/patches/patch-ac
deleted file mode 100644
index 7f951438541..00000000000
--- a/x11/xfce4-settings/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2009/09/16 01:04:02 reed Exp $
-
-Needed for newer libxlavier API change
-
---- dialogs/keyboard-settings/xfce-keyboard-settings.c.orig	2009-09-15 19:42:23.000000000 -0500
-+++ dialogs/keyboard-settings/xfce-keyboard-settings.c	2009-09-15 19:41:38.000000000 -0500
-@@ -378,7 +378,7 @@
-   xkl_config_rec_get_from_server (settings->priv->xkl_rec_config, settings->priv->xkl_engine);
- 
-   settings->priv->xkl_registry = xkl_config_registry_get_instance (settings->priv->xkl_engine);
--  xkl_config_registry_load (settings->priv->xkl_registry);
-+  xkl_config_registry_load (settings->priv->xkl_registry, FALSE);
- 
-   /* Tab */
-   xkb_tab_layout_vbox = glade_xml_get_widget (settings->priv->glade_xml, "xkb_tab_layout_vbox");