5 files changed, 20 insertions, 46 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 9ad24c45284..6cf516b9003 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.96 2005/12/31 12:32:48 wiz Exp $
+# $NetBSD: Makefile,v 1.97 2006/01/20 13:33:19 jmmv Exp $
 #
 
-DISTNAME=	gdm-2.8.0.5
-PKGREVISION=	3
+DISTNAME=	gdm-2.8.0.7
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gdm/2.8/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index 29d58ce217f..c78b1b96e1c 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.30 2005/10/22 22:07:32 minskim Exp $
+$NetBSD: distinfo,v 1.31 2006/01/20 13:33:19 jmmv Exp $
 
-SHA1 (gdm-2.8.0.5.tar.bz2) = e3a392d69a7715a1243ff06d5c42b38ac862da08
-RMD160 (gdm-2.8.0.5.tar.bz2) = 3ca5d2dcf00edb0bc7fc6c5a053e788beb2c7392
-Size (gdm-2.8.0.5.tar.bz2) = 2758902 bytes
+SHA1 (gdm-2.8.0.7.tar.bz2) = 8643faefc7151f38021a83c7986f08e3a4e2d1b6
+RMD160 (gdm-2.8.0.7.tar.bz2) = 1c75d83e1a0f94ec1b927491a0409ea86e12a51f
+Size (gdm-2.8.0.7.tar.bz2) = 2777760 bytes
 SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
 RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4
 Size (Daemon.README) = 2191 bytes
@@ -10,10 +10,8 @@ SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d
 RMD160 (Daemon.png) = eb317dc7ac501ee03aac1276856eee14674e3da7
 Size (Daemon.png) = 15725 bytes
 SHA1 (patch-aa) = 649f62f21f55822afb17753cacda9a4bc8873595
-SHA1 (patch-ab) = 2d1a1c07ae830630d02c0d666c0ea6ed2d006655
 SHA1 (patch-ac) = bcb4656d9467737d62b69a1dd3f3750d5607fef3
 SHA1 (patch-ad) = 4f4c4395ba6de7235069fe7ff9877381e9bc997a
 SHA1 (patch-ae) = 01288c3cff79f957fb616feeb81234e7fb7210ba
-SHA1 (patch-af) = 467afc3ee4d555fac4d5d26e49c3ff8b098e7369
+SHA1 (patch-af) = a52aff5bd9656036a205dd9d76960e3d58d33a67
 SHA1 (patch-ag) = 467552a6da5c83fcc3a37e59d1f4cd63241dee0d
-SHA1 (patch-ak) = b35c36326ce70c4840716bda948843c883876124
diff --git a/x11/gdm/patches/patch-ab b/x11/gdm/patches/patch-ab
deleted file mode 100644
index e90689eebf9..00000000000
--- a/x11/gdm/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.9 2005/10/16 21:39:11 minskim Exp $
-
---- po/bn.po.orig	2005-10-16 14:20:34.000000000 -0700
-+++ po/bn.po
-@@ -736,7 +736,6 @@ msgstr "লগআউট সংক্র�
- 
- #: daemon/gdm.c:3716 daemon/gdm.c:3771
- msgid "Set logout action request denied: Not authenticated"
--
- msgstr "লগআউট সংক্রান্ত কার্যাবলী নির্দেশের আবেদন প্রত্যাখ্যাত: পরিচয় প্রমাণিত নয়"
- 
- #: daemon/gdm.c:3816 daemon/gdm.c:3843
diff --git a/x11/gdm/patches/patch-af b/x11/gdm/patches/patch-af
index 79e22c01b00..67c32a90cd9 100644
--- a/x11/gdm/patches/patch-af
+++ b/x11/gdm/patches/patch-af
@@ -1,10 +1,10 @@
-$NetBSD: patch-af,v 1.11 2004/06/20 21:25:46 jmmv Exp $
+$NetBSD: patch-af,v 1.12 2006/01/20 13:33:19 jmmv Exp $
 
 http://bugzilla.gnome.org/show_bug.cgi?id=142338
 
---- vicious-extensions/ve-misc.c.orig	2004-05-28 21:23:01.000000000 +0200
+--- vicious-extensions/ve-misc.c.orig	2005-11-22 21:23:27.000000000 +0100
 +++ vicious-extensions/ve-misc.c
-@@ -342,110 +342,6 @@ ve_locale_exists (const char *loc)
+@@ -345,120 +345,6 @@ ve_locale_exists (const char *loc)
  	return ret;
  }
  
@@ -66,7 +66,12 @@ http://bugzilla.gnome.org/show_bug.cgi?id=142338
 -#if defined (HAVE_SETENV)
 -	unsetenv (name);
 -#else
+-
+-#ifdef HAVE__NSGETENVIRON
+-#define environ (*_NSGetEnviron())
+-#else
 -	extern char **environ;
+-#endif
 -	int i, len;
 -
 -	if (environ == NULL)
@@ -106,7 +111,12 @@ http://bugzilla.gnome.org/show_bug.cgi?id=142338
 -#ifdef HAVE_CLEARENV
 -	clearenv ();
 -#else
+-
+-#ifdef HAVE__NSGETENVIRON
+-#define environ (*_NSGetEnviron())
+-#else
 -	extern char **environ;
+-#endif
 -	if (environ != NULL)
 -		environ[0] = NULL;
 -#endif
diff --git a/x11/gdm/patches/patch-ak b/x11/gdm/patches/patch-ak
deleted file mode 100644
index e1ad3cb1576..00000000000
--- a/x11/gdm/patches/patch-ak
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2005/07/17 22:53:06 kristerw Exp $
-
---- gui/gdmchooser.c.orig	Sun Jul 17 23:43:21 2005
-+++ gui/gdmchooser.c	Sun Jul 17 23:44:59 2005
-@@ -2030,6 +2030,7 @@
-     int nextopt;
-     const char *gdm_version;
-     int i;
-+    guint sid;
- 
-     stored_argv = g_new0 (char *, argc + 1);
-     for (i = 0; i < argc; i++)
-@@ -2124,7 +2125,7 @@
-     gdm_chooser_xdmcp_init (hosts);
-     poptFreeContext (ctx);
- 
--    guint sid = g_signal_lookup ("event",
-+    sid = g_signal_lookup ("event",
- 				 GTK_TYPE_WIDGET);
-     g_signal_add_emission_hook (sid,
- 				0 /* detail */,