From b1cf2d6a0d781b36b3e41c1761bd09b0d1e714ae Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Wed, 29 Aug 2001 22:41:00 +0000
Subject: Use x11.buildlink.mk instead of USE_X11.  Also convert hard-coded
 references to ${X11BASE} in the header and library search paths into
 references to ${LOCALBASE}/share/x11-links.  These packages should now be
 strongly- buildlinked regardless of whether xpkgwedge is installed.

Changes well-tested on NetBSD-1.5X/i386 with and without xpkgwedge and
lightly-tested on NetBSD-1.5.1/alpha without xpkgwedge.
---
 wm/windowmaker/patches/patch-ab | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'wm/windowmaker/patches')

diff --git a/wm/windowmaker/patches/patch-ab b/wm/windowmaker/patches/patch-ab
index 47cc00bbbe8..71e768f8cc1 100644
--- a/wm/windowmaker/patches/patch-ab
+++ b/wm/windowmaker/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.6 2001/08/18 18:13:28 tron Exp $
+$NetBSD: patch-ab,v 1.7 2001/08/29 22:41:25 jlam Exp $
 
 --- configure.in.orig	Mon Jul 23 21:43:34 2001
 +++ configure.in	Sat Aug 18 19:57:49 2001
@@ -61,8 +61,8 @@ $NetBSD: patch-ab,v 1.6 2001/08/18 18:13:28 tron Exp $
  
 -LIBRARY_SEARCH_PATH="$lib_search_path"
 -HEADER_SEARCH_PATH="$inc_search_path"
-+LIBRARY_SEARCH_PATH="-L${BUILDLINK_DIR}/lib -L${X11BASE}/lib"
-+HEADER_SEARCH_PATH="-I${BUILDLINK_DIR}/include -I${X11BASE}/include"
++LIBRARY_SEARCH_PATH="-L${BUILDLINK_DIR}/lib -L${BUILDLINK_X11_DIR}/lib"
++HEADER_SEARCH_PATH="-I${BUILDLINK_DIR}/include -I${BUILDLINK_X11_DIR}/include"
  
  AC_SUBST(LIBRARY_SEARCH_PATH)
  AC_SUBST(HEADER_SEARCH_PATH)
-- 
cgit v1.2.3