Merge cube-native-xorg, so that pkgsrc-current can be used with the native

X.Org found in NetBSD-current.

Thanks a lot to all who helped, especially Matthias Scheler who did
repeated tests on Mac OS X and older versions of NetBSD to make sure the
support for those platforms wouldn't be broken (or at least, not fatally,
as I would still expect a few hiccups here and there, because there is
only so much one can test in such limited time).

On the infrastructure side, this branch brings pkgconfig-builtin.mk, in
order to write very easily new builtin.mk files.  It can actually handle
more than just pkgconfig files, but it will provide a version if it finds
such a file.  x11.builtin.mk has also been made more useful and now all
existing (and future!) native-X11-related builtin.mk files should include
it.

59 files changed, 305 insertions, 116 deletions

diff --git a/x11/Xcomposite/builtin.mk b/x11/Xcomposite/builtin.mk
index 9ca874b471d..4fa85e8fedb 100644
--- a/x11/Xcomposite/builtin.mk
+++ b/x11/Xcomposite/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.12 2006/04/19 15:39:06 reed Exp $
+# $NetBSD: builtin.mk,v 1.13 2008/10/05 21:36:32 cube Exp $
 
 BUILTIN_PKG:=	Xcomposite
 
@@ -48,3 +48,5 @@ USE_BUILTIN.Xcomposite!=						\
 .  endif  # PREFER.Xcomposite
 .endif
 MAKEVARS+=	USE_BUILTIN.Xcomposite
+
+.include "../../mk/x11.builtin.mk"
diff --git a/x11/Xfixes/builtin.mk b/x11/Xfixes/builtin.mk
index 506d4a6b937..55ab4fde4dd 100644
--- a/x11/Xfixes/builtin.mk
+++ b/x11/Xfixes/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.10 2006/04/06 06:22:56 reed Exp $
+# $NetBSD: builtin.mk,v 1.11 2008/10/05 21:36:32 cube Exp $
 
 BUILTIN_PKG:=	Xfixes
 
@@ -47,3 +47,5 @@ USE_BUILTIN.Xfixes!=							\
 .  endif  # PREFER.Xfixes
 .endif
 MAKEVARS+=	USE_BUILTIN.Xfixes
+
+.include "../../mk/x11.builtin.mk"
diff --git a/x11/Xrender/builtin.mk b/x11/Xrender/builtin.mk
index b596f5eb625..45d4de2e408 100644
--- a/x11/Xrender/builtin.mk
+++ b/x11/Xrender/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.17 2006/04/06 06:22:57 reed Exp $
+# $NetBSD: builtin.mk,v 1.18 2008/10/05 21:36:32 cube Exp $
 
 BUILTIN_PKG:=	Xrender
 
@@ -96,6 +96,9 @@ MAKEVARS+=	USE_BUILTIN.Xrender
 ### 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.Xrender?=	no
 .if !empty(CHECK_BUILTIN.Xrender:M[nN][oO])
 
diff --git a/x11/bigreqsproto/builtin.mk b/x11/bigreqsproto/builtin.mk
new file mode 100644
index 00000000000..28b30710cb8
--- /dev/null
+++ b/x11/bigreqsproto/builtin.mk
@@ -0,0 +1,7 @@
+# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:32 cube Exp $
+
+BUILTIN_PKG:=	bigreqsproto
+PKGCONFIG_FILE.bigreqsproto=	${X11BASE}/lib/pkgconfig/bigreqsproto.pc
+
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
+.include "../../mk/x11.builtin.mk"
diff --git a/x11/compositeproto/builtin.mk b/x11/compositeproto/builtin.mk
index 576e52af0fc..d92fc0dda84 100644
--- a/x11/compositeproto/builtin.mk
+++ b/x11/compositeproto/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.4 2006/12/16 01:04:43 joerg Exp $
+# $NetBSD: builtin.mk,v 1.5 2008/10/05 21:36:32 cube Exp $
 
 BUILTIN_PKG:=	compositeproto
 
@@ -57,6 +57,8 @@ USE_BUILTIN.compositeproto!=						\
 .endif
 MAKEVARS+=	USE_BUILTIN.compositeproto
 
+.include "../../mk/x11.builtin.mk"
+
 CHECK_BUILTIN.compositeproto?=		no
 .if !empty(CHECK_BUILTIN.compositeproto:M[nN][oO])
 
