Have USE_IMAKE imply USE_X11BASE imply USE_X11. Now we can just check if

USE_X11 is defined instead of USE_X11 || USE_X11BASE || USE_IMAKE.

5 files changed, 26 insertions, 20 deletions

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index ed1732de5ee..ef54e65ff69 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1074 2002/10/21 21:58:59 seb Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1075 2002/10/22 22:54:07 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -146,7 +146,14 @@ BUILDLINK_DIR?=		${LOCALBASE}
 BUILDLINK_X11PKG_DIR?=	${X11BASE}
 BUILDLINK_X11_DIR?=	${X11BASE}
 
-.if defined(USE_IMAKE) || defined(USE_X11BASE)
+.if defined(USE_IMAKE)
+USE_X11BASE?=		implied
+.endif
+.if defined(USE_X11BASE)
+USE_X11?=		implied
+.endif
+
+.if defined(USE_X11BASE)
 .  if exists(${LOCALBASE}/lib/X11/config/xpkgwedge.def) || \
       exists(${X11BASE}/lib/X11/config/xpkgwedge.def)
 BUILD_DEPENDS+=		xpkgwedge>=1.5:../../pkgtools/xpkgwedge
@@ -359,7 +366,7 @@ M4?=			/usr/bin/m4
 .endif
 
 .if !defined(X11_BUILDLINK_MK)
-.  if defined(USE_X11BASE) || defined(USE_X11)
+.  if defined(USE_X11)
 X11_LDFLAGS=		# empty
 .    if ${_USE_RPATH} == "yes"
 X11_LDFLAGS+=		-Wl,-R${X11BASE}/lib	
@@ -433,7 +440,7 @@ BUILD_DEPENDS+=		bzip2>=0.9.0b:../../archivers/bzip2
 
 # Figure out where the local mtree file is
 .if !defined(MTREE_FILE)
-.  if defined(USE_IMAKE) || defined(USE_X11BASE)
+.  if defined(USE_X11BASE)
 MTREE_FILE=	${_PKGSRCDIR}/mk/${OPSYS}.x11.dist
 .  else
 MTREE_FILE=	${_PKGSRCDIR}/mk/${OPSYS}.pkg.dist
@@ -1075,8 +1082,7 @@ IGNORE+= "${PKGNAME} is restricted:" \
 IGNORE+= "${PKGNAME} may not be built, because it utilizes strong cryptography"
 .    endif
 .  endif
-.  if ((defined(USE_IMAKE) || defined(USE_X11BASE) || defined(USE_X11)) && \
-       !exists(${X11BASE}))
+.  if defined(USE_X11) && !exists(${X11BASE})
 IGNORE+= "${PKGNAME} uses X11, but ${X11BASE} not found"
 .  endif
 .  if defined(BROKEN)
diff --git a/mk/buildlink2/bsd.buildlink2.mk b/mk/buildlink2/bsd.buildlink2.mk
index fa33dce0f6d..8e3d70bbb4d 100644
--- a/mk/buildlink2/bsd.buildlink2.mk
+++ b/mk/buildlink2/bsd.buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink2.mk,v 1.42 2002/10/18 15:41:08 jlam Exp $
+# $NetBSD: bsd.buildlink2.mk,v 1.43 2002/10/22 22:54:09 jlam Exp $
 #
 # An example package buildlink2.mk file:
 #
@@ -65,7 +65,7 @@ _BLNK_OPSYS=		${OPSYS}
 #
 CONFIGURE_ENV+=		BUILDLINK_UPDATE_CACHE=no
 
-.if defined(USE_X11) || defined(USE_X11BASE) || defined(USE_IMAKE)
+.if defined(USE_X11)
 USE_X11_LINKS?=		YES
 .  if !empty(USE_X11_LINKS:M[nN][oO])
 .    include "../../mk/x11.buildlink2.mk"
@@ -284,7 +284,7 @@ _BUILDLINK_USE: .USE
 _BLNK_TRANSFORM+=	I:${LOCALBASE}:${BUILDLINK_DIR}
 _BLNK_TRANSFORM+=	L:${LOCALBASE}:${BUILDLINK_DIR}
 _BLNK_TRANSFORM+=	${BUILDLINK_TRANSFORM}
-.if defined(USE_X11) || defined(USE_X11BASE) || defined(USE_IMAKE)
+.if defined(USE_X11)
 .  if !empty(USE_X11_LINKS:M[nN][oO])
 _BLNK_TRANSFORM+=	I:${X11BASE}:${BUILDLINK_X11PKG_DIR}
 _BLNK_TRANSFORM+=	L:${X11BASE}:${BUILDLINK_X11PKG_DIR}
@@ -436,7 +436,7 @@ _BLNK_UNTRANSFORM_SED.3+=	${_BLNK_TRANSFORM_SED.l}
 #
 # Fix up references to the x11-links directory.
 #
-.if defined(USE_X11) || defined(USE_X11BASE) || defined(USE_IMAKE)
+.if defined(USE_X11)
 _BLNK_TRANSFORM_SED.4+= \
 	-e "s|${BUILDLINK_DIR}/\(${BUILDLINK_X11_DIR:S/^${LOCALBASE}\///}\)|${LOCALBASE}/\1|g"
 _BLNK_UNTRANSFORM_SED.4+= \
@@ -610,7 +610,7 @@ _BLNK_WRAPPEES+=	FC
 PKGLIBTOOL=		${BUILDLINK_LIBTOOL}
 .endif
 _BLNK_WRAPPEES+=	LIBTOOL
