Match the template builtin.mk file in bsd.builtin.mk, and make the two

packages that use builtin.mk files (graphics/xpm and pkgtools/x11-links)
use the new format correctly.

26 files changed, 228 insertions, 208 deletions

diff --git a/archivers/bzip2/builtin.mk b/archivers/bzip2/builtin.mk
index 408657f8b59..1fbed83b04c 100644
--- a/archivers/bzip2/builtin.mk
+++ b/archivers/bzip2/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1 2004/03/10 17:57:14 jlam Exp $
+# $NetBSD: builtin.mk,v 1.2 2004/03/29 05:43:28 jlam Exp $
 
 .if !defined(IS_BUILTIN.bzip2)
 IS_BUILTIN.bzip2=	no
@@ -10,13 +10,8 @@ IS_BUILTIN.bzip2!=							\
 		${ECHO} "no";						\
 	fi
 .  endif
-MAKEFLAGS+=	IS_BUILTIN.bzip2=${IS_BUILTIN.bzip2}
-.endif
-
-CHECK_BUILTIN.bzip2?=	no
-.if !empty(CHECK_BUILTIN.bzip2:M[yY][eE][sS])
-USE_BUILTIN.bzip2=	yes
-.endif
+BUILDLINK_VARS+=	IS_BUILTIN.bzip2
+.endif	# IS_BUILTIN.bzip2
 
 .if !defined(USE_BUILTIN.bzip2)
 USE_BUILTIN.bzip2?=	${IS_BUILTIN.bzip2}
diff --git a/converters/libiconv/builtin.mk b/converters/libiconv/builtin.mk
index 65eceadae3c..6d039ba83e7 100644
--- a/converters/libiconv/builtin.mk
+++ b/converters/libiconv/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1 2004/03/10 17:57:14 jlam Exp $
+# $NetBSD: builtin.mk,v 1.2 2004/03/29 05:43:28 jlam Exp $
 
 .if !defined(_LIBICONV_FOUND)
 _LIBICONV_FOUND!=							\
@@ -7,7 +7,7 @@ _LIBICONV_FOUND!=							\
 	else								\
 		${ECHO} "yes";						\
 	fi
-MAKEFLAGS+=	_LIBICONV_FOUND=${_LIBICONV_FOUND}
+BUILDLINK_VARS+=	_LIBICONV_FOUND
 .endif
 
 _ICONV_H=	/usr/include/iconv.h
@@ -17,12 +17,7 @@ IS_BUILTIN.iconv=	no
 .  if exists(${_ICONV_H})
 IS_BUILTIN.iconv=	yes
 .  endif
-.endif
-
-CHECK_BUILTIN.iconv?=	no
-.if !empty(CHECK_BUILTIN.iconv:M[yY][eE][sS])
-USE_BUILTIN.iconv=	yes
-.endif
+.endif	# IS_BUILTIN.iconv
 
 .if !defined(USE_BUILTIN.iconv)
 USE_BUILTIN.iconv?=	${IS_BUILTIN.iconv}
@@ -43,6 +38,9 @@ USE_BUILTIN.iconv=	no
 .  endif
 .endif	# USE_BUILTIN.iconv
 
+CHECK_BUILTIN.iconv?=	no
+.if !empty(CHECK_BUILTIN.iconv:M[nN][oO])
+
 .if !empty(USE_BUILTIN.iconv:M[nN][oO])
 _LIBICONV=		-liconv
 .else
@@ -66,7 +64,7 @@ ICONV_TYPE!=	\
 		${ECHO} "native";					\
 	fi
 .  endif
-MAKEFLAGS+=	ICONV_TYPE=${ICONV_TYPE}
+BUILDLINK_VARS+=	ICONV_TYPE
 .endif
 
 .if defined(GNU_CONFIGURE)
@@ -76,3 +74,5 @@ CONFIGURE_ARGS+=	--with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
 CONFIGURE_ARGS+=	--without-libiconv-prefix
 .  endif
 .endif
+
+.endif	# CHECK_BUILTIN.iconv
diff --git a/devel/binutils/builtin.mk b/devel/binutils/builtin.mk
index e3869b1fe13..54ea70ea6a3 100644
--- a/devel/binutils/builtin.mk
+++ b/devel/binutils/builtin.mk
@@ -1,13 +1,8 @@
-# $NetBSD: builtin.mk,v 1.1 2004/03/10 17:57:14 jlam Exp $
+# $NetBSD: builtin.mk,v 1.2 2004/03/29 05:43:29 jlam Exp $
 
 # XXX Assume that the base OS provides a built-in binutils.
 IS_BUILTIN.binutils?=	yes
 
-CHECK_BUILTIN.binutils?=	no
-.if !empty(CHECK_BUILTIN.binutils:M[yY][eE][sS])
-USE_BUILTIN.binutils=	yes
-.endif
-
 .if !defined(USE_BUILTIN.binutils)
 USE_BUILTIN.binutils?=	${IS_BUILTIN.binutils}
 PREFER.binutils?=	pkgsrc
@@ -35,6 +30,9 @@ USE_BUILTIN.binutils=	no
 .  endfor
 .endif	# USE_BUILTIN.binutils
 
+CHECK_BUILTIN.binutils?=	no
+.if !empty(CHECK_BUILTIN.binutils:M[nN][oO])
+
 .if !empty(USE_BUILTIN.binutils:M[nN][oO])
 AR=	${BUILDLINK_PREFIX.binutils}/bin/ar
 AS=	${BUILDLINK_PREFIX.binutils}/bin/as
@@ -42,3 +40,5 @@ LD=	${BUILDLINK_PREFIX.binutils}/bin/ld
 NM=	${BUILDLINK_PREFIX.binutils}/bin/nm
 RANLIB=	${BUILDLINK_PREFIX.binutils}/bin/ranlib
 .endif
+
+.endif	# CHECK_BUILTIN.binutils
diff --git a/devel/gettext-lib/builtin.mk b/devel/gettext-lib/builtin.mk
index 722b706b355..3576d21ce69 100644
--- a/devel/gettext-lib/builtin.mk
+++ b/devel/gettext-lib/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.3 2004/03/22 20:57:38 jlam Exp $
+# $NetBSD: builtin.mk,v 1.4 2004/03/29 05:43:30 jlam Exp $
 
 .if !defined(_BLNK_LIBINTL_FOUND)
 _BLNK_LIBINTL_FOUND!=	\
@@ -7,7 +7,7 @@ _BLNK_LIBINTL_FOUND!=	\
 	else								\
 		${ECHO} "yes";						\
 	fi
-MAKEFLAGS+=	_BLNK_LIBINTL_FOUND=${_BLNK_LIBINTL_FOUND}
+BUILDLINK_VARS+=	_BLNK_LIBINTL_FOUND
 .endif
 
 _LIBINTL_H=	/usr/include/libintl.h
@@ -26,16 +26,15 @@ IS_BUILTIN.gettext!=	\
 # XXX Consider the native libintl to be gettext-lib-0.10.35nb1.
 # XXX
 BUILTIN_PKG.gettext=	gettext-lib-0.10.35nb1
-MAKEFLAGS+=		BUILTIN_PKG.gettext=${BUILTIN_PKG.gettext}
+BUILDLINK_VARS+=	BUILTIN_PKG.gettext
 .    endif
 .  endif
