Kill broken check for finding X11, just wire down our values.

3 files changed, 27 insertions, 20 deletions

diff --git a/misc/xtide/Makefile b/misc/xtide/Makefile
index 7191f5273d1..a3965be13a8 100644
--- a/misc/xtide/Makefile
+++ b/misc/xtide/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2009/10/28 00:12:36 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2009/11/09 12:46:54 joerg Exp $
 
 DISTNAME=	xtide-2.8.3
 PKGREVISION=	2
@@ -15,7 +15,7 @@ USE_LANGUAGES=	c c++
 
 HARMONICS_FILE=	harmonics-dwf-20060708.tcd
 
-CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR:Q} X11BASE=${X11BASE:Q}
 EGDIR=		${PREFIX}/share/examples/xtide
 CONF_FILES=	${EGDIR}/xtide.conf ${PKG_SYSCONFDIR}/xtide.conf
 
@@ -35,13 +35,6 @@ post-install:
 	${INSTALL_DATA} ${WRKDIR}/xtide.conf ${EGDIR}/xtide.conf
 	${INSTALL_DATA} ${WRKDIR}/${HARMONICS_FILE} ${PREFIX}/share/xtide
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${X11_TYPE} == "modular"
-CONFIGURE_ARGS+=	--x-includes=${PREFIX}/include
-CONFIGURE_ARGS+=	--x-libraries=${PREFIX}/lib
-.endif
-
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXi/buildlink3.mk"
diff --git a/misc/xtide/distinfo b/misc/xtide/distinfo
index 23639917c0b..1771c72f726 100644
--- a/misc/xtide/distinfo
+++ b/misc/xtide/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2009/02/08 00:01:35 cube Exp $
+$NetBSD: distinfo,v 1.9 2009/11/09 12:46:54 joerg Exp $
 
 SHA1 (harmonics-dwf-20060708.tcd.bz2) = 1f54ed856b064e485f7e386eb4a71965e83abfa4
 RMD160 (harmonics-dwf-20060708.tcd.bz2) = 754255ac5f2e36cf2dce587e7f9f7bd0561226d9
@@ -9,4 +9,4 @@ Size (xtide-2.8.3.tar.bz2) = 463382 bytes
 SHA1 (patch-aa) = 8b9059e2870f6b8149e72ca33c452e75650f8230
 SHA1 (patch-ab) = 889c68bce0bd78cfc1b5f7410364e8c39182cfec
 SHA1 (patch-ac) = 07a0099f0d58b8774ae456470142314dabe38c1b
-SHA1 (patch-ad) = e267a7d2ab4a753935386dbbd955ebbb984dcd56
+SHA1 (patch-ad) = cf18fb73096b3cef07fbf501fa1205fe126d1155
diff --git a/misc/xtide/patches/patch-ad b/misc/xtide/patches/patch-ad
index 9472edfcd50..1da2f0e0158 100644
--- a/misc/xtide/patches/patch-ad
+++ b/misc/xtide/patches/patch-ad
@@ -1,15 +1,29 @@
-$NetBSD: patch-ad,v 1.1 2009/02/08 00:01:35 cube Exp $
+$NetBSD: patch-ad,v 1.2 2009/11/09 12:46:54 joerg Exp $
 
-Try /usr/X11R7 as a possible location for a X11 distribution too.
+Kill broken X11 check.
 
---- configure.orig	2006-03-14 00:54:31.000000000 +0000
+--- configure.orig	2006-03-14 01:54:31.000000000 +0100
 +++ configure
-@@ -2597,7 +2597,7 @@ fi
+@@ -2596,20 +2596,8 @@ fi
+ 
  echo "$as_me:$LINENO: checking location of X11" >&5
  echo $ECHO_N "checking location of X11... $ECHO_C" >&6
- xroot="NOT FOUND"
+-xroot="NOT FOUND"
 -for dir in "/usr/X11R6" "/usr/openwin" "/usr/contrib/X11R6" "/usr"; do
-+for dir in "/usr/X11R7" "/usr/X11R6" "/usr/openwin" "/usr/contrib/X11R6" "/usr"; do
-   if test -r "$dir/lib/libXaw.so" -o -r "$dir/lib/libXaw.a" -o -r "$dir/lib/libXaw.dll.a"; then
-     xroot="$dir"
-     xlibdir="$dir/lib"
+-  if test -r "$dir/lib/libXaw.so" -o -r "$dir/lib/libXaw.a" -o -r "$dir/lib/libXaw.dll.a"; then
+-    xroot="$dir"
+-    xlibdir="$dir/lib"
+-    break
+-  else
+-    if test -r "$dir/lib64/libXaw.so" -o -r "$dir/lib64/libXaw.a" -o -r "$dir/lib64/libXaw.dll.a"; then
+-      xroot="$dir"
+-      xlibdir="$dir/lib64"
+-      break
+-    fi
+-  fi
+-done
++xroot="$X11BASE"
++xlibdir="$xroot/lib"
+ echo "$as_me:$LINENO: result: $xroot" >&5
+ echo "${ECHO_T}$xroot" >&6
+ if test "$xroot" = "NOT FOUND"; then