Remove XFree86.

39 files changed, 0 insertions, 3030 deletions

diff --git a/x11/XFree86-libs/DESCR b/x11/XFree86-libs/DESCR
deleted file mode 100644
index 7d5bf8fd10d..00000000000
--- a/x11/XFree86-libs/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-This package contains the XFree86 include header files and shared
-library files.
diff --git a/x11/XFree86-libs/Makefile b/x11/XFree86-libs/Makefile
deleted file mode 100644
index 45e403f5cdc..00000000000
--- a/x11/XFree86-libs/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-# $NetBSD: Makefile,v 1.30 2006/09/16 08:28:36 adrianp Exp $
-
-DISTNAME=		${DISTFILES}
-PKGNAME=		XFree86-libs-${XF_VER}
-PKGREVISION=		9
-CATEGORIES=		x11
-MASTER_SITES=		${MASTER_SITE_XFREE}
-DISTFILES=		XFree86-${XF_VER}-src-1.tgz XFree86-${XF_VER}-src-2.tgz \
-			XFree86-${XF_VER}-src-3.tgz XFree86-${XF_VER}-src-4.tgz
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.xfree86.org/
-COMMENT=		XFree86 Libraries
-
-CONFLICTS+=		xextensions-[0-9]*
-CONFLICTS+=		libX11-[0-9]*
-CONFLICTS+=		libXau-[0-9]*
-
-BUILD_DEPENDS+=		XFree86-imake>=${XF_VER}:../../x11/XFree86-imake
-
-.include "../../mk/bsd.prefs.mk"
-
-.include "../../meta-pkgs/XFree86/Makefile.common"
-
-.if ${X11ROOT} == ${LOCALBASE}
-CONFLICTS+=		MesaLib-[0-9]* glu-[0-9]*
-.endif
-
-BUILDLINK_PASSTHRU_DIRS+=	${X11ROOT}/lib
-
-XBUILD_DIRS=		lib nls programs/Xserver/include \
-			programs/Xserver/hw/xfree86/parser
-XINCLUDE_DIRS=		programs/proxymngr
-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/XFree86-libs/PLIST.FreeBSD b/x11/XFree86-libs/PLIST.FreeBSD
deleted file mode 100644
index 160d94fd03d..00000000000
--- a/x11/XFree86-libs/PLIST.FreeBSD
+++ /dev/null
@@ -1,114 +0,0 @@
-@comment $NetBSD: PLIST.FreeBSD,v 1.3 2004/07/21 23:47:31 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/XFree86-libs/PLIST.Linux b/x11/XFree86-libs/PLIST.Linux
deleted file mode 100644
index 81895769b8c..00000000000
--- a/x11/XFree86-libs/PLIST.Linux
+++ /dev/null
@@ -1,122 +0,0 @@
-@comment $NetBSD: PLIST.Linux,v 1.5 2004/07/21 23:47:31 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/XFree86-libs/PLIST.NetBSD b/x11/XFree86-libs/PLIST.NetBSD
deleted file mode 100644
index 4d5fdf79cd2..00000000000
--- a/x11/XFree86-libs/PLIST.NetBSD
+++ /dev/null
@@ -1,150 +0,0 @@
-@comment $NetBSD: PLIST.NetBSD,v 1.5 2004/07/21 23:47:31 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/XFree86-libs/PLIST.OpenBSD b/x11/XFree86-libs/PLIST.OpenBSD
deleted file mode 100644
index 2e234da5a39..00000000000
--- a/x11/XFree86-libs/PLIST.OpenBSD
+++ /dev/null
@@ -1,77 +0,0 @@
-@comment $NetBSD: PLIST.OpenBSD,v 1.1 2004/07/21 23:47:31 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/XFree86-libs/PLIST.SunOS b/x11/XFree86-libs/PLIST.SunOS
deleted file mode 100644
index b415f6d21af..00000000000
--- a/x11/XFree86-libs/PLIST.SunOS
+++ /dev/null
@@ -1,121 +0,0 @@
-@comment $NetBSD: PLIST.SunOS,v 1.1 2004/11/08 08:22:02 markd Exp $
-${X11ROOT_PREFIX}/lib/libFS.so
-${X11ROOT_PREFIX}/lib/libFS.so.6.0
-${X11ROOT_PREFIX}/lib/libGL.so
-${X11ROOT_PREFIX}/lib/libGL.so.1.2
-${X11ROOT_PREFIX}/lib/libGLU.so
-${X11ROOT_PREFIX}/lib/libGLU.so.1.3
-${X11ROOT_PREFIX}/lib/libICE.so
-${X11ROOT_PREFIX}/lib/libICE.so.6.3
-${X11ROOT_PREFIX}/lib/libOSMesa.so
-${X11ROOT_PREFIX}/lib/libOSMesa.so.4.0
-${X11ROOT_PREFIX}/lib/libSM.so
-${X11ROOT_PREFIX}/lib/libSM.so.6.0
-${X11ROOT_PREFIX}/lib/libX11.so
-${X11ROOT_PREFIX}/lib/libX11.so.6.2
-${X11ROOT_PREFIX}/lib/libXRes.so
-${X11ROOT_PREFIX}/lib/libXRes.so.1.0
-${X11ROOT_PREFIX}/lib/libXTrap.so
-${X11ROOT_PREFIX}/lib/libXTrap.so.6.4
-${X11ROOT_PREFIX}/lib/libXau.a
-${X11ROOT_PREFIX}/lib/libXaw.so
-${X11ROOT_PREFIX}/lib/libXaw.so.6.1
-${X11ROOT_PREFIX}/lib/libXaw.so.7.0
-${X11ROOT_PREFIX}/lib/libXdmcp.a
-${X11ROOT_PREFIX}/lib/libXext.so
-${X11ROOT_PREFIX}/lib/libXext.so.6.4
-${X11ROOT_PREFIX}/lib/libXfont.a
-${X11ROOT_PREFIX}/lib/libXfont.so
-${X11ROOT_PREFIX}/lib/libXfont.so.1.5
-${X11ROOT_PREFIX}/lib/libXfontcache.so
-${X11ROOT_PREFIX}/lib/libXfontcache.so.1.2
-${X11ROOT_PREFIX}/lib/libXi.so
-${X11ROOT_PREFIX}/lib/libXi.so.6.0
-${X11ROOT_PREFIX}/lib/libXinerama.so
-${X11ROOT_PREFIX}/lib/libXinerama.so.1.0
-${X11ROOT_PREFIX}/lib/libXmu.so
-${X11ROOT_PREFIX}/lib/libXmu.so.6.2
-${X11ROOT_PREFIX}/lib/libXmuu.so
-${X11ROOT_PREFIX}/lib/libXmuu.so.1.0
-${X11ROOT_PREFIX}/lib/libXp.so
-${X11ROOT_PREFIX}/lib/libXp.so.6.2
-${X11ROOT_PREFIX}/lib/libXpm.so
-${X11ROOT_PREFIX}/lib/libXpm.so.4.11
-${X11ROOT_PREFIX}/lib/libXss.so
-${X11ROOT_PREFIX}/lib/libXss.so.1.0
-${X11ROOT_PREFIX}/lib/libXt.so
-${X11ROOT_PREFIX}/lib/libXt.so.6.0
-${X11ROOT_PREFIX}/lib/libXtst.so
-${X11ROOT_PREFIX}/lib/libXtst.so.6.1
-${X11ROOT_PREFIX}/lib/libXv.so
-${X11ROOT_PREFIX}/lib/libXv.so.1.0
-${X11ROOT_PREFIX}/lib/libXvMC.so
-${X11ROOT_PREFIX}/lib/libXvMC.so.1.0
-${X11ROOT_PREFIX}/lib/libXxf86dga.so
-${X11ROOT_PREFIX}/lib/libXxf86dga.so.1.0
-${X11ROOT_PREFIX}/lib/libXxf86misc.so
-${X11ROOT_PREFIX}/lib/libXxf86misc.so.1.1
-${X11ROOT_PREFIX}/lib/libXxf86vm.so
-${X11ROOT_PREFIX}/lib/libXxf86vm.so.1.0
-${X11ROOT_PREFIX}/lib/libdps.so
-${X11ROOT_PREFIX}/lib/libdps.so.1.0
-${X11ROOT_PREFIX}/lib/libdpstk.so
-${X11ROOT_PREFIX}/lib/libdpstk.so.1.0
-${X11ROOT_PREFIX}/lib/libfntstubs.a
-${X11ROOT_PREFIX}/lib/libfontenc.so
-${X11ROOT_PREFIX}/lib/libfontenc.so.1.0
-${X11ROOT_PREFIX}/lib/liboldX.so
-${X11ROOT_PREFIX}/lib/liboldX.so.6.0
-${X11ROOT_PREFIX}/lib/libpsres.a
-${X11ROOT_PREFIX}/lib/libpsres.so
-${X11ROOT_PREFIX}/lib/libpsres.so.1.0
-${X11ROOT_PREFIX}/lib/libxf86config.a
-${X11ROOT_PREFIX}/lib/libxkbfile.so
-${X11ROOT_PREFIX}/lib/libxkbfile.so.1.0
-${X11ROOT_PREFIX}/lib/libxkbui.so
-${X11ROOT_PREFIX}/lib/libxkbui.so.1.0
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/FontCacheChangeCacheSettings.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/FontCacheGetCacheSettings.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/FontCacheGetCacheStatistics.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/FontCacheQueryExtension.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/FontCacheQueryVersion.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGA.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGAChangePixmapMode.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGACloseFramebuffer.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGACopyArea.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGACopyTransparentArea.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGACreateColormap.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGAFillRectangle.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGAGetViewportStatus.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGAInstallColormap.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGAKeyEventToXKeyEvent.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGAOpenFramebuffer.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGAQueryExtension.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGAQueryModes.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGAQueryVersion.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGASelectInput.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGASetClientVersion.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGASetMode.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGASetViewport.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGASync.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86DGA.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XFree86-DGA.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XRes.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XResQueryClientPixmapBytes.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XResQueryClientResources.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XResQueryClients.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XResQueryExtension.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XResQueryVersion.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XScreenSaverAllocInfo.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XScreenSaverGetRegistered.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XScreenSaverQueryExtension.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XScreenSaverQueryInfo.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XScreenSaverQueryVersion.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XScreenSaverRegister.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XScreenSaverSelectInput.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XScreenSaverSetAttributes.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XScreenSaverUnregister.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XScreenSaverUnsetAttributes.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/Xaw.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/Xfontcache.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/Xss.${LIBMAN_SUFFIX}
diff --git a/x11/XFree86-libs/PLIST.common b/x11/XFree86-libs/PLIST.common
deleted file mode 100644
index 3441b70dcc1..00000000000
--- a/x11/XFree86-libs/PLIST.common
+++ /dev/null
@@ -1,521 +0,0 @@
-@comment $NetBSD: PLIST.common,v 1.5 2004/07/21 23:47:31 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/XFree86-libs/PLIST.common_end b/x11/XFree86-libs/PLIST.common_end
deleted file mode 100644
index a45503a1fac..00000000000
--- a/x11/XFree86-libs/PLIST.common_end
+++ /dev/null
@@ -1,65 +0,0 @@
-@comment $NetBSD: PLIST.common_end,v 1.1 2004/07/21 23:47:31 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/XFree86-libs/buildlink3.mk b/x11/XFree86-libs/buildlink3.mk
deleted file mode 100644
index 58a1f90b90f..00000000000
--- a/x11/XFree86-libs/buildlink3.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/10 21:50:34 jlam Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-XFREE86_LIBS_BUILDLINK3_MK:=	${XFREE86_LIBS_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	XFree86-libs
-.endif
-
-#
-# XFree86-libs must come first so that packages listed later can overwrite
-# any symlinks created by buildlinking XFree86-libs.
-#
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NXFree86-libs}
-BUILDLINK_PACKAGES:=	XFree86-libs ${BUILDLINK_PACKAGES}
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}XFree86-libs
-
-.include "../../mk/bsd.prefs.mk"
-
-.if !empty(XFREE86_LIBS_BUILDLINK3_MK:M+)
-
-BUILDLINK_API_DEPENDS.XFree86-libs+=	XFree86-libs>=4.4.0
-BUILDLINK_ABI_DEPENDS.XFree86-libs+=	XFree86-libs>=4.4.0nb7
-BUILDLINK_PKGSRCDIR.XFree86-libs?=	../../x11/XFree86-libs
-BUILDLINK_LIBDIRS.XFree86-libs?=	${X11ROOT_PREFIX}/lib
-BUILDLINK_TRANSFORM.XFree86-libs+=	-e "s|/${X11ROOT_PREFIX}/|/|"
-
-.endif  # XFREE86_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/XFree86-libs/builtin.mk b/x11/XFree86-libs/builtin.mk
deleted file mode 100644
index ab078e059b3..00000000000
--- a/x11/XFree86-libs/builtin.mk
+++ /dev/null
@@ -1,73 +0,0 @@
-# $NetBSD: builtin.mk,v 1.4 2006/04/06 06:22:56 reed Exp $
-
-BUILTIN_PKG:=	XFree86-libs
-
-BUILTIN_FIND_FILES_VAR:=	CF_XFREE86
-BUILTIN_FIND_FILES.CF_XFREE86=	${X11BASE}/lib/X11/config/xfree86.cf
-
-.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 !defined(IS_BUILTIN.XFree86-libs)
-IS_BUILTIN.XFree86-libs=	no
-.  if empty(CF_XFREE86:M__nonexistent__) && empty(CF_XFREE86:M${LOCALBASE}/*)
-IS_BUILTIN.XFree86-libs=	yes
-.  endif
-.endif
-MAKEVARS+=	IS_BUILTIN.XFree86-libs
-
-###
-### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
-### a package name to represent the built-in package.
-###
-.if !defined(BUILTIN_PKG.XFree86-libs) && \
-    !empty(IS_BUILTIN.XFree86-libs:M[yY][eE][sS]) && \
-    empty(CF_XFREE86:M__nonexistent__)
-.  include "${BUILDLINK_PKGSRCDIR.XFree86-libs}/version.mk"
-BUILTIN_PKG.XFree86-libs=	XFree86-libs-${BUILTIN_X11_VERSION.XFree86}
-.endif
-MAKEVARS+=	BUILTIN_PKG.XFree86-libs
-
-###
-### 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.XFree86-libs)
-.  if ${PREFER.XFree86-libs} == "pkgsrc"
-USE_BUILTIN.XFree86-libs=	no
-.  else
-USE_BUILTIN.XFree86-libs=	${IS_BUILTIN.XFree86-libs}
-.    if defined(BUILTIN_PKG.XFree86-libs) && \
-        !empty(IS_BUILTIN.XFree86-libs:M[yY][eE][sS])
-USE_BUILTIN.XFree86-libs=	yes
-.      for _dep_ in ${BUILDLINK_API_DEPENDS.XFree86-libs}
-.        if !empty(USE_BUILTIN.XFree86-libs:M[yY][eE][sS])
-USE_BUILTIN.XFree86-libs!=						\
-	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.XFree86-libs:Q}; then \
-		${ECHO} yes;						\
-	else								\
-		${ECHO} no;						\
-	fi
-.        endif
-.      endfor
-.    endif
-.  endif  # PREFER.XFree86-libs
-.endif
-MAKEVARS+=	USE_BUILTIN.XFree86-libs
-
-###
-### The section below only applies if we are not including this file
-### solely to determine whether a built-in implementation exists.
-###
-CHECK_BUILTIN.XFree86-libs?=	no
-.if !empty(CHECK_BUILTIN.XFree86-libs:M[nN][oO])
-
-.  if !empty(USE_BUILTIN.XFree86-libs:M[yY][eE][sS])
-BUILDLINK_PREFIX.XFree86-libs=	${X11BASE}
-BUILDLINK_FILES.XFree86-libs+=	lib/pkgconfig/XFree86-libs.pc
-.  endif
-
-.endif	# CHECK_BUILTIN.XFree86-libs
diff --git a/x11/XFree86-libs/distinfo b/x11/XFree86-libs/distinfo
deleted file mode 100644
index 511355d4781..00000000000
--- a/x11/XFree86-libs/distinfo
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: distinfo,v 1.12 2006/09/16 08:28:36 adrianp Exp $
-
-SHA1 (XFree86-4.4.0-src-1.tgz) = 44b38a7044c82d0b2f785b0e6a935349abcb5d79
-RMD160 (XFree86-4.4.0-src-1.tgz) = 40917951f1f661bfa28450771bbe86e8f0dd2549
-Size (XFree86-4.4.0-src-1.tgz) = 11760814 bytes
-SHA1 (XFree86-4.4.0-src-2.tgz) = ee2dd36c0b3f29bd2df776ad23c850374001f1a6
-RMD160 (XFree86-4.4.0-src-2.tgz) = d832cc43abce69d3a2f2b5c6f75d75968ccd0360
-Size (XFree86-4.4.0-src-2.tgz) = 5745538 bytes
-SHA1 (XFree86-4.4.0-src-3.tgz) = a012694d5a5aa3df1d9a3a52363d73cf8f03326b
-RMD160 (XFree86-4.4.0-src-3.tgz) = 1ffad685dc513fd39ff0d9da34ec9a577041989f
-Size (XFree86-4.4.0-src-3.tgz) = 11239253 bytes
-SHA1 (XFree86-4.4.0-src-4.tgz) = beba65576a085b9d1c0c4f950c4bc134f8d7d15d
-RMD160 (XFree86-4.4.0-src-4.tgz) = f919330c921d1b2623f3c884378d8b2490d0a95e
-Size (XFree86-4.4.0-src-4.tgz) = 13057535 bytes
-SHA1 (patch-aa) = cf384e765cc7c8ab5b22e6befea5df0316a12a4d
-SHA1 (patch-ab) = c12a13b07e5f0636da195266c743fc8095b486b3
-SHA1 (patch-ac) = 89a4bcd4351d7b2967da744619e3912b2efa7138
-SHA1 (patch-ad) = 17ede6e7c6c232f9fe2804d7ab4addd85b5cd25c
-SHA1 (patch-ae) = 90584e5732fb882f431afd69f6fd1c26c9d22bee
-SHA1 (patch-af) = b34f46d715e90159df3897cf20023b58b9deff67
-SHA1 (patch-ag) = a06752ee9f55e64a407fac6fbde3547fd096c71d
-SHA1 (patch-ah) = 30618658577dd37b31191197cd2c156ff72e0d90
-SHA1 (patch-ai) = dd2f382f7dc3aea9ca591b386e988cd1655adff0
-SHA1 (patch-aj) = 4545d9fd50c2a7b6f5a04da330784eaf9a5373ad
-SHA1 (patch-ak) = 8df00ceb043f9a1d99b5bd270bd19198f0a23a51
-SHA1 (patch-al) = 4eb342844fe90e1269b6a0296c5ba52ab7be50b3
-SHA1 (patch-am) = 3a0cda8079164e1f17c5aa1b21c666941b462079
-SHA1 (patch-an) = e78b95ab07b532db41a3785344e89dc23e9e7e34
-SHA1 (patch-ao) = 12af967565c0c3ddb29464f7f726786c5d04c60b
-SHA1 (patch-ap) = e2d533dd24e176e20fb1af7c8791e2670aad5c20
-SHA1 (patch-aq) = 398fbbeca94beb6e4a878941d1b825d0b734e11b
-SHA1 (patch-ar) = c9ad52d94aedd94d7c0e0dc254d02cde5e33b637
-SHA1 (patch-as) = c0b27ef82c688c535fdd46cb5de3315e24677fc6
-SHA1 (patch-at) = 7cd02712c1ae4ca070564d2f7b5cb4e3e5b6e93b
-SHA1 (patch-au) = 8e121828d0f826f9029c0aee0f39e4e7ea2b0dac
-SHA1 (patch-av) = bb9adf1a535781ef9f765d8e705a031cfabf7edb
-SHA1 (patch-aw) = ee25a878725b00e6c1f4cbd592ee6e63c33a9d55
-SHA1 (patch-ax) = c90ff7bfe7dbb9d7bf3bf3300ec386da187aec29
diff --git a/x11/XFree86-libs/files/Wraphelp.c b/x11/XFree86-libs/files/Wraphelp.c
deleted file mode 100755
index d6fd58694aa..00000000000
--- a/x11/XFree86-libs/files/Wraphelp.c
+++ /dev/null
@@ -1,409 +0,0 @@
-/* $NetBSD: Wraphelp.c,v 1.1.1.1 2004/01/24 08:47:33 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/XFree86-libs/files/host.def b/x11/XFree86-libs/files/host.def
deleted file mode 100644
index 1e3255c0b79..00000000000
--- a/x11/XFree86-libs/files/host.def
+++ /dev/null
@@ -1,71 +0,0 @@
-/* $NetBSD: host.def,v 1.4 2004/11/07 12:57:37 markd 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
-
-#if !defined(FreeBSDArchitecture) && !defined(SunArchitecture)
-#  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/XFree86-libs/patches/patch-aa b/x11/XFree86-libs/patches/patch-aa
deleted file mode 100644
index 22aeee6f235..00000000000
--- a/x11/XFree86-libs/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/01/24 08:47:28 xtraeme Exp $
-
---- programs/Xserver/hw/xfree86/parser/scan.c.orig	2003-07-15 23:55:49.000000000 +0000
-+++ programs/Xserver/hw/xfree86/parser/scan.c	2003-07-15 23:56:40.000000000 +0000
-@@ -425,7 +425,8 @@
- #ifndef XCONFENV
- #define XCONFENV	"XF86CONFIG"
- #endif
--#ifndef XF86_VERSION_MAJOR
-+#define XF86_VERSION_MAJOR 4
-+#if 0
- #ifdef XVERSION
- #if XVERSION > 40000000
- #define XF86_VERSION_MAJOR	(XVERSION / 10000000)
diff --git a/x11/XFree86-libs/patches/patch-ab b/x11/XFree86-libs/patches/patch-ab
deleted file mode 100644
index fc63926a56e..00000000000
--- a/x11/XFree86-libs/patches/patch-ab
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2004/03/28 22:06:15 xtraeme Exp $
-
---- config/cf/Library.tmpl.orig	Mon Aug 27 10:40:55 2001
-+++ config/cf/Library.tmpl	Wed Oct 16 21:53:13 2002
-@@ -300,6 +300,10 @@
-  */
- 
- #ifndef MakeStringsDependency
-+#if defined(UseInstalled) || defined(UseInstalledPrograms)
-+#define MakeStringsDependency						@@\
-+MAKESTRS = @MAKESTRS@
-+#else
- # define MakeStringsDependency						@@\
- MAKESTRS = $(CONFIGSRC)/util/makestrs					@@\
- NoCmpScript(HostProgramTargetName($(MAKESTRS)) $(MAKESTRS).Osuf)	@@\
-@@ -308,6 +312,7 @@
- 	cd $(CONFIGSRC)/util && $(MAKE) HostProgramTargetName(makestrs)	@@\
- 									@@\
- includes:: HostProgramTargetName($(MAKESTRS))
-+#endif
- #endif
- 
- #ifndef ToolkitMakeStrings
diff --git a/x11/XFree86-libs/patches/patch-ac b/x11/XFree86-libs/patches/patch-ac
deleted file mode 100644
index 75d85d91cae..00000000000
--- a/x11/XFree86-libs/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2004/03/28 22:06:15 xtraeme Exp $
-
---- programs/Xserver/hw/xfree86/xf86config/xf86config.c.orig	2003-07-09 13:48:58.000000000 +0000
-+++ programs/Xserver/hw/xfree86/xf86config/xf86config.c	2003-07-09 13:49:42.000000000 +0000
-@@ -176,6 +176,9 @@
- #endif
- #define CONFIGNAME		XCONFIGFILE
- 
-+/* Comment this out for now ... */
-+
-+#if 0
- #ifndef XF86_VERSION_MAJOR
- #ifdef XVERSION
- #if XVERSION > 40000000
-@@ -187,6 +190,7 @@
- #define XF86_VERSION_MAJOR	4
- #endif
- #endif
-+#endif
- 
- 
- int config_mousetype;		/* Mouse. */
diff --git a/x11/XFree86-libs/patches/patch-ad b/x11/XFree86-libs/patches/patch-ad
deleted file mode 100644
index 610edcd0624..00000000000
--- a/x11/XFree86-libs/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2004/03/28 22:06:15 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/XFree86-libs/patches/patch-ae b/x11/XFree86-libs/patches/patch-ae
deleted file mode 100644
index 4401ca0a98b..00000000000
--- a/x11/XFree86-libs/patches/patch-ae
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2004/03/28 22:06:15 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/XFree86-libs/patches/patch-af b/x11/XFree86-libs/patches/patch-af
deleted file mode 100644
index 644dc2a8d46..00000000000
--- a/x11/XFree86-libs/patches/patch-af
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-af,v 1.2 2004/03/28 22:06:15 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/XFree86-libs/patches/patch-ag b/x11/XFree86-libs/patches/patch-ag
deleted file mode 100644
index ca43c336d0d..00000000000
--- a/x11/XFree86-libs/patches/patch-ag
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2004/03/28 22:06:15 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/XFree86-libs/patches/patch-ah b/x11/XFree86-libs/patches/patch-ah
deleted file mode 100644
index d2a2dd6bd89..00000000000
--- a/x11/XFree86-libs/patches/patch-ah
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2004/03/28 22:06:15 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/XFree86-libs/patches/patch-ai b/x11/XFree86-libs/patches/patch-ai
deleted file mode 100644
index 4e1a8ef0fe4..00000000000
--- a/x11/XFree86-libs/patches/patch-ai
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ai,v 1.4 2004/11/07 12:57:37 markd Exp $
-
---- config/cf/sun.cf.in.orig	2004-02-02 16:55:26.000000000 +1300
-+++ config/cf/sun.cf.in
-@@ -19,6 +19,12 @@ 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
-+#define HasZlib YES
-+#define HasSunC NO
-+#define HasGcc2 YES
-+
- /*
-  * Compiler setup.  This sun.cf file knows what options to use with 
-  * certain compilers, including Sun C, CenterLine C, and gcc.  It 
-@@ -224,6 +230,14 @@ XCOMM SunPro C++ CplusplusCompilerMajorV
- #endif
- #endif
- 
-+#define CcCmd @@PKGSRC_CC@@
-+#define LdCmd @@PKGSRC_CC@@
-+#define CplusplusCmd @@PKGSRC_CXX@@
-+#define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@
-+#define ExtraLoadFlags -Wl,-R$(USRLIBDIRPATH)
-+#define SharedLibraryLoadFlags -shared ExtraLoadFlags
-+#define HasLdRunPath NO
-+
- # if HasSunC && (CCompilerMajorVersion < 3)
- #  define BootstrapCFlags	-DSVR4
- # else
diff --git a/x11/XFree86-libs/patches/patch-aj b/x11/XFree86-libs/patches/patch-aj
deleted file mode 100644
index 32f082f89b9..00000000000
--- a/x11/XFree86-libs/patches/patch-aj
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-aj,v 1.3 2004/07/21 22:21:49 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/XFree86-libs/patches/patch-ak b/x11/XFree86-libs/patches/patch-ak
deleted file mode 100644
index 48a15aca833..00000000000
--- a/x11/XFree86-libs/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.3 2004/09/16 19:28:56 minskim Exp $
-
---- extras/Xpm/lib/data.c.orig	2002-01-07 13:40:49.000000000 -0600
-+++ extras/Xpm/lib/data.c
-@@ -375,7 +375,7 @@ xpmGetCmt(data, cmt)
- {
-     if (!data->type)
- 	*cmt = NULL;
--    else if (data->CommentLength) {
-+    else if (data->CommentLength != 0 && data->CommentLength < SIZE_MAX - 1) {
- 	*cmt = (char *) XpmMalloc(data->CommentLength + 1);
- 	strncpy(*cmt, data->Comment, data->CommentLength);
- 	(*cmt)[data->CommentLength] = '\0';
diff --git a/x11/XFree86-libs/patches/patch-al b/x11/XFree86-libs/patches/patch-al
deleted file mode 100644
index 6145f9d1238..00000000000
--- a/x11/XFree86-libs/patches/patch-al
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-al,v 1.3 2004/09/16 19:28:56 minskim Exp $
-
---- extras/Xpm/lib/hashtab.c.orig	1999-01-11 07:23:11.000000000 -0600
-+++ extras/Xpm/lib/hashtab.c
-@@ -135,7 +135,7 @@ HashTableGrows(table)
-     xpmHashTable *table;
- {
-     xpmHashAtom *atomTable = table->atomTable;
--    int size = table->size;
-+    unsigned int size = table->size;
-     xpmHashAtom *t, *p;
-     int i;
-     int oldSize = size;
-@@ -144,6 +144,8 @@ HashTableGrows(table)
-     HASH_TABLE_GROWS
- 	table->size = size;
-     table->limit = size / 3;
-+    if (size >= SIZE_MAX / sizeof(*atomTable)) 
-+	return (XpmNoMemory);
-     atomTable = (xpmHashAtom *) XpmMalloc(size * sizeof(*atomTable));
-     if (!atomTable)
- 	return (XpmNoMemory);
-@@ -204,6 +206,8 @@ xpmHashTableInit(table)
-     table->size = INITIAL_HASH_SIZE;
-     table->limit = table->size / 3;
-     table->used = 0;
-+    if (table->size >= SIZE_MAX / sizeof(*atomTable))
-+	return (XpmNoMemory);
-     atomTable = (xpmHashAtom *) XpmMalloc(table->size * sizeof(*atomTable));
-     if (!atomTable)
- 	return (XpmNoMemory);
diff --git a/x11/XFree86-libs/patches/patch-am b/x11/XFree86-libs/patches/patch-am
deleted file mode 100644
index 9215c09d26c..00000000000
--- a/x11/XFree86-libs/patches/patch-am
+++ /dev/null
@@ -1,179 +0,0 @@
-$NetBSD: patch-am,v 1.3 2004/09/16 19:28:56 minskim Exp $
-
---- extras/Xpm/lib/parse.c.orig	2001-10-27 22:32:10.000000000 -0500
-+++ extras/Xpm/lib/parse.c
-@@ -44,6 +44,24 @@
- #include <ctype.h>
- #include <string.h>
- 
-+#ifdef HAS_STRLCAT
-+# define STRLCAT(dst, src, dstsize) { \
-+  	if (strlcat(dst, src, dstsize) >= (dstsize)) \
-+	    return (XpmFileInvalid); }
-+# define STRLCPY(dst, src, dstsize) { \
-+  	if (strlcpy(dst, src, dstsize) >= (dstsize)) \
-+	    return (XpmFileInvalid); }
-+#else
-+# define STRLCAT(dst, src, dstsize) { \
-+	if ((strlen(dst) + strlen(src)) < (dstsize)) \
-+ 	    strcat(dst, src); \
-+	else return (XpmFileInvalid); }
-+# define STRLCPY(dst, src, dstsize) { \
-+	if (strlen(src) < (dstsize)) \
-+ 	    strcpy(dst, src); \
-+	else return (XpmFileInvalid); }
-+#endif
-+
- LFUNC(ParsePixels, int, (xpmData *data, unsigned int width,
- 			 unsigned int height, unsigned int ncolors,
- 			 unsigned int cpp, XpmColor *colorTable,
-@@ -66,7 +84,7 @@ xpmParseValues(data, width, height, ncol
-     unsigned int *extensions;
- {
-     unsigned int l;
--    char buf[BUFSIZ];
-+    char buf[BUFSIZ + 1];
- 
-     if (!data->format) {		/* XPM 2 or 3 */
- 
-@@ -175,10 +193,10 @@ xpmParseColors(data, ncolors, cpp, color
-     XpmColor **colorTablePtr;
-     xpmHashTable *hashtable;
- {
--    unsigned int key = 0, l, a, b;
-+    unsigned int key = 0, l, a, b, len;
-     unsigned int curkey;		/* current color key */
-     unsigned int lastwaskey;		/* key read */
--    char buf[BUFSIZ];
-+    char buf[BUFSIZ+1];
-     char curbuf[BUFSIZ];		/* current buffer */
-     char **sptr, *s;
-     XpmColor *color;
-@@ -186,6 +204,8 @@ xpmParseColors(data, ncolors, cpp, color
-     char **defaults;
-     int ErrorStatus;
- 
-+    if (ncolors >= SIZE_MAX / sizeof(XpmColor))
-+	return (XpmNoMemory);
-     colorTable = (XpmColor *) XpmCalloc(ncolors, sizeof(XpmColor));
-     if (!colorTable)
- 	return (XpmNoMemory);
-@@ -197,6 +217,10 @@ xpmParseColors(data, ncolors, cpp, color
- 	    /*
- 	     * read pixel value
- 	     */
-+	    if (cpp >= SIZE_MAX - 1) {
-+		xpmFreeColorTable(colorTable, ncolors);
-+		return (XpmNoMemory);
-+	    }
- 	    color->string = (char *) XpmMalloc(cpp + 1);
- 	    if (!color->string) {
- 		xpmFreeColorTable(colorTable, ncolors);
-@@ -234,13 +258,14 @@ xpmParseColors(data, ncolors, cpp, color
- 		}
- 		if (!lastwaskey && key < NKEYS) {	/* open new key */
- 		    if (curkey) {	/* flush string */
--			s = (char *) XpmMalloc(strlen(curbuf) + 1);
-+			len = strlen(curbuf) + 1;
-+			s = (char *) XpmMalloc(len);
- 			if (!s) {
- 			    xpmFreeColorTable(colorTable, ncolors);
- 			    return (XpmNoMemory);
- 			}
- 			defaults[curkey] = s;
--			strcpy(s, curbuf);
-+			memcpy(s, curbuf, len);
- 		    }
- 		    curkey = key + 1;	/* set new key  */
- 		    *curbuf = '\0';	/* reset curbuf */
-@@ -251,9 +276,9 @@ xpmParseColors(data, ncolors, cpp, color
- 			return (XpmFileInvalid);
- 		    }
- 		    if (!lastwaskey)
--			strcat(curbuf, " ");	/* append space */
-+			STRLCAT(curbuf, " ", sizeof(curbuf)); /* append space */
- 		    buf[l] = '\0';
--		    strcat(curbuf, buf);/* append buf */
-+		    STRLCAT(curbuf, buf, sizeof(curbuf));/* append buf */
- 		    lastwaskey = 0;
- 		}
- 	    }
-@@ -261,12 +286,13 @@ xpmParseColors(data, ncolors, cpp, color
- 		xpmFreeColorTable(colorTable, ncolors);
- 		return (XpmFileInvalid);
- 	    }
--	    s = defaults[curkey] = (char *) XpmMalloc(strlen(curbuf) + 1);
-+	    len = strlen(curbuf) + 1;
-+	    s = defaults[curkey] = (char *) XpmMalloc(len);
- 	    if (!s) {
- 		xpmFreeColorTable(colorTable, ncolors);
- 		return (XpmNoMemory);
- 	    }
--	    strcpy(s, curbuf);
-+	    memcpy(s, curbuf, len);
- 	}
-     } else {				/* XPM 1 */
- 	/* get to the beginning of the first string */
-@@ -279,6 +305,10 @@ xpmParseColors(data, ncolors, cpp, color
- 	    /*
- 	     * read pixel value
- 	     */
-+	    if (cpp >= SIZE_MAX - 1) {
-+		xpmFreeColorTable(colorTable, ncolors);
-+		return (XpmNoMemory);
-+	    }
- 	    color->string = (char *) XpmMalloc(cpp + 1);
- 	    if (!color->string) {
- 		xpmFreeColorTable(colorTable, ncolors);
-@@ -307,16 +337,17 @@ xpmParseColors(data, ncolors, cpp, color
- 	    *curbuf = '\0';		/* init curbuf */
- 	    while ((l = xpmNextWord(data, buf, BUFSIZ))) {
- 		if (*curbuf != '\0')
--		    strcat(curbuf, " ");/* append space */
-+		    STRLCAT(curbuf, " ", sizeof(curbuf));/* append space */
- 		buf[l] = '\0';
--		strcat(curbuf, buf);	/* append buf */
-+		STRLCAT(curbuf, buf, sizeof(curbuf));	/* append buf */
- 	    }
--	    s = (char *) XpmMalloc(strlen(curbuf) + 1);
-+	    len = strlen(curbuf) + 1;
-+	    s = (char *) XpmMalloc(len);
- 	    if (!s) {
- 		xpmFreeColorTable(colorTable, ncolors);
- 		return (XpmNoMemory);
- 	    }
--	    strcpy(s, curbuf);
-+	    memcpy(s, curbuf, len);
- 	    color->c_color = s;
- 	    *curbuf = '\0';		/* reset curbuf */
- 	    if (a < ncolors - 1)
-@@ -341,6 +372,9 @@ ParsePixels(data, width, height, ncolors
-     unsigned int *iptr, *iptr2;
-     unsigned int a, x, y;
- 
-+    if ((height > 0 && width >= SIZE_MAX / height) ||
-+	width * height >= SIZE_MAX / sizeof(unsigned int)) 
-+	return XpmNoMemory;
- #ifndef FOR_MSW
-     iptr2 = (unsigned int *) XpmMalloc(sizeof(unsigned int) * width * height);
- #else
-@@ -364,6 +398,9 @@ ParsePixels(data, width, height, ncolors
- 	{
- 	    unsigned short colidx[256];
- 
-+	    if (ncolors > 256)
-+		return (XpmFileInvalid);
-+
- 	    bzero((char *)colidx, 256 * sizeof(short));
- 	    for (a = 0; a < ncolors; a++)
- 		colidx[(unsigned char)colorTable[a].string[0]] = a + 1;
-@@ -442,6 +479,9 @@ if (cidx[f]) XpmFree(cidx[f]);}
- 	    char *s;
- 	    char buf[BUFSIZ];
- 
-+	    if (cpp >= sizeof(buf))
-+		return (XpmFileInvalid);
-+
- 	    buf[cpp] = '\0';
- 	    if (USE_HASHTABLE) {
- 		xpmHashAtom *slot;
diff --git a/x11/XFree86-libs/patches/patch-an b/x11/XFree86-libs/patches/patch-an
deleted file mode 100644
index a3c6fd1e4bf..00000000000
--- a/x11/XFree86-libs/patches/patch-an
+++ /dev/null
@@ -1,68 +0,0 @@
-$NetBSD: patch-an,v 1.3 2004/09/16 19:28:56 minskim Exp $
-
---- extras/Xpm/lib/scan.c.orig	2002-01-07 13:40:49.000000000 -0600
-+++ extras/Xpm/lib/scan.c
-@@ -107,7 +107,8 @@ LFUNC(MSWGetImagePixels, int, (Display *
- LFUNC(ScanTransparentColor, int, (XpmColor *color, unsigned int cpp,
- 				  XpmAttributes *attributes));
- 
--LFUNC(ScanOtherColors, int, (Display *display, XpmColor *colors, int ncolors,
-+LFUNC(ScanOtherColors, int, (Display *display, XpmColor *colors, 
-+			     unsigned int ncolors, 
- 			     Pixel *pixels, unsigned int mask,
- 			     unsigned int cpp, XpmAttributes *attributes));
- 
-@@ -232,11 +233,17 @@ XpmCreateXpmImageFromImage(display, imag
-     else
- 	cpp = 0;
- 
-+    if ((height > 0 && width >= SIZE_MAX / height) ||
-+	width * height >= SIZE_MAX / sizeof(unsigned int))
-+	RETURN(XpmNoMemory);
-     pmap.pixelindex =
- 	(unsigned int *) XpmCalloc(width * height, sizeof(unsigned int));
-     if (!pmap.pixelindex)
- 	RETURN(XpmNoMemory);
- 
-+    if (pmap.size >= SIZE_MAX / sizeof(Pixel)) 
-+	RETURN(XpmNoMemory);
-+
-     pmap.pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * pmap.size);
-     if (!pmap.pixels)
- 	RETURN(XpmNoMemory);
-@@ -302,6 +309,8 @@ XpmCreateXpmImageFromImage(display, imag
-      * color
-      */
- 
-+    if (pmap.ncolors >= SIZE_MAX / sizeof(XpmColor))
-+	RETURN(XpmNoMemory);
-     colorTable = (XpmColor *) XpmCalloc(pmap.ncolors, sizeof(XpmColor));
-     if (!colorTable)
- 	RETURN(XpmNoMemory);
-@@ -360,6 +369,8 @@ ScanTransparentColor(color, cpp, attribu
- 
-     /* first get a character string */
-     a = 0;
-+    if (cpp >= SIZE_MAX - 1)
-+	return (XpmNoMemory);
-     if (!(s = color->string = (char *) XpmMalloc(cpp + 1)))
- 	return (XpmNoMemory);
-     *s++ = printable[c = a % MAXPRINTABLE];
-@@ -407,7 +418,7 @@ static int
- ScanOtherColors(display, colors, ncolors, pixels, mask, cpp, attributes)
-     Display *display;
-     XpmColor *colors;
--    int ncolors;
-+    unsigned int ncolors;
-     Pixel *pixels;
-     unsigned int mask;
-     unsigned int cpp;
-@@ -451,6 +462,8 @@ ScanOtherColors(display, colors, ncolors
-     }
- 
-     /* first get character strings and rgb values */
-+    if (ncolors >= SIZE_MAX / sizeof(XColor) || cpp >= SIZE_MAX - 1)
-+	return (XpmNoMemory);
-     xcolors = (XColor *) XpmMalloc(sizeof(XColor) * ncolors);
-     if (!xcolors)
- 	return (XpmNoMemory);
diff --git a/x11/XFree86-libs/patches/patch-ao b/x11/XFree86-libs/patches/patch-ao
deleted file mode 100644
index 2a6e740dcaa..00000000000
--- a/x11/XFree86-libs/patches/patch-ao
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ao,v 1.3 2004/09/16 19:28:56 minskim Exp $
-
---- extras/Xpm/lib/Attrib.c.orig	1999-01-11 07:23:09.000000000 -0600
-+++ extras/Xpm/lib/Attrib.c
-@@ -35,7 +35,7 @@
- #include "XpmI.h"
- 
- /* 3.2 backward compatibility code */
--LFUNC(CreateOldColorTable, int, (XpmColor *ct, int ncolors,
-+LFUNC(CreateOldColorTable, int, (XpmColor *ct, unsigned int ncolors,
- 				 XpmColor ***oldct));
- 
- LFUNC(FreeOldColorTable, void, (XpmColor **colorTable, int ncolors));
-@@ -46,12 +46,15 @@ LFUNC(FreeOldColorTable, void, (XpmColor
- static int
- CreateOldColorTable(ct, ncolors, oldct)
-     XpmColor *ct;
--    int ncolors;
-+    unsigned int ncolors;
-     XpmColor ***oldct;
- {
-     XpmColor **colorTable, **color;
-     int a;
- 
-+    if (ncolors >= SIZE_MAX / sizeof(XpmColor *))
-+	return XpmNoMemory;
-+
-     colorTable = (XpmColor **) XpmMalloc(ncolors * sizeof(XpmColor *));
-     if (!colorTable) {
- 	*oldct = NULL;
diff --git a/x11/XFree86-libs/patches/patch-ap b/x11/XFree86-libs/patches/patch-ap
deleted file mode 100644
index d8391259806..00000000000
--- a/x11/XFree86-libs/patches/patch-ap
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ap,v 1.3 2004/09/16 19:28:56 minskim Exp $
-
---- extras/Xpm/lib/CrDatFrI.c.orig	2001-10-27 22:32:09.000000000 -0500
-+++ extras/Xpm/lib/CrDatFrI.c
-@@ -124,6 +124,8 @@ XpmCreateDataFromXpmImage(data_return, i
-      */
-     header_nlines = 1 + image->ncolors;
-     header_size = sizeof(char *) * header_nlines;
-+    if (header_size >= SIZE_MAX / sizeof(char *))
-+	return (XpmNoMemory);
-     header = (char **) XpmCalloc(header_size, sizeof(char *));
-     if (!header)
- 	return (XpmNoMemory);
diff --git a/x11/XFree86-libs/patches/patch-aq b/x11/XFree86-libs/patches/patch-aq
deleted file mode 100644
index 436da06043a..00000000000
--- a/x11/XFree86-libs/patches/patch-aq
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-aq,v 1.3 2004/09/16 19:28:56 minskim Exp $
-
---- extras/Xpm/lib/XpmI.h.orig	2003-08-06 09:03:58.000000000 -0500
-+++ extras/Xpm/lib/XpmI.h
-@@ -86,6 +86,18 @@ extern FILE *popen();
- 		boundCheckingCalloc((long)(nelem),(long) (elsize))
- #endif
- 
-+#if defined(SCO) || defined(__USLC__)
-+#include <stdint.h>	/* For SIZE_MAX */
-+#endif
-+#include <limits.h>
-+#ifndef SIZE_MAX
-+# ifdef ULONG_MAX
-+#  define SIZE_MAX ULONG_MAX
-+# else 
-+#  define SIZE_MAX UINT_MAX
-+# endif
-+#endif
-+
- #define XPMMAXCMTLEN BUFSIZ
- typedef struct {
-     unsigned int type;
-@@ -187,9 +199,9 @@ typedef struct _xpmHashAtom {
- }      *xpmHashAtom;
- 
- typedef struct {
--    int size;
--    int limit;
--    int used;
-+    unsigned int size;
-+    unsigned int limit;
-+    unsigned int used;
-     xpmHashAtom *atomTable;
- }      xpmHashTable;
- 
diff --git a/x11/XFree86-libs/patches/patch-ar b/x11/XFree86-libs/patches/patch-ar
deleted file mode 100644
index 1e0b84c3886..00000000000
--- a/x11/XFree86-libs/patches/patch-ar
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-ar,v 1.3 2004/09/16 19:28:56 minskim Exp $
-
---- extras/Xpm/lib/create.c.orig	2003-10-07 16:25:37.000000000 -0500
-+++ extras/Xpm/lib/create.c
-@@ -816,6 +816,9 @@ XpmCreateImageFromXpmImage(display, imag
- 
-     ErrorStatus = XpmSuccess;
- 
-+    if (image->ncolors >= SIZE_MAX / sizeof(Pixel))
-+	return (XpmNoMemory);
-+
-     /* malloc pixels index tables */
-     image_pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * image->ncolors);
-     if (!image_pixels)
-@@ -988,6 +991,8 @@ CreateXImage(display, visual, depth, for
- 	return (XpmNoMemory);
- 
- #if !defined(FOR_MSW) && !defined(AMIGA)
-+    if (height != 0 && (*image_return)->bytes_per_line >= SIZE_MAX / height)
-+	return XpmNoMemory;
-     /* now that bytes_per_line must have been set properly alloc data */
-     (*image_return)->data =
- 	(char *) XpmMalloc((*image_return)->bytes_per_line * height);
-@@ -2055,6 +2060,9 @@ xpmParseDataAndCreate(display, data, ima
- 	xpmGetCmt(data, &colors_cmt);
- 
-     /* malloc pixels index tables */
-+    if (ncolors >= SIZE_MAX / sizeof(Pixel)) 
-+	return XpmNoMemory;
-+
-     image_pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * ncolors);
-     if (!image_pixels)
- 	RETURN(XpmNoMemory);
-@@ -2309,7 +2317,8 @@ ParseAndPutPixels(
- 	    }
- 	    obm = SelectObject(*dc, image->bitmap);
- #endif
--
-+	    if (ncolors > 256)
-+		return (XpmFileInvalid);
- 
- 	    bzero((char *)colidx, 256 * sizeof(short));
- 	    for (a = 0; a < ncolors; a++)
-@@ -2415,6 +2424,9 @@ if (cidx[f]) XpmFree(cidx[f]);}
- 	    char *s;
- 	    char buf[BUFSIZ];
- 
-+	    if (cpp >= sizeof(buf))
-+		return (XpmFileInvalid);
-+
- 	    buf[cpp] = '\0';
- 	    if (USE_HASHTABLE) {
- 		xpmHashAtom *slot;
diff --git a/x11/XFree86-libs/patches/patch-as b/x11/XFree86-libs/patches/patch-as
deleted file mode 100644
index 890914656c8..00000000000
--- a/x11/XFree86-libs/patches/patch-as
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-as,v 1.3 2004/11/07 12:57:37 markd Exp $
-
---- config/cf/sunLib.tmpl.orig	2003-07-12 10:17:41.000000000 +1200
-+++ config/cf/sunLib.tmpl
-@@ -57,6 +57,17 @@ XCOMM $XFree86: xc/config/cf/sunLib.tmpl
- # define SharedXrenderReqs $(LDPRELIB) $(XLIB)
- # define FixupLibReferences() /**/
- 
-+#define SharedX11Reqs $(LDPRELIB) -lsocket -lnsl
-+#define SharedXlibi18nReqs $(LDPRELIB) $(XONLYLIB)
-+#define SharedOldXReqs $(LDPRELIBS) $(XONLYLIB)
-+#define SharedXtReqs $(LDPRELIBS) $(XONLYLIB) $(SMLIB) $(ICELIB)
-+#define SharedXaw6Reqs $(LDPRELIBS) $(XMULIB) $(XTOOLLIB) $(XLIB)
-+#define SharedXawReqs $(LDPRELIBS) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
-+#define SharedXextReqs $(LDPRELIBS) $(XONLYLIB)
-+#define SharedXiReqs $(LDPRELIBS) $(XLIB)
-+#define SharedXtstReqs $(LDPRELIBS) $(XLIB)
-+#define SharedSMReqs $(LDPRELIBS) $(ICELIB)
-+
- # define SharedPamReqs -ldl
- # define SharedPamUnixReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) -lnsl -lmp -lcmd SharedThreadReqs
- # define SharedPamSampleReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) SharedThreadReqs
diff --git a/x11/XFree86-libs/patches/patch-at b/x11/XFree86-libs/patches/patch-at
deleted file mode 100644
index 9056ef98577..00000000000
--- a/x11/XFree86-libs/patches/patch-at
+++ /dev/null
@@ -1,187 +0,0 @@
-$NetBSD: patch-at,v 1.3 2005/09/18 19:51:55 xtraeme Exp $
-
-Single patch to fix CAN-2005-2495.
-
---- programs/Xserver/afb/afbpixmap.c.orig	Fri Apr 23 20:59:39 2004
-+++ programs/Xserver/afb/afbpixmap.c	Sun Sep 18 04:56:02 2005
-@@ -73,10 +73,14 @@
- 	int				depth;
- {
- 	PixmapPtr pPixmap;
--	int datasize;
--	int paddedWidth;
-+	size_t datasize;
-+	size_t paddedWidth;
- 
- 	paddedWidth = BitmapBytePad(width);
-+
-+	if (paddedWidth > 32767 || height > 32767 || depth > 4)
-+	    return NullPixmap;
-+	
- 	datasize = height * paddedWidth * depth;
- 	pPixmap = AllocatePixmap(pScreen, datasize);
- 	if (!pPixmap)
---- programs/Xserver/cfb/cfbpixmap.c.orig	Fri Apr 23 21:00:12 2004
-+++ programs/Xserver/cfb/cfbpixmap.c	Sun Sep 18 04:56:02 2005
-@@ -70,10 +70,13 @@
-     int		depth;
- {
-     PixmapPtr pPixmap;
--    int datasize;
--    int paddedWidth;
-+    size_t datasize;
-+    size_t paddedWidth;
- 
-     paddedWidth = PixmapBytePad(width, depth);
-+
-+    if (paddedWidth / 4 > 32767 || height > 32767)
-+	return NullPixmap;
-     datasize = height * paddedWidth;
-     pPixmap = AllocatePixmap(pScreen, datasize);
-     if (!pPixmap)
---- programs/Xserver/dix/dispatch.c.orig	Mon Dec 13 02:23:05 2004
-+++ programs/Xserver/dix/dispatch.c	Sun Sep 18 04:56:02 2005
-@@ -1506,6 +1506,23 @@
- 	client->errorValue = 0;
-         return BadValue;
-     }
-+    if (stuff->width > 32767 || stuff->height > 32767)
-+    {
-+	/* It is allowed to try and allocate a pixmap which is larger than
-+	 * 32767 in either dimension. However, all of the framebuffer code
-+	 * is buggy and does not reliably draw to such big pixmaps, basically
-+	 * because the Region data structure operates with signed shorts
-+	 * for the rectangles in it.
-+	 *
-+	 * Furthermore, several places in the X server computes the
-+	 * size in bytes of the pixmap and tries to store it in an
-+	 * integer. This integer can overflow and cause the allocated size
-+	 * to be much smaller.
-+	 *
-+	 * So, such big pixmaps are rejected here with a BadAlloc
-+	 */
-+	return BadAlloc;
-+    }
-     if (stuff->depth != 1)
-     {
-         pDepth = pDraw->pScreen->allowedDepths;
---- programs/Xserver/dix/pixmap.c.orig	Fri Apr 23 21:04:44 2004
-+++ programs/Xserver/dix/pixmap.c	Sun Sep 18 04:56:02 2005
-@@ -126,6 +126,9 @@
-     unsigned size;
-     int i;
- 
-+    if (pScreen->totalPixmapSize > ((size_t)-1) - pixDataSize)
-+	return NullPixmap;
-+    
-     pPixmap = (PixmapPtr)xalloc(pScreen->totalPixmapSize + pixDataSize);
-     if (!pPixmap)
- 	return NullPixmap;
---- programs/Xserver/fb/fbpixmap.c.orig	Mon Aug  9 05:40:50 2004
-+++ programs/Xserver/fb/fbpixmap.c	Sun Sep 18 04:56:02 2005
-@@ -32,12 +32,14 @@
- fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp)
- {
-     PixmapPtr	pPixmap;
--    int		datasize;
--    int		paddedWidth;
-+    size_t	datasize;
-+    size_t	paddedWidth;
-     int		adjust;
-     int		base;
- 
-     paddedWidth = ((width * bpp + FB_MASK) >> FB_SHIFT) * sizeof (FbBits);
-+    if (paddedWidth / 4 > 32767 || height > 32767)
-+	return NullPixmap;
-     datasize = height * paddedWidth;
- #ifdef PIXPRIV
-     base = pScreen->totalPixmapSize;
---- programs/Xserver/hw/xfree86/xaa/xaaInit.c.orig	Fri Jul 30 22:30:56 2004
-+++ programs/Xserver/hw/xfree86/xaa/xaaInit.c	Sun Sep 18 04:56:02 2005
-@@ -498,6 +498,9 @@
-     XAAPixmapPtr pPriv;
-     PixmapPtr pPix = NULL;
-     int size = w * h;
-+
-+    if (w > 32767 || h > 32767)
-+	return NullPixmap;
-     
-     if (!infoRec->offscreenDepthsInitialized)
- 	XAAInitializeOffscreenDepths (pScreen);
---- programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c.orig	Fri Apr 23 21:54:17 2004
-+++ programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c	Sun Sep 18 04:56:02 2005
-@@ -85,7 +85,7 @@
-     int		depth ;
- {
-     register PixmapPtr pPixmap  = (PixmapPtr)NULL;
--    int size ;
-+    size_t size ;
-     
-     TRACE(("xf4bppCreatePixmap(pScreen=0x%x, width=%d, height=%d, depth=%d)\n", pScreen, width, height, depth)) ;
- 
-@@ -93,6 +93,10 @@
- 	return (PixmapPtr) NULL ;
- 
-     size = PixmapBytePad(width, depth);
-+
-+    if (size / 4 > 32767 || height > 32767)
-+	return (PixmapPtr) NULL ;
-+    
-     pPixmap = AllocatePixmap (pScreen, (height * size));
-     
-     if ( !pPixmap )
---- programs/Xserver/ilbm/ilbmpixmap.c.orig	Fri Apr 23 21:54:22 2004
-+++ programs/Xserver/ilbm/ilbmpixmap.c	Sun Sep 18 04:56:02 2005
-@@ -75,10 +75,12 @@
- 	int				depth;
- {
- 	PixmapPtr pPixmap;
--	int datasize;
--	int paddedWidth;
-+	size_t datasize;
-+	size_t paddedWidth;
- 
- 	paddedWidth = BitmapBytePad(width);
-+	if (paddedWidth > 32767 || height > 32767 || depth > 4)
-+		return NullPixmap;
- 	datasize = height * paddedWidth * depth;
- 	pPixmap = AllocatePixmap(pScreen, datasize);
- 	if (!pPixmap)
---- programs/Xserver/iplan2p4/iplpixmap.c.orig	Fri Apr 23 21:54:24 2004
-+++ programs/Xserver/iplan2p4/iplpixmap.c	Sun Sep 18 04:56:02 2005
-@@ -74,12 +74,14 @@
-     int		depth;
- {
-     PixmapPtr pPixmap;
--    int datasize;
--    int paddedWidth;
-+    size_t datasize;
-+    size_t paddedWidth;
-     int ipad=INTER_PLANES*2 - 1;
- 
-     paddedWidth = PixmapBytePad(width, depth);
-     paddedWidth = (paddedWidth + ipad) & ~ipad;
-+    if (paddedWidth / 4 > 32767 || height > 32767)
-+	return NullPixmap;
-     datasize = height * paddedWidth;
-     pPixmap = AllocatePixmap(pScreen, datasize);
-     if (!pPixmap)
---- programs/Xserver/mfb/mfbpixmap.c.orig	Fri Nov 14 17:48:57 2003
-+++ programs/Xserver/mfb/mfbpixmap.c	Sun Sep 18 04:56:02 2005
-@@ -72,12 +72,14 @@
-     int		depth;
- {
-     PixmapPtr pPixmap;
--    int datasize;
--    int paddedWidth;
-+    size_t datasize;
-+    size_t paddedWidth;
- 
-     if (depth != 1)
- 	return NullPixmap;
-     paddedWidth = BitmapBytePad(width);
-+    if (paddedWidth / 4 > 32767 || height > 32767)
-+	return NullPixmap;
-     datasize = height * paddedWidth;
-     pPixmap = AllocatePixmap(pScreen, datasize);
-     if (!pPixmap)
diff --git a/x11/XFree86-libs/patches/patch-au b/x11/XFree86-libs/patches/patch-au
deleted file mode 100644
index b83a72e8968..00000000000
--- a/x11/XFree86-libs/patches/patch-au
+++ /dev/null
@@ -1,106 +0,0 @@
-$NetBSD: patch-au,v 1.4 2006/09/04 20:48:04 adrianp Exp $
-
-Security fix for SA21446, adapted from X.org.
-
---- lib/font/bitmap/pcfread.c.orig	2003-11-18 02:17:04.000000000 +0100
-+++ lib/font/bitmap/pcfread.c	2006-08-22 16:31:30.000000000 +0200
-@@ -32,6 +32,8 @@ from The Open Group.
-  * Author:  Keith Packard, MIT X Consortium
-  */
- 
-+#include <stdint.h>
-+
- #include "fntfilst.h"
- #include "bitmap.h"
- #include "pcf.h"
-@@ -129,6 +131,10 @@ pcfReadTOC(FontFilePtr file, int *countp
- 	return (PCFTablePtr) NULL;
-     count = pcfGetLSB32(file);
-     if (IS_EOF(file)) return (PCFTablePtr) NULL;
-+    if (count < 0 || count > INT32_MAX / sizeof(PCFTableRec)) {
-+	pcfError("pcfReadTOC(): invalid file format\n");
-+	return NULL;
-+    }
-     tables = (PCFTablePtr) xalloc(count * sizeof(PCFTableRec));
-     if (!tables) {
-       pcfError("pcfReadTOC(): Couldn't allocate tables (%d*%d)\n", count, sizeof(PCFTableRec));
-@@ -248,6 +254,10 @@ pcfGetProperties(FontInfoPtr pFontInfo, 
-     if (!PCF_FORMAT_MATCH(format, PCF_DEFAULT_FORMAT))
- 	goto Bail;
-     nprops = pcfGetINT32(file, format);
-+    if (nprops <= 0 || nprops > INT32_MAX / sizeof(FontPropRec)) {
-+	pcfError("pcfGetProperties(): invalid nprops value (%d)\n", nprops);
-+	goto Bail;
-+    }
-     if (IS_EOF(file)) goto Bail;
-     props = (FontPropPtr) xalloc(nprops * sizeof(FontPropRec));
-     if (!props) {
-@@ -263,6 +273,13 @@ pcfGetProperties(FontInfoPtr pFontInfo, 
- 	props[i].name = pcfGetINT32(file, format);
- 	isStringProp[i] = pcfGetINT8(file, format);
- 	props[i].value = pcfGetINT32(file, format);
-+	if (props[i].name < 0 
-+	    || (isStringProp[i] != 0 && isStringProp[i] != 1)
-+	    || (isStringProp[i] && props[i].value < 0)) {
-+	    pcfError("pcfGetProperties(): invalid file format %d %d %d\n",
-+		     props[i].name, isStringProp[i], props[i].value);
-+	    goto Bail;
-+	}
- 	if (IS_EOF(file)) goto Bail;
-     }
-     /* pad the property array */
-@@ -278,6 +295,7 @@ pcfGetProperties(FontInfoPtr pFontInfo, 
-     }
-     if (IS_EOF(file)) goto Bail;
-     string_size = pcfGetINT32(file, format);
-+    if (string_size < 0) goto Bail;
-     if (IS_EOF(file)) goto Bail;
-     strings = (char *) xalloc(string_size);
-     if (!strings) {
-@@ -418,6 +436,10 @@ pcfReadFont(FontPtr pFont, FontFilePtr f
-     else
- 	nmetrics = pcfGetINT16(file, format);
-     if (IS_EOF(file)) goto Bail;
-+    if (nmetrics < 0 || nmetrics > INT32_MAX / sizeof(CharInfoRec)) {
-+	pcfError("pcfReadFont(): invalid file format\n");
-+	goto Bail;
-+    }
-     metrics = (CharInfoPtr) xalloc(nmetrics * sizeof(CharInfoRec));
-     if (!metrics) {
-       pcfError("pcfReadFont(): Couldn't allocate metrics (%d*%d)\n", nmetrics, sizeof(CharInfoRec));
-@@ -443,7 +465,7 @@ pcfReadFont(FontPtr pFont, FontFilePtr f
-     nbitmaps = pcfGetINT32(file, format);
-     if (nbitmaps != nmetrics || IS_EOF(file))
- 	goto Bail;
--
-+    /* nmetrics is already ok, so nbitmap also is */
-     offsets = (CARD32 *) xalloc(nbitmaps * sizeof(CARD32));
-     if (!offsets) {
-       pcfError("pcfReadFont(): Couldn't allocate offsets (%d*%d)\n", nbitmaps, sizeof(CARD32));
-@@ -457,6 +479,7 @@ pcfReadFont(FontPtr pFont, FontFilePtr f
-     for (i = 0; i < GLYPHPADOPTIONS; i++) {
- 	bitmapSizes[i] = pcfGetINT32(file, format);
- 	if (IS_EOF(file)) goto Bail;
-+	if (bitmapSizes[i] < 0) goto Bail;
-     }
-     
-     sizebitmaps = bitmapSizes[PCF_GLYPH_PAD_INDEX(format)];
-@@ -532,6 +555,7 @@ pcfReadFont(FontPtr pFont, FontFilePtr f
- 	if (IS_EOF(file)) goto Bail;
- 	if (nink_metrics != nmetrics)
- 	    goto Bail;
-+	/* nmetrics already checked */
- 	ink_metrics = (xCharInfo *) xalloc(nink_metrics * sizeof(xCharInfo));
-       if (!ink_metrics) {
-           pcfError("pcfReadFont(): Couldn't allocate ink_metrics (%d*%d)\n", nink_metrics, sizeof(xCharInfo));       
-@@ -805,6 +829,10 @@ pmfReadFont(FontPtr pFont, FontFilePtr f
-     else
- 	nmetrics = pcfGetINT16(file, format);
-     if (IS_EOF(file)) goto Bail;
-+    if (nmetrics < 0 || nmetrics > INT32_MAX / sizeof(CharInfoRec)) {
-+	pcfError("pmfReadFont(): invalid file format\n");
-+	goto Bail;
-+    }
-     metrics = (CharInfoPtr) xalloc(nmetrics * sizeof(CharInfoRec));
-     if (!metrics) {
-       pcfError("pmfReadFont(): Couldn't allocate metrics (%d*%d)\n", nmetrics, sizeof(CharInfoRec));
diff --git a/x11/XFree86-libs/patches/patch-av b/x11/XFree86-libs/patches/patch-av
deleted file mode 100644
index 64232e7be70..00000000000
--- a/x11/XFree86-libs/patches/patch-av
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-av,v 1.3 2006/09/16 08:28:36 adrianp Exp $
-
---- lib/font/Type1/afm.c.orig	2001-08-27 20:49:52.000000000 +0100
-+++ lib/font/Type1/afm.c
-@@ -30,6 +30,8 @@
- #include "fontmisc.h"			/* for xalloc/xfree */
- #include "AFM.h"
- 
-+#include <limits.h>
-+
- #define PBUF 256
- #define KBUF 20
- 
-@@ -111,6 +113,11 @@ int CIDAFM(FILE *fd, FontInfo **pfi) {
-             
-             fi->nChars = atoi(p);
- 
-+	    if (fi->nChars < 0 || fi->nChars > INT_MAX / sizeof(Metrics)) {
-+		xfree(afmbuf);
-+		xfree(fi);
-+		return(1);
-+	    }
-             fi->metrics = (Metrics *)xalloc(fi->nChars * 
-                 sizeof(Metrics));
-             if (fi->metrics == NULL) {
diff --git a/x11/XFree86-libs/patches/patch-aw b/x11/XFree86-libs/patches/patch-aw
deleted file mode 100644
index 7708823991c..00000000000
--- a/x11/XFree86-libs/patches/patch-aw
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD: patch-aw,v 1.3 2006/09/16 08:28:36 adrianp Exp $
-
---- lib/font/Type1/scanfont.c.orig	2003-11-29 04:55:28.000000000 +0000
-+++ lib/font/Type1/scanfont.c
-@@ -64,6 +64,8 @@
- #include "spaces.h"
- #include "fontfcn.h"
- #include "blues.h"
-+
-+#include <limits.h>
-  
- #ifdef BUILDCID
- #define CID_BUFSIZE 80
-@@ -646,6 +648,7 @@ getFDArray(psobj *arrayP)
-   arrayP->data.valueP = tokenStartP;
- 
-   /* allocate FDArray */
-+  /* No integer overflow since arrayP->len is unsigned short */
-   FDArrayP = (psfont *)vm_alloc(arrayP->len*(sizeof(psfont)));
-   if (!(FDArrayP)) return(SCAN_OUT_OF_MEMORY);
- 
-@@ -842,7 +845,8 @@ BuildSubrs(psfont *FontP)
-      }
-      return(SCAN_OK);
-    }
-- 
-+   if (N > INT_MAX / sizeof(psobj)) 
-+       return (SCAN_ERROR);
-    arrayP = (psobj *)vm_alloc(N*sizeof(psobj));
-    if (!(arrayP) ) return(SCAN_OUT_OF_MEMORY);
-    FontP->Subrs.len = N;
-@@ -903,7 +907,7 @@ BuildCharStrings(psfont *FontP)
-      }
-      else return(rc);  /* if next token was not an Int */
-    }
--   if (N<=0) return(SCAN_ERROR);
-+   if (N<=0 || N > INT_MAX / sizeof(psdict)) return(SCAN_ERROR);
-    /* save number of entries in the dictionary */
-  
-    dictP = (psdict *)vm_alloc((N+1)*sizeof(psdict));
-@@ -1711,6 +1715,10 @@ scan_cidfont(cidfont *CIDFontP, cmapres 
-     if (tokenType == TOKEN_INTEGER)
-       rangecnt = tokenValue.integer;
- 
-+    if (rangecnt < 0 || rangecnt > INT_MAX / sizeof(spacerangecode)) {
-+	rc = SCAN_ERROR;
-+	break;
-+    }
-     /* ==> tokenLength, tokenTooLong, tokenType, and */
-     /* tokenValue are now set                        */
- 
diff --git a/x11/XFree86-libs/patches/patch-ax b/x11/XFree86-libs/patches/patch-ax
deleted file mode 100644
index c84df7fa585..00000000000
--- a/x11/XFree86-libs/patches/patch-ax
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ax,v 1.3 2006/09/16 08:28:36 adrianp Exp $
-
---- lib/font/Type1/util.c.orig	2001-01-17 19:43:24.000000000 +0000
-+++ lib/font/Type1/util.c
-@@ -97,7 +97,7 @@ vm_alloc(int bytes)
-   bytes = (bytes + 7) & ~7;
-  
-   /* Allocate the space, if it is available */
--  if (bytes <= vm_free) {
-+  if (bytes > 0 && bytes <= vm_free) {
-     answer = vm_next;
-     vm_free -= bytes;
-     vm_next += bytes;
diff --git a/x11/XFree86-libs/version.mk b/x11/XFree86-libs/version.mk
deleted file mode 100644
index cd5fbc70e28..00000000000
--- a/x11/XFree86-libs/version.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-# $NetBSD: version.mk,v 1.2 2005/06/20 22:13:10 jlam Exp $
-#
-# This Makefile fragment is included by Makefiles that need to access
-# the X11_TYPE and version number of a XFree86 distribution.
-#
-# The following variables are provided by this file:
-#
-#    BUILTIN_X11_TYPE.XFree86 is the X11_TYPE of the XFree86 distribution
-#	and is simply "XFree86".
-#
-#    BUILTIN_X11_VERSION.XFree86 is the version number of the XFree86
-#	distribution detected on the system.
-#
-
-BUILTIN_X11_TYPE.XFree86=	XFree86
-
-BUILTIN_FIND_FILES_VAR:=		CF_XFREE86 CF_XFREE86_VERSION
-BUILTIN_FIND_FILES.CF_XFREE86=		${X11BASE}/lib/X11/config/xfree86.cf
-BUILTIN_FIND_FILES.CF_XFREE86_VERSION=	${X11BASE}/lib/X11/config/version.def
-.include "../../mk/buildlink3/find-files.mk"
-
-.if !defined(BUILTIN_X11_VERSION.XFree86) && \
-    exists(${CF_XFREE86}) && exists(${CF_XFREE86_VERSION})
-BUILTIN_X11_VERSION.XFree86!=						\
-	${AWK} '/\#define[ 	]*XF86_VERSION_MAJOR/ { M = $$3 }	\
-		/\#define[ 	]*XF86_VERSION_MINOR/ { m = "."$$3 }	\
-		/\#define[ 	]*XF86_VERSION_PATCH/ { p = "."$$3 }	\
-		/\#define[ 	]*XF86_VERSION_SNAP/ { s = "."$$3 }	\
-		/\#define[ 	]*XFree86Version/ {			\
-			V = $$3;					\
-			if (M == "") M = int(V / 1000) % 10;		\
-			if (m == "") m = "."(int(V / 100) % 10);	\
-			if (p == "") p = "."(int(V / 10) % 10);		\
-			if (s == "") s = "."(V % 10);			\
-		}							\
-		END { if (s == ".0") s = "";				\
-		      if (p == ".0" && s == "") p = "";			\
-		      printf "%s%s%s%s\n", M, m, p, s }'		\
-		${CF_XFREE86_VERSION}
-.endif
-MAKEVARS+=	BUILTIN_X11_VERSION.XFree86