-MAKEFLAGS+=	IS_BUILTIN.gettext=${IS_BUILTIN.gettext}
-.endif
+BUILDLINK_VARS+=	IS_BUILTIN.gettext
+.endif	# IS_BUILTIN.gettext
 
-CHECK_BUILTIN.gettext?=	no
-.if !empty(CHECK_BUILTIN.gettext:M[yY][eE][sS])
-USE_BUILTIN.gettext=	yes
-.endif
+#.if defined(USE_BUILTIN.iconv) && !empty(USE_BUILTIN.iconv:M[nN][oO])
+#USE_BUILTIN.gettext=	no
+#.endif
 
 .if !defined(USE_BUILTIN.gettext)
 USE_BUILTIN.gettext?=	${IS_BUILTIN.gettext}
@@ -83,6 +82,9 @@ USE_BUILTIN.gettext=	no
 .  endif
 .endif	# USE_BUILTIN.gettext
 
+CHECK_BUILTIN.gettext?=	no
+.if !empty(CHECK_BUILTIN.gettext:M[nN][oO])
+
 .if !empty(USE_BUILTIN.gettext:M[nN][oO])
 _BLNK_LIBINTL=		-lintl
 _GETTEXT_ICONV_DEPENDS=	gettext-lib>=0.11.5nb1
@@ -147,3 +149,5 @@ CONFIGURE_ARGS+=	--with-libintl-prefix=${BUILDLINK_PREFIX.gettext}
 CONFIGURE_ARGS+=	--without-libintl-prefix
 .  endif
 .endif
+
+.endif	# CHECK_BUILTIN.gettext
diff --git a/devel/libgetopt/builtin.mk b/devel/libgetopt/builtin.mk
index 74615cdb8be..7c43be9e1c5 100644
--- a/devel/libgetopt/builtin.mk
+++ b/devel/libgetopt/builtin.mk
@@ -1,19 +1,17 @@
-# $NetBSD: builtin.mk,v 1.1 2004/03/10 17:57:14 jlam Exp $
+# $NetBSD: builtin.mk,v 1.2 2004/03/29 05:43:30 jlam Exp $
 
 .if !defined(IS_BUILTIN.getopt)
 IS_BUILTIN.getopt=	no
 .  if exists(/usr/include/getopt.h)
 IS_BUILTIN.getopt=	yes
 .  endif
-.endif
-
-CHECK_BUILTIN.getopt?=	no
-.if !empty(CHECK_BUILTIN.getopt:M[yY][eE][sS])
-USE_BUILTIN.getopt=	yes
-.endif
+.endif	# IS_BUILTIN.getopt
 
 USE_BUILTIN.getopt?=	${IS_BUILTIN.getopt}
 
+CHECK_BUILTIN.getopt?=	no
+.if !empty(CHECK_BUILTIN.getopt:M[nN][oO])
+
 .if !empty(USE_BUILTIN.getopt:M[nN][oO])
 LIBGETOPT=	-lgetopt
 .else
@@ -24,3 +22,5 @@ BUILDLINK_LDADD.getopt?=	${LIBGETOPT}
 
 CONFIGURE_ENV+=		LIBGETOPT="${LIBGETOPT}"
 MAKE_ENV+=		LIBGETOPT="${LIBGETOPT}"
+
+.endif	# CHECK_BUILTIN.getopt
diff --git a/devel/ncurses/builtin.mk b/devel/ncurses/builtin.mk
index 0911871ec22..c7607797fd1 100644
--- a/devel/ncurses/builtin.mk
+++ b/devel/ncurses/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2004/03/20 19:28:46 jlam Exp $
+# $NetBSD: builtin.mk,v 1.3 2004/03/29 05:43:30 jlam Exp $
 
 .if !defined(_BLNK_LIBNCURSES_FOUND)
 _BLNK_LIBNCURSES_FOUND!=	\
@@ -7,7 +7,7 @@ _BLNK_LIBNCURSES_FOUND!=	\
 	else								\
 		${ECHO} "yes";						\
 	fi
-MAKEFLAGS+=	_BLNK_LIBNCURSES_FOUND=${_BLNK_LIBNCURSES_FOUND}
+BUILDLINK_VARS+=	_BLNK_LIBNCURSES_FOUND
 .endif
 
 _NCURSES_H=	/usr/include/curses.h
@@ -38,16 +38,11 @@ _NCURSES_VERSION!=							\
 		}							\
 	' ${_NCURSES_H}
 BUILTIN_PKG.ncurses=	ncurses-${_NCURSES_VERSION}
-MAKEFLAGS+=		BUILTIN_PKG.ncurses=${BUILTIN_PKG.ncurses}
+BUILDLINK_VARS+=	BUILTIN_PKG.ncurses
 .    endif
 .  endif
-MAKEFLAGS+=	IS_BUILTIN.ncurses=${IS_BUILTIN.ncurses}
-.endif
-
-CHECK_BUILTIN.ncurses?=	no
-.if !empty(CHECK_BUILTIN.ncurses:M[yY][eE][sS])
-USE_BUILTIN.ncurses=	yes
-.endif
+BUILDLINK_VARS+=	IS_BUILTIN.ncurses
+.endif	# IS_BUILTIN.ncurses
 
 .if !defined(USE_BUILTIN.ncurses)
 USE_BUILTIN.ncurses?=	${IS_BUILTIN.ncurses}
@@ -100,6 +95,9 @@ USE_BUILTIN.ncurses=	no
 .  endif
 .endif	# USE_BUILTIN.ncurses
 
+CHECK_BUILTIN.ncurses?=	no
+.if !empty(CHECK_BUILTIN.ncurses:M[nN][oO])
+
 .if !empty(USE_BUILTIN.ncurses:M[yY][eE][sS])
 .  if !empty(_BLNK_LIBNCURSES_FOUND:M[nN][oO])
 BUILDLINK_TRANSFORM.ncurses+=	-e "s|/curses\.h|/ncurses.h|g"
@@ -135,3 +133,5 @@ buildlink-ncurses-curses-h:
 			${BUILDLINK_DIR}/include/curses.h;		\
 	fi
 .endif
+
+.endif	# CHECK_BUILTIN.ncurses
diff --git a/devel/readline/builtin.mk b/devel/readline/builtin.mk
index ac9a400c342..72d401b8294 100644
--- a/devel/readline/builtin.mk
+++ b/devel/readline/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2004/03/13 18:39:16 jlam Exp $
+# $NetBSD: builtin.mk,v 1.3 2004/03/29 05:43:30 jlam Exp $
 
 .if !defined(_BLNK_LIBREADLINE_FOUND)
 _BLNK_LIBREADLINE_FOUND!=	\
@@ -7,7 +7,7 @@ _BLNK_LIBREADLINE_FOUND!=	\
 	else								\
 		${ECHO} "yes";						\
 	fi
-MAKEFLAGS+=	_BLNK_LIBREADLINE_FOUND=${_BLNK_LIBREADLINE_FOUND}
+BUILDLINK_VARS+=	_BLNK_LIBREADLINE_FOUND
 .endif
 
 .if !defined(_BLNK_LIBEDIT_FOUND)
@@ -17,7 +17,7 @@ _BLNK_LIBEDIT_FOUND!=	\
 	else								\
 		${ECHO} "yes";						\
 	fi
