update to 2.14.9

changes:
- Backporting some useful features from 2.15 to 2.14.   Per-display
  configuration and new gdmgreeter theming options
-bugfixes
-Better configure support for FreeBSD
-Translation updates
-Added gestures to the AccessKeyMouseEvents configuration file

4 files changed, 20 insertions, 20 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index c6eef62e2a8..d9cef9eb708 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.115 2006/07/05 05:37:46 jlam Exp $
+# $NetBSD: Makefile,v 1.116 2006/07/26 12:36:12 drochner Exp $
 #
 
-DISTNAME=	gdm-2.14.5
-PKGREVISION=    1
+DISTNAME=	gdm-2.14.9
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gdm/2.14/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index 7825d3a960f..496e0724a1e 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.39 2006/05/20 17:26:15 joerg Exp $
+$NetBSD: distinfo,v 1.40 2006/07/26 12:36:12 drochner Exp $
 
-SHA1 (gdm-2.14.5.tar.bz2) = 00757ebfb29f67ffb2c7d01121ab95432c7f898e
-RMD160 (gdm-2.14.5.tar.bz2) = 17aceb6eaed470efff4acb95acdd4fe702c6c3df
-Size (gdm-2.14.5.tar.bz2) = 3041754 bytes
+SHA1 (gdm-2.14.9.tar.bz2) = 264eaa09874a930c4080f903f43631dbf621e111
+RMD160 (gdm-2.14.9.tar.bz2) = f043ed11a8b174556b114e52dc50daa5432e68bb
+Size (gdm-2.14.9.tar.bz2) = 3046665 bytes
 SHA1 (patch-aa) = 2b7112cd5670f99b261765f47a6b70b73c0f42a0
-SHA1 (patch-ab) = b5dde01828ce7289e53af319c92532b1231ca593
+SHA1 (patch-ab) = b151843608e3418962dfcbfd454cf0ba8aac39e0
 SHA1 (patch-ac) = 69b3539e50af0b32207b9ffeb7cb01645c9ece3c
-SHA1 (patch-ae) = 87f26d19ec42eacef853df1b0cf680dae102d3fd
+SHA1 (patch-ae) = 9f159a277f9526ca3c2085b45b76d0449eeb2a69
 SHA1 (patch-ak) = e3eaf2dfa1e393f9808d22fe4384710a46a83afc
diff --git a/x11/gdm/patches/patch-ab b/x11/gdm/patches/patch-ab
index f4c23eb56a0..ddae0fd6b4d 100644
--- a/x11/gdm/patches/patch-ab
+++ b/x11/gdm/patches/patch-ab
@@ -1,12 +1,13 @@
-$NetBSD: patch-ab,v 1.15 2006/05/20 17:26:16 joerg Exp $
+$NetBSD: patch-ab,v 1.16 2006/07/26 12:36:12 drochner Exp $
 
---- daemon/gdmconfig.c.orig	2006-05-20 16:43:50.000000000 +0000
+--- daemon/gdmconfig.c.orig	2006-05-12 07:58:21.000000000 +0200
 +++ daemon/gdmconfig.c
-@@ -38,6 +38,7 @@
+@@ -38,7 +38,7 @@
  #include <ctype.h>
  #include <fcntl.h>
  #include <sys/types.h>
+-#include <sys/resource.h>
 +#include <sys/time.h>
- #include <sys/resource.h>
  #include <sys/stat.h>
+ #include <sys/resource.h>
  #include <signal.h>
diff --git a/x11/gdm/patches/patch-ae b/x11/gdm/patches/patch-ae
index abe8727e54a..e29e3c83f04 100644
--- a/x11/gdm/patches/patch-ae
+++ b/x11/gdm/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.11 2006/05/01 09:50:25 jmmv Exp $
+$NetBSD: patch-ae,v 1.12 2006/07/26 12:36:12 drochner Exp $
 
---- config/Makefile.in.orig	2006-04-14 22:49:13.000000000 +0200
+--- config/Makefile.in.orig	2006-05-23 21:33:18.000000000 +0200
 +++ config/Makefile.in
-@@ -569,10 +569,6 @@ install-data-hook: gdm.conf gdm.conf-cus
+@@ -565,10 +565,6 @@ install-data-hook: gdm.conf gdm.conf-cus
  		$(mkinstalldirs) $(DESTDIR)$(confdir); \
  		chmod 755 $(DESTDIR)$(confdir); \
  	fi
@@ -13,7 +13,7 @@ $NetBSD: patch-ae,v 1.11 2006/05/01 09:50:25 jmmv Exp $
  	if test '!' -d `dirname $(DESTDIR)$(GDM_DEFAULTS_CONF)`; then \
  		$(mkinstalldirs) `dirname $(DESTDIR)$(GDM_DEFAULTS_CONF)`; \
  		chmod 755 `dirname $(DESTDIR)$(GDM_DEFAULTS_CONF)`; \
-@@ -601,10 +597,7 @@ install-data-hook: gdm.conf gdm.conf-cus
+@@ -597,10 +593,7 @@ install-data-hook: gdm.conf gdm.conf-cus
  	$(INSTALL_SCRIPT) $(srcdir)/XKeepsCrashing $(DESTDIR)$(confdir)/XKeepsCrashing
  	$(INSTALL_SCRIPT) Xsession $(DESTDIR)$(confdir)/Xsession
  
@@ -25,20 +25,20 @@ $NetBSD: patch-ae,v 1.11 2006/05/01 09:50:25 jmmv Exp $
  
  	if test '!' -d $(DESTDIR)$(bisessdir); then \
  		$(mkinstalldirs) $(DESTDIR)$(bisessdir); \
-@@ -682,20 +675,8 @@ install-data-hook: gdm.conf gdm.conf-cus
+@@ -678,20 +671,8 @@ install-data-hook: gdm.conf gdm.conf-cus
  		chmod 755 $(DESTDIR)$(gnomercdir); \
  	fi
  
 -	if test '!' -d $(DESTDIR)$(logdir); then \
 -		$(mkinstalldirs) $(DESTDIR)$(logdir); \
--		chown root:root $(DESTDIR)$(logdir); \
 -		chmod 755 $(DESTDIR)$(logdir); \
+-		chown root:root $(DESTDIR)$(logdir) || : ; \
 -	fi
 -
 -	if test '!' -d $(DESTDIR)$(authdir); then \
 -		$(mkinstalldirs) $(DESTDIR)$(authdir); \
--		chown root:gdm $(DESTDIR)$(authdir); \
 -		chmod 1770 $(DESTDIR)$(authdir); \
+-		chown root:gdm $(DESTDIR)$(authdir) || : ; \
 -	fi
 -
  	system=`uname`; \