Re: pkg/41319 (gdm-2.20.7nb5 binary package for 5.0/i386 references /usr/X11R6)

[Matthias Drochner <M.Drochner%fz-juelich.de@localhost>]

jmcneill%invisible.ca@localhost said:
> Looks like it tests for the presence of the X server [${X11BASE}/bin/
> X], which isn't required to build the package.

OK, I see, this makes the build a bit nondeterministic. We
could assume the Xserver in ${X11BASE}/bin/X if X11BASE
was specified (which is the case in pkgsrc). Would that
work for you?

best regards
Matthias



------------------------------------------------------------------------------------------------
------------------------------------------------------------------------------------------------
Forschungszentrum Juelich GmbH
52425 Juelich
Sitz der Gesellschaft: Juelich
Eingetragen im Handelsregister des Amtsgerichts Dueren Nr. HR B 3498
Vorsitzende des Aufsichtsrats: MinDir'in Baerbel Brumme-Bothe
Geschaeftsfuehrung: Prof. Dr. Achim Bachem (Vorsitzender),
Dr. Ulrich Krafft (stellv. Vorsitzender), Prof. Dr.-Ing. Harald Bolt,
Prof. Dr. Sebastian M. Schmidt
------------------------------------------------------------------------------------------------
------------------------------------------------------------------------------------------------

Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/x11/gdm/patches/patch-aa,v
retrieving revision 1.23
diff -u -r1.23 patch-aa
--- patches/patch-aa    29 May 2008 17:21:45 -0000      1.23
+++ patches/patch-aa    18 Aug 2009 18:52:56 -0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.23 2008/05/29 17:21:45 drochner Exp $
+$NetBSD$
 
---- 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 @@
  _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 @@
  *)
        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 @@
  
  # 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 @@
  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