Adapt to new x11.builtin.mk.

8 files changed, 28 insertions, 59 deletions

diff --git a/graphics/MesaLib/builtin.mk b/graphics/MesaLib/builtin.mk
index 317a10a45e7..6b9073d1edd 100644
--- a/graphics/MesaLib/builtin.mk
+++ b/graphics/MesaLib/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.14 2006/04/06 06:22:00 reed Exp $
+# $NetBSD: builtin.mk,v 1.14.22.1 2008/09/26 19:59:46 cube Exp $
 
 BUILTIN_PKG:=	MesaLib
 
@@ -74,12 +74,8 @@ BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
 .  endif
 
-.  if !empty(USE_BUILTIN.MesaLib:M[yY][eE][sS])
-BUILDLINK_PREFIX.MesaLib=	${X11BASE}
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-.    include "../../mk/x11.buildlink3.mk"
-.    include "../../mk/x11.builtin.mk"
+.  include "../../mk/x11.builtin.mk"
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
-.  endif
 
 .endif	# CHECK_BUILTIN.MesaLib
diff --git a/graphics/freetype2/builtin.mk b/graphics/freetype2/builtin.mk
index ff321dc54b9..fa8a87ad476 100644
--- a/graphics/freetype2/builtin.mk
+++ b/graphics/freetype2/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.11 2008/04/24 11:18:13 tron Exp $
+# $NetBSD: builtin.mk,v 1.11.6.1 2008/09/26 19:59:46 cube Exp $
 
 BUILTIN_PKG:=	freetype2
 
@@ -70,6 +70,9 @@ MAKEVARS+=	USE_BUILTIN.freetype2
 ### The section below only applies if we are not including this file
 ### solely to determine whether a built-in implementation exists.
 ###
+
+.include "../../mk/x11.builtin.mk"
+
 CHECK_BUILTIN.freetype2?=	no
 .if !empty(CHECK_BUILTIN.freetype2:M[nN][oO])
 
@@ -77,10 +80,4 @@ CHECK_BUILTIN.freetype2?=	no
 BUILDLINK_API_DEPENDS.freetype2+=	freetype2>=2.1.3
 .  endif
 
-.  if !empty(USE_BUILTIN.freetype2:M[yY][eE][sS])
-BUILDLINK_PREFIX.freetype2=	${X11BASE}
-.    include "../../mk/x11.buildlink3.mk"
-.    include "../../mk/x11.builtin.mk"
-.  endif
-
 .endif	# CHECK_BUILTIN.freetype2
diff --git a/graphics/glu/builtin.mk b/graphics/glu/builtin.mk
index b1b963b23dd..6935622f0a6 100644
--- a/graphics/glu/builtin.mk
+++ b/graphics/glu/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.11 2006/04/06 06:22:02 reed Exp $
+# $NetBSD: builtin.mk,v 1.11.22.1 2008/09/26 19:59:46 cube Exp $
 
 BUILTIN_PKG:=	glu
 
@@ -64,6 +64,9 @@ MAKEVARS+=	USE_BUILTIN.glu
 ### The section below only applies if we are not including this file
 ### solely to determine whether a built-in implementation exists.
 ###
+
+.include "../../mk/x11.builtin.mk"
+
 CHECK_BUILTIN.glu?=	no
 .if !empty(CHECK_BUILTIN.glu:M[nN][oO])
 
@@ -71,10 +74,4 @@ CHECK_BUILTIN.glu?=	no
 BUILDLINK_API_DEPENDS.glu+=	glu>=6.0
 .  endif
 
-.  if !empty(USE_BUILTIN.glu:M[yY][eE][sS])
-BUILDLINK_PREFIX.glu=	${X11BASE}
-.    include "../../mk/x11.buildlink3.mk"
-.    include "../../mk/x11.builtin.mk"
-.  endif
-
 .endif	# CHECK_BUILTIN.glu
diff --git a/graphics/xpm/builtin.mk b/graphics/xpm/builtin.mk
index c5adc96d509..24da6032353 100644
--- a/graphics/xpm/builtin.mk
+++ b/graphics/xpm/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.15 2007/09/21 15:17:14 rillig Exp $
+# $NetBSD: builtin.mk,v 1.15.12.1 2008/09/26 19:59:46 cube Exp $
 
 BUILTIN_PKG:=	xpm
 
@@ -84,13 +84,5 @@ MAKEVARS+=	USE_BUILTIN.xpm
 ### The section below only applies if we are not including this file
 ### solely to determine whether a built-in implementation exists.
 ###
-CHECK_BUILTIN.xpm?=	no
-.if !empty(CHECK_BUILTIN.xpm:M[nN][oO])
 
-.  if !empty(USE_BUILTIN.xpm:M[yY][eE][sS])
-BUILDLINK_PREFIX.xpm=	${X11BASE}
-.    include "../../mk/x11.buildlink3.mk"
-.    include "../../mk/x11.builtin.mk"
-.  endif
-
-.endif	# CHECK_BUILTIN.xpm
+.include "../../mk/x11.builtin.mk"
diff --git a/textproc/expat/builtin.mk b/textproc/expat/builtin.mk
index aa67b1aa257..1778c686c32 100644
--- a/textproc/expat/builtin.mk
+++ b/textproc/expat/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.12.18.1 2008/09/13 04:46:45 cube Exp $
+# $NetBSD: builtin.mk,v 1.12.18.2 2008/09/26 19:59:46 cube Exp $
 
 BUILTIN_PKG:=	expat
 
