[pkgsrc/trunk]: pkgsrc/mk Temporary fix for xpkgwedge'd packages which were g...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/471e689d8d7c
branches:  trunk
changeset: 466814:471e689d8d7c
user:      agc <agc%pkgsrc.org@localhost>
date:      Fri Jan 23 16:49:47 2004 +0000

description:
Temporary fix for xpkgwedge'd packages which were getting buildlinked
with a prefix of X11BASE, rather than LOCALBASE - check whether
USE_XPKGWEDGE is defined to {"YES", "yes"} as well as looking for the
existence of the xpkgwedge definition file when calculating the value
of X11PREFIX.

diffstat:

 mk/bsd.prefs.mk |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (19 lines):

diff -r 7fb04e9da898 -r 471e689d8d7c mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk   Fri Jan 23 16:48:54 2004 +0000
+++ b/mk/bsd.prefs.mk   Fri Jan 23 16:49:47 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.140 2004/01/21 18:13:27 jlam Exp $
+# $NetBSD: bsd.prefs.mk,v 1.141 2004/01/23 16:49:47 agc Exp $
 #
 # Make file, included to get the site preferences, if any.  Should
 # only be included by package Makefiles before any .if defined()
@@ -283,7 +283,8 @@
 XMKMF?=                        ${XMKMF_CMD} ${XMKMF_FLAGS} -a
 XMKMF_FLAGS?=          # empty
 .if exists(${LOCALBASE}/lib/X11/config/xpkgwedge.def) || \
-    exists(${X11BASE}/lib/X11/config/xpkgwedge.def)
+    exists(${X11BASE}/lib/X11/config/xpkgwedge.def) || \
+    !empty(USE_XPKGWEDGE:M[Yy][Ee][Ss]) 
 HAVE_XPKGWEDGE=                yes
 X11PREFIX=             ${LOCALBASE}
 XMKMF_CMD?=            ${X11PREFIX}/bin/pkgxmkmf