-MAKEFLAGS+=	_BLNK_LIBEDIT_FOUND=${_BLNK_LIBEDIT_FOUND}
+BUILDLINK_VARS+=	_BLNK_LIBEDIT_FOUND
 .endif
 
 _READLINE_H=		/usr/include/readline.h
@@ -54,16 +54,11 @@ _READLINE_MINOR!=							\
 		${_READLINE_HEADER}
 _READLINE_VERSION=	${_READLINE_MAJOR}.${_READLINE_MINOR}
 BUILTIN_PKG.readline=	readline-${_READLINE_VERSION}
-MAKEFLAGS+=		BUILTIN_PKG.readline=${BUILTIN_PKG.readline}
+BUILDLINK_VARS+=	BUILTIN_PKG.readline
 .    endif
 .  endif
-MAKEFLAGS+=	IS_BUILTIN.readline=${IS_BUILTIN.readline}
-.endif
-
-CHECK_BUILTIN.readline?=	no
-.if !empty(CHECK_BUILTIN.readline:M[yY][eE][sS])
-USE_BUILTIN.readline=	yes
-.endif
+BUILDLINK_VARS+=	IS_BUILTIN.readline
+.endif	# IS_BUILTIN.readline
 
 .if !defined(USE_BUILTIN.readline)
 USE_BUILTIN.readline?=	${IS_BUILTIN.readline}
@@ -107,6 +102,9 @@ USE_BUILTIN.readline=	no
 .  endif
 .endif	# USE_BUILTIN.readline
 
+CHECK_BUILTIN.readline?=	no
+.if !empty(CHECK_BUILTIN.readline:M[nN][oO])
+
 .if !empty(USE_BUILTIN.readline:M[yY][eE][sS])
 .  if !empty(_BLNK_LIBREADLINE_FOUND:M[nN][oO]) && \
       !empty(_BLNK_LIBEDIT_FOUND:M[yY][eE][sS])
@@ -114,3 +112,5 @@ BUILDLINK_TRANSFORM+=		l:history:edit
 BUILDLINK_TRANSFORM+=		l:readline:edit:termcap
 .  endif
 .endif
+
+.endif	# CHECK_BUILTIN.readline
diff --git a/devel/zlib/builtin.mk b/devel/zlib/builtin.mk
index 7df7fe471b4..ca90ebdcd28 100644
--- a/devel/zlib/builtin.mk
+++ b/devel/zlib/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1 2004/03/10 17:57:14 jlam Exp $
+# $NetBSD: builtin.mk,v 1.2 2004/03/29 05:43:30 jlam Exp $
 
 _ZLIB_H=	/usr/include/zlib.h
 
@@ -40,15 +40,10 @@ BUILTIN_PKG.zlib=	zlib-1.1.4nb1
 .        endif
 .      endfor
 .    endif
-MAKEFLAGS+=	BUILTIN_PKG.zlib=${BUILTIN_PKG.zlib}
+BUILDLINK_VARS+=	BUILTIN_PKG.zlib
 .  endif
-MAKEFLAGS+=	IS_BUILTIN.zlib=${IS_BUILTIN.zlib}
-.endif
-
-CHECK_BUILTIN.zlib?=	no
-.if !empty(CHECK_BUILTIN.zlib:M[yY][eE][sS])
-USE_BUILTIN.zlib=	yes
-.endif
+BUILDLINK_VARS+=	IS_BUILTIN.zlib
+.endif	# IS_BUILTIN.zlib
 
 .if !defined(USE_BUILTIN.zlib)
 USE_BUILTIN.zlib?=	${IS_BUILTIN.zlib}
@@ -76,6 +71,11 @@ USE_BUILTIN.zlib=	no
 .  endif
 .endif	# USE_BUILTIN.zlib
 
+CHECK_BUILTIN.zlib?=	no
+.if !empty(CHECK_BUILTIN.zlib:M[nN][oO])
+
 .if !empty(USE_BUILTIN.zlib:M[nN][oO])
 BUILDLINK_DEPENDS.zlib+=	zlib>=1.2.1
 .endif
+
+.endif	# CHECK_BUILTIN.zlib
diff --git a/fonts/Xft2/builtin.mk b/fonts/Xft2/builtin.mk
index cd06112318e..5727d71f458 100644
--- a/fonts/Xft2/builtin.mk
+++ b/fonts/Xft2/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1 2004/03/10 17:57:14 jlam Exp $
+# $NetBSD: builtin.mk,v 1.2 2004/03/29 05:43:30 jlam Exp $
 
 _X11_TMPL=	${X11BASE}/lib/X11/config/X11.tmpl
 
@@ -47,7 +47,7 @@ _XF86_VERSION=	${_XF86_MAJOR}.${_XF86_MINOR}
 _XF86_VERSION=	${_XF86_MAJOR}.${_XF86_MINOR}.${_XF86_TEENY}
 .          endif
 .        endif
-MAKEFLAGS+=	_XF86_VERSION=${_XF86_VERSION}
+BUILDLINK_VARS+=	_XF86_VERSION
 .      endif
 .      for _xrender_version_ in ${_XFT2_VERSIONS}
 .        for _pattern_ in ${_XFT2_${_xrender_version_}}
@@ -58,15 +58,17 @@ _XFT2_VERSION?=	${_xrender_version_}
 .      endfor
 _XFT2_VERSION?=		0.0
 BUILTIN_PKG.Xft2=	Xft2-${_XFT2_VERSION}
-MAKEFLAGS+=		BUILTIN_PKG.Xft2=${BUILTIN_PKG.Xft2}
+BUILDLINK_VARS+=	BUILTIN_PKG.Xft2
 .    endif
 .  endif
-MAKEFLAGS+=	IS_BUILTIN.Xft2=${IS_BUILTIN.Xft2}
-.endif
+BUILDLINK_VARS+=	IS_BUILTIN.Xft2
+.endif	# IS_BUILTIN.Xft2
 
-CHECK_BUILTIN.Xft2?=	no
-.if !empty(CHECK_BUILTIN.Xft2:M[yY][eE][sS])
-USE_BUILTIN.Xft2=	yes
+.if defined(USE_BUILTIN.fontconfig) && !empty(USE_BUILTIN.fontconfig:M[nN][oO])
+USE_BUILTIN.Xft2=	no
+.endif
+.if defined(USE_BUILTIN.Xrender) && !empty(USE_BUILTIN.Xrender:M[nN][oO])
+USE_BUILTIN.Xft2=	no
 .endif
 
 .if !defined(USE_BUILTIN.Xft2)
@@ -87,6 +89,9 @@ USE_BUILTIN.Xft2!=	\
 .  endif
 .endif	# USE_BUILTIN.Xft2
 
+CHECK_BUILTIN.Xft2?=	no
+.if !empty(CHECK_BUILTIN.Xft2:M[nN][oO])
+
 .if !empty(USE_BUILTIN.Xft2:M[nN][oO])
 BUILDLINK_DEPENDS.Xft2+=	Xft2>=2.1nb1
 .endif
@@ -98,3 +103,5 @@ BUILDLINK_FILES.Xft2+=	lib/pkgconfig/xft.pc
 USE_BUILTIN.Xrender=	yes
 USE_BUILTIN.fontconfig=	yes
 .endif
