Don't check for the X server location at "configure" time. The X server

is no formal dependency of this pkg, so the outcome is not deterministic.
Assume instead that the X server is at ${X11BASE}/bin/X.
fixes PR pkg/41319 by Jared D. McNeill
bump PKGREVISION

3 files changed, 12 insertions, 11 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index f9575d553e1..10cec9cca46 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.153 2009/08/04 08:14:39 abs Exp $
+# $NetBSD: Makefile,v 1.154 2009/08/18 19:31:30 drochner Exp $
 #
 
 DISTNAME=	gdm-2.20.10
+PKGREVISION=	1
 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 7719b4902f5..4e233652295 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.59 2009/04/07 11:40:20 drochner Exp $
+$NetBSD: distinfo,v 1.60 2009/08/18 19:31:30 drochner Exp $
 
 SHA1 (gdm-2.20.10.tar.bz2) = 42e9e52184393352f005f1735843a30f764aef18
 RMD160 (gdm-2.20.10.tar.bz2) = 4bb50375d30638143b47b7884405e9999e304da5
 Size (gdm-2.20.10.tar.bz2) = 3940077 bytes
-SHA1 (patch-aa) = 0e919c36bed0901583b4a527d4e9461ab737a171
+SHA1 (patch-aa) = 5e950a5271d3c399cb9e613b4c5b8557a0844656
 SHA1 (patch-ab) = 43b565fcbe2e172f5e319b3d111d475646f481e0
 SHA1 (patch-ac) = 69b3539e50af0b32207b9ffeb7cb01645c9ece3c
 SHA1 (patch-ae) = c95265b55c968a0466e1ae50bbe58c121f05b027
diff --git a/x11/gdm/patches/patch-aa b/x11/gdm/patches/patch-aa
index 9fe7b80395e..62200ee61ee 100644
--- a/x11/gdm/patches/patch-aa
+++ b/x11/gdm/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.23 2008/05/29 17:21:45 drochner Exp $
+$NetBSD: patch-aa,v 1.24 2009/08/18 19:31:30 drochner Exp $
 
---- configure.orig	2008-05-13 02:27:18.000000000 +0200
+--- configure.orig	2009-03-19 06:00:24.000000000 +0100
 +++ configure
-@@ -27278,7 +27278,9 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -27448,7 +27448,9 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <sys/statvfs.h>
@@ -12,7 +12,7 @@ $NetBSD: patch-aa,v 1.23 2008/05/29 17:21:45 drochner Exp $
  _ACEOF
  if { (ac_try="$ac_cpp conftest.$ac_ext"
  case "(($ac_try" in
-@@ -33554,6 +33556,18 @@ case "$host" in
+@@ -33725,6 +33727,18 @@ case "$host" in
  	HOST_UTMP_LINE_REMOTE=""
  	HOST_UTMP_PSEUDO_DEVICE="false"
  	;;
@@ -31,7 +31,7 @@ $NetBSD: patch-aa,v 1.23 2008/05/29 17:21:45 drochner Exp $
  *)
  	HOST_GDM_USER_PATH="/bin:/usr/bin"
  	HOST_HALT_COMMAND="/usr/bin/poweroff;/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now"
-@@ -33570,18 +33584,18 @@ esac
+@@ -33741,18 +33755,18 @@ esac
  
  # allow user to override the host-specific default
  
@@ -62,11 +62,11 @@ $NetBSD: patch-aa,v 1.23 2008/05/29 17:21:45 drochner Exp $
  
  # On Solaris, the /usr/bin/Xserver script is used to decide whether to
  # use Xsun or Xorg, so this is used on Solaris.
-@@ -33654,6 +33668,11 @@ elif test -x /usr/bin/X; then
+@@ -33825,6 +33839,11 @@ elif test -x /usr/bin/X; then
     X_SERVER_PATH="/usr/bin"
     X_SERVER="/usr/bin/X"
     X_CONFIG_OPTIONS="-audit 0"
-+elif test -x ${X11BASE}/bin/X; then
++elif test "x${X11BASE}" != x; then
 +   X_PATH="${X11BASE}/bin"
 +   X_SERVER_PATH="${X11BASE}/bin"
 +   X_SERVER="${X11BASE}/bin/X"
@@ -74,7 +74,7 @@ $NetBSD: patch-aa,v 1.23 2008/05/29 17:21:45 drochner Exp $
  else
     # what to do, what to do, this is wrong, but this just sets the
     # defaults, perhaps this user is cross compiling or some such
-@@ -33663,6 +33682,7 @@ else
+@@ -33834,6 +33853,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