4 files changed, 12 insertions, 30 deletions
diff --git a/graphics/MesaLib/builtin.mk b/graphics/MesaLib/builtin.mk
index 317a10a45e7..86961a001cd 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.15 2008/10/05 21:36:35 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..d2842992800 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.12 2008/10/05 21:36:35 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..75e48502e16 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.12 2008/10/05 21:36:36 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..86ecad54a4b 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.16 2008/10/05 21:36:36 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"