-.if defined(USE_X11) || defined(USE_X11BASE) || defined(USE_IMAKE)
+.if defined(USE_X11)
 IMAKE?=			${X11BASE}/bin/imake
 _BLNK_WRAPPEES+=	IMAKE
 .endif
@@ -716,7 +716,7 @@ _BLNK_WRAP_SPECIFIC_LOGIC.LD=	${BUILDLINK_DIR}/bin/.ld-logic
 # Don't transform the arguments for imake, which uses the C preprocessor
 # to generate Makefiles, so that imake will find its config files.
 #
-.if defined(USE_X11) || defined(USE_X11BASE) || defined(USE_IMAKE)
+.if defined(USE_X11)
 _BLNK_WRAP_PRE_CACHE.IMAKE=	${_BLNK_WRAP_PRE_CACHE}
 _BLNK_WRAP_POST_CACHE.IMAKE=	${_BLNK_WRAP_POST_CACHE}
 _BLNK_WRAP_CACHE.IMAKE=		${_BLNK_WRAP_CACHE}
diff --git a/mk/ghostscript.mk b/mk/ghostscript.mk
index ff0a09e9821..c796d39b2bd 100644
--- a/mk/ghostscript.mk
+++ b/mk/ghostscript.mk
@@ -1,4 +1,4 @@
-# $NetBSD: ghostscript.mk,v 1.10 2002/09/21 20:49:21 jlam Exp $
+# $NetBSD: ghostscript.mk,v 1.11 2002/10/22 22:54:08 jlam Exp $
 #
 # This Makefile fragment is included by packages that require a run-time
 # dependency on a ghostscript Postscript interpreter.
@@ -30,7 +30,7 @@ _VALID_GS=	# empty
 	[0-6].* 7.0 7.0nb* 7.0[0-4] 7.0[0-4]nb* 7.05 7.05nb1 \
 	7.05.[1-4] 7.05.[1-4]nb* 7.05.5
 .  if !empty(GHOSTSCRIPT_REQD:M${_gs_pattern_})
-.    if defined(USE_X11) || defined(USE_X11BASE) || defined(USE_IMAKE)
+.    if defined(USE_X11)
 _VALID_GS+=	ghostscript-esp>=${GHOSTSCRIPT_REQD}
 .    else
 _VALID_GS+=	ghostscript-esp>=${GHOSTSCRIPT_REQD}
@@ -43,7 +43,7 @@ _VALID_GS+=	ghostscript-esp-nox11>=${GHOSTSCRIPT_REQD}
 #
 .for _gs_pattern_ in [0-6].* 7.0 7.0nb* 7.0[0-4] 7.0[0-4]nb* 7.05 7.05nb1
 .  if !empty(GHOSTSCRIPT_REQD:M${_gs_pattern_})
-.    if defined(USE_X11) || defined(USE_X11BASE) || defined(USE_IMAKE)
+.    if defined(USE_X11)
 _VALID_GS+=	ghostscript-gnu>=${GHOSTSCRIPT_REQD}
 _VALID_GS+=	ghostscript-gnu-x11>=${GHOSTSCRIPT_REQD}
 .    else
@@ -58,7 +58,7 @@ _VALID_GS+=	ghostscript-gnu-nox11>=${GHOSTSCRIPT_REQD}
 #
 .for _gs_pattern_ in [0-5].* 6.0 6.0nb* 6.01 6.01nb[1-4]
 .  if !empty(GHOSTSCRIPT_REQD:M${_gs_pattern_})
-.    if defined(USE_X11) || defined(USE_X11BASE) || defined(USE_IMAKE)
+.    if defined(USE_X11)
 _VALID_GS+=	ghostscript>=${GHOSTSCRIPT_REQD}
 .    else
 _VALID_GS+=	ghostscript>=${GHOSTSCRIPT_REQD}
diff --git a/mk/motif.buildlink2.mk b/mk/motif.buildlink2.mk
index 6fb876957ac..921f21cbcae 100644
--- a/mk/motif.buildlink2.mk
+++ b/mk/motif.buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: motif.buildlink2.mk,v 1.2 2002/08/22 08:21:27 jlam Exp $
+# $NetBSD: motif.buildlink2.mk,v 1.3 2002/10/22 22:54:08 jlam Exp $
 #
 # USE_MOTIF12
 #	use a Motif-1.2-compatible installation, otherwise, assume
@@ -147,7 +147,7 @@ MOTIFBASE=		${_MOTIFBASE}
 .  endif
 .endif
 
-USE_X11=		# defined
+USE_X11?=		# defined
 MAKE_ENV+=		MOTIFLIB="${MOTIFLIB}"
 MAKE_ENV+=		MOTIFBASE="${_MOTIFBASE}"
 LDFLAGS+=		-Wl,-R${_MOTIFBASE}/lib
diff --git a/mk/x11.buildlink2.mk b/mk/x11.buildlink2.mk
index d85c1e40790..cc682d89d79 100644
--- a/mk/x11.buildlink2.mk
+++ b/mk/x11.buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: x11.buildlink2.mk,v 1.2 2002/10/08 14:32:10 jlam Exp $
+# $NetBSD: x11.buildlink2.mk,v 1.3 2002/10/22 22:54:08 jlam Exp $
 #
 # This file is for internal use by bsd.buildlink2.mk and should _not_ be
 # include by package Makefiles.
@@ -6,7 +6,7 @@
 .if !defined(X11_BUILDLINK2_MK)
 X11_BUILDLINK2_MK=	# defined
 
-USE_X11=	# defined
+USE_X11?=	# defined
 USE_X11_LINKS=	no
 
 .include "../../mk/bsd.prefs.mk"