summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcube <cube@pkgsrc.org>2008-10-05 21:36:32 +0000
committercube <cube@pkgsrc.org>2008-10-05 21:36:32 +0000
commit403e256ff68dfb7e0b0918954c99f3bed3e40b3b (patch)
tree7e3acb4e1cfd62c69446a0e9e96faf8cfb567d76
parenta30aea172505b1d10850d01b7974de0e75626463 (diff)
downloadpkgsrc-403e256ff68dfb7e0b0918954c99f3bed3e40b3b.tar.gz
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.
-rw-r--r--fonts/Xft2/builtin.mk10
-rw-r--r--fonts/fontconfig/builtin.mk8
-rw-r--r--fonts/libfontenc/builtin.mk7
-rw-r--r--graphics/MesaLib/builtin.mk8
-rw-r--r--graphics/freetype2/builtin.mk11
-rw-r--r--graphics/glu/builtin.mk11
-rw-r--r--graphics/xpm/builtin.mk12
-rw-r--r--misc/openoffice2/Makefile.NetBSD11
-rw-r--r--mk/bsd.prefs.mk4
-rw-r--r--mk/buildlink3/pkgconfig-builtin.mk57
-rw-r--r--mk/defaults/mk.conf9
-rw-r--r--mk/x11.builtin.mk23
-rw-r--r--pkgtools/x11-links/files/xfree.MesaLib5
-rw-r--r--pkgtools/x11-links/files/xfree.Xft24
-rw-r--r--pkgtools/x11-links/files/xfree.xpm3
-rw-r--r--pkgtools/x11-links/files/xorg22
-rw-r--r--pkgtools/x11-links/files/xorg.Xcomposite4
-rw-r--r--pkgtools/x11-links/files/xorg.Xfixes3
-rw-r--r--pkgtools/x11-links/files/xorg.bigreqsproto3
-rw-r--r--pkgtools/x11-links/files/xorg.compositeproto3
-rw-r--r--pkgtools/x11-links/files/xorg.damageproto3
-rw-r--r--pkgtools/x11-links/files/xorg.evieext3
-rw-r--r--pkgtools/x11-links/files/xorg.expat6
-rw-r--r--pkgtools/x11-links/files/xorg.fixesproto4
-rw-r--r--pkgtools/x11-links/files/xorg.fontcacheproto3
-rw-r--r--pkgtools/x11-links/files/xorg.fontconfig7
-rw-r--r--pkgtools/x11-links/files/xorg.fontsproto6
-rw-r--r--pkgtools/x11-links/files/xorg.freetype25
-rw-r--r--pkgtools/x11-links/files/xorg.glproto7
-rw-r--r--pkgtools/x11-links/files/xorg.libFS3
-rw-r--r--pkgtools/x11-links/files/xorg.libXScrnSaver3
-rw-r--r--pkgtools/x11-links/files/xorg.libXTrap3
-rw-r--r--pkgtools/x11-links/files/xorg.libXdamage12
-rw-r--r--pkgtools/x11-links/files/xorg.libXevie3
-rw-r--r--pkgtools/x11-links/files/xorg.libXfont20
-rw-r--r--pkgtools/x11-links/files/xorg.libXprintUtil6
-rw-r--r--pkgtools/x11-links/files/xorg.libXrandr6
-rw-r--r--pkgtools/x11-links/files/xorg.libXrender6
-rw-r--r--pkgtools/x11-links/files/xorg.libXres11
-rw-r--r--pkgtools/x11-links/files/xorg.libdrm9
-rw-r--r--pkgtools/x11-links/files/xorg.libfontenc3
-rw-r--r--pkgtools/x11-links/files/xorg.liblbxutil6
-rw-r--r--pkgtools/x11-links/files/xorg.pixman17
-rw-r--r--pkgtools/x11-links/files/xorg.printproto3
-rw-r--r--pkgtools/x11-links/files/xorg.recordproto3
-rw-r--r--pkgtools/x11-links/files/xorg.resourceproto3
-rw-r--r--pkgtools/x11-links/files/xorg.scrnsaverproto3
-rw-r--r--pkgtools/x11-links/files/xorg.trapproto3
-rw-r--r--pkgtools/x11-links/files/xorg.videoproto4
-rw-r--r--pkgtools/x11-links/files/xorg.xcmiscproto3
-rw-r--r--pkgtools/x11-links/files/xorg.xcursor6
-rw-r--r--pkgtools/x11-links/files/xorg.xextensions54
-rw-r--r--pkgtools/x11-links/files/xorg.xextproto6
-rw-r--r--pkgtools/x11-links/files/xorg.xf86bigfontproto3
-rw-r--r--pkgtools/x11-links/files/xorg.xf86dgaproto3
-rw-r--r--pkgtools/x11-links/files/xorg.xf86driproto5
-rw-r--r--pkgtools/x11-links/files/xorg.xf86miscproto3
-rw-r--r--pkgtools/x11-links/files/xorg.xf86vidmodeproto3
-rw-r--r--pkgtools/x11-links/files/xorg.xproxymanagementprotocol3
-rw-r--r--pkgtools/x11-links/files/xorg.xtrans13
-rw-r--r--pkgtools/x11-links/xorg.mk38
-rw-r--r--textproc/expat/builtin.mk12
-rw-r--r--x11/Xcomposite/builtin.mk4
-rw-r--r--x11/Xfixes/builtin.mk4
-rw-r--r--x11/Xrender/builtin.mk5
-rw-r--r--x11/bigreqsproto/builtin.mk7
-rw-r--r--x11/compositeproto/builtin.mk4
-rw-r--r--x11/damageproto/builtin.mk7
-rw-r--r--x11/evieext/builtin.mk7
-rw-r--r--x11/fixesproto/builtin.mk4
-rw-r--r--x11/fontcacheproto/builtin.mk7
-rw-r--r--x11/fontsproto/builtin.mk7
-rw-r--r--x11/glproto/builtin.mk7
-rw-r--r--x11/inputproto/builtin.mk4
-rw-r--r--x11/kbproto/builtin.mk4
-rw-r--r--x11/libFS/builtin.mk7
-rw-r--r--x11/libICE/builtin.mk4
-rw-r--r--x11/libSM/builtin.mk4
-rw-r--r--x11/libX11/builtin.mk7
-rw-r--r--x11/libXScrnSaver/buildlink3.mk10
-rw-r--r--x11/libXScrnSaver/builtin.mk8
-rw-r--r--x11/libXTrap/builtin.mk7
-rw-r--r--x11/libXau/builtin.mk4
-rw-r--r--x11/libXdamage/buildlink3.mk8
-rw-r--r--x11/libXdamage/builtin.mk8
-rw-r--r--x11/libXdmcp/builtin.mk4
-rw-r--r--x11/libXevie/builtin.mk7
-rw-r--r--x11/libXext/builtin.mk6
-rw-r--r--x11/libXfont/builtin.mk7
-rw-r--r--x11/libXinerama/builtin.mk50
-rw-r--r--x11/libXmu/builtin.mk4
-rw-r--r--x11/libXprintUtil/builtin.mk7
-rw-r--r--x11/libXrandr/builtin.mk4
-rw-r--r--x11/libXrender/builtin.mk4
-rw-r--r--x11/libXres/buildlink3.mk8
-rw-r--r--x11/libXres/builtin.mk8
-rw-r--r--x11/libXt/builtin.mk4
-rw-r--r--x11/libdrm/builtin.mk7
-rw-r--r--x11/liblbxutil/builtin.mk7
-rw-r--r--x11/liboldXrandr/builtin.mk5
-rw-r--r--x11/pixman/builtin.mk7
-rw-r--r--x11/printproto/builtin.mk7
-rw-r--r--x11/randrproto/builtin.mk11
-rw-r--r--x11/recordproto/builtin.mk7
-rw-r--r--x11/renderproto/builtin.mk11
-rw-r--r--x11/resourceproto/builtin.mk7
-rw-r--r--x11/scrnsaverproto/builtin.mk7
-rw-r--r--x11/trapproto/builtin.mk7
-rw-r--r--x11/videoproto/builtin.mk7
-rw-r--r--x11/xcmiscproto/builtin.mk7
-rw-r--r--x11/xcursor/builtin.mk5
-rw-r--r--x11/xextproto/builtin.mk11
-rw-r--r--x11/xf86bigfontproto/builtin.mk7
-rw-r--r--x11/xf86dgaproto/builtin.mk7
-rw-r--r--x11/xf86driproto/builtin.mk7
-rw-r--r--x11/xf86miscproto/builtin.mk7
-rw-r--r--x11/xf86vidmodeproto/builtin.mk7
-rw-r--r--x11/xineramaproto/builtin.mk4
-rw-r--r--x11/xproto/builtin.mk4
-rw-r--r--x11/xproxymanagementprotocol/builtin.mk7
-rw-r--r--x11/xtrans/builtin.mk7
121 files changed, 696 insertions, 266 deletions
diff --git a/fonts/Xft2/builtin.mk b/fonts/Xft2/builtin.mk
index ac3dba3bf8e..4c900dc738f 100644
--- a/fonts/Xft2/builtin.mk
+++ b/fonts/Xft2/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.16 2008/01/05 17:24:12 tron Exp $
+# $NetBSD: builtin.mk,v 1.17 2008/10/05 21:36:35 cube Exp $
BUILTIN_PKG:= Xft2
@@ -86,6 +86,9 @@ MAKEVARS+= USE_BUILTIN.Xft2
### 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.Xft2?= no
.if !empty(CHECK_BUILTIN.Xft2:M[nN][oO])
@@ -93,9 +96,4 @@ CHECK_BUILTIN.Xft2?= no
BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1nb2
. endif
-. if !empty(USE_BUILTIN.Xft2:M[yY][eE][sS])
-BUILDLINK_PREFIX.Xft2= ${X11BASE}
-BUILDLINK_FILES.Xft2+= lib/pkgconfig/xft.pc
-. endif
-
.endif # CHECK_BUILTIN.Xft2
diff --git a/fonts/fontconfig/builtin.mk b/fonts/fontconfig/builtin.mk
index d046f36709a..82d5afb1cdd 100644
--- a/fonts/fontconfig/builtin.mk
+++ b/fonts/fontconfig/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.9 2006/04/06 06:21:59 reed Exp $
+# $NetBSD: builtin.mk,v 1.10 2008/10/05 21:36:35 cube Exp $
BUILTIN_PKG:= fontconfig
@@ -85,6 +85,9 @@ MAKEVARS+= USE_BUILTIN.fontconfig
### 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.fontconfig?= no
.if !empty(CHECK_BUILTIN.fontconfig:M[nN][oO])
@@ -94,9 +97,6 @@ BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.1.3
. endif
. if !empty(USE_BUILTIN.fontconfig:M[yY][eE][sS])
-BUILDLINK_PREFIX.fontconfig= ${X11BASE}
-BUILDLINK_FILES.fontconfig+= lib/pkgconfig/fontconfig.pc
-
USE_BUILTIN.expat= yes
USE_BUILTIN.freetype2= yes
USE_BUILTIN.zlib= yes
diff --git a/fonts/libfontenc/builtin.mk b/fonts/libfontenc/builtin.mk
new file mode 100644
index 00000000000..1597118e222
--- /dev/null
+++ b/fonts/libfontenc/builtin.mk
@@ -0,0 +1,7 @@
+# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:35 cube Exp $
+
+BUILTIN_PKG:= libfontenc
+PKGCONFIG_FILE.libfontenc= ${X11BASE}/lib/pkgconfig/fontenc.pc
+
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
+.include "../../mk/x11.builtin.mk"
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"
diff --git a/misc/openoffice2/Makefile.NetBSD b/misc/openoffice2/Makefile.NetBSD
index fb0eee2d070..d341633960b 100644
--- a/misc/openoffice2/Makefile.NetBSD
+++ b/misc/openoffice2/Makefile.NetBSD
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.NetBSD,v 1.1 2008/02/05 19:17:24 hira Exp $
+# $NetBSD: Makefile.NetBSD,v 1.2 2008/10/05 21:36:35 cube Exp $
#
# systray quickstarter is broken with mutex handling?
@@ -6,10 +6,11 @@ CONFIGURE_ARGS+= --disable-systray
# *.pc files are required, but these don't exist on NetBSD.
.if defined(X11_TYPE) && !empty(X11_TYPE:Mnative)
-USE_BUILTIN.freetype2= no
-USE_BUILTIN.Xfixes= no
-USE_BUILTIN.Xrandr= no
-USE_BUILTIN.Xrender= no
+. for _pkg_ in freetype2 Xfixes Xrandr Xrender
+. if !exists(${X11BASE}/lib/pkgconfig/${_pkg_:tl}.pc)
+USE_BUILTIN.${_pkg_}= no
+. endif
+. endfor
.endif
.if ${MACHINE_ARCH} == "i386"
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index e6add2cc6c9..d2983084e9c 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.287 2008/09/16 11:40:10 tron Exp $
+# $NetBSD: bsd.prefs.mk,v 1.288 2008/10/05 21:36:34 cube Exp $
#
# This file includes the mk.conf file, which contains the user settings.
#
@@ -493,6 +493,8 @@ X11BASE?= /usr/openwin
X11BASE?= /usr
. elif !empty(MACHINE_PLATFORM:MDarwin-9.*-*)
X11BASE?= /usr/X11
+. elif exists(/usr/X11R7/lib/libX11.so)
+X11BASE?= /usr/X11R7
. else
X11BASE?= /usr/X11R6
. endif
diff --git a/mk/buildlink3/pkgconfig-builtin.mk b/mk/buildlink3/pkgconfig-builtin.mk
new file mode 100644
index 00000000000..1cd204d94f6
--- /dev/null
+++ b/mk/buildlink3/pkgconfig-builtin.mk
@@ -0,0 +1,57 @@
+# $NetBSD: pkgconfig-builtin.mk,v 1.2 2008/10/05 21:36:35 cube Exp $
+
+# This file is used to factor out a common pattern in builtin.mk files backed
+# up by the existence of a pkgconfig file.
+#
+# Caller has to define BUILTIN_PKG and PKGCONFIG_FILE.<BUILTIN_PKG>.
+#
+# Optionally, caller may define PKGCONFIG_BASE.<BUILTIN_PKG> as the base
+# location for a native implementation of the package. It conveniently
+# defaults to X11BASE.
+
+BUILTIN_FIND_FILES_VAR:= FIND_FILES_${BUILTIN_PKG}
+BUILTIN_FIND_FILES.FIND_FILES_${BUILTIN_PKG}= ${PKGCONFIG_FILE.${BUILTIN_PKG}}
+
+.include "../../mk/buildlink3/bsd.builtin.mk"
+
+.if ${PKGCONFIG_BASE.${BUILTIN_PKG}:U${X11BASE}} == ${LOCALBASE}
+IS_BUILTIN.${BUILTIN_PKG}= no
+.elif !defined(IS_BUILTIN.${BUILTIN_PKG})
+IS_BUILTIN.${BUILTIN_PKG}= no
+. if empty(FIND_FILES_${BUILTIN_PKG}:M__nonexistent__)
+IS_BUILTIN.${BUILTIN_PKG}= yes
+. endif
+.endif
+MAKEVARS:= ${MAKEVARS} IS_BUILTIN.${BUILTIN_PKG}
+
+.if !defined(BUILTIN_PKG.${BUILTIN_PKG}) && \
+ !empty(IS_BUILTIN.${BUILTIN_PKG}:M[yY][eE][sS]) && \
+ !empty(FIND_FILES_${BUILTIN_PKG}:M*.pc)
+BUILTIN_VERSION.${BUILTIN_PKG}!= \
+ ${SED} -n -e 's/Version: //p' ${FIND_FILES_${BUILTIN_PKG}}
+BUILTIN_PKG.${BUILTIN_PKG}:= ${BUILTIN_PKG}-${BUILTIN_VERSION.${BUILTIN_PKG}}
+.endif
+MAKEVARS:= ${MAKEVARS} BUILTIN_PKG.${BUILTIN_PKG}
+
+.if !defined(USE_BUILTIN.${BUILTIN_PKG})
+. if ${PREFER.${BUILTIN_PKG}} == "pkgsrc"
+USE_BUILTIN.${BUILTIN_PKG}= no
+. else
+USE_BUILTIN.${BUILTIN_PKG}:= ${IS_BUILTIN.${BUILTIN_PKG}}
+. if defined(BUILTIN_PKG.${BUILTIN_PKG}) && \
+ !empty(IS_BUILTIN.${BUILTIN_PKG}:M[Yy][Ee][Ss])
+USE_BUILTIN.${BUILTIN_PKG}= yes
+. for _dep_ in ${BUILDLINK_API_DEPENDS.${BUILTIN_PKG}}
+. if !empty(USE_BUILTIN.${BUILTIN_PKG}:M[Yy][Ee][Ss])
+USE_BUILTIN.${BUILTIN_PKG}!= \
+ if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.${BUILTIN_PKG}}; then \
+ ${ECHO} yes; \
+ else \
+ ${ECHO} no; \
+ fi
+. endif
+. endfor
+. endif
+. endif
+.endif
+MAKEVARS:= ${MAKEVARS} USE_BUILTIN.${BUILTIN_PKG}
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index b9d8b7d382d..570ae07efb4 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.176 2008/05/22 20:11:55 joerg Exp $
+# $NetBSD: mk.conf,v 1.177 2008/10/05 21:36:35 cube Exp $
#
# This file provides default values for variables that may be overridden
@@ -203,8 +203,11 @@ PKGSRC_RUN_TEST?= no
# Possible: yes, no
# Default: no
-.if empty(MACHINE_PLATFORM:MDarwin-9.*-*) || \
- (defined(X11_TYPE) && ${X11_TYPE} != "native")
+.if (!empty(MACHINE_PLATFORM:MNetBSD-*-*) && \
+ exists(/usr/X11R7/lib/libX11.so))
+PREFER_PKGSRC?=
+.elif empty(MACHINE_PLATFORM:MDarwin-9.*-*) || \
+ (defined(X11_TYPE) && ${X11_TYPE} != "native")
PREFER_PKGSRC?= MesaLib Xft2 Xrandr Xrender expat fontconfig \
freetype2 glu randrproto renderproto xcursor
.else
diff --git a/mk/x11.builtin.mk b/mk/x11.builtin.mk
index 22ae6398214..1337eb0a21c 100644
--- a/mk/x11.builtin.mk
+++ b/mk/x11.builtin.mk
@@ -1,8 +1,25 @@
-# $NetBSD: x11.builtin.mk,v 1.2 2006/10/26 17:08:08 rillig Exp $
+# $NetBSD: x11.builtin.mk,v 1.3 2008/10/05 21:36:35 cube Exp $
#
# x11.builtin.mk will include the builtin.mk file from the appropriate
# X11 distribution.
#
+# BUILTIN_PKG and USE_BUILTIN.<BUILTIN_PKG> must be defined by the caller
-.include "../../mk/x11.version.mk"
-.include "${X11_PKGSRCDIR.${X11_TYPE}}/builtin.mk"
+# XXX make(1) idiosyncrasy
+# 'CHECK_BUILTIN.${BUILTIN_PKG}?= no' will overwrite the value on older
+# version of make (in NetBSD's base system, prior to 20080331).
+.if !defined(CHECK_BUILTIN.${BUILTIN_PKG})
+CHECK_BUILTIN.${BUILTIN_PKG}= no
+.endif
+
+.if !empty(CHECK_BUILTIN.${BUILTIN_PKG}:M[Nn][Oo])
+. if !empty(USE_BUILTIN.${BUILTIN_PKG}:M[Yy][Ee][Ss])
+
+BUILDLINK_PREFIX.${BUILTIN_PKG}= ${X11BASE}
+
+. include "../../mk/x11.buildlink3.mk"
+. include "../../mk/x11.version.mk"
+. include "${X11_PKGSRCDIR.${X11_TYPE}}/builtin.mk"
+
+. endif
+.endif
diff --git a/pkgtools/x11-links/files/xfree.MesaLib b/pkgtools/x11-links/files/xfree.MesaLib
index 2a4d4797cf9..bfea078da3f 100644
--- a/pkgtools/x11-links/files/xfree.MesaLib
+++ b/pkgtools/x11-links/files/xfree.MesaLib
@@ -1,4 +1,4 @@
-# $NetBSD: xfree.MesaLib,v 1.4 2003/12/19 19:19:15 veego Exp $
+# $NetBSD: xfree.MesaLib,v 1.5 2008/10/05 21:36:35 cube Exp $
#
include/GL/GLwDrawA.h
include/GL/GLwDrawAP.h
@@ -16,6 +16,7 @@ include/GL/osmesa.h
lib/libGL.a
lib/libGL.so
lib/libGL.so.1
+lib/libGL.so.1.0.2
lib/libGL.so.1.2
lib/libGL.dylib
lib/libGL.1.dylib
@@ -31,6 +32,8 @@ lib/libOSMesa.a
lib/libOSMesa.so
lib/libOSMesa.so.4
lib/libOSMesa.so.4.0
+lib/libOSMesa.so.6
+lib/libOSMesa.so.6.5.3
lib/libOSMesa.dylib
lib/libOSMesa.4.dylib
lib/libOSMesa.4.0.dylib
diff --git a/pkgtools/x11-links/files/xfree.Xft2 b/pkgtools/x11-links/files/xfree.Xft2
index 4c8bbfb22d5..e312938dae3 100644
--- a/pkgtools/x11-links/files/xfree.Xft2
+++ b/pkgtools/x11-links/files/xfree.Xft2
@@ -1,4 +1,4 @@
-# $NetBSD: xfree.Xft2,v 1.1 2004/02/17 16:50:26 jlam Exp $
+# $NetBSD: xfree.Xft2,v 1.2 2008/10/05 21:36:35 cube Exp $
#
include/X11/Xft/Xft.h
include/X11/Xft/XftCompat.h
@@ -7,6 +7,8 @@ lib/libXft.so
lib/libXft.so.2
lib/libXft.so.2.0
lib/libXft.so.2.1
+lib/libXft.so.2.1.2
lib/libXft.dylib
lib/libXft.2.dylib
lib/libXft.2.0.dylib
+lib/pkgconfig/xft.pc
diff --git a/pkgtools/x11-links/files/xfree.xpm b/pkgtools/x11-links/files/xfree.xpm
index c1ddf9f8ea6..1fe9d9a165e 100644
--- a/pkgtools/x11-links/files/xfree.xpm
+++ b/pkgtools/x11-links/files/xfree.xpm
@@ -1,4 +1,4 @@
-# $NetBSD: xfree.xpm,v 1.2 2003/09/07 21:53:03 jlam Exp $
+# $NetBSD: xfree.xpm,v 1.3 2008/10/05 21:36:35 cube Exp $
#
include/X11/xpm.h
lib/libXpm.a
@@ -8,3 +8,4 @@ lib/libXpm.so.4.11
lib/libXpm.dylib
lib/libXpm.4.dylib
lib/libXpm.4.11.dylib
+lib/pkgconfig/xpm.pc
diff --git a/pkgtools/x11-links/files/xorg b/pkgtools/x11-links/files/xorg
index 0fc47ca264f..3cfa3b2ee42 100644
--- a/pkgtools/x11-links/files/xorg
+++ b/pkgtools/x11-links/files/xorg
@@ -1,4 +1,4 @@
-# $NetBSD: xorg,v 1.8 2008/09/16 12:38:38 tron Exp $
+# $NetBSD: xorg,v 1.9 2008/10/05 21:36:35 cube Exp $
#
# The files listed below are the union of the sets of files installed by
# the supported Xorg (and some XFree) distributions, minus the set of files
@@ -248,9 +248,7 @@ include/X11/extensions/XKBrules.h
include/X11/extensions/XKBui.h
include/X11/extensions/XKM.h
include/X11/extensions/XKMformat.h
-include/X11/extensions/XRes.h
include/X11/extensions/XResproto.h
-include/X11/extensions/Xdamage.h
include/X11/extensions/Xevie.h
include/X11/extensions/Xeviestr.h
include/X11/extensions/Xinerama.h
@@ -334,13 +332,6 @@ lib/libXIE.dylib
lib/libXIE.so
lib/libXIE.so.6
lib/libXIE.so.6.0
-lib/libXRes.1.0.0.dylib
-lib/libXRes.1.dylib
-lib/libXRes.dylib
-lib/libXRes.a
-lib/libXRes.so
-lib/libXRes.so.1
-lib/libXRes.so.1.0
lib/libXTrap.6.4.0.dylib
lib/libXTrap.6.4.dylib
lib/libXTrap.6.dylib
@@ -364,12 +355,11 @@ lib/libXaw.so.6
lib/libXaw.so.6.1
lib/libXaw.so.7
lib/libXaw.so.7.0
+lib/libXaw.so.8
lib/libXaw.so.8.0
-lib/libXdamage.1.0.0.dylib
-lib/libXdamage.1.dylib
-lib/libXdamage.dylib
-lib/libXdamage.a
-lib/libXdamage.so.1.0
+lib/libXaw6.6.dylib
+lib/libXaw7.7.dylib
+lib/libXaw8.8.dylib
lib/libXevie.1.0.0.dylib
lib/libXevie.1.dylib
lib/libXevie.dylib
@@ -529,9 +519,9 @@ lib/libxkbfile.a
lib/libxkbfile.so
lib/libxkbfile.so.1
lib/libxkbfile.so.1.0
+lib/libxkbfile.so.1.0.2
lib/libxkbui.a
lib/libxkbui.so
lib/libxkbui.so.1
lib/libxkbui.so.1.0
-lib/pkgconfig/xdamage.pc
lib/pkgconfig/xevie.pc
diff --git a/pkgtools/x11-links/files/xorg.Xcomposite b/pkgtools/x11-links/files/xorg.Xcomposite
index df153ecf785..da815923a55 100644
--- a/pkgtools/x11-links/files/xorg.Xcomposite
+++ b/pkgtools/x11-links/files/xorg.Xcomposite
@@ -1,8 +1,10 @@
-# $NetBSD: xorg.Xcomposite,v 1.2 2008/08/22 13:34:39 tron Exp $
+# $NetBSD: xorg.Xcomposite,v 1.3 2008/10/05 21:36:35 cube Exp $
include/X11/extensions/Xcomposite.h
lib/libXcomposite.1.0.0.dylib
lib/libXcomposite.1.dylib
lib/libXcomposite.dylib
+lib/libXcomposite.so
+lib/libXcomposite.so.1
lib/libXcomposite.so.1.0
lib/libXcomposite.a
lib/pkgconfig/xcomposite.pc
diff --git a/pkgtools/x11-links/files/xorg.Xfixes b/pkgtools/x11-links/files/xorg.Xfixes
index 06684e1e0da..8961554ad85 100644
--- a/pkgtools/x11-links/files/xorg.Xfixes
+++ b/pkgtools/x11-links/files/xorg.Xfixes
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.Xfixes,v 1.2 2007/12/17 18:20:19 tron Exp $
+# $NetBSD: xorg.Xfixes,v 1.3 2008/10/05 21:36:35 cube Exp $
#
include/X11/extensions/Xfixes.h
lib/libXfixes.3.1.0.dylib
@@ -9,4 +9,5 @@ lib/libXfixes.la
lib/libXfixes.so
lib/libXfixes.so.3
lib/libXfixes.so.3.0
+lib/libXfixes.so.3.1
lib/pkgconfig/xfixes.pc
diff --git a/pkgtools/x11-links/files/xorg.bigreqsproto b/pkgtools/x11-links/files/xorg.bigreqsproto
new file mode 100644
index 00000000000..76ef20dd043
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.bigreqsproto
@@ -0,0 +1,3 @@
+# $NetBSD: xorg.bigreqsproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+lib/pkgconfig/bigreqsproto.pc
diff --git a/pkgtools/x11-links/files/xorg.compositeproto b/pkgtools/x11-links/files/xorg.compositeproto
index 69fff625310..367b5d77a3a 100644
--- a/pkgtools/x11-links/files/xorg.compositeproto
+++ b/pkgtools/x11-links/files/xorg.compositeproto
@@ -1,4 +1,5 @@
-# $NetBSD: xorg.compositeproto,v 1.1 2006/04/19 15:56:38 reed Exp $
+# $NetBSD: xorg.compositeproto,v 1.2 2008/10/05 21:36:35 cube Exp $
include/X11/extensions/composite.h
include/X11/extensions/compositeproto.h
lib/pkgconfig/compositeext.pc
+lib/pkgconfig/compositeproto.pc
diff --git a/pkgtools/x11-links/files/xorg.damageproto b/pkgtools/x11-links/files/xorg.damageproto
new file mode 100644
index 00000000000..7177ea6e26b
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.damageproto
@@ -0,0 +1,3 @@
+# $NetBSD: xorg.damageproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+lib/pkgconfig/damageproto.pc
diff --git a/pkgtools/x11-links/files/xorg.evieext b/pkgtools/x11-links/files/xorg.evieext
new file mode 100644
index 00000000000..3759623d3ee
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.evieext
@@ -0,0 +1,3 @@
+# $NetBSD: xorg.evieext,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+lib/pkgconfig/evieproto.pc
diff --git a/pkgtools/x11-links/files/xorg.expat b/pkgtools/x11-links/files/xorg.expat
index 40ade3c36b0..fa01626e940 100644
--- a/pkgtools/x11-links/files/xorg.expat
+++ b/pkgtools/x11-links/files/xorg.expat
@@ -1,8 +1,12 @@
-# $NetBSD: xorg.expat,v 1.1 2007/12/15 17:53:40 tron Exp $
+# $NetBSD: xorg.expat,v 1.2 2008/10/05 21:36:35 cube Exp $
#
include/expat.h
include/expat_external.h
lib/libexpat.1.5.0.dylib
lib/libexpat.1.dylib
+lib/libexpat.a
lib/libexpat.dylib
lib/libexpat.la
+lib/libexpat.so.1.5.2
+lib/libexpat.so.1
+lib/libexpat.so
diff --git a/pkgtools/x11-links/files/xorg.fixesproto b/pkgtools/x11-links/files/xorg.fixesproto
index c7523f3ac68..415822c5b23 100644
--- a/pkgtools/x11-links/files/xorg.fixesproto
+++ b/pkgtools/x11-links/files/xorg.fixesproto
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.fixesproto,v 1.1 2006/04/19 15:56:38 reed Exp $
+# $NetBSD: xorg.fixesproto,v 1.2 2008/10/05 21:36:35 cube Exp $
include/X11/extensions/xfixesproto.h
include/X11/extensions/xfixeswire.h
-lib/pkgconfig/fixesext.pc
+lib/pkgconfig/fixesproto.pc
diff --git a/pkgtools/x11-links/files/xorg.fontcacheproto b/pkgtools/x11-links/files/xorg.fontcacheproto
new file mode 100644
index 00000000000..d1dff8dc19a
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.fontcacheproto
@@ -0,0 +1,3 @@
+# $NetBSD: xorg.fontcacheproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+include/X11/extensions/fontcachstr.h
+lib/pkgconfig/fontcacheproto.pc
diff --git a/pkgtools/x11-links/files/xorg.fontconfig b/pkgtools/x11-links/files/xorg.fontconfig
index d3534e81718..a835a239c23 100644
--- a/pkgtools/x11-links/files/xorg.fontconfig
+++ b/pkgtools/x11-links/files/xorg.fontconfig
@@ -1,12 +1,15 @@
-# $NetBSD: xorg.fontconfig,v 1.2 2008/08/22 13:34:39 tron Exp $
+# $NetBSD: xorg.fontconfig,v 1.3 2008/10/05 21:36:35 cube Exp $
#
include/fontconfig/fcfreetype.h
include/fontconfig/fcprivate.h
include/fontconfig/fontconfig.h
-lib/libfontconfig.la
+lib/libfontconfig.a
lib/libfontconfig.1.3.0.dylib
lib/libfontconfig.1.1.0.dylib
lib/libfontconfig.1.dylib
lib/libfontconfig.dylib
lib/libfontconfig.la
+lib/libfontconfig.so
+lib/libfontconfig.so.1
+lib/libfontconfig.so.1.3
lib/pkgconfig/fontconfig.pc
diff --git a/pkgtools/x11-links/files/xorg.fontsproto b/pkgtools/x11-links/files/xorg.fontsproto
new file mode 100644
index 00000000000..9f2eceec030
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.fontsproto
@@ -0,0 +1,6 @@
+# $NetBSD: xorg.fontsproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+include/X11/fonts/font.h
+include/X11/fonts/fontproto.h
+include/X11/fonts/fontstruct.h
+lib/pkgconfig/fontsproto.pc
diff --git a/pkgtools/x11-links/files/xorg.freetype2 b/pkgtools/x11-links/files/xorg.freetype2
index 232807415ad..3951ab7bf08 100644
--- a/pkgtools/x11-links/files/xorg.freetype2
+++ b/pkgtools/x11-links/files/xorg.freetype2
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.freetype2,v 1.1 2007/12/15 17:53:40 tron Exp $
+# $NetBSD: xorg.freetype2,v 1.2 2008/10/05 21:36:35 cube Exp $
#
bin/freetype-config
include/freetype2/freetype/config/ftconfig.h
@@ -50,5 +50,8 @@ lib/libfreetype.la
lib/libfreetype.6.3.16.dylib
lib/libfreetype.6.dylib
lib/libfreetype.dylib
+lib/libfreetype.so
+lib/libfreetype.so.6
+lib/libfreetype.so.6.3.17
lib/pkgconfig/freetype2.pc
share/aclocal/freetype2.m4
diff --git a/pkgtools/x11-links/files/xorg.glproto b/pkgtools/x11-links/files/xorg.glproto
new file mode 100644
index 00000000000..73cd4eb3677
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.glproto
@@ -0,0 +1,7 @@
+# $NetBSD: xorg.glproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+include/GL/glxint.h
+include/GL/glxmd.h
+include/GL/glxproto.h
+include/GL/glxtokens.h
+lib/pkgconfig/glproto.pc
diff --git a/pkgtools/x11-links/files/xorg.libFS b/pkgtools/x11-links/files/xorg.libFS
new file mode 100644
index 00000000000..119ccd70a87
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.libFS
@@ -0,0 +1,3 @@
+# $NetBSD: xorg.libFS,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+lib/pkgconfig/libfs.pc
diff --git a/pkgtools/x11-links/files/xorg.libXScrnSaver b/pkgtools/x11-links/files/xorg.libXScrnSaver
new file mode 100644
index 00000000000..055f5cc140d
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.libXScrnSaver
@@ -0,0 +1,3 @@
+# $NetBSD: xorg.libXScrnSaver,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+lib/pkgconfig/xscrnsaver.pc
diff --git a/pkgtools/x11-links/files/xorg.libXTrap b/pkgtools/x11-links/files/xorg.libXTrap
new file mode 100644
index 00000000000..0989be62bea
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.libXTrap
@@ -0,0 +1,3 @@
+# $NetBSD: xorg.libXTrap,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+lib/pkgconfig/xtrap.pc
diff --git a/pkgtools/x11-links/files/xorg.libXdamage b/pkgtools/x11-links/files/xorg.libXdamage
new file mode 100644
index 00000000000..711bbf1d13e
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.libXdamage
@@ -0,0 +1,12 @@
+# $NetBSD: xorg.libXdamage,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+include/X11/extensions/Xdamage.h
+lib/libXdamage.1.0.0.dylib
+lib/libXdamage.1.dylib
+lib/libXdamage.a
+lib/libXdamage.dylib
+lib/libXdamage.so
+lib/libXdamage.so.1
+lib/libXdamage.so.1.0
+lib/libXdamage.so.1.1
+lib/pkgconfig/xdamage.pc
diff --git a/pkgtools/x11-links/files/xorg.libXevie b/pkgtools/x11-links/files/xorg.libXevie
new file mode 100644
index 00000000000..cdfbdfac3d0
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.libXevie
@@ -0,0 +1,3 @@
+# $NetBSD: xorg.libXevie,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+lib/pkgconfig/xevie.pc
diff --git a/pkgtools/x11-links/files/xorg.libXfont b/pkgtools/x11-links/files/xorg.libXfont
new file mode 100644
index 00000000000..cf58e9af5dc
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.libXfont
@@ -0,0 +1,20 @@
+# $NetBSD: xorg.libXfont,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+include/X11/fonts/bdfint.h
+include/X11/fonts/bitmap.h
+include/X11/fonts/bufio.h
+include/X11/fonts/fntfil.h
+include/X11/fonts/fntfilio.h
+include/X11/fonts/fntfilst.h
+include/X11/fonts/fontconf.h
+include/X11/fonts/fontencc.h
+include/X11/fonts/fontmisc.h
+include/X11/fonts/fontmod.h
+include/X11/fonts/fontshow.h
+include/X11/fonts/fontutil.h
+include/X11/fonts/fontxlfd.h
+include/X11/fonts/ft.h
+include/X11/fonts/ftfuncs.h
+include/X11/fonts/pcf.h
+lib/libXfont.so.1.4.1
+lib/pkgconfig/xfont.pc
diff --git a/pkgtools/x11-links/files/xorg.libXprintUtil b/pkgtools/x11-links/files/xorg.libXprintUtil
new file mode 100644
index 00000000000..9f465b2014e
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.libXprintUtil
@@ -0,0 +1,6 @@
+# $NetBSD: xorg.libXprintUtil,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+lib/libXprintUtil.so
+lib/libXprintUtil.so.1
+lib/libXprintUtil.so.1.0.0
+lib/pkgconfig/xprintutil.pc
diff --git a/pkgtools/x11-links/files/xorg.libXrandr b/pkgtools/x11-links/files/xorg.libXrandr
index 472cef82554..5b2e3609480 100644
--- a/pkgtools/x11-links/files/xorg.libXrandr
+++ b/pkgtools/x11-links/files/xorg.libXrandr
@@ -1,10 +1,14 @@
-# $NetBSD: xorg.libXrandr,v 1.3 2008/08/22 13:34:39 tron Exp $
+# $NetBSD: xorg.libXrandr,v 1.4 2008/10/05 21:36:35 cube Exp $
#
include/X11/extensions/Xrandr.h
lib/libXrandr.2.1.0.dylib
lib/libXrandr.2.0.0.dylib
lib/libXrandr.2.1.0.dylib
lib/libXrandr.2.dylib
+lib/libXrandr.a
lib/libXrandr.dylib
lib/libXrandr.la
+lib/libXrandr.so
+lib/libXrandr.so.2
+lib/libXrandr.so.2.1
lib/pkgconfig/xrandr.pc
diff --git a/pkgtools/x11-links/files/xorg.libXrender b/pkgtools/x11-links/files/xorg.libXrender
index 8da8d985a95..8925b37b354 100644
--- a/pkgtools/x11-links/files/xorg.libXrender
+++ b/pkgtools/x11-links/files/xorg.libXrender
@@ -1,8 +1,12 @@
-# $NetBSD: xorg.libXrender,v 1.1 2007/12/17 18:20:20 tron Exp $
+# $NetBSD: xorg.libXrender,v 1.2 2008/10/05 21:36:35 cube Exp $
#
include/X11/extensions/Xrender.h
lib/libXrender.1.3.0.dylib
lib/libXrender.1.dylib
+lib/libXrender.a
lib/libXrender.dylib
lib/libXrender.la
+lib/libXrender.so
+lib/libXrender.so.1
+lib/libXrender.so.1.3
lib/pkgconfig/xrender.pc
diff --git a/pkgtools/x11-links/files/xorg.libXres b/pkgtools/x11-links/files/xorg.libXres
new file mode 100644
index 00000000000..c50d2d69263
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.libXres
@@ -0,0 +1,11 @@
+# $NetBSD: xorg.libXres,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+include/X11/extensions/XRes.h
+lib/libXRes.a
+lib/libXRes.1.0.0.dylib
+lib/libXRes.1.dylib
+lib/libXRes.dylib
+lib/libXRes.so
+lib/libXRes.so.1
+lib/libXRes.so.1.0
+lib/pkgconfig/xres.pc
diff --git a/pkgtools/x11-links/files/xorg.libdrm b/pkgtools/x11-links/files/xorg.libdrm
new file mode 100644
index 00000000000..25d0f9ea6a8
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.libdrm
@@ -0,0 +1,9 @@
+# $NetBSD: xorg.libdrm,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+include/X11/xf86drm.h
+include/X11/xf86mm.h
+lib/libdrm.a
+lib/libdrm.so
+lib/libdrm.so.2
+lib/libdrm.so.2.3
+lib/pkgconfig/libdrm.pc
diff --git a/pkgtools/x11-links/files/xorg.libfontenc b/pkgtools/x11-links/files/xorg.libfontenc
new file mode 100644
index 00000000000..9f7b03e202b
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.libfontenc
@@ -0,0 +1,3 @@
+# $NetBSD: xorg.libfontenc,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+lib/pkgconfig/fontenc.pc
diff --git a/pkgtools/x11-links/files/xorg.liblbxutil b/pkgtools/x11-links/files/xorg.liblbxutil
new file mode 100644
index 00000000000..7f9b2670ddc
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.liblbxutil
@@ -0,0 +1,6 @@
+# $NetBSD: xorg.liblbxutil,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+lib/liblbxutil.so
+lib/liblbxutil.so.1
+lib/liblbxutil.so.1.0
+lib/pkgconfig/lbxutil.pc
diff --git a/pkgtools/x11-links/files/xorg.pixman b/pkgtools/x11-links/files/xorg.pixman
index 150c9b29235..ca517770088 100644
--- a/pkgtools/x11-links/files/xorg.pixman
+++ b/pkgtools/x11-links/files/xorg.pixman
@@ -1,4 +1,19 @@
-# $NetBSD: xorg.pixman,v 1.2 2008/09/16 12:38:38 tron Exp $
+# $NetBSD: xorg.pixman,v 1.3 2008/10/05 21:36:35 cube Exp $
+#
+# NB: The .la file is not listed here because it is bogus in some
+# versions of MacOS X, so we don't want it buildlinked. Everything
+# is happy with just the pkgconfig file.
+include/pixman-1/pixman.h
+include/pixman-1/pixman-version.h
+lib/libpixman-1.a
+lib/libpixman-1.0.11.8.dylib
+lib/libpixman-1.0.dylib
+lib/libpixman-1.dylib
+lib/libpixman-1.so
+lib/libpixman-1.so.0
+lib/libpixman-1.so.0.11.2
+lib/pkgconfig/pixman-1.pc
+# $NetBSD: xorg.pixman,v 1.3 2008/10/05 21:36:35 cube Exp $
#
include/pixman-1/pixman.h
include/pixman-1/pixman-version.h
diff --git a/pkgtools/x11-links/files/xorg.printproto b/pkgtools/x11-links/files/xorg.printproto
new file mode 100644
index 00000000000..9c78caf598e
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.printproto
@@ -0,0 +1,3 @@
+# $NetBSD: xorg.printproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+lib/pkgconfig/printproto.pc
diff --git a/pkgtools/x11-links/files/xorg.recordproto b/pkgtools/x11-links/files/xorg.recordproto
new file mode 100644
index 00000000000..a0afb0cef2a
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.recordproto
@@ -0,0 +1,3 @@
+# $NetBSD: xorg.recordproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+lib/pkgconfig/recordproto.pc
diff --git a/pkgtools/x11-links/files/xorg.resourceproto b/pkgtools/x11-links/files/xorg.resourceproto
new file mode 100644
index 00000000000..c66d09c6dad
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.resourceproto
@@ -0,0 +1,3 @@
+# $NetBSD: xorg.resourceproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+lib/pkgconfig/resourceproto.pc
diff --git a/pkgtools/x11-links/files/xorg.scrnsaverproto b/pkgtools/x11-links/files/xorg.scrnsaverproto
new file mode 100644
index 00000000000..bd6bb60c34f
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.scrnsaverproto
@@ -0,0 +1,3 @@
+# $NetBSD: xorg.scrnsaverproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+lib/pkgconfig/scrnsaverproto.pc
diff --git a/pkgtools/x11-links/files/xorg.trapproto b/pkgtools/x11-links/files/xorg.trapproto
new file mode 100644
index 00000000000..6be84e47f21
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.trapproto
@@ -0,0 +1,3 @@
+# $NetBSD: xorg.trapproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+lib/pkgconfig/trapproto.pc
diff --git a/pkgtools/x11-links/files/xorg.videoproto b/pkgtools/x11-links/files/xorg.videoproto
new file mode 100644
index 00000000000..5e43bfc970e
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.videoproto
@@ -0,0 +1,4 @@
+# $NetBSD: xorg.videoproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+include/X11/extensions/vldXvMC.h
+lib/pkgconfig/videoproto.pc
diff --git a/pkgtools/x11-links/files/xorg.xcmiscproto b/pkgtools/x11-links/files/xorg.xcmiscproto
new file mode 100644
index 00000000000..d93f8e4a4f8
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.xcmiscproto
@@ -0,0 +1,3 @@
+# $NetBSD: xorg.xcmiscproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+lib/pkgconfig/xcmiscproto.pc
diff --git a/pkgtools/x11-links/files/xorg.xcursor b/pkgtools/x11-links/files/xorg.xcursor
index 20b47279ea6..efc2cb49471 100644
--- a/pkgtools/x11-links/files/xorg.xcursor
+++ b/pkgtools/x11-links/files/xorg.xcursor
@@ -1,8 +1,12 @@
-# $NetBSD: xorg.xcursor,v 1.1 2007/12/17 18:20:21 tron Exp $
+# $NetBSD: xorg.xcursor,v 1.2 2008/10/05 21:36:35 cube Exp $
#
include/X11/Xcursor/Xcursor.h
lib/libXcursor.1.0.2.dylib
lib/libXcursor.1.dylib
+lib/libXcursor.a
lib/libXcursor.dylib
lib/libXcursor.la
+lib/libXcursor.so
+lib/libXcursor.so.1
+lib/libXcursor.so.1.0.2
lib/pkgconfig/xcursor.pc
diff --git a/pkgtools/x11-links/files/xorg.xextensions b/pkgtools/x11-links/files/xorg.xextensions
deleted file mode 100644
index 27b778dfc89..00000000000
--- a/pkgtools/x11-links/files/xorg.xextensions
+++ /dev/null
@@ -1,54 +0,0 @@
-# $NetBSD: xorg.xextensions,v 1.1 2005/07/25 20:50:25 reed Exp $
-include/X11/extensions/MITMisc.h
-include/X11/extensions/XEVI.h
-include/X11/extensions/XEVIstr.h
-include/X11/extensions/XI.h
-include/X11/extensions/XInput.h
-include/X11/extensions/XIproto.h
-include/X11/extensions/XKB.h
-include/X11/extensions/XKBgeom.h
-include/X11/extensions/XKBproto.h
-include/X11/extensions/XKBsrv.h
-include/X11/extensions/XKBstr.h
-include/X11/extensions/XLbx.h
-include/X11/extensions/XShm.h
-include/X11/extensions/XTest.h
-include/X11/extensions/Xag.h
-include/X11/extensions/Xagsrv.h
-include/X11/extensions/Xagstr.h
-include/X11/extensions/Xcup.h
-include/X11/extensions/Xcupstr.h
-include/X11/extensions/Xdbe.h
-include/X11/extensions/Xdbeproto.h
-include/X11/extensions/Xext.h
-include/X11/extensions/Xv.h
-include/X11/extensions/XvMC.h
-include/X11/extensions/XvMCproto.h
-include/X11/extensions/Xvproto.h
-include/X11/extensions/bigreqstr.h
-include/X11/extensions/dpms.h
-include/X11/extensions/dpmsstr.h
-include/X11/extensions/extutil.h
-include/X11/extensions/lbxbuf.h
-include/X11/extensions/lbxbufstr.h
-include/X11/extensions/lbxdeltastr.h
-include/X11/extensions/lbximage.h
-include/X11/extensions/lbxopts.h
-include/X11/extensions/lbxstr.h
-include/X11/extensions/lbxzlib.h
-include/X11/extensions/mitmiscstr.h
-include/X11/extensions/multibuf.h
-include/X11/extensions/multibufst.h
-include/X11/extensions/saver.h
-include/X11/extensions/saverproto.h
-include/X11/extensions/security.h
-include/X11/extensions/securstr.h
-include/X11/extensions/shape.h
-include/X11/extensions/shapestr.h
-include/X11/extensions/shmstr.h
-include/X11/extensions/sync.h
-include/X11/extensions/syncstr.h
-include/X11/extensions/xcmiscstr.h
-include/X11/extensions/xtestext1.h
-include/X11/extensions/xteststr.h
-lib/pkgconfig/xextensions.pc
diff --git a/pkgtools/x11-links/files/xorg.xextproto b/pkgtools/x11-links/files/xorg.xextproto
index a47e3b06c5e..e26cdc6e101 100644
--- a/pkgtools/x11-links/files/xorg.xextproto
+++ b/pkgtools/x11-links/files/xorg.xextproto
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.xextproto,v 1.1 2006/04/19 15:56:38 reed Exp $
+# $NetBSD: xorg.xextproto,v 1.2 2008/10/05 21:36:35 cube Exp $
include/X11/extensions/MITMisc.h
include/X11/extensions/XEVI.h
include/X11/extensions/XEVIstr.h
@@ -21,6 +21,7 @@ include/X11/extensions/Xcupstr.h
include/X11/extensions/Xdbe.h
include/X11/extensions/Xdbeproto.h
include/X11/extensions/Xext.h
+include/X11/extensions/Xge.h
include/X11/extensions/Xv.h
include/X11/extensions/XvMC.h
include/X11/extensions/XvMCproto.h
@@ -29,6 +30,8 @@ include/X11/extensions/bigreqstr.h
include/X11/extensions/dpms.h
include/X11/extensions/dpmsstr.h
include/X11/extensions/extutil.h
+include/X11/extensions/ge.h
+include/X11/extensions/geproto.h
include/X11/extensions/lbxbuf.h
include/X11/extensions/lbxbufstr.h
include/X11/extensions/lbxdeltastr.h
@@ -52,3 +55,4 @@ include/X11/extensions/xcmiscstr.h
include/X11/extensions/xtestext1.h
include/X11/extensions/xteststr.h
lib/pkgconfig/xextensions.pc
+lib/pkgconfig/xextproto.pc
diff --git a/pkgtools/x11-links/files/xorg.xf86bigfontproto b/pkgtools/x11-links/files/xorg.xf86bigfontproto
new file mode 100644
index 00000000000..f79e13b3341
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.xf86bigfontproto
@@ -0,0 +1,3 @@
+# $NetBSD: xorg.xf86bigfontproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+lib/pkgconfig/xf86bigfontproto.pc
diff --git a/pkgtools/x11-links/files/xorg.xf86dgaproto b/pkgtools/x11-links/files/xorg.xf86dgaproto
new file mode 100644
index 00000000000..741ba29f8c3
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.xf86dgaproto
@@ -0,0 +1,3 @@
+# $NetBSD: xorg.xf86dgaproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+lib/pkgconfig/xf86dgaproto.pc
diff --git a/pkgtools/x11-links/files/xorg.xf86driproto b/pkgtools/x11-links/files/xorg.xf86driproto
new file mode 100644
index 00000000000..0721ce45812
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.xf86driproto
@@ -0,0 +1,5 @@
+# $NetBSD: xorg.xf86driproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+include/X11/dri/xf86dri.h
+include/X11/dri/xf86dristr.h
+lib/pkgconfig/xf86driproto.pc
diff --git a/pkgtools/x11-links/files/xorg.xf86miscproto b/pkgtools/x11-links/files/xorg.xf86miscproto
new file mode 100644
index 00000000000..6806c154a7d
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.xf86miscproto
@@ -0,0 +1,3 @@
+# $NetBSD: xorg.xf86miscproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+lib/pkgconfig/xf86miscproto.pc
diff --git a/pkgtools/x11-links/files/xorg.xf86vidmodeproto b/pkgtools/x11-links/files/xorg.xf86vidmodeproto
new file mode 100644
index 00000000000..150c4cdcc6a
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.xf86vidmodeproto
@@ -0,0 +1,3 @@
+# $NetBSD: xorg.xf86vidmodeproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+lib/pkgconfig/xf86vidmode.pc
diff --git a/pkgtools/x11-links/files/xorg.xproxymanagementprotocol b/pkgtools/x11-links/files/xorg.xproxymanagementprotocol
new file mode 100644
index 00000000000..4bdd0d1b31d
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.xproxymanagementprotocol
@@ -0,0 +1,3 @@
+# $NetBSD: xorg.xproxymanagementprotocol,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+lib/pkgconfig/xproxymngproto.pc
diff --git a/pkgtools/x11-links/files/xorg.xtrans b/pkgtools/x11-links/files/xorg.xtrans
new file mode 100644
index 00000000000..e3003ff06ce
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.xtrans
@@ -0,0 +1,13 @@
+# $NetBSD: xorg.xtrans,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+include/X11/Xtrans/Xtrans.c
+include/X11/Xtrans/Xtrans.h
+include/X11/Xtrans/Xtransdnet.c
+include/X11/Xtrans/Xtransint.h
+include/X11/Xtrans/Xtranslcl.c
+include/X11/Xtrans/Xtransos2.c
+include/X11/Xtrans/Xtranssock.c
+include/X11/Xtrans/Xtranstli.c
+include/X11/Xtrans/Xtransutil.c
+include/X11/Xtrans/transport.c
+lib/pkgconfig/xtrans.pc
diff --git a/pkgtools/x11-links/xorg.mk b/pkgtools/x11-links/xorg.mk
index 254ded1782a..0afdce272ac 100644
--- a/pkgtools/x11-links/xorg.mk
+++ b/pkgtools/x11-links/xorg.mk
@@ -1,39 +1,71 @@
-# $NetBSD: xorg.mk,v 1.10 2008/09/16 12:38:38 tron Exp $
+# $NetBSD: xorg.mk,v 1.11 2008/10/05 21:36:35 cube Exp $
#
# This is for X.org, but use "xfree" files also.
FILES_LIST= ${FILESDIR}/xorg
-# libXdamage and damageext only in pkgsrc-wip so not used here
# XXX: what about xaw?
.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../fonts/libfontenc/buildlink3.mk"
.include "../../graphics/MesaLib/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/glu/buildlink3.mk"
.include "../../textproc/expat/buildlink3.mk"
+.include "../../x11/bigreqsproto/buildlink3.mk"
.include "../../x11/compositeproto/buildlink3.mk"
+.include "../../x11/damageproto/buildlink3.mk"
+.include "../../x11/evieext/buildlink3.mk"
.include "../../x11/fixesproto/buildlink3.mk"
+.include "../../x11/fontcacheproto/buildlink3.mk"
+.include "../../x11/fontsproto/buildlink3.mk"
+.include "../../x11/glproto/buildlink3.mk"
.include "../../x11/inputproto/buildlink3.mk"
+.include "../../x11/libFS/buildlink3.mk"
.include "../../x11/libICE/buildlink3.mk"
.include "../../x11/libSM/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXScrnSaver/buildlink3.mk"
+.include "../../x11/libXTrap/buildlink3.mk"
+.include "../../x11/libXau/buildlink3.mk"
.include "../../x11/libXcomposite/buildlink3.mk"
.include "../../x11/libXcursor/buildlink3.mk"
+.include "../../x11/libXdamage/buildlink3.mk"
+.include "../../x11/libXdmcp/buildlink3.mk"
+.include "../../x11/libXevie/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXfixes/buildlink3.mk"
+.include "../../x11/libXfont/buildlink3.mk"
.include "../../x11/libXft/buildlink3.mk"
.include "../../x11/libXinerama/buildlink3.mk"
.include "../../x11/libXmu/buildlink3.mk"
.include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/libXprintUtil/buildlink3.mk"
.include "../../x11/libXrandr/buildlink3.mk"
.include "../../x11/libXrender/buildlink3.mk"
+.include "../../x11/libXres/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/libdrm/buildlink3.mk"
+.include "../../x11/liblbxutil/buildlink3.mk"
.include "../../x11/pixman/buildlink3.mk"
-.include "../../x11/renderproto/buildlink3.mk"
+.include "../../x11/printproto/buildlink3.mk"
.include "../../x11/randrproto/buildlink3.mk"
+.include "../../x11/recordproto/buildlink3.mk"
+.include "../../x11/renderproto/buildlink3.mk"
+.include "../../x11/resourceproto/buildlink3.mk"
+.include "../../x11/scrnsaverproto/buildlink3.mk"
+.include "../../x11/trapproto/buildlink3.mk"
+.include "../../x11/videoproto/buildlink3.mk"
+.include "../../x11/xcmiscproto/buildlink3.mk"
.include "../../x11/xextproto/buildlink3.mk"
+.include "../../x11/xf86bigfontproto/buildlink3.mk"
+.include "../../x11/xf86dgaproto/buildlink3.mk"
+.include "../../x11/xf86driproto/buildlink3.mk"
+.include "../../x11/xf86miscproto/buildlink3.mk"
+.include "../../x11/xf86vidmodeproto/buildlink3.mk"
.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xproxymanagementprotocol/buildlink3.mk"
+.include "../../x11/xtrans/buildlink3.mk"
# XXX what is ${X11_MODULES} ?
diff --git a/textproc/expat/builtin.mk b/textproc/expat/builtin.mk
index c363e0ad9fe..2d339d4f6d7 100644
--- a/textproc/expat/builtin.mk
+++ b/textproc/expat/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.12 2006/10/26 19:13:48 wiz Exp $
+# $NetBSD: builtin.mk,v 1.13 2008/10/05 21:36:34 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/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"