Sow BUILDLINK_USE_BUILTIN.<pkg> and reap _NEED_<PKG> variables.

4 files changed, 72 insertions, 72 deletions

diff --git a/graphics/MesaLib/buildlink3.mk b/graphics/MesaLib/buildlink3.mk
index f8ab82733bb..37de2c2b6fe 100644
--- a/graphics/MesaLib/buildlink3.mk
+++ b/graphics/MesaLib/buildlink3.mk
@@ -1,13 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.9 2004/01/04 23:34:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2004/01/05 09:31:31 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 MESALIB_BUILDLINK3_MK:=	${MESALIB_BUILDLINK3_MK}+
 
-.if !empty(MESALIB_BUILDLINK3_MK:M+)
-.  include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.prefs.mk"
 
+.if !empty(MESALIB_BUILDLINK3_MK:M+)
 MESA_REQD?=		3.4.2
 
+BUILDLINK_PACKAGES+=		MesaLib
 BUILDLINK_DEPENDS.MesaLib?=	MesaLib>=${MESA_REQD}
 BUILDLINK_PKGSRCDIR.MesaLib?=	../../graphics/MesaLib
 .endif	# MESALIB_BUILDLINK3_MK
@@ -22,21 +23,21 @@ BUILDLINK_IS_BUILTIN.MesaLib=	NO
 .  if exists(${_GL_GLX_H}) && exists(${_X11_TMPL})
 BUILDLINK_IS_BUILTIN.MesaLib!=						\
 	if ${GREP} -q BuildGLXLibrary ${_X11_TMPL}; then		\
-		${ECHO} YES;						\
+		${ECHO} "YES";						\
 	else								\
-		${ECHO} NO;						\
+		${ECHO} "NO";						\
 	fi
 .  endif
-MAKEFLAGS+=	BUILDLINK_IS_BUILTIN.MesaLib=${BUILDLINK_IS_BUILTIN.MesaLib}
+MAKEFLAGS+=	BUILDLINK_IS_BUILTIN.MesaLib="${BUILDLINK_IS_BUILTIN.MesaLib}"
 .endif
 
 .if !empty(BUILDLINK_CHECK_BUILTIN.MesaLib:M[yY][eE][sS])
-_NEED_MESALIB=	NO
+BUILDLINK_USE_BUILTIN.MesaLib=	YES
 .endif
 
-.if !defined(_NEED_MESALIB)
+.if !defined(BUILDLINK_USE_BUILTIN.MesaLib)
 .  if !empty(BUILDLINK_IS_BUILTIN.MesaLib:M[nN][oO])
-_NEED_MESALIB=	YES
+BUILDLINK_USE_BUILTIN.MesaLib=	NO
 .  else
 #
 # Create an appropriate package name for the built-in Mesa/GLX distributed
@@ -47,17 +48,18 @@ _NEED_MESALIB=	YES
 .    include "../../graphics/Mesa/version.mk"
 _MESALIB_PKG=		MesaLib-${_MESA_VERSION}
 _MESALIB_DEPENDS=	${BUILDLINK_DEPENDS.MesaLib}
-_NEED_MESALIB!=	\
+BUILDLINK_USE_BUILTIN.MesaLib!=	\
 	if ${PKG_ADMIN} pmatch '${_MESALIB_DEPENDS}' ${_MESALIB_PKG}; then \
-		${ECHO} "NO";						\
-	else								\
 		${ECHO} "YES";						\
+	else								\
+		${ECHO} "NO";						\
 	fi
 .  endif
-MAKEFLAGS+=	_NEED_MESALIB="${_NEED_MESALIB}"
-.endif	# _NEED_MESALIB
+MAKEFLAGS+=	\
+	BUILDLINK_USE_BUILTIN.MesaLib="${BUILDLINK_USE_BUILTIN.MesaLib}"
+.endif	# BUILDLINK_USE_BUILTIN.MesaLib
 
-.if ${_NEED_MESALIB} == "YES"
+.if !empty(BUILDLINK_USE_BUILTIN.MesaLib:M[nN][oO])
 #
 # If we depend on the package, depend on the latest version with a library
 # major number bump.
@@ -69,11 +71,10 @@ BUILDLINK_DEPENDS+=		MesaLib
 .endif
 
 .if !empty(MESALIB_BUILDLINK3_MK:M+)