diff --git a/x11/damageproto/builtin.mk b/x11/damageproto/builtin.mk
new file mode 100644
index 00000000000..b432ad7e388
--- /dev/null
+++ b/x11/damageproto/builtin.mk
@@ -0,0 +1,7 @@
+# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:32 cube Exp $
+
+BUILTIN_PKG:=	damageproto
+PKGCONFIG_FILE.damageproto=	${X11BASE}/lib/pkgconfig/damageproto.pc
+
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
+.include "../../mk/x11.builtin.mk"
diff --git a/x11/evieext/builtin.mk b/x11/evieext/builtin.mk
new file mode 100644
index 00000000000..829eb087b40
--- /dev/null
+++ b/x11/evieext/builtin.mk
@@ -0,0 +1,7 @@
+# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:32 cube Exp $
+
+BUILTIN_PKG:=	evieext
+PKGCONFIG_FILE.evieext=	${X11BASE}/lib/pkgconfig/evieproto.pc
+
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
+.include "../../mk/x11.builtin.mk"
diff --git a/x11/fixesproto/builtin.mk b/x11/fixesproto/builtin.mk
index faa3b6bbb16..369cc4a61ec 100644
--- a/x11/fixesproto/builtin.mk
+++ b/x11/fixesproto/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.6 2007/02/22 19:27:26 wiz Exp $
+# $NetBSD: builtin.mk,v 1.7 2008/10/05 21:36:33 cube Exp $
 
 BUILTIN_PKG:=	fixesproto
 
@@ -57,6 +57,8 @@ USE_BUILTIN.fixesproto!=						\
 .endif
 MAKEVARS+=	USE_BUILTIN.fixesproto
 
+.include "../../mk/x11.builtin.mk"
+
 CHECK_BUILTIN.fixesproto?=	no
 .if !empty(CHECK_BUILTIN.fixesproto:M[nN][oO])
 
diff --git a/x11/fontcacheproto/builtin.mk b/x11/fontcacheproto/builtin.mk
new file mode 100644
index 00000000000..f521f2d9771
--- /dev/null
+++ b/x11/fontcacheproto/builtin.mk
@@ -0,0 +1,7 @@
+# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:33 cube Exp $
+
+BUILTIN_PKG:=	fontcacheproto
+PKGCONFIG_FILE.fontcacheproto=	${X11BASE}/lib/pkgconfig/fontcacheproto.pc
+
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
+.include "../../mk/x11.builtin.mk"
diff --git a/x11/fontsproto/builtin.mk b/x11/fontsproto/builtin.mk
new file mode 100644
index 00000000000..2c98f63c37e
--- /dev/null
+++ b/x11/fontsproto/builtin.mk
@@ -0,0 +1,7 @@
+# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:33 cube Exp $
+
+BUILTIN_PKG:=	fontsproto
+PKGCONFIG_FILE.fontsproto=	${X11BASE}/lib/pkgconfig/fontsproto.pc
+
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
+.include "../../mk/x11.builtin.mk"
diff --git a/x11/glproto/builtin.mk b/x11/glproto/builtin.mk
new file mode 100644
index 00000000000..0c90f8624b5
--- /dev/null
+++ b/x11/glproto/builtin.mk
@@ -0,0 +1,7 @@
+# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:33 cube Exp $
+
+BUILTIN_PKG:=	glproto
+PKGCONFIG_FILE.glproto=	${X11BASE}/lib/pkgconfig/glproto.pc
+
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
+.include "../../mk/x11.builtin.mk"
diff --git a/x11/inputproto/builtin.mk b/x11/inputproto/builtin.mk
index 46e1ba6f329..d7aa050ae8b 100644
--- a/x11/inputproto/builtin.mk
+++ b/x11/inputproto/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2008/01/05 16:00:08 tron Exp $
+# $NetBSD: builtin.mk,v 1.3 2008/10/05 21:36:33 cube Exp $
 
 BUILTIN_PKG:=	inputproto
 
@@ -59,3 +59,5 @@ USE_BUILTIN.inputproto!=							\
 .  endif  # PREFER.inputproto
 .endif
 MAKEVARS+=	USE_BUILTIN.inputproto
+
+.include "../../mk/x11.builtin.mk"
diff --git a/x11/kbproto/builtin.mk b/x11/kbproto/builtin.mk
index cac336fe076..05b0101e6ca 100644
--- a/x11/kbproto/builtin.mk
+++ b/x11/kbproto/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1 2007/12/15 15:34:51 tron Exp $
+# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:33 cube Exp $
 
 BUILTIN_PKG:=	kbproto
 
@@ -47,3 +47,5 @@ USE_BUILTIN.kbproto!=							\
 .  endif  # PREFER.kbproto
 .endif
 MAKEVARS+=	USE_BUILTIN.kbproto
+
+.include "../../mk/x11.builtin.mk"
diff --git a/x11/libFS/builtin.mk b/x11/libFS/builtin.mk
new file mode 100644
index 00000000000..03a6613b228
--- /dev/null
+++ b/x11/libFS/builtin.mk
@@ -0,0 +1,7 @@
+# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:33 cube Exp $
+
+BUILTIN_PKG:=	libFS
+PKGCONFIG_FILE.libFS=	${X11BASE}/lib/pkgconfig/libfs.pc
+
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
+.include "../../mk/x11.builtin.mk"
diff --git a/x11/libICE/builtin.mk b/x11/libICE/builtin.mk
index 43dcd9348a3..5f07588cdf6 100644
--- a/x11/libICE/builtin.mk
+++ b/x11/libICE/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1 2007/12/17 13:27:29 tron Exp $
+# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:33 cube Exp $
 
 BUILTIN_PKG:=	libICE
 