+
+.endif	# CHECK_BUILTIN.Xft2
diff --git a/fonts/fontconfig/builtin.mk b/fonts/fontconfig/builtin.mk
index 3a832e349bd..b8184f41ea8 100644
--- a/fonts/fontconfig/builtin.mk
+++ b/fonts/fontconfig/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1 2004/03/10 17:57:14 jlam Exp $
+# $NetBSD: builtin.mk,v 1.2 2004/03/29 05:43:30 jlam Exp $
 
 _FONTCONFIG_FONTCONFIG_H=	${X11BASE}/include/fontconfig/fontconfig.h
 _X11_TMPL=			${X11BASE}/lib/X11/config/X11.tmpl
@@ -31,15 +31,20 @@ _FONTCONFIG_REVISION!=	\
 _FONTCONFIG_VERSION=	\
 	${_FONTCONFIG_MAJOR}.${_FONTCONFIG_MINOR}.${_FONTCONFIG_REVISION}
 BUILTIN_PKG.fontconfig=	fontconfig-${_FONTCONFIG_VERSION}
-MAKEFLAGS+=		BUILTIN_PKG.fontconfig=${BUILTIN_PKG.fontconfig}
+BUILDLINK_VARS+=	BUILTIN_PKG.fontconfig
 .    endif
 .  endif
-MAKEFLAGS+=	IS_BUILTIN.fontconfig=${IS_BUILTIN.fontconfig}
-.endif
+BUILDLINK_VARS+=	IS_BUILTIN.fontconfig
+.endif	# IS_BUILTIN.fontconfig
 
-CHECK_BUILTIN.fontconfig?=	no
-.if !empty(CHECK_BUILTIN.fontconfig:M[yY][eE][sS])
-USE_BUILTIN.fontconfig=		yes
+.if defined(USE_BUILTIN.zlib) && !empty(USE_BUILTIN.zlib:M[nN][oO])
+USE_BUILTIN.fontconfig=	no
+.endif
+.if defined(USE_BUILTIN.freetype2) && !empty(USE_BUILTIN.freetype2:M[nN][oO])
+USE_BUILTIN.fontconfig=	no
+.endif
+.if defined(USE_BUILTIN.expat) && !empty(USE_BUILTIN.expat:M[nN][oO])
+USE_BUILTIN.fontconfig=	no
 .endif
 
 .if !defined(USE_BUILTIN.fontconfig)
@@ -60,6 +65,9 @@ USE_BUILTIN.fontconfig!=	\
 .  endif
 .endif	# USE_BUILTIN.fontconfig
 
+CHECK_BUILTIN.fontconfig?=	no
+.if !empty(CHECK_BUILTIN.fontconfig:M[nN][oO])
+
 .if !empty(USE_BUILTIN.fontconfig:M[nN][oO])
 BUILDLINK_DEPENDS.fontconfig+=	fontconfig>=2.1nb2
 BUILDLINK_DEPENDS.freetype2+=	freetype2>=2.1.3
@@ -73,3 +81,5 @@ USE_BUILTIN.expat=	yes
 USE_BUILTIN.freetype2=	yes
 USE_BUILTIN.zlib=	yes
 .endif
+
+.endif	# CHECK_BUILTIN.fontconfig
diff --git a/graphics/MesaLib/builtin.mk b/graphics/MesaLib/builtin.mk
index d6e52a3cc84..1ed8a68b14a 100644
--- a/graphics/MesaLib/builtin.mk
+++ b/graphics/MesaLib/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.3 2004/03/15 17:38:10 jlam Exp $
+# $NetBSD: builtin.mk,v 1.4 2004/03/29 05:43:30 jlam Exp $
 
 _GL_GLX_H=	${X11BASE}/include/GL/glx.h
 _X11_TMPL=	${X11BASE}/lib/X11/config/X11.tmpl
@@ -21,16 +21,11 @@ IS_BUILTIN.MesaLib!=							\
 # Mesa software distributed with the built-in XFree86.
 #
 BUILTIN_PKG.MesaLib=	MesaLib-${_MESA_VERSION}
-MAKEFLAGS+=		BUILTIN_PKG.MesaLib=${BUILTIN_PKG.MesaLib}
+BUILDLINK_VARS+=	BUILTIN_PKG.MesaLib
 .    endif
 .  endif
-MAKEFLAGS+=	IS_BUILTIN.MesaLib=${IS_BUILTIN.MesaLib}
-.endif
-
-CHECK_BUILTIN.MesaLib?=	no
-.if !empty(CHECK_BUILTIN.MesaLib:M[yY][eE][sS])
-USE_BUILTIN.MesaLib=	yes
-.endif
+BUILDLINK_VARS+=	IS_BUILTIN.MesaLib
+.endif	# IS_BUILTIN.MesaLib
 
 .if !defined(USE_BUILTIN.MesaLib)
 USE_BUILTIN.MesaLib?=	${IS_BUILTIN.MesaLib}
@@ -50,6 +45,9 @@ USE_BUILTIN.MesaLib!=	\
 .  endif
 .endif	# USE_BUILTIN.MesaLib
 
+CHECK_BUILTIN.MesaLib?=	no
+.if !empty(CHECK_BUILTIN.MesaLib:M[nN][oO])
+
 .if !empty(USE_BUILTIN.MesaLib:M[nN][oO])
 BUILDLINK_DEPENDS.MesaLib+=	MesaLib>=6.0
 .endif
@@ -59,3 +57,5 @@ BUILDLINK_PREFIX.MesaLib=	${X11BASE}
 USE_X11=			yes
 _MESA_REQD=			${_MESA_VERSION}
 .endif
+
+.endif	# CHECK_BUILTIN.MesaLib
diff --git a/graphics/freetype2/builtin.mk b/graphics/freetype2/builtin.mk
index 10ab50c29ce..dca9a8947c7 100644
--- a/graphics/freetype2/builtin.mk
+++ b/graphics/freetype2/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1 2004/03/10 17:57:14 jlam Exp $
+# $NetBSD: builtin.mk,v 1.2 2004/03/29 05:43:31 jlam Exp $
 
 _FREETYPE2_FREETYPE_H=	${X11BASE}/include/freetype2/freetype/freetype.h
 _X11_TMPL=		${X11BASE}/lib/X11/config/X11.tmpl
@@ -27,16 +27,11 @@ _FREETYPE2_PATCH!=	\
 	${AWK} 'BEGIN { patch=0; } /\#define[ 	]*FREETYPE_PATCH/ { patch=$$3; } END { print "."patch; }' ${_FREETYPE2_FREETYPE_H}
 _FREETYPE2_VERSION=	${_FREETYPE2_MAJOR}${_FREETYPE2_MINOR}${_FREETYPE2_PATCH}
 BUILTIN_PKG.freetype2=	freetype2-${_FREETYPE2_VERSION}
-MAKEFLAGS+=		BUILTIN_PKG.freetype2=${BUILTIN_PKG.freetype2}
+BUILDLINK_VARS+=	BUILTIN_PKG.freetype2
 .    endif
 .  endif
-MAKEFLAGS+=	IS_BUILTIN.freetype2=${IS_BUILTIN.freetype2}
-.endif
-
-CHECK_BUILTIN.freetype2?=	no
-.if !empty(CHECK_BUILTIN.freetype2:M[yY][eE][sS])
-USE_BUILTIN.freetype2=	yes
-.endif
+BUILDLINK_VARS+=	IS_BUILTIN.freetype2
+.endif	# IS_BUILTIN.freetype2
 
 .if !defined(USE_BUILTIN.freetype2)
 USE_BUILTIN.freetype2?=	${IS_BUILTIN.freetype2}