-.  if ${_NEED_MESALIB} == "YES"
-BUILDLINK_PACKAGES+=		MesaLib
-BUILDLINK_CPPFLAGS.MesaLib=	-DGLX_GLXEXT_LEGACY
-.  else
+.  if !empty(BUILDLINK_USE_BUILTIN.MesaLib:M[yY][eE][sS])
 BUILDLINK_PREFIX.MesaLib=	${X11BASE}
+.  else
+BUILDLINK_CPPFLAGS.MesaLib=	-DGLX_GLXEXT_LEGACY
 .  endif
 .endif	# MESALIB_BUILDLINK3_MK
 
diff --git a/graphics/freetype2/buildlink3.mk b/graphics/freetype2/buildlink3.mk
index d007badf629..4ecb9661a57 100644
--- a/graphics/freetype2/buildlink3.mk
+++ b/graphics/freetype2/buildlink3.mk
@@ -1,11 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/01/04 23:34:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2004/01/05 09:31:31 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 FREETYPE2_BUILDLINK3_MK:=	${FREETYPE2_BUILDLINK3_MK}+
 
-.if !empty(FREETYPE2_BUILDLINK3_MK:M+)
-.  include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.prefs.mk"
 
+.if !empty(FREETYPE2_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=		freetype2
 BUILDLINK_DEPENDS.freetype2?=	freetype2>=2.0.1
 BUILDLINK_PKGSRCDIR.freetype2?=	../../graphics/freetype2
 .endif	# FREETYPE2_BUILDLINK3_MK
@@ -20,21 +21,22 @@ BUILDLINK_IS_BUILTIN.freetype2=	NO
 .  if exists(${_FREETYPE2_FREETYPE_H}) && exists(${_X11_TMPL})
 BUILDLINK_IS_BUILTIN.freetype2!=					\
 	if ${GREP} -q BuildFreetype2Library ${_X11_TMPL}; then		\
-		${ECHO} YES;						\
+		${ECHO} "YES";						\
 	else								\
-		${ECHO} NO;						\
+		${ECHO} "NO";						\
 	fi
 .  endif
-MAKEFLAGS+=	BUILDLINK_IS_BUILTIN.freetype2=${BUILDLINK_IS_BUILTIN.freetype2}
+MAKEFLAGS+=	\
+	BUILDLINK_IS_BUILTIN.freetype2="${BUILDLINK_IS_BUILTIN.freetype2}"
 .endif
 
 .if !empty(BUILDLINK_CHECK_BUILTIN.freetype2:M[yY][eE][sS])
-_NEED_FREETYPE2=	NO
+BUILDLINK_USE_BUILTIN.freetype2=	YES
 .endif
 
-.if !defined(_NEED_FREETYPE2)
+.if !defined(BUILDLINK_USE_BUILTIN.freetype2)
 .  if !empty(BUILDLINK_IS_BUILTIN.freetype2:M[nN][oO])
-_NEED_FREETYPE2=	YES
+BUILDLINK_USE_BUILTIN.freetype2=	NO
 .  else
 #
 # Create an appropriate package name for the built-in freetype2 distributed
@@ -51,17 +53,18 @@ _FREETYPE2_PATCH!=	\
 _FREETYPE2_VERSION=	${_FREETYPE2_MAJOR}${_FREETYPE2_MINOR}${_FREETYPE2_PATCH}
 _FREETYPE2_PKG=		freetype2-${_FREETYPE2_VERSION}
 _FREETYPE2_DEPENDS=	${BUILDLINK_DEPENDS.freetype2}
-_NEED_FREETYPE2!=	\
+BUILDLINK_USE_BUILTIN.freetype2!=	\
 	if ${PKG_ADMIN} pmatch '${_FREETYPE2_DEPENDS}' ${_FREETYPE2_PKG}; then \
-		${ECHO} "NO";						\
-	else								\
 		${ECHO} "YES";						\
+	else								\
+		${ECHO} "NO";						\
 	fi
 .  endif
-MAKEFLAGS+=	_NEED_FREETYPE2="${_NEED_FREETYPE2}"
+MAKEFLAGS+=	\
+	BUILDLINK_USE_BUILTIN.freetype2="${BUILDLINK_USE_BUILTIN.freetype2}"
 .endif
 
-.if ${_NEED_FREETYPE2} == "YES"
+.if !empty(BUILDLINK_USE_BUILTIN.freetype2:M[nN][oO])
 #
 # If we depend on the package, depend on the latest version with a library
 # major number bump.
@@ -73,9 +76,7 @@ BUILDLINK_DEPENDS+=		freetype2
 .endif
 
 .if !empty(FREETYPE2_BUILDLINK3_MK:M+)
-.  if ${_NEED_FREETYPE2} == "YES"
-BUILDLINK_PACKAGES+=		freetype2
-.  else
+.  if !empty(BUILDLINK_USE_BUILTIN.freetype2:M[yY][eE][sS])
 BUILDLINK_PREFIX.freetype2=	${X11BASE}
 .  endif
 
diff --git a/graphics/glu/buildlink3.mk b/graphics/glu/buildlink3.mk
index b69b0fe22d8..54c40dfd1e3 100644
--- a/graphics/glu/buildlink3.mk
+++ b/graphics/glu/buildlink3.mk
@@ -1,13 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/01/04 23:34:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2004/01/05 09:31:31 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GLU_BUILDLINK3_MK:=	${GLU_BUILDLINK3_MK}+
 
-.if !empty(GLU_BUILDLINK3_MK:M+)
-.  include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.prefs.mk"
 
+.if !empty(GLU_BUILDLINK3_MK:M+)
 MESA_REQD?=		3.4.2
 
+BUILDLINK_PACKAGES+=		glu
 BUILDLINK_DEPENDS.glu?=		glu>=${MESA_REQD}
 BUILDLINK_PKGSRCDIR.glu?=	../../graphics/glu
 .endif	# GLU_BUILDLINK3_MK
@@ -22,21 +23,21 @@ BUILDLINK_IS_BUILTIN.glu=	NO
 .  if exists(${_GL_GLU_H}) && exists(${_X11_TMPL})
 BUILDLINK_IS_BUILTIN.glu!=						\
 	if ${GREP} -q BuildGLULibrary ${_X11_TMPL}; then		\
-		${ECHO} YES;						\
+		${ECHO} "YES";						\
 	else								\
-		${ECHO} NO;						\
+		${ECHO} "NO";						\
 	fi
 .  endif
-MAKEFLAGS+=	BUILDLINK_IS_BUILTIN.glu=${BUILDLINK_IS_BUILTIN.glu}
+MAKEFLAGS+=	BUILDLINK_IS_BUILTIN.glu="${BUILDLINK_IS_BUILTIN.glu}"
 .endif
 
 .if !empty(BUILDLINK_CHECK_BUILTIN.glu:M[yY][eE][sS])
-_NEED_GLU=	NO
+BUILDLINK_USE_BUILTIN.glu=	YES
 .endif
 
-.if !defined(_NEED_GLU)
+.if !defined(BUILDLINK_USE_BUILTIN.glu)
 .  if !empty(BUILDLINK_IS_BUILTIN.glu:M[nN][oO])
-_NEED_GLU=	YES
+BUILDLINK_USE_BUILTIN.glu=	NO
 .  else
 #
 # Create an appropriate package name for the built-in Mesa/GLU distributed
@@ -47,17 +48,17 @@ _NEED_GLU=	YES
 .    include "../../graphics/Mesa/version.mk"
 _GLU_PKG=	glu-${_MESA_VERSION}
 _GLU_DEPENDS=	${BUILDLINK_DEPENDS.glu}
-_NEED_GLU!=	\
+BUILDLINK_USE_BUILTIN.glu!=	\
 	if ${PKG_ADMIN} pmatch '${_GLU_DEPENDS}' ${_GLU_PKG}; then \
-		${ECHO} "NO";						\
-	else								\
 		${ECHO} "YES";						\
+	else								\
+		${ECHO} "NO";						\
 	fi
 .  endif
-MAKEFLAGS+=	_NEED_GLU="${_NEED_GLU}"
-.endif	# _NEED_GLU
+MAKEFLAGS+=	BUILDLINK_USE_BUILTIN.glu="${BUILDLINK_USE_BUILTIN.glu}"
+.endif	# BUILDLINK_USE_BUILTIN.glu
 
-.if ${_NEED_GLU} == "YES"
+.if !empty(BUILDLINK_USE_BUILTIN.glu:M[nN][oO])
 #
 # If we depend on the package, depend on the latest version with a library
 # major number bump.
@@ -69,9 +70,7 @@ BUILDLINK_DEPENDS+=	glu
 .endif
 
 .if !empty(GLU_BUILDLINK3_MK:M+)
-.  if ${_NEED_GLU} == "YES"
-BUILDLINK_PACKAGES+=	glu
-.  else
+.  if !empty(BUILDLINK_USE_BUILTIN.glu:M[yY][eE][sS])
 BUILDLINK_PREFIX.glu=	${X11BASE}
 .  endif
 .endif	# GLU_BUILDLINK3_MK
diff --git a/graphics/xpm/buildlink3.mk b/graphics/xpm/buildlink3.mk
index 2a8dbed0f40..f983413ec58 100644
--- a/graphics/xpm/buildlink3.mk
+++ b/graphics/xpm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2004/01/04 23:34:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2004/01/05 09:31:31 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XPM_BUILDLINK3_MK:=	${XPM_BUILDLINK3_MK}+
@@ -6,6 +6,7 @@ XPM_BUILDLINK3_MK:=	${XPM_BUILDLINK3_MK}+
 .include "../../mk/bsd.prefs.mk"
 
 .if !empty(XPM_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=		xpm
 BUILDLINK_DEPENDS.xpm?=		xpm>=3.4k
 BUILDLINK_PKGSRCDIR.xpm?=	../../graphics/xpm
 .endif	# XPM_BUILDLINK3_MK
@@ -21,31 +22,31 @@ BUILDLINK_IS_BUILTIN.xpm=	NO
 .    if !empty(X11BASE:M*openwin)
 BUILDLINK_IS_BUILTIN.xpm!=						\
 	if /usr/sbin/pkgchk -l SUNWxwinc | ${GREP} -q xpm.h; then	\
-		${ECHO} YES;						\
+		${ECHO} "YES";						\
 	else								\
-		${ECHO} NO;						\
+		${ECHO} "NO";						\
 	fi
 .    elif exists(${_X11_TMPL})
 BUILDLINK_IS_BUILTIN.xpm!=						\
 	if ${GREP} -q NormalLibXpm ${_X11_TMPL}; then			\
-		${ECHO} YES;						\
+		${ECHO} "YES";						\
 	else								\
-		${ECHO} NO;						\
+		${ECHO} "NO";						\
 	fi
 .    else
 BUILDLINK_IS_BUILTIN.xpm=	NO
 .    endif
 .  endif
-MAKEFLAGS+=	BUILDLINK_IS_BUILTIN.xpm=${BUILDLINK_IS_BUILTIN.xpm}
+MAKEFLAGS+=	BUILDLINK_IS_BUILTIN.xpm="${BUILDLINK_IS_BUILTIN.xpm}"
 .endif
 
 .if !empty(BUILDLINK_CHECK_BUILTIN.xpm:M[yY][eE][sS])
-_NEED_XPM=	NO
+BUILDLINK_USE_BUILTIN.xpm=	YES
 .endif
 
-.if !defined(_NEED_XPM)
+.if !defined(BUILDLINK_USE_BUILTIN.xpm)
 .  if !empty(BUILDLINK_IS_BUILTIN.xpm:M[nN][oO])
-_NEED_XPM=	YES
+BUILDLINK_USE_BUILTIN.xpm=	NO
 .  else
 #
 # Create an appropriate package name for the built-in xpm distributed
@@ -62,26 +63,24 @@ _XPM_PATCH!=	\
 _XPM_VERSION=	${_XPM_MAJOR}${_XPM_MINOR}${_XPM_PATCH}
 _XPM_PKG=	xpm-${_XPM_VERSION}
 _XPM_DEPENDS=	${BUILDLINK_DEPENDS.xpm}
-_NEED_XPM!=	\
+BUILDLINK_USE_BUILTIN.xpm!=	\
 	if ${PKG_ADMIN} pmatch '${_XPM_DEPENDS}' ${_XPM_PKG}; then	\
-		${ECHO} "NO";						\
-	else								\
 		${ECHO} "YES";						\
+	else								\
+		${ECHO} "NO";						\
 	fi
 .  endif
-MAKEFLAGS+=	_NEED_XPM="${_NEED_XPM}"
-.endif	# _NEED_XPM
+MAKEFLAGS+=	BUILDLINK_USE_BUILTIN.xpm="${BUILDLINK_USE_BUILTIN.xpm}"
+.endif	# BUILDLINK_USE_BUILTIN.xpm
 
-.if ${_NEED_XPM} == "YES"
+.if !empty(BUILDLINK_USE_BUILTIN.xpm:M[nN][oO])
 .  if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	xpm
 .  endif
 .endif
 
 .if !empty(XPM_BUILDLINK3_MK:M+)
-.  if ${_NEED_XPM} == "YES"
-BUILDLINK_PACKAGES+=	xpm
-.  else
+.  if !empty(BUILDLINK_USE_BUILTIN.xpm:M[yY][eE][sS])
 BUILDLINK_PREFIX.xpm=	${X11BASE}
 .  endif
 .endif	# XPM_BUILDLINK3_MK