@@ -47,3 +47,5 @@ USE_BUILTIN.libICE!=							\
 .  endif  # PREFER.libICE
 .endif
 MAKEVARS+=	USE_BUILTIN.libICE
+
+.include "../../mk/x11.builtin.mk"
diff --git a/x11/libSM/builtin.mk b/x11/libSM/builtin.mk
index 2cf24688655..8ac2106c8d8 100644
--- a/x11/libSM/builtin.mk
+++ b/x11/libSM/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1 2007/12/17 14:24:06 tron Exp $
+# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:33 cube Exp $
 
 BUILTIN_PKG:=	libSM
 
@@ -47,3 +47,5 @@ USE_BUILTIN.libSM!=							\
 .  endif  # PREFER.libSM
 .endif
 MAKEVARS+=	USE_BUILTIN.libSM
+
+.include "../../mk/x11.builtin.mk"
diff --git a/x11/libX11/builtin.mk b/x11/libX11/builtin.mk
index 024567319e5..130cfd6f46f 100644
--- a/x11/libX11/builtin.mk
+++ b/x11/libX11/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.3 2008/04/01 13:46:13 tron Exp $
+# $NetBSD: builtin.mk,v 1.4 2008/10/05 21:36:33 cube Exp $
 
 BUILTIN_PKG:=	libX11
 
@@ -48,7 +48,4 @@ USE_BUILTIN.libX11!=							\
 .endif
 MAKEVARS+=	USE_BUILTIN.libX11
 
-.if !empty(USE_BUILTIN.libX11:M[yY][eE][sS])
-BUILDLINK_PREFIX.libX11=	${X11BASE}
-BUILDLINK_PASSTHRU_DIRS+=	${X11BASE}/include ${X11BASE}/lib
-.endif
+.include "../../mk/x11.builtin.mk"
diff --git a/x11/libXScrnSaver/buildlink3.mk b/x11/libXScrnSaver/buildlink3.mk
index 3dcc72ff227..4e990d9f568 100644
--- a/x11/libXScrnSaver/buildlink3.mk
+++ b/x11/libXScrnSaver/buildlink3.mk
@@ -1,10 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/12/27 12:23:15 joerg Exp $
-
-.include "../../mk/bsd.fast.prefs.mk"
-
-.if ${X11_TYPE} != "modular"
-.include "../../mk/x11.buildlink3.mk"
-.else
+# $NetBSD: buildlink3.mk,v 1.2 2008/10/05 21:36:33 cube Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBXSCRNSAVER_BUILDLINK3_MK:=	${LIBXSCRNSAVER_BUILDLINK3_MK}+
@@ -27,5 +21,3 @@ BUILDLINK_PKGSRCDIR.libXScrnSaver?=	../../x11/libXScrnSaver
 .include "../../x11/scrnsaverproto/buildlink3.mk"
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
-
-.endif
diff --git a/x11/libXScrnSaver/builtin.mk b/x11/libXScrnSaver/builtin.mk
new file mode 100644
index 00000000000..e88b6670415
--- /dev/null
+++ b/x11/libXScrnSaver/builtin.mk
@@ -0,0 +1,8 @@
+# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:33 cube Exp $
+
+BUILTIN_PKG:=	libXScrnSaver
+PKGCONFIG_FILE.libXScrnSaver=	${X11BASE}/lib/pkgconfig/xscrnsaver.pc \
+				${X11BASE}/lib/libXss.so
+
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
+.include "../../mk/x11.builtin.mk"
diff --git a/x11/libXTrap/builtin.mk b/x11/libXTrap/builtin.mk
new file mode 100644
index 00000000000..e15501836a0
--- /dev/null
+++ b/x11/libXTrap/builtin.mk
@@ -0,0 +1,7 @@
+# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:33 cube Exp $
+
+BUILTIN_PKG:=	libXTrap
+PKGCONFIG_FILE.libXTrap=	${X11BASE}/lib/pkgconfig/xtrap.pc
+
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
+.include "../../mk/x11.builtin.mk"
diff --git a/x11/libXau/builtin.mk b/x11/libXau/builtin.mk
index cef415ac8b4..c5b7248497f 100644
--- a/x11/libXau/builtin.mk
+++ b/x11/libXau/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1 2007/12/15 15:41:36 tron Exp $
+# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:33 cube Exp $
 
 BUILTIN_PKG:=	libXau
 
@@ -47,3 +47,5 @@ USE_BUILTIN.libXau!=							\
 .  endif  # PREFER.libXau
 .endif
 MAKEVARS+=	USE_BUILTIN.libXau