@@ -56,6 +51,9 @@ USE_BUILTIN.freetype2!=	\
 .  endif
 .endif	# USE_BUILTIN.freetype2
 
+CHECK_BUILTIN.freetype2?=	no
+.if !empty(CHECK_BUILTIN.freetype2:M[nN][oO])
+
 .if !empty(USE_BUILTIN.freetype2:M[nN][oO])
 BUILDLINK_DEPENDS.freetype2+=	freetype2>=2.1.3
 .endif
@@ -64,3 +62,5 @@ BUILDLINK_DEPENDS.freetype2+=	freetype2>=2.1.3
 BUILDLINK_PREFIX.freetype2=	${X11BASE}
 USE_X11=			yes
 .endif
+
+.endif	# CHECK_BUILTIN.freetype2
diff --git a/graphics/glu/builtin.mk b/graphics/glu/builtin.mk
index 3121db76098..dd085aaf529 100644
--- a/graphics/glu/builtin.mk
+++ b/graphics/glu/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2004/03/15 17:38:10 jlam Exp $
+# $NetBSD: builtin.mk,v 1.3 2004/03/29 05:43:31 jlam Exp $
 
 _GL_GLU_H=	${X11BASE}/include/GL/glu.h
 _X11_TMPL=	${X11BASE}/lib/X11/config/X11.tmpl
@@ -21,15 +21,14 @@ IS_BUILTIN.glu!=							\
 # Mesa software distributed with the built-in XFree86.
 #
 BUILTIN_PKG.glu=	glu-${_MESA_VERSION}
-MAKEFLAGS+=		BUILTIN_PKG.glu=${BUILTIN_PKG.glu}
+BUILDLINK_VARS+=	BUILTIN_PKG.glu
 .    endif
 .  endif
-MAKEFLAGS+=	IS_BUILTIN.glu=${IS_BUILTIN.glu}
-.endif
+BUILDLINK_VARS+=	IS_BUILTIN.glu
+.endif	# IS_BUILTIN.glu
 
-CHECK_BUILTIN.glu?=	no
-.if !empty(CHECK_BUILTIN.glu:M[yY][eE][sS])
-USE_BUILTIN.glu=	yes
+.if defined(USE_BUILTIN.MesaLib) && !empty(USE_BUILTIN.MesaLib:M[nN][oO])
+USE_BUILTIN.glu=	no
 .endif
 
 .if !defined(USE_BUILTIN.glu)
@@ -50,6 +49,9 @@ USE_BUILTIN.glu!=	\
 .  endif
 .endif	# USE_BUILTIN.glu
 
+CHECK_BUILTIN.glu?=	no
+.if !empty(CHECK_BUILTIN.glu:M[nN][oO])
+
 .if !empty(USE_BUILTIN.glu:M[nN][oO])
 BUILDLINK_DEPENDS.glu+=	glu>=6.0
 .endif
@@ -59,3 +61,5 @@ BUILDLINK_PREFIX.glu=	${X11BASE}
 USE_X11=		yes
 _MESA_REQD=		${_MESA_VERSION}
 .endif
+
+.endif	# CHECK_BUILTIN.glu
diff --git a/graphics/xpm/Makefile b/graphics/xpm/Makefile
index c86c9239997..e2d903d26d1 100644
--- a/graphics/xpm/Makefile
+++ b/graphics/xpm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2004/03/23 04:41:01 jlam Exp $
+# $NetBSD: Makefile,v 1.35 2004/03/29 05:43:31 jlam Exp $
 
 DISTNAME=       xpm-3.4k
 PKGREVISION=	1
@@ -14,7 +14,6 @@ USE_BUILDLINK3=	yes
 USE_IMAKE=	# defined
 
 CHECK_BUILTIN.xpm=	yes
-
 .include "builtin.mk"
 
 .if !empty(IS_BUILTIN.xpm:M[yY][eE][sS])
diff --git a/graphics/xpm/builtin.mk b/graphics/xpm/builtin.mk
index 1a2c59b7166..4ec15513261 100644
--- a/graphics/xpm/builtin.mk
+++ b/graphics/xpm/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1 2004/03/10 17:57:14 jlam Exp $
+# $NetBSD: builtin.mk,v 1.2 2004/03/29 05:43:32 jlam Exp $
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -43,15 +43,10 @@ _XPM_PATCH!=	\
 	${AWK} 'BEGIN { split("abcdefghijklmnopqrstuvwxyz", alpha, "") } /\#define[ 	]*XpmRevision/ { print alpha[$$3] }' ${_X11_XPM_H}
 _XPM_VERSION=		${_XPM_MAJOR}${_XPM_MINOR}${_XPM_PATCH}
 BUILTIN_PKG.xpm=	xpm-${_XPM_VERSION}
-MAKEFLAGS+=		BUILTIN_PKG.xpm=${BUILTIN_PKG.xpm}
+BUILDLINK_VARS+=	BUILTIN_PKG.xpm
 .  endif
-MAKEFLAGS+=	IS_BUILTIN.xpm=${IS_BUILTIN.xpm}
-.endif	# USE_BUILTIN.xpm
-
-CHECK_BUILTIN.xpm?=	no
-.if !empty(CHECK_BUILTIN.xpm:M[yY][eE][sS])
-USE_BUILTIN.xpm=	yes
-.endif
+BUILDLINK_VARS+=	IS_BUILTIN.xpm
+.endif	# IS_BUILTIN.xpm
 
 .if !defined(USE_BUILTIN.xpm)
 USE_BUILTIN.xpm?=	${IS_BUILTIN.xpm}
diff --git a/net/libpcap/builtin.mk b/net/libpcap/builtin.mk
index 546a9dbaa00..8152bf1cdd5 100644
--- a/net/libpcap/builtin.mk
+++ b/net/libpcap/builtin.mk
@@ -1,15 +1,10 @@
-# $NetBSD: builtin.mk,v 1.1 2004/03/10 17:57:14 jlam Exp $
+# $NetBSD: builtin.mk,v 1.2 2004/03/29 05:43:32 jlam Exp $
 
 .if !defined(IS_BUILTIN.libpcap)
 IS_BUILTIN.libpcap=	no
 .  if exists(/usr/include/pcap.h)
 IS_BUILTIN.libpcap=	yes
 .  endif
-.endif
-
-CHECK_BUILTIN.libpcap?=	no
-.if !empty(CHECK_BUILTIN.libpcap:M[yY][eE][sS])
-USE_BUILTIN.libpcap=	yes
-.endif
+.endif	# IS_BUILTIN.libpcap
 
 USE_BUILTIN.libpcap?=	${IS_BUILTIN.libpcap}
diff --git a/pkgtools/x11-links/xfree.mk b/pkgtools/x11-links/xfree.mk
index 265b131b4af..adddf84380a 100644
--- a/pkgtools/x11-links/xfree.mk
+++ b/pkgtools/x11-links/xfree.mk
@@ -1,4 +1,4 @@
-# $NetBSD: xfree.mk,v 1.9 2004/03/11 00:47:01 jlam Exp $
+# $NetBSD: xfree.mk,v 1.10 2004/03/29 05:43:32 jlam Exp $
 
 FILES_LIST=	${FILESDIR}/xfree
 
