[pkgsrc/trunk]: pkgsrc/x11/gdm1 Fix build when Xinerama is detected by also u...

[jmmv <jmmv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1bd350c5dcf3
branches:  trunk
changeset: 477466:1bd350c5dcf3
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Sat Jul 03 10:37:24 2004 +0000

description:
Fix build when Xinerama is detected by also using Xext; if none of them are
found, just disable Xinerama support.  Closes PR pkg/25198.

diffstat:

 x11/gdm1/distinfo         |   4 ++--
 x11/gdm1/patches/patch-aa |  20 +++++++++++++++++++-
 2 files changed, 21 insertions(+), 3 deletions(-)

diffs (52 lines):

diff -r 798241def493 -r 1bd350c5dcf3 x11/gdm1/distinfo
--- a/x11/gdm1/distinfo Sat Jul 03 10:22:38 2004 +0000
+++ b/x11/gdm1/distinfo Sat Jul 03 10:37:24 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2004/07/03 10:22:38 jmmv Exp $
+$NetBSD: distinfo,v 1.3 2004/07/03 10:37:24 jmmv Exp $
 
 SHA1 (gdm-2.2.0.tar.gz) = 135b424cc1493f92b500c4fe7d85e9ada57313e1
 Size (gdm-2.2.0.tar.gz) = 810976 bytes
@@ -6,7 +6,7 @@
 Size (Daemon.README) = 2191 bytes
 SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d
 Size (Daemon.png) = 15725 bytes
-SHA1 (patch-aa) = e05abb384dba1ce0a8094687d15a6d8f3ed8f886
+SHA1 (patch-aa) = 3c060965959e0605c87e19ce23243d90cd2a8f9a
 SHA1 (patch-ab) = 944f67fd37460172b7b434ec5f3cc4ad31d3eff1
 SHA1 (patch-ac) = 32361628caef6cd0f1f50318a0b3f76249f6b76c
 SHA1 (patch-ae) = 1af3691044028dcf75b7eac9aa20563b7cc152d5
diff -r 798241def493 -r 1bd350c5dcf3 x11/gdm1/patches/patch-aa
--- a/x11/gdm1/patches/patch-aa Sat Jul 03 10:22:38 2004 +0000
+++ b/x11/gdm1/patches/patch-aa Sat Jul 03 10:37:24 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2004/07/03 10:22:38 jmmv Exp $
+$NetBSD: patch-aa,v 1.3 2004/07/03 10:37:24 jmmv Exp $
 
 --- configure.orig     2001-03-13 00:23:59.000000000 +0000
 +++ configure  2004-07-03 10:09:16.000000000 +0000
@@ -11,6 +11,24 @@
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
  echo "configure:4627: checking for $ac_func" >&5
+@@ -4976,7 +4976,7 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-lXinerama $GTK_LIBS $LIBS"
++LIBS="-lXinerama -lXext $GTK_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 4982 "configure"
+ #include "confdefs.h"
+@@ -5010,7 +5010,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-  LIBS="-lXinerama $LIBS"
++  LIBS="-lXinerama -lXext $LIBS"
+ 
+ else
+   echo "$ac_t""no" 1>&6
 @@ -5289,6 +5289,10 @@
  s%@LIBGLADE_LIBS@%$LIBGLADE_LIBS%g
  s%@CONSOLE_HELPER_TRUE@%$CONSOLE_HELPER_TRUE%g