make user's login photo display work again: the code checks whether

the file (~/.face) is on a local filesystem which didn't work because
it didn't recognize NetBSD's way to use statvfs()
(I had to make the check for statvfs a bit weaker, hope that doesn't
break on another platform.)

4 files changed, 44 insertions, 7 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 932a9a267c4..90fbda3cfb6 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.119 2006/09/16 12:20:41 jmmv Exp $
+# $NetBSD: Makefile,v 1.120 2006/09/22 19:56:59 drochner Exp $
 #
 
 DISTNAME=	gdm-2.16.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gdm/2.16/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index 15cf37f2490..f19860be80c 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.42 2006/09/15 15:19:34 jmmv Exp $
+$NetBSD: distinfo,v 1.43 2006/09/22 19:56:59 drochner Exp $
 
 SHA1 (gdm-2.16.0.tar.bz2) = dba97d43b83a27351b53866d06a1b99c1ce21557
 RMD160 (gdm-2.16.0.tar.bz2) = e6775e55b0f4f7ec2dbde8e2295af7dcab4ae3b4
 Size (gdm-2.16.0.tar.bz2) = 3160137 bytes
-SHA1 (patch-aa) = 2b7112cd5670f99b261765f47a6b70b73c0f42a0
+SHA1 (patch-aa) = ee702f2f5cd8853c58ac42f2229a41f4ce6f6125
 SHA1 (patch-ab) = b151843608e3418962dfcbfd454cf0ba8aac39e0
 SHA1 (patch-ac) = 69b3539e50af0b32207b9ffeb7cb01645c9ece3c
 SHA1 (patch-ae) = 9f159a277f9526ca3c2085b45b76d0449eeb2a69
 SHA1 (patch-ak) = e3eaf2dfa1e393f9808d22fe4384710a46a83afc
+SHA1 (patch-al) = 3b66dd3f4cdea6a3af5cbd0ff65eb02ccdead483
diff --git a/x11/gdm/patches/patch-aa b/x11/gdm/patches/patch-aa
index c5b19f7ed8d..af238db7573 100644
--- a/x11/gdm/patches/patch-aa
+++ b/x11/gdm/patches/patch-aa
@@ -1,8 +1,16 @@
-$NetBSD: patch-aa,v 1.18 2006/05/01 09:50:25 jmmv Exp $
+$NetBSD: patch-aa,v 1.19 2006/09/22 19:56:59 drochner Exp $
 
---- configure.orig	2006-04-14 22:49:06.000000000 +0200
+--- configure.orig	2006-09-04 23:27:10.000000000 +0200
 +++ configure
-@@ -32571,6 +32571,7 @@ else
+@@ -28633,7 +28633,6 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #include <sys/statvfs.h>
+-#include <sys/fstyp.h>
+ _ACEOF
+ if { (ac_try="$ac_cpp conftest.$ac_ext"
+ case "(($ac_try" in
+@@ -33911,6 +33910,7 @@ else
     GDM_USER_PATH="$GDM_USER_PATH:/usr/bin/X11:/usr/X11R6/bin:/usr/local/bin:/opt/X11R6/bin"
     X_CONFIG_OPTIONS="-audit 0"
  fi
diff --git a/x11/gdm/patches/patch-al b/x11/gdm/patches/patch-al
new file mode 100644
index 00000000000..85edd1f2e4e
--- /dev/null
+++ b/x11/gdm/patches/patch-al
@@ -0,0 +1,28 @@
+$NetBSD: patch-al,v 1.3 2006/09/22 19:57:00 drochner Exp $
+
+--- daemon/fstype.c.orig	2006-01-20 19:42:08.000000000 +0100
++++ daemon/fstype.c
+@@ -89,8 +89,10 @@ static int xatoi P_((char *cp));
+ 
+ #ifdef FSTYPE_STATVFS		/* SVR4.  */
+ #include <sys/statvfs.h>
++#ifndef __NetBSD__
+ #include <sys/fstyp.h>
+ #endif
++#endif
+ 
+ #ifdef FSTYPE_STATFS		/* 4.4BSD.  */
+ #include <sys/param.h>		/* NetBSD needs this.  */
+@@ -352,8 +354,12 @@ filesystem_type_uncached (char *path, ch
+ 	fstype_internal_error (1, errno, "%s", path);
+     }
+   else
++#ifdef __NetBSD__
++    type = fss.f_fstypename;
++#else
+     type = fss.f_basetype;
+ #endif
++#endif
+ 
+ #ifdef FSTYPE_STATFS		/* 4.4BSD.  */
+   struct statfs fss;