+
+.include "../../mk/x11.builtin.mk"
diff --git a/x11/libXdamage/buildlink3.mk b/x11/libXdamage/buildlink3.mk
index 655f48b8459..24feddda819 100644
--- a/x11/libXdamage/buildlink3.mk
+++ b/x11/libXdamage/buildlink3.mk
@@ -1,11 +1,7 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/12/17 23:02:25 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2008/10/05 21:36:33 cube Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if ${X11_TYPE} != "modular"
-.include "../../mk/x11.buildlink3.mk"
-.else
-
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBXDAMAGE_BUILDLINK3_MK:=	${LIBXDAMAGE_BUILDLINK3_MK}+
 
@@ -28,5 +24,3 @@ BUILDLINK_PKGSRCDIR.libXdamage?=	../../x11/libXdamage
 .include "../../x11/xproto/buildlink3.mk"
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
-
-.endif
diff --git a/x11/libXdamage/builtin.mk b/x11/libXdamage/builtin.mk
new file mode 100644
index 00000000000..3d04b6891fa
--- /dev/null
+++ b/x11/libXdamage/builtin.mk
@@ -0,0 +1,8 @@
+# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:33 cube Exp $
+
+BUILTIN_PKG:=	libXdamage
+PKGCONFIG_FILE.libXdamage=	${X11BASE}/lib/pkgconfig/xdamage.pc \
+				${X11BASE}/lib/libXdamage.so
+
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
+.include "../../mk/x11.builtin.mk"
diff --git a/x11/libXdmcp/builtin.mk b/x11/libXdmcp/builtin.mk
index 98d4349c3cc..f98afdc44c9 100644
--- a/x11/libXdmcp/builtin.mk
+++ b/x11/libXdmcp/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1 2007/12/15 15:44:24 tron Exp $
+# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:33 cube Exp $
 
 BUILTIN_PKG:=	libXdmcp
 
@@ -47,3 +47,5 @@ USE_BUILTIN.libXdmcp!=							\
 .  endif  # PREFER.libXdmcp
 .endif
 MAKEVARS+=	USE_BUILTIN.libXdmcp
+
+.include "../../mk/x11.builtin.mk"
diff --git a/x11/libXevie/builtin.mk b/x11/libXevie/builtin.mk
new file mode 100644
index 00000000000..08a6b502c87
--- /dev/null
+++ b/x11/libXevie/builtin.mk
@@ -0,0 +1,7 @@
+# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:33 cube Exp $
+
+BUILTIN_PKG:=	libXevie
+PKGCONFIG_FILE.libXevie=	${X11BASE}/lib/pkgconfig/xevie.pc
+
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
+.include "../../mk/x11.builtin.mk"
diff --git a/x11/libXext/builtin.mk b/x11/libXext/builtin.mk
index 0104553773b..623fb38dbc9 100644
--- a/x11/libXext/builtin.mk
+++ b/x11/libXext/builtin.mk
@@ -1,9 +1,9 @@
-# $NetBSD: builtin.mk,v 1.1 2007/12/16 23:38:12 tron Exp $
+# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:33 cube Exp $
 
 BUILTIN_PKG:=	libXext
 
 BUILTIN_FIND_FILES_VAR:=	LIB_XEXT
-BUILTIN_FIND_FILES.LIB_XEXT=	${X11BASE}/lib/libXext.la
+BUILTIN_FIND_FILES.LIB_XEXT=	${X11BASE}/lib/pkgconfig/xext.pc
 
 .include "../../mk/buildlink3/bsd.builtin.mk"
 
@@ -47,3 +47,5 @@ USE_BUILTIN.libXext!=							\
 .  endif  # PREFER.libXext
 .endif
 MAKEVARS+=	USE_BUILTIN.libXext
+
+.include "../../mk/x11.builtin.mk"
diff --git a/x11/libXfont/builtin.mk b/x11/libXfont/builtin.mk
new file mode 100644
index 00000000000..fc98a04a503
--- /dev/null
+++ b/x11/libXfont/builtin.mk
@@ -0,0 +1,7 @@
+# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:33 cube Exp $
+
+BUILTIN_PKG:=	libXfont
+PKGCONFIG_FILE.libXfont=	${X11BASE}/lib/pkgconfig/xfont.pc
+
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
+.include "../../mk/x11.builtin.mk"
diff --git a/x11/libXinerama/builtin.mk b/x11/libXinerama/builtin.mk
index f988d3f5d63..95e0a0e8b7b 100644
--- a/x11/libXinerama/builtin.mk
+++ b/x11/libXinerama/builtin.mk
@@ -1,49 +1,7 @@
-# $NetBSD: builtin.mk,v 1.1 2007/12/16 23:08:05 tron Exp $
+# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:33 cube Exp $
 
 BUILTIN_PKG:=	libXinerama
