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.

5 files changed, 34 insertions, 36 deletions

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}