@@ -18,13 +18,16 @@ FILES_LIST=	${FILESDIR}/xfree
 # Check if any headers and libraries for ${X11_MODULES} found in
 # ${X11BASE} actually belong to the base XFree86 or not.
 #
-.for _module_ in ${BUILDLINK_PACKAGES}
-CHECK_BUILTIN.${_module_}=	yes
-.  if exists(${BUILDLINK_PKGSRCDIR.${_module_}}/builtin.mk)
-.    include "${BUILDLINK_PKGSRCDIR.${_module_}}/builtin.mk"
-.    if !empty(IS_BUILTIN.${_module_}:M[yY][eE][sS]) && \
-        exists(${FILESDIR}/xfree.${_module_})
-FILES_LIST+=	${FILESDIR}/xfree.${_module_}
-.    endif
+.for _pkg_ in ${BUILDLINK_PACKAGES}
+CHECK_BUILTIN.${_pkg_}=	yes
+USE_BUILTIN.${_pkg_}=	yes
+.endfor
+.include "../../mk/buildlink3/bsd.builtin.mk"
+
+.for _pkg_ in ${BUILDLINK_PACKAGES}
+IGNORE_PKG.${_pkg_}=	yes
+.  if !empty(IS_BUILTIN.${_pkg_}:M[yY][eE][sS]) && \
+      exists(${FILESDIR}/xfree.${_pkg_})
+FILES_LIST+=	${FILESDIR}/xfree.${_pkg_}
 .  endif
 .endfor
diff --git a/security/PAM/builtin.mk b/security/PAM/builtin.mk
index cd234981780..43cbb672fce 100644
--- a/security/PAM/builtin.mk
+++ b/security/PAM/builtin.mk
@@ -1,15 +1,10 @@
-# $NetBSD: builtin.mk,v 1.1 2004/03/10 17:57:14 jlam Exp $
+# $NetBSD: builtin.mk,v 1.2 2004/03/29 05:43:35 jlam Exp $
 
 .if !defined(IS_BUILTIN.pam)
 IS_BUILTIN.pam=	no
 .  if exists(/usr/include/security/pam_appl.h)
 IS_BUILTIN.pam=	yes
 .  endif
-.endif
-
-CHECK_BUILTIN.pam?=	no
-.if !empty(CHECK_BUILTIN.pam:M[yY][eE][sS])
-USE_BUILTIN.pam=	yes
-.endif
+.endif	# IS_BUILTIN.pam
 
 USE_BUILTIN.pam?=	${IS_BUILTIN.pam}
diff --git a/security/heimdal/builtin.mk b/security/heimdal/builtin.mk
index 5267e9e0b75..73cd87e4d5b 100644
--- a/security/heimdal/builtin.mk
+++ b/security/heimdal/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1 2004/03/10 17:57:14 jlam Exp $
+# $NetBSD: builtin.mk,v 1.2 2004/03/29 05:43:35 jlam Exp $
 
 _KRB5_KRB5_H=	/usr/include/krb5/krb5.h
 
@@ -48,11 +48,6 @@ MAKEFLAGS+=		BUILTIN_PKG.heimdal=${BUILTIN_PKG.heimdal}
 MAKEFLAGS+=	IS_BUILTIN.heimdal=${IS_BUILTIN.heimdal}
 .endif
 
-CHECK_BUILTIN.heimdal?=	no
-.if !empty(CHECK_BUILTIN.heimdal:M[yY][eE][sS])
-USE_BUILTIN.heimdal=	yes
-.endif
-
 .if !defined(USE_BUILTIN.heimdal)
 USE_BUILTIN.heimdal?=	${IS_BUILTIN.heimdal}
 
@@ -71,10 +66,15 @@ USE_BUILTIN.heimdal!=	\
 .  endif
 .endif	# USE_BUILTIN.heimdal
 
+CHECK_BUILTIN.heimdal?=	no
+.if !empty(CHECK_BUILTIN.heimdal:M[nN][oO])
+
 .if !empty(USE_BUILTIN.heimdal:M[nN][oO])
 BUILDLINK_DEPENDS.heimdal+=	heimdal>=0.6
 
 KRB5_CONFIG?=	${BUILDLINK_PREFIX.heimdal}/bin/krb5-config
 CONFIGURE_ENV+=	KRB5_CONFIG="${KRB5_CONFIG}"
 MAKE_ENV+=	KRB5_CONFIG="${KRB5_CONFIG}"
-.endif	# HEIMDAL_BUILDLINK3_MK
+.endif
+
+.endif	# CHECK_BUILTIN.heimdal
diff --git a/security/tcp_wrappers/builtin.mk b/security/tcp_wrappers/builtin.mk
index 468cc9ec558..86d119d53e0 100644
--- a/security/tcp_wrappers/builtin.mk
+++ b/security/tcp_wrappers/builtin.mk
@@ -1,15 +1,10 @@
-# $NetBSD: builtin.mk,v 1.1 2004/03/10 17:57:15 jlam Exp $
+# $NetBSD: builtin.mk,v 1.2 2004/03/29 05:43:35 jlam Exp $
 
 .if !defined(IS_BUILTIN.tcp_wrappers)
 IS_BUILTIN.tcp_wrappers=	no
 .  if exists(/usr/include/tcpd.h)
 IS_BUILTIN.tcp_wrappers=	yes
 .  endif
-.endif
-
-CHECK_BUILTIN.tcp_wrappers?=	no
-.if !empty(CHECK_BUILTIN.tcp_wrappers:M[yY][eE][sS])
-USE_BUILTIN.tcp_wrappers=	yes
-.endif
+.endif	# IS_BUILTIN.tcp_wrappers
 
 USE_BUILTIN.tcp_wrappers?=	${IS_BUILTIN.tcp_wrappers}
diff --git a/textproc/expat/builtin.mk b/textproc/expat/builtin.mk
index affa0e49395..1b6ea514d5b 100644
--- a/textproc/expat/builtin.mk
+++ b/textproc/expat/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1 2004/03/10 17:57:15 jlam Exp $
+# $NetBSD: builtin.mk,v 1.2 2004/03/29 05:43:35 jlam Exp $
 
 _EXPAT_H=	${X11BASE}/include/expat.h
 _X11_TMPL=	${X11BASE}/lib/X11/config/X11.tmpl
@@ -30,16 +30,11 @@ _EXPAT_MICRO!=	\
 		${_EXPAT_H}
 _EXPAT_VERSION=	${_EXPAT_MAJOR}.${_EXPAT_MINOR}.${_EXPAT_MICRO}
 BUILTIN_PKG.expat=	expat-${_EXPAT_VERSION}
-MAKEFLAGS+=		BUILTIN_PKG.expat=${BUILTIN_PKG.expat}
+BUILDLINK_VARS+=	BUILTIN_PKG.expat
 .    endif
 .  endif
-MAKEFLAGS+=	IS_BUILTIN.expat=${IS_BUILTIN.expat}
-.endif
-
-CHECK_BUILTIN.expat?=	no
-.if !empty(CHECK_BUILTIN.expat:M[yY][eE][sS])
-USE_BUILTIN.expat=	yes
-.endif
+BUILDLINK_VARS+=	IS_BUILTIN.expat
+.endif	# IS_BUILTIN.expat
 
 .if !defined(USE_BUILTIN.expat)
 USE_BUILTIN.expat?=	${IS_BUILTIN.expat}