@@ -80,14 +80,10 @@ CHECK_BUILTIN.expat?=	no
 BUILDLINK_API_DEPENDS.expat+=	expat>=1.95.4
 .  endif
 
-.  if !empty(USE_BUILTIN.expat:M[yY][eE][sS])
-.    if !empty(H_EXPAT:M${X11BASE}/*)
-BUILDLINK_PREFIX.expat=	${X11BASE}
-.      include "../../mk/x11.buildlink3.mk"
-.      include "../../mk/x11.builtin.mk"
-.    else
+.  if !empty(H_EXPAT:M${X11BASE}/*)
+.    include "../../mk/x11.builtin.mk"
+.  else
 BUILDLINK_PREFIX.expat=	/usr
-.    endif
 .  endif
 
 .endif	# CHECK_BUILTIN.expat
diff --git a/x11/randrproto/builtin.mk b/x11/randrproto/builtin.mk
index 94fa8856656..3447865ac27 100644
--- a/x11/randrproto/builtin.mk
+++ b/x11/randrproto/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.4 2007/02/22 19:27:27 wiz Exp $
+# $NetBSD: builtin.mk,v 1.4.16.1 2008/09/26 19:59:46 cube Exp $
 
 # TODO: builtin.mk failed to use native on XFree86
 # the two headers are identical with native XFree86
@@ -76,6 +76,9 @@ MAKEVARS+=	USE_BUILTIN.randrproto
 ### The section below only applies if we are not including this file
 ### solely to determine whether a built-in implementation exists.
 ###
+
+.include "../../mk/x11.builtin.mk"
+
 CHECK_BUILTIN.randrproto?=	no
 .if !empty(CHECK_BUILTIN.randrproto:M[nN][oO])
 
@@ -83,10 +86,4 @@ CHECK_BUILTIN.randrproto?=	no
 BUILDLINK_API_DEPENDS.randrproto+=	randrproto>=1.0
 .  endif
 
-.  if !empty(USE_BUILTIN.randrproto:M[yY][eE][sS])
-BUILDLINK_PREFIX.randrproto=	${X11BASE}
-.    include "../../mk/x11.buildlink3.mk"
-.    include "../../mk/x11.builtin.mk"
-.  endif
-
 .endif	# CHECK_BUILTIN.randrproto
diff --git a/x11/renderproto/builtin.mk b/x11/renderproto/builtin.mk
index 37215f0b41a..cf8b80b4a7c 100644
--- a/x11/renderproto/builtin.mk
+++ b/x11/renderproto/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.8 2006/12/17 16:06:31 joerg Exp $
+# $NetBSD: builtin.mk,v 1.8.18.1 2008/09/26 19:59:46 cube Exp $
 
 BUILTIN_PKG:=	renderproto
 
@@ -74,6 +74,9 @@ MAKEVARS+=	USE_BUILTIN.renderproto
 ### The section below only applies if we are not including this file
 ### solely to determine whether a built-in implementation exists.
 ###
+
+.include "../../mk/x11.builtin.mk"
+
 CHECK_BUILTIN.renderproto?=	no
 .if !empty(CHECK_BUILTIN.renderproto:M[nN][oO])
 
@@ -81,12 +84,6 @@ CHECK_BUILTIN.renderproto?=	no
 BUILDLINK_API_DEPENDS.renderproto+=	renderproto>=0.9
 .  endif
 
-.  if !empty(USE_BUILTIN.renderproto:M[yY][eE][sS])
-BUILDLINK_PREFIX.renderproto=	${X11BASE}
-.    include "../../mk/x11.buildlink3.mk"
-.    include "../../mk/x11.builtin.mk"
-.  endif
-
 .endif	# CHECK_BUILTIN.renderproto
 
 CHECK_BUILTIN.renderproto?=	no
diff --git a/x11/xextproto/builtin.mk b/x11/xextproto/builtin.mk
index 8e8dd7e329f..f1d454ed157 100644
--- a/x11/xextproto/builtin.mk
+++ b/x11/xextproto/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.5 2007/02/22 19:27:28 wiz Exp $
+# $NetBSD: builtin.mk,v 1.5.16.1 2008/09/26 19:59:46 cube Exp $
 
 BUILTIN_PKG:=	xextproto
 
@@ -58,15 +58,12 @@ MAKEVARS+=	USE_BUILTIN.xextproto
 ### The section below only applies if we are not including this file
 ### solely to determine whether a built-in implementation exists.
 ###
+
+.include "../../mk/x11.builtin.mk"
+
 CHECK_BUILTIN.xextproto?=	no
 .if !empty(CHECK_BUILTIN.xextproto:M[nN][oO])
 
-.  if !empty(USE_BUILTIN.xextproto:M[yY][eE][sS])
-BUILDLINK_PREFIX.xextproto=	${X11BASE}
-.    include "../../mk/x11.buildlink3.mk"
-.    include "../../mk/x11.builtin.mk"
-.  endif
-
 # If we are using the builtin version, check whether it has a xextproto.pc
 # file or not.  If the latter, generate a fake one.
 .  if !empty(USE_BUILTIN.xextproto:M[Yy][Ee][Ss])