+PKGCONFIG_FILE.libXinerama=	${X11BASE}/lib/pkgconfig/xinerama.pc
 
-BUILTIN_FIND_FILES_VAR:=	LIB_XINERAMA
-BUILTIN_FIND_FILES.LIB_XINERAMA=${X11BASE}/lib/libXinerama.la
-
-.include "../../mk/buildlink3/bsd.builtin.mk"
-
-###
-### Determine if there is a built-in implementation of the package and
-### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
-###
-.if ${X11BASE} == ${LOCALBASE}
-IS_BUILTIN.libXinerama=	no
-.elif !defined(IS_BUILTIN.libXinerama)
-IS_BUILTIN.libXinerama=	no
-.  if empty(LIB_XINERAMA:M__nonexistent__)
-IS_BUILTIN.libXinerama=	yes
-.  endif
-.endif
-MAKEVARS+=	IS_BUILTIN.libXinerama
-
-###
-### Determine whether we should use the built-in implementation if it
-### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no").
-###
-.if !defined(USE_BUILTIN.libXinerama)
-.  if ${PREFER.libXinerama} == "pkgsrc"
-USE_BUILTIN.libXinerama=	no
-.  else
-USE_BUILTIN.libXinerama=	${IS_BUILTIN.libXinerama}
-.    if defined(BUILTIN_PKG.libXinerama) && \
-        !empty(IS_BUILTIN.libXinerama:M[yY][eE][sS])
-USE_BUILTIN.libXinerama=	yes
-.      for _dep_ in ${BUILDLINK_API_DEPENDS.libXinerama}
-.        if !empty(USE_BUILTIN.libXinerama:M[yY][eE][sS])
-USE_BUILTIN.libXinerama!=							\
-	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.libXinerama:Q}; then \
-		${ECHO} yes;						\
-	else								\
-		${ECHO} no;						\
-	fi
-.        endif
-.      endfor
-.    endif
-.  endif  # PREFER.libXinerama
-.endif
-MAKEVARS+=	USE_BUILTIN.libXinerama
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
+.include "../../mk/x11.builtin.mk"
diff --git a/x11/libXmu/builtin.mk b/x11/libXmu/builtin.mk
index b2429237d90..d60d0d8e7f1 100644
--- a/x11/libXmu/builtin.mk
+++ b/x11/libXmu/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1 2007/12/16 19:04:28 tron Exp $
+# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:33 cube Exp $
 
 BUILTIN_PKG:=	libXmu
 
@@ -47,3 +47,5 @@ USE_BUILTIN.libXmu!=							\
 .  endif  # PREFER.libXmu
 .endif
 MAKEVARS+=	USE_BUILTIN.libXmu
+
+.include "../../mk/x11.builtin.mk"
diff --git a/x11/libXprintUtil/builtin.mk b/x11/libXprintUtil/builtin.mk
new file mode 100644
index 00000000000..0dc8d255ac7
--- /dev/null
+++ b/x11/libXprintUtil/builtin.mk
@@ -0,0 +1,7 @@
+# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:33 cube Exp $
+
+BUILTIN_PKG:=	libXprintUtil
+PKGCONFIG_FILE.libXprintUtil=	${X11BASE}/lib/pkgconfig/xprintutil.pc
+
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
+.include "../../mk/x11.builtin.mk"
diff --git a/x11/libXrandr/builtin.mk b/x11/libXrandr/builtin.mk
index c5715afa354..f0c80105507 100644
--- a/x11/libXrandr/builtin.mk
+++ b/x11/libXrandr/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1 2007/12/16 20:19:11 tron Exp $
+# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:33 cube Exp $
 
 BUILTIN_PKG:=	libXrandr
 
@@ -47,3 +47,5 @@ USE_BUILTIN.libXrandr!=							\
 .  endif  # PREFER.libXrandr
 .endif
 MAKEVARS+=	USE_BUILTIN.libXrandr
+
+.include "../../mk/x11.builtin.mk"
diff --git a/x11/libXrender/builtin.mk b/x11/libXrender/builtin.mk
index 0cf3219f91a..f8d427c7293 100644
--- a/x11/libXrender/builtin.mk
+++ b/x11/libXrender/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1 2007/12/16 19:38:25 tron Exp $
+# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:33 cube Exp $
 
 BUILTIN_PKG:=	libXrender
 
@@ -47,3 +47,5 @@ USE_BUILTIN.libXrender!=							\
 .  endif  # PREFER.libXrender
 .endif
 MAKEVARS+=	USE_BUILTIN.libXrender