@@ -59,6 +54,9 @@ USE_BUILTIN.expat!=	\
 .  endif
 .endif	# USE_BUILTIN.expat
 
+CHECK_BUILTIN.expat?=	no
+.if !empty(CHECK_BUILTIN.expat:M[nN][oO])
+
 .if !empty(USE_BUILTIN.expat:M[nN][oO])
 BUILDLINK_DEPENDS.expat+=	expat>=1.95.4
 .endif
@@ -67,3 +65,5 @@ BUILDLINK_DEPENDS.expat+=	expat>=1.95.4
 BUILDLINK_PREFIX.expat=		${X11BASE}
 USE_X11=			yes
 .endif
+
+.endif	# CHECK_BUILTIN.expat
diff --git a/x11/Xrandr-mixedcase/builtin.mk b/x11/Xrandr-mixedcase/builtin.mk
index 26eeb68d4d2..cec185a9a22 100644
--- a/x11/Xrandr-mixedcase/builtin.mk
+++ b/x11/Xrandr-mixedcase/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1 2004/03/10 17:57:15 jlam Exp $
+# $NetBSD: builtin.mk,v 1.2 2004/03/29 05:43:36 jlam Exp $
 
 _X11_TMPL=	${X11BASE}/lib/X11/config/X11.tmpl
 
@@ -47,7 +47,7 @@ _XF86_VERSION=	${_XF86_MAJOR}.${_XF86_MINOR}
 _XF86_VERSION=	${_XF86_MAJOR}.${_XF86_MINOR}.${_XF86_TEENY}
 .          endif
 .        endif
-MAKEFLAGS+=	_XF86_VERSION=${_XF86_VERSION}
+BUILDLINK_VARS+=	_XF86_VERSION
 .      endif
 .      for _xrandr_version_ in ${_XRANDR_VERSIONS}
 .        for _pattern_ in ${_XRANDR_${_xrandr_version_}}
@@ -58,15 +58,17 @@ _XRANDR_VERSION?=	${_xrandr_version_}
 .      endfor
 _XRANDR_VERSION?=	1.0
 BUILTIN_PKG.Xrandr=	Xrandr-${_XRANDR_VERSION}
-MAKEFLAGS+=		BUILTIN_PKG.Xrandr=${BUILTIN_PKG.Xrandr}
+BUILDLINK_VARS+=	BUILTIN_PKG.Xrandr
 .    endif
 .  endif
-MAKEFLAGS+=	IS_BUILTIN.Xrandr=${IS_BUILTIN.Xrandr}
-.endif
+BUILDLINK_VARS+=	IS_BUILTIN.Xrandr
+.endif	# IS_BUILTIN.Xrandr
 
-CHECK_BUILTIN.Xrandr?=	no
-.if !empty(CHECK_BUILTIN.Xrandr:M[yY][eE][sS])
-USE_BUILTIN.Xrandr=	yes
+.if defined(USE_BUILTIN.randrext) && !empty(USE_BUILTIN.randrext:M[nN][oO])
+USE_BUILTIN.Xrandr=	no
+.endif
+.if defined(USE_BUILTIN.Xrender) && !empty(USE_BUILTIN.Xrender:M[nN][oO])
+USE_BUILTIN.Xrandr=	no
 .endif
 
 .if !defined(USE_BUILTIN.Xrandr)
@@ -87,6 +89,9 @@ USE_BUILTIN.Xrandr!=	\
 .  endif
 .endif	# USE_BUILTIN.Xrandr
 
+CHECK_BUILTIN.Xrandr?=	no
+.if !empty(CHECK_BUILTIN.Xrandr:M[nN][oO])
+
 .if !empty(USE_BUILTIN.Xrandr:M[nN][oO])
 BUILDLINK_DEPENDS.Xrandr+=	Xrandr>=1.0.1
 BUILDLINK_DEPENDS.Xrender+=	Xrender>=0.8
@@ -97,3 +102,5 @@ BUILDLINK_PREFIX.Xrandr=	${X11BASE}
 USE_BUILTIN.randrext=		yes
 USE_BUILTIN.Xrender=		yes
 .endif
+
+.endif	# CHECK_BUILTIN.Xrandr
diff --git a/x11/Xrender/builtin.mk b/x11/Xrender/builtin.mk
index b7a1940bc8c..bfd222e00b4 100644
--- a/x11/Xrender/builtin.mk
+++ b/x11/Xrender/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1 2004/03/10 17:57:15 jlam Exp $
+# $NetBSD: builtin.mk,v 1.2 2004/03/29 05:43:36 jlam Exp $
 
 _X11_TMPL=	${X11BASE}/lib/X11/config/X11.tmpl
 
@@ -49,7 +49,7 @@ _XF86_VERSION=	${_XF86_MAJOR}.${_XF86_MINOR}
 _XF86_VERSION=	${_XF86_MAJOR}.${_XF86_MINOR}.${_XF86_TEENY}
 .          endif
 .        endif
-MAKEFLAGS+=	_XF86_VERSION=${_XF86_VERSION}
+BUILDLINK_VARS+=	_XF86_VERSION
 .      endif
 .      for _xrender_version_ in ${_XRENDER_VERSIONS}
 .        for _pattern_ in ${_XRENDER_${_xrender_version_}}
@@ -60,16 +60,15 @@ _XRENDER_VERSION?=	${_xrender_version_}
 .      endfor
 _XRENDER_VERSION?=	0.1
 BUILTIN_PKG.Xrender=	Xrender-${_XRENDER_VERSION}
-MAKEFLAGS+=		BUILTIN_PKG.Xrender=${BUILTIN_PKG.Xrender}
+BUILDLINK_VARS+=	BUILTIN_PKG.Xrender
 .    endif
 .  endif
-MAKEFLAGS+=	IS_BUILTIN.Xrender=${IS_BUILTIN.Xrender}
-.endif
+BUILDLINK_VARS+=	IS_BUILTIN.Xrender
+.endif	# IS_BUILTIN.Xrender
 
-CHECK_BUILTIN.Xrender?=	no
-.if !empty(CHECK_BUILTIN.Xrender:M[yY][eE][sS])
-USE_BUILTIN.Xrender=	yes
-.endif
+#.if defined(USE_BUILTIN.render) && !empty(USE_BUILTIN.render:M[nN][oO])
+#USE_BUILTIN.Xrender=	no
+#.endif
 
 .if !defined(USE_BUILTIN.Xrender)
 USE_BUILTIN.Xrender?=	${IS_BUILTIN.Xrender}
@@ -89,6 +88,9 @@ USE_BUILTIN.Xrender!=	\
 .  endif
 .endif	# USE_BUILTIN.Xrender
 
+CHECK_BUILTIN.Xrender?=	no
+.if !empty(CHECK_BUILTIN.Xrender:M[nN][oO])
+
 .if !empty(USE_BUILTIN.Xrender:M[nN][oO])
 BUILDLINK_DEPENDS.Xrender+=	Xrender>=0.8.2
 BUILDLINK_DEPENDS.render+=	render>=0.8
@@ -98,3 +100,5 @@ BUILDLINK_DEPENDS.render+=	render>=0.8
 BUILDLINK_PREFIX.Xrender=	${X11BASE}
 USE_BUILTIN.render=		yes
 .endif
