Initial import of xorg-libs-6.7.0.

This package contains the X.org include header files and shared
library files.

21 files changed, 1904 insertions, 0 deletions

diff --git a/x11/xorg-libs/DESCR b/x11/xorg-libs/DESCR
new file mode 100644
index 00000000000..f73895f601b
--- /dev/null
+++ b/x11/xorg-libs/DESCR
@@ -0,0 +1,2 @@
+This package contains the X.org include header files and shared
+library files.
diff --git a/x11/xorg-libs/Makefile b/x11/xorg-libs/Makefile
new file mode 100644
index 00000000000..77cb89b3478
--- /dev/null
+++ b/x11/xorg-libs/Makefile
@@ -0,0 +1,54 @@
+# $NetBSD: Makefile,v 1.1.1.1 2004/07/29 04:50:56 xtraeme Exp $
+
+DISTNAME=		${DISTFILES}
+PKGNAME=		xorg-libs-${XORG_VER}
+CATEGORIES=		x11
+MASTER_SITES=		${MASTER_SITE_XORG}
+DISTFILES=		X11R6.7.0-src1.tar.gz X11R6.7.0-src2.tar.gz \
+			X11R6.7.0-src3.tar.gz
+
+MAINTAINER=		xtraeme@NetBSD.org
+HOMEPAGE=		http://www.x.org/
+COMMENT=		X.org Libraries
+
+CONFLICTS+=		xextensions-[0-9]*
+CONFLICTS+=		libX11-[0-9]*
+CONFLICTS+=		libXau-[0-9]*
+CONFLICTS+=		XFree86-libs-[0-9]*
+
+BUILD_DEPENDS=		xorg-imake>=6.7.0:../../x11/xorg-imake
+
+.include "../../mk/bsd.prefs.mk"
+
+.include "../../meta-pkgs/xorg/Makefile.common"
+
+.if ${X11ROOT} == ${LOCALBASE}
+CONFLICTS+=		MesaLib-[0-9]* glu-[0-9]*
+.endif
+
+MESSAGE_SRC=		${_PKGSRCDIR}/x11/XFree86-libs/MESSAGE
+
+USE_BUILDLINK3=			yes
+BUILDLINK_PASSTHRU_DIRS+=	${X11ROOT}/lib
+
+XBUILD_DIRS=		lib nls programs/Xserver/include \
+			programs/Xserver/hw/xfree86/parser
+XINSTALL_DIRS=		include lib nls programs/Xserver/include \
+			programs/Xserver/hw/xfree86/parser
+XINSTALL_MAN_DIRS=	${XINSTALL_DIRS}
+
+SUBST_CLASSES=		mkstrs
+SUBST_STAGE.mkstrs=	post-patch
+SUBST_FILES.mkstrs=	config/cf/Library.tmpl
+SUBST_SED.mkstrs=	-e 's,@MAKESTRS@,${X11ROOT}/bin/makestrs,g'
+SUBST_MESSAGE.mkstrs=	"Fixing path of makestrs."
+
+.if ${OPSYS} == "Linux"
+post-install:
+	@${LDCONFIG} ${X11ROOT}/lib || ${TRUE}
+.endif
+
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xorg-libs/PLIST.FreeBSD b/x11/xorg-libs/PLIST.FreeBSD
new file mode 100644
index 00000000000..0579d40d1fb
--- /dev/null
+++ b/x11/xorg-libs/PLIST.FreeBSD
@@ -0,0 +1,114 @@
+@comment $NetBSD: PLIST.FreeBSD,v 1.1.1.1 2004/07/29 04:50:56 xtraeme Exp $
+${X11ROOT_PREFIX}/lib/libFS.a
+${X11ROOT_PREFIX}/lib/libFS.so
+${X11ROOT_PREFIX}/lib/libFS.so.6
+${X11ROOT_PREFIX}/lib/libGL.a
+${X11ROOT_PREFIX}/lib/libGL.so
+${X11ROOT_PREFIX}/lib/libGL.so.1
+${X11ROOT_PREFIX}/lib/libGLU.a
+${X11ROOT_PREFIX}/lib/libGLU.so
+${X11ROOT_PREFIX}/lib/libGLU.so.1
+${X11ROOT_PREFIX}/lib/libGLw.a
+${X11ROOT_PREFIX}/lib/libGLw.so
+${X11ROOT_PREFIX}/lib/libGLw.so.1
+${X11ROOT_PREFIX}/lib/libICE.a
+${X11ROOT_PREFIX}/lib/libICE.so
+${X11ROOT_PREFIX}/lib/libICE.so.6
+${X11ROOT_PREFIX}/lib/libOSMesa.a
+${X11ROOT_PREFIX}/lib/libOSMesa.so
+${X11ROOT_PREFIX}/lib/libOSMesa.so.4
+${X11ROOT_PREFIX}/lib/libSM.a
+${X11ROOT_PREFIX}/lib/libSM.so
+${X11ROOT_PREFIX}/lib/libSM.so.6
+${X11ROOT_PREFIX}/lib/libX11.a
+${X11ROOT_PREFIX}/lib/libX11.so
+${X11ROOT_PREFIX}/lib/libX11.so.6
+${X11ROOT_PREFIX}/lib/libXRes.a
+${X11ROOT_PREFIX}/lib/libXRes.so
+${X11ROOT_PREFIX}/lib/libXRes.so.1
+${LIBXTHRSTUB}${X11ROOT_PREFIX}/lib/libXThrStub.so
+${LIBXTHRSTUB}${X11ROOT_PREFIX}/lib/libXThrStub.so.6
+${LIBXTHRSTUB}${XTHRSTUB_MINOR}${X11ROOT_PREFIX}/lib/libXThrStub.so.6.1
+${X11ROOT_PREFIX}/lib/libXTrap.a
+${X11ROOT_PREFIX}/lib/libXTrap.so
+${X11ROOT_PREFIX}/lib/libXTrap.so.6
+${X11ROOT_PREFIX}/lib/libXau.a
+${X11ROOT_PREFIX}/lib/libXaw.a
+${X11ROOT_PREFIX}/lib/libXaw.so
+${X11ROOT_PREFIX}/lib/libXaw.so.6
+${X11ROOT_PREFIX}/lib/libXaw.so.7
+${X11ROOT_PREFIX}/lib/libXdmcp.a
+${X11ROOT_PREFIX}/lib/libXext.a
+${X11ROOT_PREFIX}/lib/libXext.so
+${X11ROOT_PREFIX}/lib/libXext.so.6
+${X11ROOT_PREFIX}/lib/libXfont.a
+${X11ROOT_PREFIX}/lib/libXfont.so
+${X11ROOT_PREFIX}/lib/libXfont.so.1
+${X11ROOT_PREFIX}/lib/libXfontcache.a
+${X11ROOT_PREFIX}/lib/libXfontcache.so
+${X11ROOT_PREFIX}/lib/libXfontcache.so.1
+${X11ROOT_PREFIX}/lib/libXi.a
+${X11ROOT_PREFIX}/lib/libXi.so
+${X11ROOT_PREFIX}/lib/libXi.so.6
+${X11ROOT_PREFIX}/lib/libXinerama.a
+${X11ROOT_PREFIX}/lib/libXinerama.so
+${X11ROOT_PREFIX}/lib/libXinerama.so.1
+${X11ROOT_PREFIX}/lib/libXmu.a
+${X11ROOT_PREFIX}/lib/libXmu.so
+${X11ROOT_PREFIX}/lib/libXmu.so.6
+${X11ROOT_PREFIX}/lib/libXmuu.a
+${X11ROOT_PREFIX}/lib/libXmuu.so
+${X11ROOT_PREFIX}/lib/libXmuu.so.1
+${X11ROOT_PREFIX}/lib/libXp.a
+${X11ROOT_PREFIX}/lib/libXp.so
+${X11ROOT_PREFIX}/lib/libXp.so.6
+${X11ROOT_PREFIX}/lib/libXpm.a
+${X11ROOT_PREFIX}/lib/libXpm.so
+${X11ROOT_PREFIX}/lib/libXpm.so.4
+${X11ROOT_PREFIX}/lib/libXss.a
+${X11ROOT_PREFIX}/lib/libXss.so
+${X11ROOT_PREFIX}/lib/libXss.so.1
+${X11ROOT_PREFIX}/lib/libXt.a
+${X11ROOT_PREFIX}/lib/libXt.so
+${X11ROOT_PREFIX}/lib/libXt.so.6
+${X11ROOT_PREFIX}/lib/libXtst.a
+${X11ROOT_PREFIX}/lib/libXtst.so
+${X11ROOT_PREFIX}/lib/libXtst.so.6
+${X11ROOT_PREFIX}/lib/libXv.a
+${X11ROOT_PREFIX}/lib/libXv.so
+${X11ROOT_PREFIX}/lib/libXv.so.1
+${X11ROOT_PREFIX}/lib/libXvMC.a
+${X11ROOT_PREFIX}/lib/libXvMC.so
+${X11ROOT_PREFIX}/lib/libXvMC.so.1
+${X11ROOT_PREFIX}/lib/libXxf86dga.a
+${X11ROOT_PREFIX}/lib/libXxf86dga.so
+${X11ROOT_PREFIX}/lib/libXxf86dga.so.1
+${X11ROOT_PREFIX}/lib/libXxf86misc.a
+${X11ROOT_PREFIX}/lib/libXxf86misc.so
+${X11ROOT_PREFIX}/lib/libXxf86misc.so.1
+${X11ROOT_PREFIX}/lib/libXxf86vm.a
+${X11ROOT_PREFIX}/lib/libXxf86vm.so
+${X11ROOT_PREFIX}/lib/libXxf86vm.so.1
+${X11ROOT_PREFIX}/lib/libdps.a
+${X11ROOT_PREFIX}/lib/libdps.so
+${X11ROOT_PREFIX}/lib/libdps.so.1
+${X11ROOT_PREFIX}/lib/libdpstk.a
+${X11ROOT_PREFIX}/lib/libdpstk.so
+${X11ROOT_PREFIX}/lib/libdpstk.so.1
+${X11ROOT_PREFIX}/lib/libfntstubs.a
+${X11ROOT_PREFIX}/lib/libfontenc.a
+${X11ROOT_PREFIX}/lib/libfontenc.so
+${X11ROOT_PREFIX}/lib/libfontenc.so.1
+${X11ROOT_PREFIX}/lib/liboldX.a
+${X11ROOT_PREFIX}/lib/liboldX.so
+${X11ROOT_PREFIX}/lib/liboldX.so.6
+${X11ROOT_PREFIX}/lib/libpsres.a
+${X11ROOT_PREFIX}/lib/libpsres.so
+${X11ROOT_PREFIX}/lib/libpsres.so.1
+${X11ROOT_PREFIX}/lib/libxf86config.a
+${X11ROOT_PREFIX}/lib/libxkbfile.a
+${X11ROOT_PREFIX}/lib/libxkbfile.so
+${X11ROOT_PREFIX}/lib/libxkbfile.so.1
+${X11ROOT_PREFIX}/lib/libxkbui.a
+${X11ROOT_PREFIX}/lib/libxkbui.so
+${X11ROOT_PREFIX}/lib/libxkbui.so.1
diff --git a/x11/xorg-libs/PLIST.Linux b/x11/xorg-libs/PLIST.Linux
new file mode 100644
index 00000000000..f63aefaa230
--- /dev/null
+++ b/x11/xorg-libs/PLIST.Linux
@@ -0,0 +1,122 @@
+@comment $NetBSD: PLIST.Linux,v 1.1.1.1 2004/07/29 04:50:56 xtraeme Exp $
+${X11ROOT_PREFIX}/lib/libFS.so
+${X11ROOT_PREFIX}/lib/libFS.so.6
+${X11ROOT_PREFIX}/lib/libFS.so.6.0
+${X11ROOT_PREFIX}/lib/libGL.so
+${X11ROOT_PREFIX}/lib/libGL.so.1
+${X11ROOT_PREFIX}/lib/libGL.so.1.2
+${X11ROOT_PREFIX}/lib/libGLU.so
+${X11ROOT_PREFIX}/lib/libGLU.so.1
+${X11ROOT_PREFIX}/lib/libGLU.so.1.3
+${X11ROOT_PREFIX}/lib/libGLw.so
+${X11ROOT_PREFIX}/lib/libGLw.so.1
+${X11ROOT_PREFIX}/lib/libGLw.so.1.0
+${X11ROOT_PREFIX}/lib/libI810XvMC.so
+${X11ROOT_PREFIX}/lib/libI810XvMC.so.1
+${X11ROOT_PREFIX}/lib/libI810XvMC.so.1.0
+${X11ROOT_PREFIX}/lib/libICE.so
+${X11ROOT_PREFIX}/lib/libICE.so.6
+${X11ROOT_PREFIX}/lib/libICE.so.6.3
+${X11ROOT_PREFIX}/lib/libOSMesa.a
+${X11ROOT_PREFIX}/lib/libOSMesa.so
+${X11ROOT_PREFIX}/lib/libOSMesa.so.4
+${X11ROOT_PREFIX}/lib/libOSMesa.so.4.0
+${X11ROOT_PREFIX}/lib/libSM.so
+${X11ROOT_PREFIX}/lib/libSM.so.6
+${X11ROOT_PREFIX}/lib/libSM.so.6.0
+${X11ROOT_PREFIX}/lib/libX11.so
+${X11ROOT_PREFIX}/lib/libX11.so.6
+${X11ROOT_PREFIX}/lib/libX11.so.6.2
+${X11ROOT_PREFIX}/lib/libXRes.so
+${X11ROOT_PREFIX}/lib/libXRes.so.1
+${X11ROOT_PREFIX}/lib/libXRes.so.1.0
+${X11ROOT_PREFIX}/lib/libXThrStub.so
+${X11ROOT_PREFIX}/lib/libXThrStub.so.6
+${X11ROOT_PREFIX}/lib/libXThrStub.so.6.1
+${X11ROOT_PREFIX}/lib/libXTrap.so
+${X11ROOT_PREFIX}/lib/libXTrap.so.6
+${X11ROOT_PREFIX}/lib/libXTrap.so.6.4
+${X11ROOT_PREFIX}/lib/libXau.a
+${X11ROOT_PREFIX}/lib/libXaw.so
+${X11ROOT_PREFIX}/lib/libXaw.so.6
+${X11ROOT_PREFIX}/lib/libXaw.so.6.1
+${X11ROOT_PREFIX}/lib/libXaw.so.7
+${X11ROOT_PREFIX}/lib/libXaw.so.7.0
+${X11ROOT_PREFIX}/lib/libXdmcp.a
+${X11ROOT_PREFIX}/lib/libXext.so
+${X11ROOT_PREFIX}/lib/libXext.so.6
+${X11ROOT_PREFIX}/lib/libXext.so.6.4
+${X11ROOT_PREFIX}/lib/libXfont.a
+${X11ROOT_PREFIX}/lib/libXfont.so
+${X11ROOT_PREFIX}/lib/libXfont.so.1
+${X11ROOT_PREFIX}/lib/libXfont.so.1.5
+${X11ROOT_PREFIX}/lib/libXfontcache.so
+${X11ROOT_PREFIX}/lib/libXfontcache.so.1
+${X11ROOT_PREFIX}/lib/libXfontcache.so.1.2
+${X11ROOT_PREFIX}/lib/libXi.so
+${X11ROOT_PREFIX}/lib/libXi.so.6
+${X11ROOT_PREFIX}/lib/libXi.so.6.0
+${X11ROOT_PREFIX}/lib/libXinerama.so
+${X11ROOT_PREFIX}/lib/libXinerama.so.1
+${X11ROOT_PREFIX}/lib/libXinerama.so.1.0
+${X11ROOT_PREFIX}/lib/libXmu.so
+${X11ROOT_PREFIX}/lib/libXmu.so.6
+${X11ROOT_PREFIX}/lib/libXmu.so.6.2
+${X11ROOT_PREFIX}/lib/libXmuu.so
+${X11ROOT_PREFIX}/lib/libXmuu.so.1
+${X11ROOT_PREFIX}/lib/libXmuu.so.1.0
+${X11ROOT_PREFIX}/lib/libXp.so
+${X11ROOT_PREFIX}/lib/libXp.so.6
+${X11ROOT_PREFIX}/lib/libXp.so.6.2
+${X11ROOT_PREFIX}/lib/libXpm.so
+${X11ROOT_PREFIX}/lib/libXpm.so.4
+${X11ROOT_PREFIX}/lib/libXpm.so.4.11
+${X11ROOT_PREFIX}/lib/libXss.so
+${X11ROOT_PREFIX}/lib/libXss.so.1
+${X11ROOT_PREFIX}/lib/libXss.so.1.0
+${X11ROOT_PREFIX}/lib/libXt.so
+${X11ROOT_PREFIX}/lib/libXt.so.6
+${X11ROOT_PREFIX}/lib/libXt.so.6.0
+${X11ROOT_PREFIX}/lib/libXtst.so
+${X11ROOT_PREFIX}/lib/libXtst.so.6
+${X11ROOT_PREFIX}/lib/libXtst.so.6.1
+${X11ROOT_PREFIX}/lib/libXv.so
+${X11ROOT_PREFIX}/lib/libXv.so.1
+${X11ROOT_PREFIX}/lib/libXv.so.1.0
+${X11ROOT_PREFIX}/lib/libXvMC.so
+${X11ROOT_PREFIX}/lib/libXvMC.so.1
+${X11ROOT_PREFIX}/lib/libXvMC.so.1.0
+${X11ROOT_PREFIX}/lib/libXxf86dga.so
+${X11ROOT_PREFIX}/lib/libXxf86dga.so.1
+${X11ROOT_PREFIX}/lib/libXxf86dga.so.1.0
+${X11ROOT_PREFIX}/lib/libXxf86misc.so
+${X11ROOT_PREFIX}/lib/libXxf86misc.so.1
+${X11ROOT_PREFIX}/lib/libXxf86misc.so.1.1
+${X11ROOT_PREFIX}/lib/libXxf86rush.so
+${X11ROOT_PREFIX}/lib/libXxf86rush.so.1
+${X11ROOT_PREFIX}/lib/libXxf86rush.so.1.0
+${X11ROOT_PREFIX}/lib/libXxf86vm.so
+${X11ROOT_PREFIX}/lib/libXxf86vm.so.1
+${X11ROOT_PREFIX}/lib/libXxf86vm.so.1.0
+${X11ROOT_PREFIX}/lib/libdps.so
+${X11ROOT_PREFIX}/lib/libdps.so.1
+${X11ROOT_PREFIX}/lib/libdps.so.1.0
+${X11ROOT_PREFIX}/lib/libdpstk.so
+${X11ROOT_PREFIX}/lib/libdpstk.so.1
+${X11ROOT_PREFIX}/lib/libdpstk.so.1.0
+${X11ROOT_PREFIX}/lib/libfntstubs.a
+${X11ROOT_PREFIX}/lib/libfontenc.so
+${X11ROOT_PREFIX}/lib/libfontenc.so.1
+${X11ROOT_PREFIX}/lib/libfontenc.so.1.0
+${X11ROOT_PREFIX}/lib/liboldX.a
+${X11ROOT_PREFIX}/lib/libpsres.a
+${X11ROOT_PREFIX}/lib/libpsres.so
+${X11ROOT_PREFIX}/lib/libpsres.so.1
+${X11ROOT_PREFIX}/lib/libpsres.so.1.0
+${X11ROOT_PREFIX}/lib/libxf86config.a
+${X11ROOT_PREFIX}/lib/libxkbfile.so
+${X11ROOT_PREFIX}/lib/libxkbfile.so.1
+${X11ROOT_PREFIX}/lib/libxkbfile.so.1.0
+${X11ROOT_PREFIX}/lib/libxkbui.so
+${X11ROOT_PREFIX}/lib/libxkbui.so.1
+${X11ROOT_PREFIX}/lib/libxkbui.so.1.0
diff --git a/x11/xorg-libs/PLIST.NetBSD b/x11/xorg-libs/PLIST.NetBSD
new file mode 100644
index 00000000000..9817ceac7e4
--- /dev/null
+++ b/x11/xorg-libs/PLIST.NetBSD
@@ -0,0 +1,150 @@
+@comment $NetBSD: PLIST.NetBSD,v 1.1.1.1 2004/07/29 04:50:56 xtraeme Exp $
+${X11ROOT_PREFIX}/lib/libFS.a
+${X11ROOT_PREFIX}/lib/libFS.so
+${X11ROOT_PREFIX}/lib/libFS.so.6
+${X11ROOT_PREFIX}/lib/libFS.so.6.0
+${X11ROOT_PREFIX}/lib/libGL.a
+${X11ROOT_PREFIX}/lib/libGL.so
+${X11ROOT_PREFIX}/lib/libGL.so.1
+${X11ROOT_PREFIX}/lib/libGL.so.1.2
+${X11ROOT_PREFIX}/lib/libGLU.a
+${X11ROOT_PREFIX}/lib/libGLU.so
+${X11ROOT_PREFIX}/lib/libGLU.so.1
+${X11ROOT_PREFIX}/lib/libGLU.so.1.3
+${X11ROOT_PREFIX}/lib/libGLw.a
+${X11ROOT_PREFIX}/lib/libGLw.so
+${X11ROOT_PREFIX}/lib/libGLw.so.1
+${X11ROOT_PREFIX}/lib/libGLw.so.1.0
+${X11ROOT_PREFIX}/lib/libICE.a
+${X11ROOT_PREFIX}/lib/libICE.so
+${X11ROOT_PREFIX}/lib/libICE.so.6
+${X11ROOT_PREFIX}/lib/libICE.so.6.3
+${X11ROOT_PREFIX}/lib/libOSMesa.a
+${X11ROOT_PREFIX}/lib/libOSMesa.so
+${X11ROOT_PREFIX}/lib/libOSMesa.so.4
+${X11ROOT_PREFIX}/lib/libOSMesa.so.4.0
+${X11ROOT_PREFIX}/lib/libSM.a
+${X11ROOT_PREFIX}/lib/libSM.so
+${X11ROOT_PREFIX}/lib/libSM.so.6
+${X11ROOT_PREFIX}/lib/libSM.so.6.0
+${X11ROOT_PREFIX}/lib/libX11.a
+${X11ROOT_PREFIX}/lib/libX11.so
+${X11ROOT_PREFIX}/lib/libX11.so.6
+${X11ROOT_PREFIX}/lib/libX11.so.6.2
+${X11ROOT_PREFIX}/lib/libXRes.a
+${X11ROOT_PREFIX}/lib/libXRes.so
+${X11ROOT_PREFIX}/lib/libXRes.so.1
+${X11ROOT_PREFIX}/lib/libXRes.so.1.0
+${X11ROOT_PREFIX}/lib/libXThrStub.so
+${X11ROOT_PREFIX}/lib/libXThrStub.so.6
+${X11ROOT_PREFIX}/lib/libXThrStub.so.6.1
+${X11ROOT_PREFIX}/lib/libXTrap.a
+${X11ROOT_PREFIX}/lib/libXTrap.so
+${X11ROOT_PREFIX}/lib/libXTrap.so.6
+${X11ROOT_PREFIX}/lib/libXTrap.so.6.4
+${X11ROOT_PREFIX}/lib/libXau.a
+${X11ROOT_PREFIX}/lib/libXaw.a
+${X11ROOT_PREFIX}/lib/libXaw.so
+${X11ROOT_PREFIX}/lib/libXaw.so.6
+${X11ROOT_PREFIX}/lib/libXaw.so.6.1
+${X11ROOT_PREFIX}/lib/libXaw.so.7
+${X11ROOT_PREFIX}/lib/libXaw.so.7.0
+${X11ROOT_PREFIX}/lib/libXdmcp.a
+${X11ROOT_PREFIX}/lib/libXext.a
+${X11ROOT_PREFIX}/lib/libXext.so
+${X11ROOT_PREFIX}/lib/libXext.so.6
+${X11ROOT_PREFIX}/lib/libXext.so.6.4
+${X11ROOT_PREFIX}/lib/libXfont.a
+${X11ROOT_PREFIX}/lib/libXfont.so
+${X11ROOT_PREFIX}/lib/libXfont.so.1
+${X11ROOT_PREFIX}/lib/libXfont.so.1.5
+${X11ROOT_PREFIX}/lib/libXfontcache.a
+${X11ROOT_PREFIX}/lib/libXfontcache.so
+${X11ROOT_PREFIX}/lib/libXfontcache.so.1
+${X11ROOT_PREFIX}/lib/libXfontcache.so.1.2
+${X11ROOT_PREFIX}/lib/libXi.a
+${X11ROOT_PREFIX}/lib/libXi.so
+${X11ROOT_PREFIX}/lib/libXi.so.6
+${X11ROOT_PREFIX}/lib/libXi.so.6.0
+${X11ROOT_PREFIX}/lib/libXinerama.a
+${X11ROOT_PREFIX}/lib/libXinerama.so
+${X11ROOT_PREFIX}/lib/libXinerama.so.1
+${X11ROOT_PREFIX}/lib/libXinerama.so.1.0
+${X11ROOT_PREFIX}/lib/libXmu.a
+${X11ROOT_PREFIX}/lib/libXmu.so
+${X11ROOT_PREFIX}/lib/libXmu.so.6
+${X11ROOT_PREFIX}/lib/libXmu.so.6.2
+${X11ROOT_PREFIX}/lib/libXmuu.a
+${X11ROOT_PREFIX}/lib/libXmuu.so
+${X11ROOT_PREFIX}/lib/libXmuu.so.1
+${X11ROOT_PREFIX}/lib/libXmuu.so.1.0
+${X11ROOT_PREFIX}/lib/libXp.a
+${X11ROOT_PREFIX}/lib/libXp.so
+${X11ROOT_PREFIX}/lib/libXp.so.6
+${X11ROOT_PREFIX}/lib/libXp.so.6.2
+${X11ROOT_PREFIX}/lib/libXpm.a
+${X11ROOT_PREFIX}/lib/libXpm.so
+${X11ROOT_PREFIX}/lib/libXpm.so.4
+${X11ROOT_PREFIX}/lib/libXpm.so.4.11
+${X11ROOT_PREFIX}/lib/libXss.a
+${X11ROOT_PREFIX}/lib/libXss.so
+${X11ROOT_PREFIX}/lib/libXss.so.1
+${X11ROOT_PREFIX}/lib/libXss.so.1.0
+${X11ROOT_PREFIX}/lib/libXt.a
+${X11ROOT_PREFIX}/lib/libXt.so
+${X11ROOT_PREFIX}/lib/libXt.so.6
+${X11ROOT_PREFIX}/lib/libXt.so.6.0
+${X11ROOT_PREFIX}/lib/libXtst.a
+${X11ROOT_PREFIX}/lib/libXtst.so
+${X11ROOT_PREFIX}/lib/libXtst.so.6
+${X11ROOT_PREFIX}/lib/libXtst.so.6.1
+${X11ROOT_PREFIX}/lib/libXv.a
+${X11ROOT_PREFIX}/lib/libXv.so
+${X11ROOT_PREFIX}/lib/libXv.so.1
+${X11ROOT_PREFIX}/lib/libXv.so.1.0
+${X11ROOT_PREFIX}/lib/libXvMC.a
+${X11ROOT_PREFIX}/lib/libXvMC.so
+${X11ROOT_PREFIX}/lib/libXvMC.so.1
+${X11ROOT_PREFIX}/lib/libXvMC.so.1.0
+${X11ROOT_PREFIX}/lib/libXxf86dga.a
+${X11ROOT_PREFIX}/lib/libXxf86dga.so
+${X11ROOT_PREFIX}/lib/libXxf86dga.so.1
+${X11ROOT_PREFIX}/lib/libXxf86dga.so.1.0
+${X11ROOT_PREFIX}/lib/libXxf86misc.a
+${X11ROOT_PREFIX}/lib/libXxf86misc.so
+${X11ROOT_PREFIX}/lib/libXxf86misc.so.1
+${X11ROOT_PREFIX}/lib/libXxf86misc.so.1.1
+${X11ROOT_PREFIX}/lib/libXxf86vm.a
+${X11ROOT_PREFIX}/lib/libXxf86vm.so
+${X11ROOT_PREFIX}/lib/libXxf86vm.so.1
+${X11ROOT_PREFIX}/lib/libXxf86vm.so.1.0
+${X11ROOT_PREFIX}/lib/libdps.a
+${X11ROOT_PREFIX}/lib/libdps.so
+${X11ROOT_PREFIX}/lib/libdps.so.1
+${X11ROOT_PREFIX}/lib/libdps.so.1.0
+${X11ROOT_PREFIX}/lib/libdpstk.a
+${X11ROOT_PREFIX}/lib/libdpstk.so
+${X11ROOT_PREFIX}/lib/libdpstk.so.1
+${X11ROOT_PREFIX}/lib/libdpstk.so.1.0
+${X11ROOT_PREFIX}/lib/libfntstubs.a
+${X11ROOT_PREFIX}/lib/libfontenc.a
+${X11ROOT_PREFIX}/lib/libfontenc.so
+${X11ROOT_PREFIX}/lib/libfontenc.so.1
+${X11ROOT_PREFIX}/lib/libfontenc.so.1.0
+${X11ROOT_PREFIX}/lib/liboldX.a
+${X11ROOT_PREFIX}/lib/liboldX.so
+${X11ROOT_PREFIX}/lib/liboldX.so.6
+${X11ROOT_PREFIX}/lib/liboldX.so.6.0
+${X11ROOT_PREFIX}/lib/libpsres.a
+${X11ROOT_PREFIX}/lib/libpsres.so
+${X11ROOT_PREFIX}/lib/libpsres.so.1
+${X11ROOT_PREFIX}/lib/libpsres.so.1.0
+${X11ROOT_PREFIX}/lib/libxf86config.a
+${X11ROOT_PREFIX}/lib/libxkbfile.a
+${X11ROOT_PREFIX}/lib/libxkbfile.so
+${X11ROOT_PREFIX}/lib/libxkbfile.so.1
+${X11ROOT_PREFIX}/lib/libxkbfile.so.1.0
+${X11ROOT_PREFIX}/lib/libxkbui.a
+${X11ROOT_PREFIX}/lib/libxkbui.so
+${X11ROOT_PREFIX}/lib/libxkbui.so.1
+${X11ROOT_PREFIX}/lib/libxkbui.so.1.0
diff --git a/x11/xorg-libs/PLIST.OpenBSD b/x11/xorg-libs/PLIST.OpenBSD
new file mode 100644
index 00000000000..0b8fac7deef
--- /dev/null
+++ b/x11/xorg-libs/PLIST.OpenBSD
@@ -0,0 +1,77 @@
+@comment $NetBSD: PLIST.OpenBSD,v 1.1.1.1 2004/07/29 04:50:55 xtraeme Exp $
+${X11ROOT_PREFIX}/lib/libFS.a
+${X11ROOT_PREFIX}/lib/libFS.so.7.0
+${X11ROOT_PREFIX}/lib/libGL.a
+${X11ROOT_PREFIX}/lib/libGL.so.2.0
+${X11ROOT_PREFIX}/lib/libGLU.a
+${X11ROOT_PREFIX}/lib/libGLU.so.2.0
+${X11ROOT_PREFIX}/lib/libGLw.a
+${X11ROOT_PREFIX}/lib/libGLw.so.2.0
+${X11ROOT_PREFIX}/lib/libICE.a
+${X11ROOT_PREFIX}/lib/libICE.so.7.0
+${X11ROOT_PREFIX}/lib/libOSMesa.a
+${X11ROOT_PREFIX}/lib/libOSMesa.so.4.0
+${X11ROOT_PREFIX}/lib/libSM.a
+${X11ROOT_PREFIX}/lib/libSM.so.7.0
+${X11ROOT_PREFIX}/lib/libX11.a
+${X11ROOT_PREFIX}/lib/libX11.so.7.0
+${X11ROOT_PREFIX}/lib/libXRes.a
+${X11ROOT_PREFIX}/lib/libXRes.so.1.0
+${X11ROOT_PREFIX}/lib/libXThrStub.so.7.0
+${X11ROOT_PREFIX}/lib/libXTrap.a
+${X11ROOT_PREFIX}/lib/libXTrap.so.7.0
+${X11ROOT_PREFIX}/lib/libXau.a
+${X11ROOT_PREFIX}/lib/libXaw.a
+${X11ROOT_PREFIX}/lib/libXaw.so.7.1
+${X11ROOT_PREFIX}/lib/libXaw.so.8.0
+${X11ROOT_PREFIX}/lib/libXdmcp.a
+${X11ROOT_PREFIX}/lib/libXext.a
+${X11ROOT_PREFIX}/lib/libXext.so.7.0
+${X11ROOT_PREFIX}/lib/libXfont.a
+${X11ROOT_PREFIX}/lib/libXfont.so.2.0
+${X11ROOT_PREFIX}/lib/libXfontcache.a
+${X11ROOT_PREFIX}/lib/libXfontcache.so.2.0
+${X11ROOT_PREFIX}/lib/libXi.a
+${X11ROOT_PREFIX}/lib/libXi.so.7.0
+${X11ROOT_PREFIX}/lib/libXinerama.a
+${X11ROOT_PREFIX}/lib/libXinerama.so.2.0
+${X11ROOT_PREFIX}/lib/libXmu.a
+${X11ROOT_PREFIX}/lib/libXmu.so.7.0
+${X11ROOT_PREFIX}/lib/libXmuu.a
+${X11ROOT_PREFIX}/lib/libXmuu.so.2.0
+${X11ROOT_PREFIX}/lib/libXp.a
+${X11ROOT_PREFIX}/lib/libXp.so.7.0
+${X11ROOT_PREFIX}/lib/libXpm.a
+${X11ROOT_PREFIX}/lib/libXpm.so.5.0
+${X11ROOT_PREFIX}/lib/libXss.a
+${X11ROOT_PREFIX}/lib/libXss.so.2.0
+${X11ROOT_PREFIX}/lib/libXt.a
+${X11ROOT_PREFIX}/lib/libXt.so.7.0
+${X11ROOT_PREFIX}/lib/libXtst.a
+${X11ROOT_PREFIX}/lib/libXtst.so.7.0
+${X11ROOT_PREFIX}/lib/libXv.a
+${X11ROOT_PREFIX}/lib/libXv.so.2.0
+${X11ROOT_PREFIX}/lib/libXvMC.a
+${X11ROOT_PREFIX}/lib/libXvMC.so.2.0
+${X11ROOT_PREFIX}/lib/libXxf86dga.a
+${X11ROOT_PREFIX}/lib/libXxf86dga.so.2.0
+${X11ROOT_PREFIX}/lib/libXxf86misc.a
+${X11ROOT_PREFIX}/lib/libXxf86misc.so.2.0
+${X11ROOT_PREFIX}/lib/libXxf86vm.a
+${X11ROOT_PREFIX}/lib/libXxf86vm.so.2.0
+${X11ROOT_PREFIX}/lib/libdps.a
+${X11ROOT_PREFIX}/lib/libdps.so.2.0
+${X11ROOT_PREFIX}/lib/libdpstk.a
+${X11ROOT_PREFIX}/lib/libdpstk.so.2.0
+${X11ROOT_PREFIX}/lib/libfntstubs.a
+${X11ROOT_PREFIX}/lib/libfontenc.a
+${X11ROOT_PREFIX}/lib/libfontenc.so.2.0
+${X11ROOT_PREFIX}/lib/liboldX.a
+${X11ROOT_PREFIX}/lib/liboldX.so.7.0
+${X11ROOT_PREFIX}/lib/libpsres.a
+${X11ROOT_PREFIX}/lib/libpsres.so.2.0
+${X11ROOT_PREFIX}/lib/libxf86config.a
+${X11ROOT_PREFIX}/lib/libxkbfile.a
+${X11ROOT_PREFIX}/lib/libxkbfile.so.1.0
+${X11ROOT_PREFIX}/lib/libxkbui.a
+${X11ROOT_PREFIX}/lib/libxkbui.so.1.0
diff --git a/x11/xorg-libs/PLIST.common b/x11/xorg-libs/PLIST.common
new file mode 100644
index 00000000000..0db22b75ac9
--- /dev/null
+++ b/x11/xorg-libs/PLIST.common
@@ -0,0 +1,521 @@
+@comment $NetBSD: PLIST.common,v 1.1.1.1 2004/07/29 04:50:55 xtraeme Exp $
+${X11ROOT_PREFIX}/include/DPS/ColorSB.h
+${X11ROOT_PREFIX}/include/DPS/ColorSBP.h
+${X11ROOT_PREFIX}/include/DPS/DPSScrollW.h
+${X11ROOT_PREFIX}/include/DPS/DPSScrollWP.h
+${X11ROOT_PREFIX}/include/DPS/FontCreatP.h
+${X11ROOT_PREFIX}/include/DPS/FontCreato.h
+${X11ROOT_PREFIX}/include/DPS/FontSB.h
+${X11ROOT_PREFIX}/include/DPS/FontSBP.h
+${X11ROOT_PREFIX}/include/DPS/FontSamplP.h
+${X11ROOT_PREFIX}/include/DPS/FontSample.h
+${X11ROOT_PREFIX}/include/DPS/PSres.h
+${X11ROOT_PREFIX}/include/DPS/XDPS.h
+${X11ROOT_PREFIX}/include/DPS/XDPSlib.h
+${X11ROOT_PREFIX}/include/DPS/XDPSproto.h
+${X11ROOT_PREFIX}/include/DPS/dpsNXargs.h
+${X11ROOT_PREFIX}/include/DPS/dpsXclient.h
+${X11ROOT_PREFIX}/include/DPS/dpsXcommon.h
+${X11ROOT_PREFIX}/include/DPS/dpsXpreview.h
+${X11ROOT_PREFIX}/include/DPS/dpsXshare.h
+${X11ROOT_PREFIX}/include/DPS/dpsXuserpath.h
+${X11ROOT_PREFIX}/include/DPS/dpsclient.h
+${X11ROOT_PREFIX}/include/DPS/dpsconfig.h
+${X11ROOT_PREFIX}/include/DPS/dpsexcept.h
+${X11ROOT_PREFIX}/include/DPS/dpsfriends.h
+${X11ROOT_PREFIX}/include/DPS/dpsops.h
+${X11ROOT_PREFIX}/include/DPS/psops.h
+${X11ROOT_PREFIX}/include/GL/GLwDrawA.h
+${X11ROOT_PREFIX}/include/GL/GLwDrawAP.h
+${X11ROOT_PREFIX}/include/GL/GLwMDrawA.h
+${X11ROOT_PREFIX}/include/GL/GLwMDrawAP.h
+${X11ROOT_PREFIX}/include/GL/gl.h
+${X11ROOT_PREFIX}/include/GL/glext.h
+${X11ROOT_PREFIX}/include/GL/glu.h
+${X11ROOT_PREFIX}/include/GL/glx.h
+${X11ROOT_PREFIX}/include/GL/glxext.h
+${X11ROOT_PREFIX}/include/GL/glxint.h
+${X11ROOT_PREFIX}/include/GL/glxmd.h
+${X11ROOT_PREFIX}/include/GL/glxproto.h
+${X11ROOT_PREFIX}/include/GL/glxtokens.h
+${X11ROOT_PREFIX}/include/GL/osmesa.h
+${X11ROOT_PREFIX}/include/X11/Composite.h
+${X11ROOT_PREFIX}/include/X11/CompositeP.h
+${X11ROOT_PREFIX}/include/X11/ConstrainP.h
+${X11ROOT_PREFIX}/include/X11/Constraint.h
+${X11ROOT_PREFIX}/include/X11/Core.h
+${X11ROOT_PREFIX}/include/X11/CoreP.h
+${X11ROOT_PREFIX}/include/X11/DECkeysym.h
+${X11ROOT_PREFIX}/include/X11/HPkeysym.h
+${X11ROOT_PREFIX}/include/X11/ICE/ICE.h
+${X11ROOT_PREFIX}/include/X11/ICE/ICEconn.h
+${X11ROOT_PREFIX}/include/X11/ICE/ICElib.h
+${X11ROOT_PREFIX}/include/X11/ICE/ICEmsg.h
+${X11ROOT_PREFIX}/include/X11/ICE/ICEproto.h
+${X11ROOT_PREFIX}/include/X11/ICE/ICEutil.h
+${X11ROOT_PREFIX}/include/X11/Intrinsic.h
+${X11ROOT_PREFIX}/include/X11/IntrinsicP.h
+${X11ROOT_PREFIX}/include/X11/Object.h
+${X11ROOT_PREFIX}/include/X11/ObjectP.h
+${X11ROOT_PREFIX}/include/X11/RectObj.h
+${X11ROOT_PREFIX}/include/X11/RectObjP.h
+${X11ROOT_PREFIX}/include/X11/SM/SM.h
+${X11ROOT_PREFIX}/include/X11/SM/SMlib.h
+${X11ROOT_PREFIX}/include/X11/SM/SMproto.h
+${X11ROOT_PREFIX}/include/X11/Shell.h
+${X11ROOT_PREFIX}/include/X11/ShellP.h
+${X11ROOT_PREFIX}/include/X11/StringDefs.h
+${X11ROOT_PREFIX}/include/X11/Sunkeysym.h
+${X11ROOT_PREFIX}/include/X11/Vendor.h
+${X11ROOT_PREFIX}/include/X11/VendorP.h
+${X11ROOT_PREFIX}/include/X11/X.h
+${X11ROOT_PREFIX}/include/X11/X10.h
+${X11ROOT_PREFIX}/include/X11/XF86keysym.h
+${X11ROOT_PREFIX}/include/X11/XKBlib.h
+${X11ROOT_PREFIX}/include/X11/XWDFile.h
+${X11ROOT_PREFIX}/include/X11/Xalloca.h
+${X11ROOT_PREFIX}/include/X11/Xarch.h
+${X11ROOT_PREFIX}/include/X11/Xatom.h
+${X11ROOT_PREFIX}/include/X11/Xauth.h
+${X11ROOT_PREFIX}/include/X11/Xaw/AllWidgets.h
+${X11ROOT_PREFIX}/include/X11/Xaw/AsciiSink.h
+${X11ROOT_PREFIX}/include/X11/Xaw/AsciiSinkP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/AsciiSrc.h
+${X11ROOT_PREFIX}/include/X11/Xaw/AsciiSrcP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/AsciiText.h
+${X11ROOT_PREFIX}/include/X11/Xaw/AsciiTextP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Box.h
+${X11ROOT_PREFIX}/include/X11/Xaw/BoxP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Cardinals.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Command.h
+${X11ROOT_PREFIX}/include/X11/Xaw/CommandP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Dialog.h
+${X11ROOT_PREFIX}/include/X11/Xaw/DialogP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Form.h
+${X11ROOT_PREFIX}/include/X11/Xaw/FormP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Grip.h
+${X11ROOT_PREFIX}/include/X11/Xaw/GripP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Label.h
+${X11ROOT_PREFIX}/include/X11/Xaw/LabelP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/List.h
+${X11ROOT_PREFIX}/include/X11/Xaw/ListP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/MenuButtoP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/MenuButton.h
+${X11ROOT_PREFIX}/include/X11/Xaw/MultiSink.h
+${X11ROOT_PREFIX}/include/X11/Xaw/MultiSinkP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/MultiSrc.h
+${X11ROOT_PREFIX}/include/X11/Xaw/MultiSrcP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Paned.h
+${X11ROOT_PREFIX}/include/X11/Xaw/PanedP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Panner.h
+${X11ROOT_PREFIX}/include/X11/Xaw/PannerP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Porthole.h
+${X11ROOT_PREFIX}/include/X11/Xaw/PortholeP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Repeater.h
+${X11ROOT_PREFIX}/include/X11/Xaw/RepeaterP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Reports.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Scrollbar.h
+${X11ROOT_PREFIX}/include/X11/Xaw/ScrollbarP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Simple.h
+${X11ROOT_PREFIX}/include/X11/Xaw/SimpleMenP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/SimpleMenu.h
+${X11ROOT_PREFIX}/include/X11/Xaw/SimpleP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Sme.h
+${X11ROOT_PREFIX}/include/X11/Xaw/SmeBSB.h
+${X11ROOT_PREFIX}/include/X11/Xaw/SmeBSBP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/SmeLine.h
+${X11ROOT_PREFIX}/include/X11/Xaw/SmeLineP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/SmeP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/StripCharP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/StripChart.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Template.c
+${X11ROOT_PREFIX}/include/X11/Xaw/Template.h
+${X11ROOT_PREFIX}/include/X11/Xaw/TemplateP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Text.h
+${X11ROOT_PREFIX}/include/X11/Xaw/TextP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/TextSink.h
+${X11ROOT_PREFIX}/include/X11/Xaw/TextSinkP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/TextSrc.h
+${X11ROOT_PREFIX}/include/X11/Xaw/TextSrcP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Tip.h
+${X11ROOT_PREFIX}/include/X11/Xaw/TipP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Toggle.h
+${X11ROOT_PREFIX}/include/X11/Xaw/ToggleP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Tree.h
+${X11ROOT_PREFIX}/include/X11/Xaw/TreeP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/VendorEP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Viewport.h
+${X11ROOT_PREFIX}/include/X11/Xaw/ViewportP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/XawImP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/XawInit.h
+${X11ROOT_PREFIX}/include/X11/Xcms.h
+${X11ROOT_PREFIX}/include/X11/Xdefs.h
+${X11ROOT_PREFIX}/include/X11/Xdmcp.h
+${X11ROOT_PREFIX}/include/X11/Xfuncproto.h
+${X11ROOT_PREFIX}/include/X11/Xfuncs.h
+${X11ROOT_PREFIX}/include/X11/Xlib.h
+${X11ROOT_PREFIX}/include/X11/Xlibint.h
+${X11ROOT_PREFIX}/include/X11/Xlocale.h
+${X11ROOT_PREFIX}/include/X11/Xmd.h
+${X11ROOT_PREFIX}/include/X11/Xmu/Atoms.h
+${X11ROOT_PREFIX}/include/X11/Xmu/CharSet.h
+${X11ROOT_PREFIX}/include/X11/Xmu/CloseHook.h
+${X11ROOT_PREFIX}/include/X11/Xmu/Converters.h
+${X11ROOT_PREFIX}/include/X11/Xmu/CurUtil.h
+${X11ROOT_PREFIX}/include/X11/Xmu/CvtCache.h
+${X11ROOT_PREFIX}/include/X11/Xmu/DisplayQue.h
+${X11ROOT_PREFIX}/include/X11/Xmu/Drawing.h
+${X11ROOT_PREFIX}/include/X11/Xmu/Editres.h
+${X11ROOT_PREFIX}/include/X11/Xmu/EditresP.h
+${X11ROOT_PREFIX}/include/X11/Xmu/Error.h
+${X11ROOT_PREFIX}/include/X11/Xmu/ExtAgent.h
+${X11ROOT_PREFIX}/include/X11/Xmu/Initer.h
+${X11ROOT_PREFIX}/include/X11/Xmu/Lookup.h
+${X11ROOT_PREFIX}/include/X11/Xmu/Misc.h
+${X11ROOT_PREFIX}/include/X11/Xmu/StdCmap.h
+${X11ROOT_PREFIX}/include/X11/Xmu/StdSel.h
+${X11ROOT_PREFIX}/include/X11/Xmu/SysUtil.h
+${X11ROOT_PREFIX}/include/X11/Xmu/WidgetNode.h
+${X11ROOT_PREFIX}/include/X11/Xmu/WinUtil.h
+${X11ROOT_PREFIX}/include/X11/Xmu/Xct.h
+${X11ROOT_PREFIX}/include/X11/Xmu/Xmu.h
+${X11ROOT_PREFIX}/include/X11/Xos.h
+${X11ROOT_PREFIX}/include/X11/Xos_r.h
+${X11ROOT_PREFIX}/include/X11/Xosdefs.h
+${X11ROOT_PREFIX}/include/X11/Xpoll.h
+${X11ROOT_PREFIX}/include/X11/Xproto.h
+${X11ROOT_PREFIX}/include/X11/Xprotostr.h
+${X11ROOT_PREFIX}/include/X11/Xresource.h
+${X11ROOT_PREFIX}/include/X11/Xthreads.h
+${X11ROOT_PREFIX}/include/X11/Xutil.h
+${X11ROOT_PREFIX}/include/X11/ap_keysym.h
+${X11ROOT_PREFIX}/include/X11/bitmaps/1x1
+${X11ROOT_PREFIX}/include/X11/bitmaps/2x2
+${X11ROOT_PREFIX}/include/X11/bitmaps/black
+${X11ROOT_PREFIX}/include/X11/bitmaps/boxes
+${X11ROOT_PREFIX}/include/X11/bitmaps/calculator
+${X11ROOT_PREFIX}/include/X11/bitmaps/cntr_ptr
+${X11ROOT_PREFIX}/include/X11/bitmaps/cntr_ptrmsk
+${X11ROOT_PREFIX}/include/X11/bitmaps/cross_weave
+${X11ROOT_PREFIX}/include/X11/bitmaps/dimple1
+${X11ROOT_PREFIX}/include/X11/bitmaps/dimple3
+${X11ROOT_PREFIX}/include/X11/bitmaps/dot
+${X11ROOT_PREFIX}/include/X11/bitmaps/dropbar7
+${X11ROOT_PREFIX}/include/X11/bitmaps/dropbar8
+${X11ROOT_PREFIX}/include/X11/bitmaps/escherknot
+${X11ROOT_PREFIX}/include/X11/bitmaps/flagdown
+${X11ROOT_PREFIX}/include/X11/bitmaps/flagup
+${X11ROOT_PREFIX}/include/X11/bitmaps/flipped_gray
+${X11ROOT_PREFIX}/include/X11/bitmaps/gray
+${X11ROOT_PREFIX}/include/X11/bitmaps/gray1
+${X11ROOT_PREFIX}/include/X11/bitmaps/gray3
+${X11ROOT_PREFIX}/include/X11/bitmaps/grid16
+${X11ROOT_PREFIX}/include/X11/bitmaps/grid2
+${X11ROOT_PREFIX}/include/X11/bitmaps/grid4
+${X11ROOT_PREFIX}/include/X11/bitmaps/grid8
+${X11ROOT_PREFIX}/include/X11/bitmaps/hlines2
+${X11ROOT_PREFIX}/include/X11/bitmaps/hlines3
+${X11ROOT_PREFIX}/include/X11/bitmaps/icon
+${X11ROOT_PREFIX}/include/X11/bitmaps/keyboard16
+${X11ROOT_PREFIX}/include/X11/bitmaps/left_ptr
+${X11ROOT_PREFIX}/include/X11/bitmaps/left_ptrmsk
+${X11ROOT_PREFIX}/include/X11/bitmaps/letters
+${X11ROOT_PREFIX}/include/X11/bitmaps/light_gray
+${X11ROOT_PREFIX}/include/X11/bitmaps/mailempty
+${X11ROOT_PREFIX}/include/X11/bitmaps/mailemptymsk
+${X11ROOT_PREFIX}/include/X11/bitmaps/mailfull
+${X11ROOT_PREFIX}/include/X11/bitmaps/mailfullmsk
+${X11ROOT_PREFIX}/include/X11/bitmaps/mensetmanus
+${X11ROOT_PREFIX}/include/X11/bitmaps/menu10
+${X11ROOT_PREFIX}/include/X11/bitmaps/menu12
+${X11ROOT_PREFIX}/include/X11/bitmaps/menu16
+${X11ROOT_PREFIX}/include/X11/bitmaps/menu6
+${X11ROOT_PREFIX}/include/X11/bitmaps/menu8
+${X11ROOT_PREFIX}/include/X11/bitmaps/noletters
+${X11ROOT_PREFIX}/include/X11/bitmaps/opendot
+${X11ROOT_PREFIX}/include/X11/bitmaps/opendotMask
+${X11ROOT_PREFIX}/include/X11/bitmaps/plaid
+${X11ROOT_PREFIX}/include/X11/bitmaps/right_ptr
+${X11ROOT_PREFIX}/include/X11/bitmaps/right_ptrmsk
+${X11ROOT_PREFIX}/include/X11/bitmaps/root_weave
+${X11ROOT_PREFIX}/include/X11/bitmaps/scales
+${X11ROOT_PREFIX}/include/X11/bitmaps/sipb
+${X11ROOT_PREFIX}/include/X11/bitmaps/star
+${X11ROOT_PREFIX}/include/X11/bitmaps/starMask
+${X11ROOT_PREFIX}/include/X11/bitmaps/stipple
+${X11ROOT_PREFIX}/include/X11/bitmaps/target
+${X11ROOT_PREFIX}/include/X11/bitmaps/terminal
+${X11ROOT_PREFIX}/include/X11/bitmaps/tie_fighter
+${X11ROOT_PREFIX}/include/X11/bitmaps/vlines2
+${X11ROOT_PREFIX}/include/X11/bitmaps/vlines3
+${X11ROOT_PREFIX}/include/X11/bitmaps/weird_size
+${X11ROOT_PREFIX}/include/X11/bitmaps/wide_weave
+${X11ROOT_PREFIX}/include/X11/bitmaps/wingdogs
+${X11ROOT_PREFIX}/include/X11/bitmaps/woman
+${X11ROOT_PREFIX}/include/X11/bitmaps/xfd_icon
+${X11ROOT_PREFIX}/include/X11/bitmaps/xlogo11
+${X11ROOT_PREFIX}/include/X11/bitmaps/xlogo16
+${X11ROOT_PREFIX}/include/X11/bitmaps/xlogo32
+${X11ROOT_PREFIX}/include/X11/bitmaps/xlogo64
+${X11ROOT_PREFIX}/include/X11/bitmaps/xsnow
+${X11ROOT_PREFIX}/include/X11/cursorfont.h
+${X11ROOT_PREFIX}/include/X11/extensions/MITMisc.h
+${X11ROOT_PREFIX}/include/X11/extensions/Print.h
+${X11ROOT_PREFIX}/include/X11/extensions/Printstr.h
+${X11ROOT_PREFIX}/include/X11/extensions/XEVI.h
+${X11ROOT_PREFIX}/include/X11/extensions/XEVIstr.h
+${X11ROOT_PREFIX}/include/X11/extensions/XI.h
+${X11ROOT_PREFIX}/include/X11/extensions/XInput.h
+${X11ROOT_PREFIX}/include/X11/extensions/XIproto.h
+${X11ROOT_PREFIX}/include/X11/extensions/XKB.h
+${X11ROOT_PREFIX}/include/X11/extensions/XKBbells.h
+${X11ROOT_PREFIX}/include/X11/extensions/XKBconfig.h
+${X11ROOT_PREFIX}/include/X11/extensions/XKBfile.h
+${X11ROOT_PREFIX}/include/X11/extensions/XKBgeom.h
+${X11ROOT_PREFIX}/include/X11/extensions/XKBproto.h
+${X11ROOT_PREFIX}/include/X11/extensions/XKBrules.h
+${X11ROOT_PREFIX}/include/X11/extensions/XKBsrv.h
+${X11ROOT_PREFIX}/include/X11/extensions/XKBstr.h
+${X11ROOT_PREFIX}/include/X11/extensions/XKBui.h
+${X11ROOT_PREFIX}/include/X11/extensions/XKM.h
+${X11ROOT_PREFIX}/include/X11/extensions/XKMformat.h
+${X11ROOT_PREFIX}/include/X11/extensions/XLbx.h
+${X11ROOT_PREFIX}/include/X11/extensions/XRes.h
+${X11ROOT_PREFIX}/include/X11/extensions/XResproto.h
+${X11ROOT_PREFIX}/include/X11/extensions/XShm.h
+${X11ROOT_PREFIX}/include/X11/extensions/XTest.h
+${X11ROOT_PREFIX}/include/X11/extensions/Xag.h
+${X11ROOT_PREFIX}/include/X11/extensions/Xagsrv.h
+${X11ROOT_PREFIX}/include/X11/extensions/Xagstr.h
+${X11ROOT_PREFIX}/include/X11/extensions/Xcup.h
+${X11ROOT_PREFIX}/include/X11/extensions/Xcupstr.h
+${X11ROOT_PREFIX}/include/X11/extensions/Xdbe.h
+${X11ROOT_PREFIX}/include/X11/extensions/Xdbeproto.h
+${X11ROOT_PREFIX}/include/X11/extensions/Xext.h
+${X11ROOT_PREFIX}/include/X11/extensions/Xinerama.h
+${X11ROOT_PREFIX}/include/X11/extensions/Xv.h
+${X11ROOT_PREFIX}/include/X11/extensions/XvMC.h
+${X11ROOT_PREFIX}/include/X11/extensions/XvMClib.h
+${X11ROOT_PREFIX}/include/X11/extensions/XvMCproto.h
+${X11ROOT_PREFIX}/include/X11/extensions/Xvlib.h
+${X11ROOT_PREFIX}/include/X11/extensions/Xvproto.h
+${X11ROOT_PREFIX}/include/X11/extensions/bigreqstr.h
+${X11ROOT_PREFIX}/include/X11/extensions/dpms.h
+${X11ROOT_PREFIX}/include/X11/extensions/dpmsstr.h
+${X11ROOT_PREFIX}/include/X11/extensions/extutil.h
+${X11ROOT_PREFIX}/include/X11/extensions/fontcache.h
+${X11ROOT_PREFIX}/include/X11/extensions/fontcacheP.h
+${X11ROOT_PREFIX}/include/X11/extensions/fontcachstr.h
+${X11ROOT_PREFIX}/include/X11/extensions/lbxbuf.h
+${X11ROOT_PREFIX}/include/X11/extensions/lbxbufstr.h
+${X11ROOT_PREFIX}/include/X11/extensions/lbxdeltastr.h
+${X11ROOT_PREFIX}/include/X11/extensions/lbximage.h
+${X11ROOT_PREFIX}/include/X11/extensions/lbxopts.h
+${X11ROOT_PREFIX}/include/X11/extensions/lbxstr.h
+${X11ROOT_PREFIX}/include/X11/extensions/lbxzlib.h
+${X11ROOT_PREFIX}/include/X11/extensions/mitmiscstr.h
+${X11ROOT_PREFIX}/include/X11/extensions/multibuf.h
+${X11ROOT_PREFIX}/include/X11/extensions/multibufst.h
+${X11ROOT_PREFIX}/include/X11/extensions/panoramiXext.h
+${X11ROOT_PREFIX}/include/X11/extensions/panoramiXproto.h
+${X11ROOT_PREFIX}/include/X11/extensions/randr.h
+${X11ROOT_PREFIX}/include/X11/extensions/randrproto.h
+${X11ROOT_PREFIX}/include/X11/extensions/record.h
+${X11ROOT_PREFIX}/include/X11/extensions/recordstr.h
+${X11ROOT_PREFIX}/include/X11/extensions/render.h
+${X11ROOT_PREFIX}/include/X11/extensions/renderproto.h
+${X11ROOT_PREFIX}/include/X11/extensions/saver.h
+${X11ROOT_PREFIX}/include/X11/extensions/saverproto.h
+${X11ROOT_PREFIX}/include/X11/extensions/scrnsaver.h
+${X11ROOT_PREFIX}/include/X11/extensions/security.h
+${X11ROOT_PREFIX}/include/X11/extensions/securstr.h
+${X11ROOT_PREFIX}/include/X11/extensions/shape.h
+${X11ROOT_PREFIX}/include/X11/extensions/shapestr.h
+${X11ROOT_PREFIX}/include/X11/extensions/shmstr.h
+${X11ROOT_PREFIX}/include/X11/extensions/sync.h
+${X11ROOT_PREFIX}/include/X11/extensions/syncstr.h
+${X11ROOT_PREFIX}/include/X11/extensions/xcmiscstr.h
+${X11ROOT_PREFIX}/include/X11/extensions/xf86bigfont.h
+${X11ROOT_PREFIX}/include/X11/extensions/xf86bigfstr.h
+${X11ROOT_PREFIX}/include/X11/extensions/xf86dga.h
+${X11ROOT_PREFIX}/include/X11/extensions/xf86dga1.h
+${X11ROOT_PREFIX}/include/X11/extensions/xf86dga1str.h
+${X11ROOT_PREFIX}/include/X11/extensions/xf86dgastr.h
+${X11ROOT_PREFIX}/include/X11/extensions/xf86misc.h
+${X11ROOT_PREFIX}/include/X11/extensions/xf86mscstr.h
+${XF86RUSH}${X11ROOT_PREFIX}/include/X11/extensions/xf86rush.h
+${XF86RUSH}${X11ROOT_PREFIX}/include/X11/extensions/xf86rushstr.h
+${X11ROOT_PREFIX}/include/X11/extensions/xf86vmode.h
+${X11ROOT_PREFIX}/include/X11/extensions/xf86vmstr.h
+${X11ROOT_PREFIX}/include/X11/extensions/xtestext1.h
+${X11ROOT_PREFIX}/include/X11/extensions/xteststr.h
+${X11ROOT_PREFIX}/include/X11/extensions/xtrapbits.h
+${X11ROOT_PREFIX}/include/X11/extensions/xtrapddmi.h
+${X11ROOT_PREFIX}/include/X11/extensions/xtrapdi.h
+${X11ROOT_PREFIX}/include/X11/extensions/xtrapemacros.h
+${X11ROOT_PREFIX}/include/X11/extensions/xtraplib.h
+${X11ROOT_PREFIX}/include/X11/extensions/xtraplibp.h
+${X11ROOT_PREFIX}/include/X11/extensions/xtrapproto.h
+${X11ROOT_PREFIX}/include/X11/fonts/FS.h
+${X11ROOT_PREFIX}/include/X11/fonts/FSlib.h
+${X11ROOT_PREFIX}/include/X11/fonts/FSproto.h
+${X11ROOT_PREFIX}/include/X11/fonts/codeconv/cconvversion.h
+${X11ROOT_PREFIX}/include/X11/fonts/codeconv/xttcap.h
+${X11ROOT_PREFIX}/include/X11/fonts/codeconv/xttcconv.h
+${X11ROOT_PREFIX}/include/X11/fonts/codeconv/xttcconvP.h
+${X11ROOT_PREFIX}/include/X11/fonts/codeconv/xttcommon.h
+${X11ROOT_PREFIX}/include/X11/fonts/codeconv/xttversion.h
+${X11ROOT_PREFIX}/include/X11/fonts/fontenc.h
+${X11ROOT_PREFIX}/include/X11/fonts/fsmasks.h
+${X11ROOT_PREFIX}/include/X11/keysym.h
+${X11ROOT_PREFIX}/include/X11/keysymdef.h
+${X11ROOT_PREFIX}/include/X11/xpm.h
+${X11ROOT_PREFIX}/include/xf86Optrec.h
+${X11ROOT_PREFIX}/include/xf86Parser.h
+${X11ROOT_PREFIX}/lib/X11/XErrorDB
+${X11ROOT_PREFIX}/lib/X11/XKeysymDB
+${X11ROOT_PREFIX}/lib/X11/Xcms.txt
+${X11ROOT_PREFIX}/lib/X11/locale/C/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/C/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/armscii-8/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/armscii-8/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/armscii-8/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/compose.dir
+${X11ROOT_PREFIX}/lib/X11/locale/el_GR.UTF-8/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/en_US.UTF-8/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/en_US.UTF-8/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/en_US.UTF-8/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/georgian-academy/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/georgian-academy/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/georgian-academy/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/georgian-ps/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/georgian-ps/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/georgian-ps/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/ibm-cp1133/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/ibm-cp1133/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/ibm-cp1133/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/iscii-dev/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/iscii-dev/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/isiri-3342/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/isiri-3342/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-1/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-1/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-1/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-10/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-10/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-10/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-11/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-11/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-13/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-13/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-13/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-14/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-14/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-14/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-15/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-15/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-15/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-2/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-2/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-2/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-3/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-3/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-3/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-4/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-4/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-4/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-5/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-5/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-5/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-6/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-6/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-6/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-7/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-7/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-7/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-8/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-8/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-8/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-9/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-9/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-9/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-9e/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-9e/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-9e/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/ja.JIS/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/ja.JIS/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/ja.JIS/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/ja.SJIS/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/ja.SJIS/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/ja.SJIS/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/ja/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/ja/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/ja/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/ja_JP.UTF-8/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/ja_JP.UTF-8/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/ko/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/ko/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/ko/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/ko_KR.UTF-8/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/ko_KR.UTF-8/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/koi8-c/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/koi8-c/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/koi8-c/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/koi8-r/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/koi8-r/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/koi8-r/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/koi8-u/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/koi8-u/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/koi8-u/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/lib/common/ximcp.so.2
+${X11ROOT_PREFIX}/lib/X11/locale/lib/common/xlcDef.so.2
+${X11ROOT_PREFIX}/lib/X11/locale/lib/common/xlcUTF8Load.so.2
+${X11ROOT_PREFIX}/lib/X11/locale/lib/common/xlibi18n.so.2
+${X11ROOT_PREFIX}/lib/X11/locale/lib/common/xlocale.so.2
+${X11ROOT_PREFIX}/lib/X11/locale/lib/common/xomGeneric.so.2
+${X11ROOT_PREFIX}/lib/X11/locale/locale.alias
+${X11ROOT_PREFIX}/lib/X11/locale/locale.dir
+${X11ROOT_PREFIX}/lib/X11/locale/microsoft-cp1251/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/microsoft-cp1251/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/microsoft-cp1255/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/microsoft-cp1255/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/microsoft-cp1256/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/microsoft-cp1256/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/mulelao-1/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/mulelao-1/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/mulelao-1/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/nokhchi-1/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/nokhchi-1/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/tatar-cyr/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/tatar-cyr/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/th_TH.UTF-8/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/th_TH.UTF-8/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/th_TH/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/th_TH/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/tscii-0/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/tscii-0/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/vi_VN.tcvn/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/vi_VN.tcvn/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/vi_VN.tcvn/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/vi_VN.viscii/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/vi_VN.viscii/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/vi_VN.viscii/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/zh_CN.UTF-8/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/zh_CN.UTF-8/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/zh_CN.gbk/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/zh_CN.gbk/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/zh_CN.gbk/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/zh_CN/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/zh_CN/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/zh_CN/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/zh_HK.big5/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/zh_HK.big5hkscs/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/zh_HK.big5hkscs/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/zh_TW.UTF-8/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/zh_TW.UTF-8/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/zh_TW.big5/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/zh_TW.big5/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/zh_TW.big5/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/zh_TW/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/zh_TW/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/zh_TW/XLC_LOCALE
diff --git a/x11/xorg-libs/PLIST.common_end b/x11/xorg-libs/PLIST.common_end
new file mode 100644
index 00000000000..f9a57aa6ddf
--- /dev/null
+++ b/x11/xorg-libs/PLIST.common_end
@@ -0,0 +1,65 @@
+@comment $NetBSD: PLIST.common_end,v 1.1.1.1 2004/07/29 04:50:53 xtraeme Exp $
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/zh_TW.big5
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/zh_TW.UTF-8
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/zh_TW
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/zh_HK.big5hkscs
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/zh_HK.big5
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/zh_CN.gbk
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/zh_CN.UTF-8
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/zh_CN
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/vi_VN.viscii
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/vi_VN.tcvn
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/tscii-0
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/th_TH.UTF-8
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/th_TH
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/tatar-cyr
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/nokhchi-1
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/mulelao-1
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/microsoft-cp1256
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/microsoft-cp1255
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/microsoft-cp1251
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/lib/common
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/lib
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/koi8-u
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/koi8-r
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/koi8-c
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/ko_KR.UTF-8
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/ko
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/ja_JP.UTF-8
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/ja.SJIS
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/ja.JIS
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/ja
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-9e
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-9
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-8
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-7
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-6
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-5
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-4
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-3
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-2
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-15
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-14
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-13
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-11
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-10
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-1
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/isiri-3342
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/iscii-dev
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/ibm-cp1133
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/georgian-ps
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/georgian-academy
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/en_US.UTF-8
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/el_GR.UTF-8
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/armscii-8
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/C
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale
+@dirrm ${X11ROOT_PREFIX}/include/X11/fonts/codeconv
+@dirrm ${X11ROOT_PREFIX}/include/X11/fonts
+@dirrm ${X11ROOT_PREFIX}/include/X11/extensions
+@dirrm ${X11ROOT_PREFIX}/include/X11/Xmu
+@dirrm ${X11ROOT_PREFIX}/include/X11/Xaw
+@dirrm ${X11ROOT_PREFIX}/include/X11/SM
+@dirrm ${X11ROOT_PREFIX}/include/X11/ICE
+@dirrm ${X11ROOT_PREFIX}/include/GL
+@dirrm ${X11ROOT_PREFIX}/include/DPS
diff --git a/x11/xorg-libs/buildlink3.mk b/x11/xorg-libs/buildlink3.mk
new file mode 100644
index 00000000000..31a6c466e1f
--- /dev/null
+++ b/x11/xorg-libs/buildlink3.mk
@@ -0,0 +1,29 @@
+# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/07/29 04:50:56 xtraeme Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+XORG_LIBS_BUILDLINK3_MK:=	${XORG_LIBS_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	xorg-libs
+.endif
+
+#
+# xorg-libs must come first so that packages listed later can overwrite
+# any symlinks created by buildlinking xorg-libs.
+#
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxorg-libs}
+BUILDLINK_PACKAGES:=	xorg-libs ${BUILDLINK_PACKAGES}
+
+.if !empty(XORG_LIBS_BUILDLINK3_MK:M+)
+
+BUILDLINK_DEPENDS.xorg-libs+=	xorg-libs>=6.7.0
+BUILDLINK_PKGSRCDIR.xorg-libs?=	../../x11/xorg-libs
+BUILDLINK_TRANSFORM.xorg-libs+=	-e "s|/X11R6/|/|"
+
+.endif  # XORG_LIBS_BUILDLINK3_MK
+
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xorg-libs/distinfo b/x11/xorg-libs/distinfo
new file mode 100644
index 00000000000..d3e2ef0c707
--- /dev/null
+++ b/x11/xorg-libs/distinfo
@@ -0,0 +1,17 @@
+$NetBSD: distinfo,v 1.1.1.1 2004/07/29 04:50:53 xtraeme Exp $
+
+SHA1 (X11R6.7.0-src1.tar.gz) = 14f282cee9dc1ff6ebc34d834892599b53195f8b
+Size (X11R6.7.0-src1.tar.gz) = 30039655 bytes
+SHA1 (X11R6.7.0-src2.tar.gz) = c043966761e84ce0a63c351f12291228fbf07d03
+Size (X11R6.7.0-src2.tar.gz) = 5739983 bytes
+SHA1 (X11R6.7.0-src3.tar.gz) = 4234d68bd9484baaaf29f5c58f432edb732b6451
+Size (X11R6.7.0-src3.tar.gz) = 10855793 bytes
+SHA1 (patch-aa) = b890d02e360df4ea43df808f4a128d465b4f607c
+SHA1 (patch-ab) = 17ede6e7c6c232f9fe2804d7ab4addd85b5cd25c
+SHA1 (patch-ac) = 90584e5732fb882f431afd69f6fd1c26c9d22bee
+SHA1 (patch-ad) = b34f46d715e90159df3897cf20023b58b9deff67
+SHA1 (patch-ae) = a06752ee9f55e64a407fac6fbde3547fd096c71d
+SHA1 (patch-af) = 30618658577dd37b31191197cd2c156ff72e0d90
+SHA1 (patch-ag) = 178d556fa11818420cd685308cf179ee5f6f7dac
+SHA1 (patch-ah) = 4545d9fd50c2a7b6f5a04da330784eaf9a5373ad
+SHA1 (patch-ai) = 841c2e76c3934b9da967aaed1876b78d3fc0465e
diff --git a/x11/xorg-libs/files/Wraphelp.c b/x11/xorg-libs/files/Wraphelp.c
new file mode 100755
index 00000000000..6231cc534d8
--- /dev/null
+++ b/x11/xorg-libs/files/Wraphelp.c
@@ -0,0 +1,409 @@
+/* $NetBSD: Wraphelp.c,v 1.1.1.1 2004/07/29 04:50:58 xtraeme Exp $ */
+
+/* Export of this software from the United States of America is assumed
+ * to require a specific license from the United States Government.
+ * It is the responsibility of any person or organization contemplating
+ * export to obtain such a license before exporting.
+ */
+
+/*
+ * This program implements the
+ * Proposed Federal Information Processing
+ *  Data Encryption Standard.
+ * See Federal Register, March 17, 1975 (40FR12134)
+ */
+
+/*
+ * Initial permutation,
+ */
+static	char	IP[] = {
+	58,50,42,34,26,18,10, 2,
+	60,52,44,36,28,20,12, 4,
+	62,54,46,38,30,22,14, 6,
+	64,56,48,40,32,24,16, 8,
+	57,49,41,33,25,17, 9, 1,
+	59,51,43,35,27,19,11, 3,
+	61,53,45,37,29,21,13, 5,
+	63,55,47,39,31,23,15, 7,
+};
+
+/*
+ * Final permutation, FP = IP^(-1)
+ */
+static	char	FP[] = {
+	40, 8,48,16,56,24,64,32,
+	39, 7,47,15,55,23,63,31,
+	38, 6,46,14,54,22,62,30,
+	37, 5,45,13,53,21,61,29,
+	36, 4,44,12,52,20,60,28,
+	35, 3,43,11,51,19,59,27,
+	34, 2,42,10,50,18,58,26,
+	33, 1,41, 9,49,17,57,25,
+};
+
+/*
+ * Permuted-choice 1 from the key bits
+ * to yield C and D.
+ * Note that bits 8,16... are left out:
+ * They are intended for a parity check.
+ */
+static	char	PC1_C[] = {
+	57,49,41,33,25,17, 9,
+	 1,58,50,42,34,26,18,
+	10, 2,59,51,43,35,27,
+	19,11, 3,60,52,44,36,
+};
+
+static	char	PC1_D[] = {
+	63,55,47,39,31,23,15,
+	 7,62,54,46,38,30,22,
+	14, 6,61,53,45,37,29,
+	21,13, 5,28,20,12, 4,
+};
+
+/*
+ * Sequence of shifts used for the key schedule.
+*/
+static	char	shifts[] = {
+	1,1,2,2,2,2,2,2,1,2,2,2,2,2,2,1,
+};
+
+/*
+ * Permuted-choice 2, to pick out the bits from
+ * the CD array that generate the key schedule.
+ */
+static	char	PC2_C[] = {
+	14,17,11,24, 1, 5,
+	 3,28,15, 6,21,10,
+	23,19,12, 4,26, 8,
+	16, 7,27,20,13, 2,
+};
+
+static	char	PC2_D[] = {
+	41,52,31,37,47,55,
+	30,40,51,45,33,48,
+	44,49,39,56,34,53,
+	46,42,50,36,29,32,
+};
+
+/*
+ * The C and D arrays used to calculate the key schedule.
+ */
+
+static	char	C[28];
+static	char	D[28];
+
+/*
+ * The key schedule.
+ * Generated from the key.
+ */
+static	char	KS[16][48];
+
+/*
+ * The E bit-selection table.
+ */
+static	char	E[48];
+static	char	e[] = {
+	32, 1, 2, 3, 4, 5,
+	 4, 5, 6, 7, 8, 9,
+	 8, 9,10,11,12,13,
+	12,13,14,15,16,17,
+	16,17,18,19,20,21,
+	20,21,22,23,24,25,
+	24,25,26,27,28,29,
+	28,29,30,31,32, 1,
+};
+
+/*
+ * Set up the key schedule from the key.
+ */
+
+static
+setkey(key)
+char *key;
+{
+	int	i, j, k;
+	int	t;
+	char	*ptr;
+
+	/*
+	 * First, generate C and D by permuting
+	 * the key.  The low order bit of each
+	 * 8-bit char is not used, so C and D are only 28
+	 * bits apiece.
+	 */
+	for (i=0; i<28; i++) {
+		C[i] = key[PC1_C[i]-1];
+		D[i] = key[PC1_D[i]-1];
+	}
+	/*
+	 * To generate Ki, rotate C and D according
+	 * to schedule and pick up a permutation
+	 * using PC2.
+	 */
+	for (i=0; i<16; i++) {
+		/*
+		 * rotate.
+		 */
+		for (k=0; k<shifts[i]; k++) {
+			t = C[0];
+			ptr = C;
+			for (j=0; j<28-1; j++)
+			{
+				*ptr = ptr[1];
+				ptr++;
+			}
+			C[27] = t;
+			t = D[0];
+			ptr = D;
+			for (j=0; j<28-1; j++)
+			{
+				*ptr = ptr[1];
+				ptr++;
+			}
+			D[27] = t;
+		}
+		/*
+		 * get Ki. Note C and D are concatenated.
+		 */
+		ptr = &KS[i][0];
+		for (j=0; j<24; j++) {
+			ptr[j] = C[PC2_C[j]-1];
+			ptr[j+24] = D[PC2_D[j]-28-1];
+		}
+	}
+
+	for(i=0;i<48;i++)
+		E[i] = e[i];
+}
+
+/*
+ * The 8 selection functions.
+ * For some reason, they give a 0-origin
+ * index, unlike everything else.
+ */
+static	char	S[8][64] = {
+	14, 4,13, 1, 2,15,11, 8, 3,10, 6,12, 5, 9, 0, 7,
+	 0,15, 7, 4,14, 2,13, 1,10, 6,12,11, 9, 5, 3, 8,
+	 4, 1,14, 8,13, 6, 2,11,15,12, 9, 7, 3,10, 5, 0,
+	15,12, 8, 2, 4, 9, 1, 7, 5,11, 3,14,10, 0, 6,13,
+
+	15, 1, 8,14, 6,11, 3, 4, 9, 7, 2,13,12, 0, 5,10,
+	 3,13, 4, 7,15, 2, 8,14,12, 0, 1,10, 6, 9,11, 5,
+	 0,14, 7,11,10, 4,13, 1, 5, 8,12, 6, 9, 3, 2,15,
+	13, 8,10, 1, 3,15, 4, 2,11, 6, 7,12, 0, 5,14, 9,
+
+	10, 0, 9,14, 6, 3,15, 5, 1,13,12, 7,11, 4, 2, 8,
+	13, 7, 0, 9, 3, 4, 6,10, 2, 8, 5,14,12,11,15, 1,
+	13, 6, 4, 9, 8,15, 3, 0,11, 1, 2,12, 5,10,14, 7,
+	 1,10,13, 0, 6, 9, 8, 7, 4,15,14, 3,11, 5, 2,12,
+
+	 7,13,14, 3, 0, 6, 9,10, 1, 2, 8, 5,11,12, 4,15,
+	13, 8,11, 5, 6,15, 0, 3, 4, 7, 2,12, 1,10,14, 9,
+	10, 6, 9, 0,12,11, 7,13,15, 1, 3,14, 5, 2, 8, 4,
+	 3,15, 0, 6,10, 1,13, 8, 9, 4, 5,11,12, 7, 2,14,
+
+	 2,12, 4, 1, 7,10,11, 6, 8, 5, 3,15,13, 0,14, 9,
+	14,11, 2,12, 4, 7,13, 1, 5, 0,15,10, 3, 9, 8, 6,
+	 4, 2, 1,11,10,13, 7, 8,15, 9,12, 5, 6, 3, 0,14,
+	11, 8,12, 7, 1,14, 2,13, 6,15, 0, 9,10, 4, 5, 3,
+
+	12, 1,10,15, 9, 2, 6, 8, 0,13, 3, 4,14, 7, 5,11,
+	10,15, 4, 2, 7,12, 9, 5, 6, 1,13,14, 0,11, 3, 8,
+	 9,14,15, 5, 2, 8,12, 3, 7, 0, 4,10, 1,13,11, 6,
+	 4, 3, 2,12, 9, 5,15,10,11,14, 1, 7, 6, 0, 8,13,
+
+	 4,11, 2,14,15, 0, 8,13, 3,12, 9, 7, 5,10, 6, 1,
+	13, 0,11, 7, 4, 9, 1,10,14, 3, 5,12, 2,15, 8, 6,
+	 1, 4,11,13,12, 3, 7,14,10,15, 6, 8, 0, 5, 9, 2,
+	 6,11,13, 8, 1, 4,10, 7, 9, 5, 0,15,14, 2, 3,12,
+
+	13, 2, 8, 4, 6,15,11, 1,10, 9, 3,14, 5, 0,12, 7,
+	 1,15,13, 8,10, 3, 7, 4,12, 5, 6,11, 0,14, 9, 2,
+	 7,11, 4, 1, 9,12,14, 2, 0, 6,10,13,15, 3, 5, 8,
+	 2, 1,14, 7, 4,10, 8,13,15,12, 9, 0, 3, 5, 6,11,
+};
+
+/*
+ * P is a permutation on the selected combination
+ * of the current L and key.
+ */
+static	char	P[] = {
+	16, 7,20,21,
+	29,12,28,17,
+	 1,15,23,26,
+	 5,18,31,10,
+	 2, 8,24,14,
+	32,27, 3, 9,
+	19,13,30, 6,
+	22,11, 4,25,
+};
+
+/*
+ * The current block, divided into 2 halves.
+ */
+
+static	char	L[64];
+#define R   (L + 32)
+static	char	tempL[32];
+static	char	f[32];
+
+/*
+ * The combination of the key and the input, before selection.
+ */
+static	char	preS[48];
+
+/*
+ * The payoff: encrypt a block.
+ */
+
+static
+encrypt (block, edflag)
+char *block;
+{
+	int i, ii;
+	register t, j, k;
+
+	/*
+	 * First, permute the bits in the input
+	 */
+	for (j=0; j<64; j++)
+		L[j] = block[IP[j]-1];
+	/*
+	 * Perform an encryption operation 16 times.
+	 */
+	for (ii=0; ii<16; ii++) {
+/*		print_bits ("L R", L); */
+		/*
+		 * Set direction
+		 */
+		if (edflag)
+			i = 15-ii;
+		else
+			i = ii;
+		/*
+		 * Save the R array,
+		 * which will be the new L.
+		 */
+		for (j=0; j<32; j++)
+			tempL[j] = R[j];
+		/*
+		 * Expand R to 48 bits using the E selector;
+		 * exclusive-or with the current key bits.
+		 */
+		for (j=0; j<48; j++)
+			preS[j] = R[E[j]-1] ^ KS[i][j];
+		/*
+		 * The pre-select bits are now considered
+		 * in 8 groups of 6 bits each.
+		 * The 8 selection functions map these
+		 * 6-bit quantities into 4-bit quantities
+		 * and the results permuted
+		 * to make an f(R, K).
+		 * The indexing into the selection functions
+		 * is peculiar; it could be simplified by
+		 * rewriting the tables.
+		 */
+		for (j=0; j<8; j++) {
+			t = 6*j;
+			k = S[j][(preS[t+0]<<5)+
+				(preS[t+1]<<3)+
+				(preS[t+2]<<2)+
+				(preS[t+3]<<1)+
+				(preS[t+4]<<0)+
+				(preS[t+5]<<4)];
+			t = 4*j;
+			f[t+0] = (k>>3)&01;
+			f[t+1] = (k>>2)&01;
+			f[t+2] = (k>>1)&01;
+			f[t+3] = (k>>0)&01;
+		}
+		/*
+		 * The new R is L ^ f(R, K).
+		 * The f here has to be permuted first, though.
+		 */
+		for (j=0; j<32; j++)
+			R[j] = L[j] ^ f[P[j]-1];
+		/*
+		 * Finally, the new L (the original R)
+		 * is copied back.
+		 */
+		for (j=0; j<32; j++)
+			L[j] = tempL[j];
+	}
+	/*
+	 * The output L and R are reversed.
+	 */
+	for (j=0; j<32; j++) {
+		t = L[j];
+		L[j] = R[j];
+		R[j] = t;
+	}
+	/*
+	 * The final output
+	 * gets the inverse permutation of the very original.
+	 */
+	for (j=0; j<64; j++)
+		block[j] = L[FP[j]-1];
+}
+
+static
+bytes_to_bits (bytes, bits)
+    unsigned char   *bytes;
+    char	    *bits;
+{
+    int	    bit, byte, value;
+
+    for (byte = 0; byte < 8; byte++)
+    {
+	value = *bytes++;
+	for (bit = 0; bit < 8; bit++)
+	    *bits++ = (value >> (7-bit)) & 1;
+    }
+}
+
+static
+bits_to_bytes (bits, bytes)
+    char	    *bits;
+    unsigned char   *bytes;
+{
+    int	    bit, byte, value;
+
+    for (byte = 0; byte < 8; byte++)
+    {
+	value = 0;
+	for (bit = 0; bit < 8; bit++)
+	    value |= *bits++ << (7-bit);
+	*bytes++ = value;
+    }
+}
+
+/*
+ * Interface compatible with Kerberos DES implementation
+ */
+
+# include   "Wrap.h"
+
+/*ARGSUSED*/
+_XdmcpAuthSetup (key, schedule)
+    auth_cblock		key;
+    auth_wrapper_schedule	schedule;
+{
+    char    expand_key[64];
+
+    bytes_to_bits ((unsigned char *) key, expand_key);
+    setkey (expand_key);
+}
+
+/*ARGSUSED*/
+_XdmcpAuthDoIt (input, output, schedule, edflag)
+    auth_cblock		input, output;
+    auth_wrapper_schedule	schedule;
+    int			edflag;
+{
+    char    expand_input[64];
+
+    bytes_to_bits ((unsigned char *) input, expand_input);
+    encrypt (expand_input, !edflag);
+    bits_to_bytes (expand_input, (unsigned char *) output);
+}
diff --git a/x11/xorg-libs/files/host.def b/x11/xorg-libs/files/host.def
new file mode 100644
index 00000000000..037a2a189d9
--- /dev/null
+++ b/x11/xorg-libs/files/host.def
@@ -0,0 +1,71 @@
+/* $NetBSD: host.def,v 1.1.1.1 2004/07/29 04:50:58 xtraeme Exp $ */
+
+#define ProjectRoot @PREFIX@
+
+#define MakeCmd @MAKE@
+#define HasGnuMake	NO
+#define ImakeCmd @IMAKE@
+#define RmanCmd @RMAN@
+#define HtmlIndexCmd @MKHTMLINDEX@
+#define DependDir @GCCMAKEDEP@
+#define DependCmd @MAKEDEPEND@
+#define RevPathCmd @REVPATH@
+
+#define NothingOutsideProjectRoot YES
+
+#define	InstallXdmConfig NO
+#define	InstallXinitConfig NO
+#define	InstallFSConfig NO
+#define	InstallAppDefFiles NO
+#define	BuildServer NO
+#define	BuildFontServer NO
+#define	BuildFonts NO
+#define	Build75DpiFonts NO
+#define	Build100DpiFonts NO
+#define	BuildSpeedoFonts NO
+#define BuildType1Fonts NO
+#define	BuildCIDFonts NO
+#define	BuildCyrillicFonts NO
+#define	BuildLatin2Fonts NO
+#define	BuildPlugin NO
+#define DebuggableLibraries NO
+#define StandardIncludes -I@BLNK@/include
+
+#undef  SharedLibXinerama
+#define SharedLibXinerama      YES
+
+#define NormalLibPSRes	YES
+
+#define LibInstallBuild  YES
+
+#ifndef DriDrivers
+#	define DriDrivers	/* Don't build the drivers here */
+#endif
+
+#define HasXdmAuth		YES
+#define UseInstalledPrograms	YES
+
+#ifndef FreeBSDArchitecture
+#  ifndef BuildThreadStubLibrary
+#	define BuildThreadStubLibrary YES
+#  endif
+#endif
+
+#define BuildRenderLibrary NO
+#define BuildExpatLibrary NO
+#define BuildFreetype2Library NO
+#define BuildFontconfigLibrary NO
+#define BuildXftLibrary NO
+#define BuildXft1Library NO
+#define BuildRandRLibrary NO
+
+#define HasFreetype2 YES
+#define Freetype2Dir @BLNK@
+
+#define HasExpat YES
+#define ExpatDir @BLNK@
+
+#define HasFontconfig YES
+#define FontconfigDir @BLNK@
+
+#define BuildHtmlManPages NO
diff --git a/x11/xorg-libs/patches/patch-aa b/x11/xorg-libs/patches/patch-aa
new file mode 100644
index 00000000000..10dadac71f1
--- /dev/null
+++ b/x11/xorg-libs/patches/patch-aa
@@ -0,0 +1,23 @@
+$NetBSD: patch-aa,v 1.1.1.1 2004/07/29 04:50:58 xtraeme Exp $
+
+--- config/cf/Library.tmpl.orig	2004-07-29 01:38:38.000000000 +0200
++++ config/cf/Library.tmpl	2004-07-29 01:39:33.000000000 +0200
+@@ -389,6 +389,10 @@
+  */
+ 
+ #ifndef MakeStringsDependency
++#if defined(UseInstalled) || defined(UseInstalledPrograms)
++#define MakeStringsDependency                                          @@\
++MAKESTRS = @MAKESTRS@
++#else
+ # define MakeStringsDependency						@@\
+ MAKESTRS = $(CONFIGSRC)/util/makestrs					@@\
+ NoCmpScript(HostProgramTargetName($(MAKESTRS)) $(MAKESTRS).Osuf)	@@\
+@@ -398,6 +402,7 @@
+ 									@@\
+ includes:: HostProgramTargetName($(MAKESTRS))
+ #endif
++#endif
+ 
+ #ifndef ToolkitMakeStrings
+ # if defined(LibTookitMakeStringsDependency) && LibTookitMakeStringsDependency
diff --git a/x11/xorg-libs/patches/patch-ab b/x11/xorg-libs/patches/patch-ab
new file mode 100644
index 00000000000..c022b4119a2
--- /dev/null
+++ b/x11/xorg-libs/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1.1.1 2004/07/29 04:50:56 xtraeme Exp $
+
+--- programs/Xserver/dix/main.c.orig	2003-07-07 01:39:11.000000000 +0000
++++ programs/Xserver/dix/main.c	2003-07-07 01:43:07.000000000 +0000
+@@ -505,7 +505,7 @@
+     /* Leave off the ridBase and ridMask, these must be sent with 
+        connection */
+ 
+-    setup.release = VENDOR_RELEASE;
++    setup.release = NULL;
+     /*
+      * per-server image and bitmap parameters are defined in Xmd.h
+      */
diff --git a/x11/xorg-libs/patches/patch-ac b/x11/xorg-libs/patches/patch-ac
new file mode 100644
index 00000000000..9d583086c0c
--- /dev/null
+++ b/x11/xorg-libs/patches/patch-ac
@@ -0,0 +1,46 @@
+$NetBSD: patch-ac,v 1.1.1.1 2004/07/29 04:50:58 xtraeme Exp $
+
+--- config/cf/NetBSD.cf.in.orig	2004-03-03 07:53:38.000000000 +0000
++++ config/cf/NetBSD.cf.in	2004-03-03 07:54:59.000000000 +0000
+@@ -143,7 +143,7 @@
+ #define MkdirHierCmd		mkdir -p
+ 
+ #undef CcCmd
+-#define CcCmd 			gcc
++#define CcCmd 			@@PKGSRC_CC@@
+ #ifndef DefaultCCOptions
+ #if defined(UseInstalled)
+ #define DefaultCCOptions 	/**/
+@@ -159,7 +159,7 @@
+ #endif
+ #endif
+ 
+-#define CppCmd			cpp
++#define CppCmd			@@PKGSRC_CPP@@
+ #define StandardCppOptions	-traditional
+ #define StandardCppDefines	/**/
+ #define PreProcessCmd   	CcCmd -E
+@@ -208,13 +208,7 @@
+ #define HasWeakSymbols		UseElfFormat 
+ 
+ #ifdef i386Architecture
+-# ifndef DefaultGcc2i386Opt
+-#  if OSMajorVersion > 1 || (OSMajorVersion == 1 && OSMinorVersion > 2)
+-    /* The GCC strength-reduce bug is fixed for NetBSD 1.3 and later */
+-#   define DefaultGcc2i386Opt -O2 GccAliasingArgs
+-#  endif
+-# endif
+-# define OptimizedCDebugFlags 	DefaultGcc2i386Opt
++# define OptimizedCDebugFlags 	@@PKGSRC_CFLAGS@@
+ # if OSMajorVersion < 1
+ #  define ServerOSDefines	XFree86ServerOSDefines -DXNO_SYSCONF
+ # else
+@@ -224,7 +218,7 @@
+ #  define ServerExtraSysLibs	-li386
+ # endif
+ #else
+-# define OptimizedCDebugFlags 	-O2
++# define OptimizedCDebugFlags 	@@PKGSRC_CFLAGS@@
+ # if defined(SparcArchitecture)
+ #  define ServerOSDefines 	-DDDXOSINIT
+ # elif defined(AlphaArchitecture)
diff --git a/x11/xorg-libs/patches/patch-ad b/x11/xorg-libs/patches/patch-ad
new file mode 100644
index 00000000000..cc769423f6d
--- /dev/null
+++ b/x11/xorg-libs/patches/patch-ad
@@ -0,0 +1,58 @@
+$NetBSD: patch-ad,v 1.1.1.1 2004/07/29 04:50:58 xtraeme Exp $
+
+--- config/cf/FreeBSD.cf.in.orig	2004-03-03 07:40:43.000000000 +0000
++++ config/cf/FreeBSD.cf.in	2004-03-03 07:44:05.000000000 +0000
+@@ -190,11 +190,11 @@
+ # define CcCmd			$(CLIENTENVSETUP) cc
+ # define CplusplusCmd		$(CLIENTENVSETUP) c++
+ #else
+-# define CcCmd			cc
+-# define CplusplusCmd		c++
++# define CcCmd			@@PKGSRC_CC@@
++# define CplusplusCmd		@@PKGSRC_CXX@@
+ #endif
+ 
+-#define CppCmd			/usr/bin/cpp
++#define CppCmd			@@PKGSRC_CPP@@
+ #define PreProcessCmd		CppCmd
+ #define StandardCppOptions	-traditional
+ #define StandardCppDefines	/**/
+@@ -207,7 +207,7 @@
+ #else
+ #define NoSystemWarn
+ #endif
+-#define DefaultCCOptions	-ansi -pedantic NoSystemWarn -Dasm=__asm \
++#define DefaultCCOptions	-ansi NoSystemWarn -Dasm=__asm \
+ 	GccWarningOptions
+ #endif
+ #endif
+@@ -439,18 +439,8 @@
+ #define XawI18nDefines		-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
+ #endif
+ 
+-/* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */
+-#ifndef DefaultGcc2i386Opt
+-#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5)
+-#define DefaultGcc2i386Opt -O2 GccAliasingArgs
+-#endif
+-#endif
+-
+-#ifdef i386Architecture
+-# define OptimizedCDebugFlags DefaultGcc2i386Opt
+-#else
+-# define OptimizedCDebugFlags -O
+-#endif
++#define DefaultGcc2i386Opt
++#define OptimizedCDebugFlags   @@PKGSRC_CFLAGS@@
+ 
+ #ifndef PreIncDir
+ # define PreIncDir	/usr/include
+@@ -476,7 +466,7 @@
+  * Compress manual pages
+  */
+ #ifndef CompressManPages
+-# define CompressManPages	YES
++# define CompressManPages	NO
+ #endif
+ 
+ #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 1)
diff --git a/x11/xorg-libs/patches/patch-ae b/x11/xorg-libs/patches/patch-ae
new file mode 100644
index 00000000000..d30142818b8
--- /dev/null
+++ b/x11/xorg-libs/patches/patch-ae
@@ -0,0 +1,41 @@
+$NetBSD: patch-ae,v 1.1.1.1 2004/07/29 04:50:58 xtraeme Exp $
+
+--- config/cf/linux.cf.in.orig	2004-03-03 07:44:42.000000000 +0000
++++ config/cf/linux.cf.in	2004-03-03 07:46:51.000000000 +0000
+@@ -549,15 +549,15 @@
+ #  if defined (i386Architecture) && ((GccMajorVersion >3) \
+    || ((GccMajorVersion == 3) &&  (GccMinorVersion >= 1)))
+ #   ifndef CcCmd
+-#    define CcCmd		gcc -m32
++#    define CcCmd		@@PKGSRC_CC@@
+ #   endif
+ #   ifndef CplusplusCmd
+-#    define CplusplusCmd		c++ -m32
++#    define CplusplusCmd	@@PKGSRC_CXX@@
+ #   endif
+ #  endif
+ #  ifndef CcCmd
+-#   define CcCmd		gcc
+-#   define CplusplusCmd		c++
++#   define CcCmd		@@PKGSRC_CC@@
++#   define CplusplusCmd		@@PKGSRC_CXX@@
+ #  endif
+ #  ifndef AsCmd
+ #   define AsCmd		CcCmd -c -x assembler
+@@ -721,7 +721,6 @@
+ #define YaccCmd			bison -y
+ #define LexCmd			flex -l
+ #define HasFlex			YES
+-#define LexLib			-lfl
+ #define PreProcessCmd		CcCmd -E
+ #define PostIncDir		DefaultGccIncludeDir
+ #define LdCombineFlags		-r
+@@ -791,7 +790,7 @@
+ 
+ #ifdef i386Architecture
+ # ifndef OptimizedCDebugFlags
+-#  define OptimizedCDebugFlags	DefaultGcc2i386Opt
++#  define OptimizedCDebugFlags	@@PKGSRC_CFLAGS@@
+ # endif
+ # define LinuxMachineDefines	-D__i386__
+ # define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
diff --git a/x11/xorg-libs/patches/patch-af b/x11/xorg-libs/patches/patch-af
new file mode 100644
index 00000000000..ac0432fe498
--- /dev/null
+++ b/x11/xorg-libs/patches/patch-af
@@ -0,0 +1,15 @@
+$NetBSD: patch-af,v 1.1.1.1 2004/07/29 04:50:58 xtraeme Exp $
+
+http://www.mail-archive.com/devel@xfree86.org/msg04688.html
+
+--- ./lib/XvMC/hw/i810/Imakefile.orig	2002-10-30 10:42:57.000000000 -0800
++++ ./lib/XvMC/hw/i810/Imakefile
+@@ -20,7 +20,7 @@ ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
+       DEFINES = $(ALLOC_DEFINES) -DTRUE=1 -DFALSE=0
+      INCLUDES = -I$(XINCLUDESRC) -I$(INCLUDESRC) -I$(XLIBSRC) -I$(EXTINCSRC) \
+ 		-I$(XF86COMSRC) -I$(XF86OSSRC) -I$(XF86OSSRC)/linux/drm/kernel \
+-		-I$(XF86DRIVERSRC)/i810
++		-I$(XF86DRIVERSRC)/i810 -I$(XF86OSSRC)/shared/drm/kernel
+          SRCS = I810XvMC.c
+          OBJS = I810XvMC.o xf86drm.o xf86drmHash.o xf86drmRandom.o xf86drmSL.o
+      LINTLIBS = $(LINTXLIB)
diff --git a/x11/xorg-libs/patches/patch-ag b/x11/xorg-libs/patches/patch-ag
new file mode 100644
index 00000000000..22b2ebbffc6
--- /dev/null
+++ b/x11/xorg-libs/patches/patch-ag
@@ -0,0 +1,14 @@
+$NetBSD: patch-ag,v 1.1.1.1 2004/07/29 04:50:58 xtraeme Exp $
+
+--- config/cf/sun.cf.orig	2004-02-02 14:55:26.000000000 +1100
++++ config/cf/sun.cf
+@@ -19,6 +19,9 @@ XCOMM platform:  $XFree86: xc/config/cf/
+ #endif
+ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
+ 
++/* This is the XFree86 package - we want to build XFree86 on Solaris */
++#define BuildXFree86OnSparcSunOS YES
++
+ /*
+  * Compiler setup.  This sun.cf file knows what options to use with 
+  * certain compilers, including Sun C, CenterLine C, and gcc.  It 
diff --git a/x11/xorg-libs/patches/patch-ah b/x11/xorg-libs/patches/patch-ah
new file mode 100644
index 00000000000..30b35ee8d1e
--- /dev/null
+++ b/x11/xorg-libs/patches/patch-ah
@@ -0,0 +1,49 @@
+$NetBSD: patch-ah,v 1.1.1.1 2004/07/29 04:50:58 xtraeme Exp $
+
+--- config/cf/OpenBSD.cf.in.orig	2004-07-22 00:18:37.000000000 +0200
++++ config/cf/OpenBSD.cf.in	2004-07-22 00:19:48.000000000 +0200
+@@ -162,7 +162,7 @@
+ #define MkdirHierCmd		mkdir -p
+ 
+ #ifndef CppCmd
+-#define CppCmd          	/usr/libexec/cpp
++#define CppCmd          	@@PKGSRC_CPP@@
+ #endif
+ #define StandardCppOptions	-traditional
+ #define StandardCppDefines	/**/
+@@ -170,10 +170,10 @@
+ #define PreIncDir		DefaultGccIncludeDir
+ 
+ #ifndef CcCmd
+-#define CcCmd 			cc
++#define CcCmd 			@@PKGSRC_CC@@
+ #endif
+ #ifndef AsCmd
+-#define AsCmd			cc -c -x assembler
++#define AsCmd			@@PKGSRC_CC@@ -c -x assembler
+ #endif
+ #ifndef DefaultCCOptions
+ #if defined(UseInstalled)
+@@ -226,7 +226,6 @@
+ 
+ #define HasBsdMake		YES
+ 
+-#define BuildCyrillicFonts	YES
+ #define GzipFontCompression	YES
+ #define DefaultUserPath		/bin:/usr/bin:/usr/local/bin:$(BINDIR)
+ #define DefaultSystemPath	/sbin:/usr/sbin:/bin:/usr/bin:$(BINDIR)
+@@ -481,13 +480,7 @@
+ # endif 
+  
+ 
+-# ifndef DefaultGcc2i386Opt
+-#   if (OSMajorVersion == 2 && OSMinorVersion >= 3) || OSMajorVersion > 2
+-      /* The GCC strength-reduce bug is fixed for OpenBSD 2.3 and later */
+-#     define DefaultGcc2i386Opt	-O2 GccAliasingArgs
+-#   endif
+-# endif
+-# define OptimizedCDebugFlags	DefaultGcc2i386Opt
++# define OptimizedCDebugFlags	@@PKGSRC_CFLAGS@@
+ # define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
+ # define ServerExtraSysLibs	-li386
+ # define LdPostLib		/**/
diff --git a/x11/xorg-libs/patches/patch-ai b/x11/xorg-libs/patches/patch-ai
new file mode 100644
index 00000000000..7471ed80cd9
--- /dev/null
+++ b/x11/xorg-libs/patches/patch-ai
@@ -0,0 +1,14 @@
+$NetBSD: patch-ai,v 1.1.1.1 2004/07/29 04:50:56 xtraeme Exp $
+
+--- programs/Xserver/hw/xfree86/parser/scan.c.orig	2004-07-29 01:55:45.000000000 +0200
++++ programs/Xserver/hw/xfree86/parser/scan.c	2004-07-29 01:57:11.000000000 +0200
+@@ -462,7 +462,8 @@
+ #define XCONFENV	"XORGCONFIG"
+ #endif
+ #define XFREE86CFGFILE "XF86Config"
+-#ifndef XF86_VERSION_MAJOR
++#define XF86_VERSION_MAJOR 4
++#if 0
+ #ifdef XVERSION
+ #if XVERSION > 40000000
+ #define XF86_VERSION_MAJOR	(XVERSION / 10000000)