+
+.include "../../mk/x11.builtin.mk"
diff --git a/x11/libXres/buildlink3.mk b/x11/libXres/buildlink3.mk
index 1fd73c6f312..c2dfd269147 100644
--- a/x11/libXres/buildlink3.mk
+++ b/x11/libXres/buildlink3.mk
@@ -1,11 +1,7 @@
-# $NetBSD: buildlink3.mk,v 1.2 2007/01/14 11:04:27 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2008/10/05 21:36:33 cube Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if ${X11_TYPE} != "modular"
-.include "../../x11/Xrender/buildlink3.mk"
-.else
-
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBXRES_BUILDLINK3_MK:=	${LIBXRES_BUILDLINK3_MK}+
 
@@ -27,5 +23,3 @@ BUILDLINK_PKGSRCDIR.libXres?=	../../x11/libXres
 .include "../../x11/xproto/buildlink3.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
-
-.endif
diff --git a/x11/libXres/builtin.mk b/x11/libXres/builtin.mk
new file mode 100644
index 00000000000..d63015c45dd
--- /dev/null
+++ b/x11/libXres/builtin.mk
@@ -0,0 +1,8 @@
+# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:33 cube Exp $
+
+BUILTIN_PKG:=	libXres
+PKGCONFIG_FILE.libXres=	${X11BASE}/lib/pkgconfig/xres.pc \
+			${X11BASE}/lib/libXRes.so
+
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
+.include "../../mk/x11.builtin.mk"
diff --git a/x11/libXt/builtin.mk b/x11/libXt/builtin.mk
index 197567e1765..7587c4a950d 100644
--- a/x11/libXt/builtin.mk
+++ b/x11/libXt/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1 2007/12/17 15:02:26 tron Exp $
+# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:33 cube Exp $
 
 BUILTIN_PKG:=	libXt
 
@@ -47,3 +47,5 @@ USE_BUILTIN.libXt!=							\
 .  endif  # PREFER.libXt
 .endif
 MAKEVARS+=	USE_BUILTIN.libXt
+
+.include "../../mk/x11.builtin.mk"
diff --git a/x11/libdrm/builtin.mk b/x11/libdrm/builtin.mk
new file mode 100644
index 00000000000..ace98bb4e04
--- /dev/null
+++ b/x11/libdrm/builtin.mk
@@ -0,0 +1,7 @@
+# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:33 cube Exp $
+
+BUILTIN_PKG:=	libdrm
+PKGCONFIG_FILE.libdrm=	${X11BASE}/lib/pkgconfig/libdrm.pc
+
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
+.include "../../mk/x11.builtin.mk"
diff --git a/x11/liblbxutil/builtin.mk b/x11/liblbxutil/builtin.mk
new file mode 100644
index 00000000000..1e2eaf3acde
--- /dev/null
+++ b/x11/liblbxutil/builtin.mk
@@ -0,0 +1,7 @@
+# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:34 cube Exp $
+
+BUILTIN_PKG:=	liblbxutil
+PKGCONFIG_FILE.liblbxutil=	${X11BASE}/lib/pkgconfig/lbxutil.pc
+
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
+.include "../../mk/x11.builtin.mk"
diff --git a/x11/liboldXrandr/builtin.mk b/x11/liboldXrandr/builtin.mk
index dd66fe919d6..35b9042dd59 100644
--- a/x11/liboldXrandr/builtin.mk
+++ b/x11/liboldXrandr/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1 2007/05/30 01:22:13 schmonz Exp $
+# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:34 cube Exp $
 
 BUILTIN_PKG:=	Xrandr
 
@@ -96,6 +96,9 @@ MAKEVARS+=	USE_BUILTIN.Xrandr
 ### 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.Xrandr?=	no
 .if !empty(CHECK_BUILTIN.Xrandr:M[nN][oO])
 