+
+.endif	# CHECK_BUILTIN.Xrender
diff --git a/x11/randrext/builtin.mk b/x11/randrext/builtin.mk
index af142fe125d..1ccb6e9655c 100644
--- a/x11/randrext/builtin.mk
+++ b/x11/randrext/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1 2004/03/10 17:57:15 jlam Exp $
+# $NetBSD: builtin.mk,v 1.2 2004/03/29 05:43:36 jlam Exp $
 
 _X11_EXTENSIONS_RANDR_H=	${X11BASE}/include/X11/extensions/randr.h
 
@@ -20,15 +20,10 @@ _RANDR_MINOR!=	\
 		${_X11_EXTENSIONS_RANDR_H}
 _RANDR_VERSION=	${_RANDR_MAJOR}${_RANDR_MINOR}
 BUILTIN_PKG.randrext=	randrext-${_RANDR_VERSION}
-MAKEFLAGS+=		BUILTIN_PKG.randrext=${BUILTIN_PKG.randrext}
+BUILDLINK_VARS+=	BUILTIN_PKG.randrext
 .  endif
-MAKEFLAGS+=	IS_BUILTIN.randrext=${IS_BUILTIN.randrext}
-.endif
-
-CHECK_BUILTIN.randrext?=	no
-.if !empty(CHECK_BUILTIN.randrext:M[yY][eE][sS])
-USE_BUILTIN.randrext=	yes
-.endif
+BUILDLINK_VARS+=	IS_BUILTIN.randrext
+.endif	# IS_BUILTIN.randrext
 
 .if !defined(USE_BUILTIN.randrext)
 USE_BUILTIN.randrext?=	${IS_BUILTIN.randrext}
@@ -48,6 +43,9 @@ USE_BUILTIN.randrext!=		\
 .  endif
 .endif	# USE_BUILTIN.randrext
 
+CHECK_BUILTIN.randrext?=	no
+.if !empty(CHECK_BUILTIN.randrext:M[nN][oO])
+
 .if !empty(USE_BUILTIN.randrext:M[nN][oO])
 BUILDLINK_DEPENDS.randrext+=	randrext>=1.0
 .endif
@@ -56,3 +54,5 @@ BUILDLINK_DEPENDS.randrext+=	randrext>=1.0
 BUILDLINK_PREFIX.randrext=	${X11BASE}
 USE_X11=			yes
 .endif
+
+.endif	# CHECK_BUILTIN.randrext
diff --git a/x11/render/builtin.mk b/x11/render/builtin.mk
index 61bf829dc13..e80d1e3e2f1 100644
--- a/x11/render/builtin.mk
+++ b/x11/render/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1 2004/03/10 17:57:15 jlam Exp $
+# $NetBSD: builtin.mk,v 1.2 2004/03/29 05:43:36 jlam Exp $
 
 _X11_EXTENSIONS_RENDER_H=	${X11BASE}/include/X11/extensions/render.h
 
@@ -20,15 +20,10 @@ _RENDER_MINOR!=	\
 		${_X11_EXTENSIONS_RENDER_H}
 _RENDER_VERSION=	${_RENDER_MAJOR}${_RENDER_MINOR}
 BUILTIN_PKG.render=	render-${_RENDER_VERSION}
-MAKEFLAGS+=		BUILTIN_PKG.render=${BUILTIN_PKG.render}
+BUILDLINK_VARS+=	BUILTIN_PKG.render
 .  endif
-MAKEFLAGS+=	IS_BUILTIN.render=${IS_BUILTIN.render}
-.endif
-
-CHECK_BUILTIN.render?=	no
-.if !empty(CHECK_BUILTIN.render:M[yY][eE][sS])
-USE_BUILTIN.render=	yes
-.endif
+BUILDLINK_VARS+=	IS_BUILTIN.render
+.endif	# IS_BUILTIN.render
 
 .if !defined(USE_BUILTIN.render)
 USE_BUILTIN.render?=	${IS_BUILTIN.render}
@@ -48,6 +43,9 @@ USE_BUILTIN.render!=	\
 .  endif
 .endif	# USE_BUILTIN.render
 
+CHECK_BUILTIN.render?=	no
+.if !empty(CHECK_BUILTIN.render:M[nN][oO])
+
 .if !empty(USE_BUILTIN.render:M[nN][oO])
 BUILDLINK_DEPENDS.render+=	render>=0.8
 .endif
@@ -56,3 +54,5 @@ BUILDLINK_DEPENDS.render+=	render>=0.8
 BUILDLINK_PREFIX.render=	${X11BASE}
 USE_X11=			yes
 .endif
+
+.endif	# CHECK_BUILTIN.render
diff --git a/x11/xcursor/builtin.mk b/x11/xcursor/builtin.mk
index 56563881777..db2aa2ba2de 100644
--- a/x11/xcursor/builtin.mk
+++ b/x11/xcursor/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2004/03/16 17:40:54 jlam Exp $
+# $NetBSD: builtin.mk,v 1.3 2004/03/29 05:43:36 jlam Exp $
 
 _X11_XCURSOR_XCURSOR_H=	${X11BASE}/include/X11/Xcursor/Xcursor.h
 
@@ -23,14 +23,16 @@ _XCURSOR_REVISION!=	\
 		${_X11_XCURSOR_XCURSOR_H}
 _XCURSOR_VERSION=	${_XCURSOR_MAJOR}${_XCURSOR_MINOR}${_XCURSOR_REVISION}
 BUILTIN_PKG.xcursor=	xcursor-${_XCURSOR_VERSION}
-MAKEFLAGS+=		BUILTIN_PKG.xcursor=${BUILTIN_PKG.xcursor}
+BUILDLINK_VARS+=	BUILTIN_PKG.xcursor
 .  endif
-MAKEFLAGS+=	IS_BUILTIN.xcursor=${IS_BUILTIN.xcursor}
-.endif
+BUILDLINK_VARS+=	IS_BUILTIN.xcursor
+.endif	# IS_BUILTIN.xcursor
 
-CHECK_BUILTIN.xcursor?=	no
-.if !empty(CHECK_BUILTIN.xcursor:M[yY][eE][sS])
-USE_BUILTIN.xcursor=	yes
+.if defined(USE_BUILTIN.Xfixes) && !empty(USE_BUILTIN.Xfixes:M[nN][oO])
+USE_BUILTIN.xcursor=	no
+.endif
+.if defined(USE_BUILTIN.Xrender) && !empty(USE_BUILTIN.Xrender:M[nN][oO])
+USE_BUILTIN.xcursor=	no
 .endif
 
 .if !defined(USE_BUILTIN.xcursor)
@@ -51,6 +53,9 @@ USE_BUILTIN.xcursor!=	\
 .  endif
 .endif	# USE_BUILTIN.xcursor
 
+CHECK_BUILTIN.xcursor?=	no
+.if !empty(CHECK_BUILTIN.xcursor:M[nN][oO])
+
 .if !empty(USE_BUILTIN.xcursor:M[nN][oO])
 BUILDLINK_DEPENDS.xcursor+=	xcursor>=1.1.1
 BUILDLINK_DEPENDS.Xrender+=	Xrender>=0.8
@@ -68,3 +73,5 @@ BUILDLINK_PREFIX.xcursor=	${X11BASE}
 BUILDLINK_FILES.xcursor+=	lib/pkgconfig/xcursor.pc
 USE_BUILTIN.Xrender=		yes
 .endif
+
+.endif	# CHECK_BUILTIN.xcursor