update to 2.20.4

changes:
-bugfixes
-UI improvements, mostly about i18n
-honour environment variable XDG_DATA_DIRS
-translation updates

4 files changed, 10 insertions, 24 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 313e408353b..c3aa8d5a1c8 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.137 2008/03/06 14:53:56 wiz Exp $
+# $NetBSD: Makefile,v 1.138 2008/03/12 21:41:21 drochner Exp $
 #
 
-DISTNAME=	gdm-2.20.3
-PKGREVISION=	2
+DISTNAME=	gdm-2.20.4
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gdm/2.20/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index cb092c308de..31d12575268 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,15 +1,14 @@
-$NetBSD: distinfo,v 1.53 2008/01/11 13:02:33 drochner Exp $
+$NetBSD: distinfo,v 1.54 2008/03/12 21:41:21 drochner Exp $
 
-SHA1 (gdm-2.20.3.tar.bz2) = de66323b890f2e65a33bb72c5937d1c95ee5bd89
-RMD160 (gdm-2.20.3.tar.bz2) = b6aace3153a9ba7adf4ed968ede9da19c3d706cb
-Size (gdm-2.20.3.tar.bz2) = 3891861 bytes
+SHA1 (gdm-2.20.4.tar.bz2) = 2e8f4c088bfbf56aa145ac3214e8ee86683a70da
+RMD160 (gdm-2.20.4.tar.bz2) = 127b75a03192efe96785045dd8029c4ba0e91238
+Size (gdm-2.20.4.tar.bz2) = 3906797 bytes
 SHA1 (patch-aa) = a0658aa32382ae45a0d253436d2104d4501daa07
 SHA1 (patch-ab) = 43b565fcbe2e172f5e319b3d111d475646f481e0
 SHA1 (patch-ac) = 69b3539e50af0b32207b9ffeb7cb01645c9ece3c
 SHA1 (patch-ae) = c95265b55c968a0466e1ae50bbe58c121f05b027
 SHA1 (patch-ak) = 99ca1a7ce804a1ae99903860e2b923c972ae95e6
 SHA1 (patch-al) = 3b66dd3f4cdea6a3af5cbd0ff65eb02ccdead483
-SHA1 (patch-ao) = 4c493da32e94689d239209d155abba67e897c364
+SHA1 (patch-ao) = 70aead2c0452a99a1036c07f22c5641e8cdc092c
 SHA1 (patch-ap) = 2fc5050893ef7794b84a66d107b90e14c79015cc
 SHA1 (patch-aq) = 4417636865d45212a7fd9ad33d907eb8916a95b7
-SHA1 (patch-ar) = 4acfba02b237dd0185660989d14669d23d0a548e
diff --git a/x11/gdm/patches/patch-ao b/x11/gdm/patches/patch-ao
index 494f427a60d..378abf180da 100644
--- a/x11/gdm/patches/patch-ao
+++ b/x11/gdm/patches/patch-ao
@@ -1,9 +1,9 @@
-$NetBSD: patch-ao,v 1.1 2007/11/30 20:08:39 drochner Exp $
+$NetBSD: patch-ao,v 1.2 2008/03/12 21:41:21 drochner Exp $
 
---- ./daemon/slave.c.orig	2007-09-17 16:45:50.000000000 +0200
+--- ./daemon/slave.c.orig	2008-03-10 23:23:00.000000000 +0100
 +++ ./daemon/slave.c
 @@ -3694,7 +3694,7 @@ session_child_run (struct passwd *pwent,
- 				       "/usr/local/share/:/usr/share/";
+ 		char *new_system_data_dirs;
  
  		new_system_data_dirs = g_build_path (":",
 -			 old_system_data_dirs, DATADIR "/gdm/", NULL);
diff --git a/x11/gdm/patches/patch-ar b/x11/gdm/patches/patch-ar
deleted file mode 100644
index 228027149cf..00000000000
--- a/x11/gdm/patches/patch-ar
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2008/01/11 13:02:34 drochner Exp $
-
---- daemon/verify-crypt.c.orig	2008-01-08 21:21:30.000000000 +0100
-+++ daemon/verify-crypt.c
-@@ -43,6 +43,7 @@
- #include "gdm-common.h"
- #include "gdm-daemon-config.h"
- #include "gdm-socket-protocol.h"
-+#include "gdm-log.h"
- 
- static char *selected_user = NULL;
-