diff --git a/x11/pixman/builtin.mk b/x11/pixman/builtin.mk
new file mode 100644
index 00000000000..4e306d46e1b
--- /dev/null
+++ b/x11/pixman/builtin.mk
@@ -0,0 +1,7 @@
+# $NetBSD: builtin.mk,v 1.4 2008/10/05 21:36:34 cube Exp $
+
+BUILTIN_PKG:=	pixman
+PKGCONFIG_FILE.pixman=	${X11BASE}/lib/pkgconfig/pixman-1.pc
+
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
+.include "../../mk/x11.builtin.mk"
diff --git a/x11/printproto/builtin.mk b/x11/printproto/builtin.mk
new file mode 100644
index 00000000000..4ad15004a24
--- /dev/null
+++ b/x11/printproto/builtin.mk
@@ -0,0 +1,7 @@
+# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:34 cube Exp $
+
+BUILTIN_PKG:=	printproto
+PKGCONFIG_FILE.printproto=	${X11BASE}/lib/pkgconfig/printproto.pc
+
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
+.include "../../mk/x11.builtin.mk"
diff --git a/x11/randrproto/builtin.mk b/x11/randrproto/builtin.mk
index 94fa8856656..9493963e4d4 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.5 2008/10/05 21:36:34 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/recordproto/builtin.mk b/x11/recordproto/builtin.mk
new file mode 100644
index 00000000000..dc36eed0d4d
--- /dev/null
+++ b/x11/recordproto/builtin.mk
@@ -0,0 +1,7 @@
+# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:34 cube Exp $
+
+BUILTIN_PKG:=	recordproto
+PKGCONFIG_FILE.recordproto=	${X11BASE}/lib/pkgconfig/recordproto.pc
+
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
+.include "../../mk/x11.builtin.mk"
diff --git a/x11/renderproto/builtin.mk b/x11/renderproto/builtin.mk
index 37215f0b41a..091418363ec 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.9 2008/10/05 21:36:34 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/resourceproto/builtin.mk b/x11/resourceproto/builtin.mk
new file mode 100644
index 00000000000..8cb59bbdb8a
--- /dev/null
+++ b/x11/resourceproto/builtin.mk
@@ -0,0 +1,7 @@
+# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:34 cube Exp $
+
+BUILTIN_PKG:=	resourceproto
+PKGCONFIG_FILE.resourceproto=	${X11BASE}/lib/pkgconfig/resourceproto.pc
+
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
+.include "../../mk/x11.builtin.mk"
diff --git a/x11/scrnsaverproto/builtin.mk b/x11/scrnsaverproto/builtin.mk
new file mode 100644
index 00000000000..76750d749a7
--- /dev/null
+++ b/x11/scrnsaverproto/builtin.mk
@@ -0,0 +1,7 @@
+# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:34 cube Exp $
+
+BUILTIN_PKG:=	scrnsaverproto
+PKGCONFIG_FILE.scrnsaverproto=	${X11BASE}/lib/pkgconfig/scrnsaverproto.pc
+
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
+.include "../../mk/x11.builtin.mk"
diff --git a/x11/trapproto/builtin.mk b/x11/trapproto/builtin.mk
new file mode 100644
index 00000000000..37d18933559
--- /dev/null
+++ b/x11/trapproto/builtin.mk
@@ -0,0 +1,7 @@
+# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:34 cube Exp $
+
+BUILTIN_PKG:=	trapproto
+PKGCONFIG_FILE.trapproto=	${X11BASE}/lib/pkgconfig/trapproto.pc
+
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
+.include "../../mk/x11.builtin.mk"
diff --git a/x11/videoproto/builtin.mk b/x11/videoproto/builtin.mk
new file mode 100644
index 00000000000..a0194209f76
--- /dev/null
+++ b/x11/videoproto/builtin.mk
@@ -0,0 +1,7 @@
+# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:34 cube Exp $
+
+BUILTIN_PKG:=	videoproto
+PKGCONFIG_FILE.videoproto=	${X11BASE}/lib/pkgconfig/videoproto.pc
+
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
+.include "../../mk/x11.builtin.mk"
diff --git a/x11/xcmiscproto/builtin.mk b/x11/xcmiscproto/builtin.mk
new file mode 100644
index 00000000000..ba5d20155bd
--- /dev/null
+++ b/x11/xcmiscproto/builtin.mk
@@ -0,0 +1,7 @@
+# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:34 cube Exp $
+
+BUILTIN_PKG:=	xcmiscproto
+PKGCONFIG_FILE.xcmiscproto=	${X11BASE}/lib/pkgconfig/xcmiscproto.pc
+
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
+.include "../../mk/x11.builtin.mk"
diff --git a/x11/xcursor/builtin.mk b/x11/xcursor/builtin.mk
index df3f01f6947..d7f190b458c 100644
--- a/x11/xcursor/builtin.mk
+++ b/x11/xcursor/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.12 2006/04/06 06:23:04 reed Exp $
+# $NetBSD: builtin.mk,v 1.13 2008/10/05 21:36:34 cube Exp $
 
 BUILTIN_PKG:=	xcursor
 
@@ -76,6 +76,9 @@ MAKEVARS+=	USE_BUILTIN.xcursor
 ### 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.xcursor?=	no
 .if !empty(CHECK_BUILTIN.xcursor:M[nN][oO])
 
diff --git a/x11/xextproto/builtin.mk b/x11/xextproto/builtin.mk
index 8e8dd7e329f..a555a2bd5a2 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.6 2008/10/05 21:36:34 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])
diff --git a/x11/xf86bigfontproto/builtin.mk b/x11/xf86bigfontproto/builtin.mk
new file mode 100644
index 00000000000..14e2ded0bae
--- /dev/null
+++ b/x11/xf86bigfontproto/builtin.mk
@@ -0,0 +1,7 @@
+# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:34 cube Exp $
+
+BUILTIN_PKG:=	xf86bigfontproto
+PKGCONFIG_FILE.xf86bigfontproto=	${X11BASE}/lib/pkgconfig/xf86bigfontproto.pc
+
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
+.include "../../mk/x11.builtin.mk"
diff --git a/x11/xf86dgaproto/builtin.mk b/x11/xf86dgaproto/builtin.mk
new file mode 100644
index 00000000000..4d30a9d16be
--- /dev/null
+++ b/x11/xf86dgaproto/builtin.mk
@@ -0,0 +1,7 @@
+# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:34 cube Exp $
+
+BUILTIN_PKG:=	xf86dgaproto
+PKGCONFIG_FILE.xf86dgaproto=	${X11BASE}/lib/pkgconfig/xf86dgaproto.pc
+
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
+.include "../../mk/x11.builtin.mk"
diff --git a/x11/xf86driproto/builtin.mk b/x11/xf86driproto/builtin.mk
new file mode 100644
index 00000000000..8dc998d3f74
--- /dev/null
+++ b/x11/xf86driproto/builtin.mk
@@ -0,0 +1,7 @@
+# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:34 cube Exp $
+
+BUILTIN_PKG:=	xf86driproto
+PKGCONFIG_FILE.xf86driproto=	${X11BASE}/lib/pkgconfig/xf86driproto.pc
+
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
+.include "../../mk/x11.builtin.mk"
diff --git a/x11/xf86miscproto/builtin.mk b/x11/xf86miscproto/builtin.mk
new file mode 100644
index 00000000000..a0a4c86c159
--- /dev/null
+++ b/x11/xf86miscproto/builtin.mk
@@ -0,0 +1,7 @@
+# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:34 cube Exp $
+
+BUILTIN_PKG:=	xf86miscproto
+PKGCONFIG_FILE.xf86miscproto=	${X11BASE}/lib/pkgconfig/xf86miscproto.pc
+
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
+.include "../../mk/x11.builtin.mk"
diff --git a/x11/xf86vidmodeproto/builtin.mk b/x11/xf86vidmodeproto/builtin.mk
new file mode 100644
index 00000000000..445cfcc3e5e
--- /dev/null
+++ b/x11/xf86vidmodeproto/builtin.mk
@@ -0,0 +1,7 @@
+# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:34 cube Exp $
+
+BUILTIN_PKG:=	xf86vidmodeproto
+PKGCONFIG_FILE.xf86vidmodeproto=	${X11BASE}/lib/pkgconfig/xf86vidmodeproto.pc
+
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
+.include "../../mk/x11.builtin.mk"
diff --git a/x11/xineramaproto/builtin.mk b/x11/xineramaproto/builtin.mk
index 6349f48f096..9841c4f4cb5 100644
--- a/x11/xineramaproto/builtin.mk
+++ b/x11/xineramaproto/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2008/01/05 16:05:52 tron Exp $
+# $NetBSD: builtin.mk,v 1.3 2008/10/05 21:36:34 cube Exp $
 
 BUILTIN_PKG:=	xineramaproto
 
@@ -59,3 +59,5 @@ USE_BUILTIN.xineramaproto!=							\
 .  endif  # PREFER.xineramaproto
 .endif
 MAKEVARS+=	USE_BUILTIN.xineramaproto
+
+.include "../../mk/x11.builtin.mk"
diff --git a/x11/xproto/builtin.mk b/x11/xproto/builtin.mk
index dd13de90f77..5e79ac1ba63 100644
--- a/x11/xproto/builtin.mk
+++ b/x11/xproto/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.3 2006/12/16 01:04:43 joerg Exp $
+# $NetBSD: builtin.mk,v 1.4 2008/10/05 21:36:34 cube Exp $
 
 BUILTIN_PKG:=	xproto
 
@@ -47,3 +47,5 @@ USE_BUILTIN.xproto!=							\
 .  endif  # PREFER.xproto
 .endif
 MAKEVARS+=	USE_BUILTIN.xproto
+
+.include "../../mk/x11.builtin.mk"
diff --git a/x11/xproxymanagementprotocol/builtin.mk b/x11/xproxymanagementprotocol/builtin.mk
new file mode 100644
index 00000000000..70efc8c7ee2
--- /dev/null
+++ b/x11/xproxymanagementprotocol/builtin.mk
@@ -0,0 +1,7 @@
+# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:34 cube Exp $
+
+BUILTIN_PKG:=	xproxymanagementprotocol
+PKGCONFIG_FILE.xproxymanagementprotocol=	${X11BASE}/lib/pkgconfig/xproxymngproto.pc
+
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
+.include "../../mk/x11.builtin.mk"
diff --git a/x11/xtrans/builtin.mk b/x11/xtrans/builtin.mk
new file mode 100644
index 00000000000..33104034695
--- /dev/null
+++ b/x11/xtrans/builtin.mk
@@ -0,0 +1,7 @@
+# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:34 cube Exp $
+
+BUILTIN_PKG:=	xtrans
+PKGCONFIG_FILE.xtrans=	${X11BASE}/lib/pkgconfig/xtrans.pc
+
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
+.include "../../mk/x11.builtin.mk"