On second thought, this can be fixed in xorg-server.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7166 df743ca5-7f9a-e211-a948-0013205c9059

27 files changed, 0 insertions, 1420 deletions

diff --git a/x11/xorg-libraries/Makefile b/x11/xorg-libraries/Makefile
deleted file mode 100644
index 85ddf239b..000000000
--- a/x11/xorg-libraries/Makefile
+++ /dev/null
@@ -1,72 +0,0 @@
-# New ports collection makefile for:    xorg-libraries
-# Date created:		29 May 2004
-# Whom:			anholt@FreeBSD.org
-#
-# $FreeBSD: ports/x11/xorg-libraries/Makefile,v 1.15 2006/01/21 18:55:04 lesi Exp $
-#
-
-PORTNAME=	xorg-libraries
-PORTVERSION=	6.9.0
-CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR=	X11R${PORTVERSION}/src
-DISTFILES=	X11R${PORTVERSION}-src1.tar.gz \
-		X11R${PORTVERSION}-src3.tar.gz
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X11 libraries and headers from X.Org
-
-LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm \
-		freetype.9:${PORTSDIR}/print/freetype2 \
-		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
-
-CONFLICTS=	Mesa-* XFree86-libraries-* \
-		libX11-* libGL-* libGLU-* libICE-* libSM-* libXau-* libXaw-* \
-		libXcursor-* libXdmcp-* libXext-* libXfont-* libXi-* \
-		libXinerama-* libXmu-* libXp-* libXpm-* libXrandr-* \
-		libXrender-* libXres-* libXt-* libXv-* libXxf86-* libxkbfile-* \
-		panoramixext-* printext-* randrext-* renderext-* resourceext-* \
-		xextensions-* xf86ext-* xlibs-* xpm-* xproto-*
-
-EXTRA_PATCHES=	${CF_PATCHES}
-
-XBUILD_DIRS=	lib nls programs/Xserver/include \
-		programs/Xserver/hw/xfree86/parser
-XINSTALL_DIRS=	include lib nls programs/Xserver/include \
-		programs/Xserver/hw/xfree86/parser
-
-INSTALLS_SHLIB=	yes
-
-post-patch:
-	${CP} ${FILESDIR}/nls-Compose-microsoft-cp1251 ${WRKSRC}/nls/Compose/microsoft-cp1251
-	${MKDIR} ${WRKSRC}/lib/XThrStub
-	${CP} ${FILESDIR}/XThrStub-Imakefile ${WRKSRC}/lib/XThrStub/Imakefile
-
-post-install:
-	${MKDIR} ${PREFIX}/libdata/pkgconfig
-	${INSTALL_DATA} ${WRKSRC}/lib/Xcursor/xcursor.pc \
-		${PREFIX}/libdata/pkgconfig
-
-.include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc"
-.include <bsd.port.pre.mk>
-
-.if ${X_WINDOW_SYSTEM:L} != xorg
-IGNORE=	is part of X.Org and you have ${X_WINDOW_SYSTEM} set for X11\
-	distribution. See The X Window System and Virtual Consoles chapter\
-	of FAQ for more information
-.endif
-
-# BuildXF86DRI is false for FreeBSD < 4.1
-.if ${OSVERSION} < 410000
-PLIST_SUB+=	OSMESA:="@comment "
-.else
-PLIST_SUB+=	OSMESA:=""
-.endif
-
-.if ${OSVERSION} >= 500043
-PLIST_SUB+=	XTHRSTUB:="@comment "
-.else
-PLIST_SUB+=	XTHRSTUB:=""
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/x11/xorg-libraries/distinfo b/x11/xorg-libraries/distinfo
deleted file mode 100644
index 177370c87..000000000
--- a/x11/xorg-libraries/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 (xorg/X11R6.9.0-src1.tar.gz) = 9cd255a090e81e2c62637122794e6150
-SHA256 (xorg/X11R6.9.0-src1.tar.gz) = 30502fd1074ee7d782bae084c8c9b4872dcbf16dc45a2b944c6d0fc0e0c1a60c
-SIZE (xorg/X11R6.9.0-src1.tar.gz) = 33460996
-MD5 (xorg/X11R6.9.0-src3.tar.gz) = 4d5450bde835270632e004b25e45ef33
-SHA256 (xorg/X11R6.9.0-src3.tar.gz) = 6c55602a0d6476457d3cf6a1413c39d63c70ca9255749bff5502dae9414f9971
-SIZE (xorg/X11R6.9.0-src3.tar.gz) = 10872474
diff --git a/x11/xorg-libraries/files/XThrStub-Imakefile b/x11/xorg-libraries/files/XThrStub-Imakefile
deleted file mode 100644
index 83e850325..000000000
--- a/x11/xorg-libraries/files/XThrStub-Imakefile
+++ /dev/null
@@ -1,35 +0,0 @@
-#define DoNormalLib NormalLibXThrStub
-#define DoSharedLib SharedLibXThrStub
-#define DoExtraLib SharedLibXThrStub
-#define DoDebugLib DebugLibXThrStub
-#define DoProfileLib ProfileLibXThrStub
-#define LibName XThrStub
-#define SoRev SOXTHRSTUBREV
-#define LibHeaders NO
-
-#include <Threads.tmpl>
-
-#ifdef SharedXThrStubReqs
-REQUIREDLIBS = SharedXThrStubReqs
-#endif
-
-#if NeedUIThrStubs
-STUBSRCS = UIThrStubs.c
-STUBOBJS = UIThrStubs.o
-#endif
-
-#if Malloc0ReturnsNull
-ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
-#endif
-
-      DEFINES = $(ALLOC_DEFINES)
-     INCLUDES = 
-         SRCS = $(STUBSRCS)
-         OBJS = $(STUBOBJS)
-     LINTLIBS = $(LINTXLIB)
-
-#include <Library.tmpl>
-
-DependTarget()
-
-LinkSourceFile(UIThrStubs.c,$(XTOP)/lib/X11)
diff --git a/x11/xorg-libraries/files/nls-Compose-microsoft-cp1251 b/x11/xorg-libraries/files/nls-Compose-microsoft-cp1251
deleted file mode 100644
index b7218bdbc..000000000
--- a/x11/xorg-libraries/files/nls-Compose-microsoft-cp1251
+++ /dev/null
@@ -1,15 +0,0 @@
-XCOMM
-XCOMM microsoft-cp1251 Compose Sequence
-XCOMM
-XCOMM Sequence Definition
-XCOMM
-XCOMM $XFree86$
-XCOMM
-XCOMM This file currently has no entries.  It appears that a compose file (even
-XCOMM just an empty one) is required for the appropriate keysyms to work for
-XCOMM this encoding.
-XCOMM
-XCOMM <Multi_key> Means <Compose>
-XCOMM Special Character
-
-XCOMM End of Sequence Definition
diff --git a/x11/xorg-libraries/files/patch-Compose-Imakefile b/x11/xorg-libraries/files/patch-Compose-Imakefile
deleted file mode 100644
index d1b90e4a9..000000000
--- a/x11/xorg-libraries/files/patch-Compose-Imakefile
+++ /dev/null
@@ -1,10 +0,0 @@
---- nls/Compose/Imakefile.orig	Mon Jun  3 22:19:43 2002
-+++ nls/Compose/Imakefile	Sat Jan 11 01:00:46 2003
-@@ -54,6 +54,7 @@
- ComposeTarget(koi8-r)
- ComposeTarget(koi8-u)
- ComposeTarget(koi8-c)
-+ComposeTarget(microsoft-cp1251)
- ComposeTarget(mulelao-1)
- ComposeTarget(vi_VN.tcvn)
- ComposeTarget(vi_VN.viscii)
diff --git a/x11/xorg-libraries/files/patch-GL-GL-Imakefile b/x11/xorg-libraries/files/patch-GL-GL-Imakefile
deleted file mode 100644
index 69f1eb2c4..000000000
--- a/x11/xorg-libraries/files/patch-GL-GL-Imakefile
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: lib/GL/GL/Imakefile
-===================================================================
-RCS file: /cvs/xorg/xc/lib/GL/GL/Imakefile,v
-retrieving revision 1.5
-diff -u -r1.5 Imakefile
---- lib/GL/GL/Imakefile	23 Jul 2004 05:25:39 -0000	1.5
-+++ lib/GL/GL/Imakefile	29 Dec 2004 20:51:25 -0000
-@@ -209,8 +209,12 @@
-        POBJS = $(GLXPOBJS) $(DRIPOBJS) $(DRVPOBJS) $(DRMPOBJS)
- 
- #if LocalThreads
-+#if NeedUIThrStubs
-+  THREADOBJS = $(LDPRELIB) $(XTHRSTUBLIB)
-+#else
-   THREADOBJS = $(THREADS_LIBS)
- #endif
-+#endif
- 
- #include <Library.tmpl>
- 
diff --git a/x11/xorg-libraries/files/patch-GL-Imakefile b/x11/xorg-libraries/files/patch-GL-Imakefile
deleted file mode 100644
index 7d2bb0b12..000000000
--- a/x11/xorg-libraries/files/patch-GL-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/GL/Imakefile.orig	Fri May 28 00:23:23 2004
-+++ lib/GL/Imakefile	Fri May 28 00:23:52 2004
-@@ -110,7 +110,7 @@
- #if BuildXF86DRI && GlxUseBuiltInDRIDriver
- SUBDIRS = $(MESADIRS) $(DRIDIRS) $(DRIVERDIRS) $(GLXDIRS) $(LIBGLBUILDDIR) $(OSMESADIRS)
- #else
--SUBDIRS = $(MESADIRS) $(GLXDIRS) $(DRIDIRS) $(LIBGLBUILDDIR) $(OSMESADIRS) $(DRIVERDIRS)
-+SUBDIRS = $(MESADIRS) $(GLXDIRS) $(DRIDIRS) $(LIBGLBUILDDIR) $(OSMESADIRS)
- #endif
- 
- MakeSubdirs($(SUBDIRS))
diff --git a/x11/xorg-libraries/files/patch-GL-dri-drm-Imakefile b/x11/xorg-libraries/files/patch-GL-dri-drm-Imakefile
deleted file mode 100644
index 21c89aa62..000000000
--- a/x11/xorg-libraries/files/patch-GL-dri-drm-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/GL/dri/drm/Imakefile.orig	Sat Dec 24 01:07:33 2005
-+++ lib/GL/dri/drm/Imakefile	Sat Dec 24 01:08:59 2005
-@@ -16,7 +16,7 @@
- 		-I$(XF86OSSRC)/$(OS_SUBDIR)/drm \
- 		-I$(DRMSRCDIR)/$(OS_SUBDIR)-core \
- 		-I$(DRMSRCDIR)/$(OS_SUBDIR2)-core \
--		-I$(XF86OSSRC) -I$(DRMSRCDIR)/shared-core
-+		-I$(XF86OSSRC) -I$(DRMSRCDIR)/shared-core -I$(LOCALBASE)/include
-          SRCS = xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c
-          OBJS = xf86drm.o xf86drmHash.o xf86drmRandom.o xf86drmSL.o
- 
diff --git a/x11/xorg-libraries/files/patch-GL-glx-Imakefile b/x11/xorg-libraries/files/patch-GL-glx-Imakefile
deleted file mode 100644
index 20affa227..000000000
--- a/x11/xorg-libraries/files/patch-GL-glx-Imakefile
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/GL/glx/Imakefile.orig	Sat Dec 24 00:52:20 2005
-+++ lib/GL/glx/Imakefile	Sat Dec 24 00:54:30 2005
-@@ -212,6 +212,7 @@
- 		-I$(MESASRCDIR)/src/mesa/drivers/x11 \
- 		-I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \
- 		-I$(XF86OSSRC) \
-+		-I$(LOCALBASE)/include \
- 		-I$(DRMSRCDIR)/shared-core \
- 		$(DRI_INCS)
- 
diff --git a/x11/xorg-libraries/files/patch-X11-Imakefile b/x11/xorg-libraries/files/patch-X11-Imakefile
deleted file mode 100644
index f8bba66d3..000000000
--- a/x11/xorg-libraries/files/patch-X11-Imakefile
+++ /dev/null
@@ -1,12 +0,0 @@
---- lib/X11/Imakefile.orig	Wed Dec 29 13:44:54 2004
-+++ lib/X11/Imakefile	Wed Dec 29 13:46:19 2004
-@@ -126,8 +126,7 @@
-          K5INCL = Krb5Includes
-          K5DEFS = Krb5Defines
- #endif
--#if (defined(FreeBSDArchitecture) && OSRelVersion < 500016) || \
--	defined(OpenBSDArchitecture)
-+#if (defined(OpenBSDArchitecture))
- THRSTUBSRCS = UIThrStubs.c
- THRSTUBOBJS = UIThrStubs.o
- #endif
diff --git a/x11/xorg-libraries/files/patch-Xau-Imakefile b/x11/xorg-libraries/files/patch-Xau-Imakefile
deleted file mode 100644
index 70119d9da..000000000
--- a/x11/xorg-libraries/files/patch-Xau-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Xau/Imakefile.orig	Wed Apr 14 19:40:56 2004
-+++ lib/Xau/Imakefile	Wed Apr 14 19:42:08 2004
-@@ -11,6 +11,8 @@
- #define DoDebugLib DebugLibXau
- #define DoProfileLib ProfileLibXau
- #define LibName Xau
-+#define DoSharedLib YES
-+SOXAUTHREV = 0.0
- #define SoRev SOXAUTHREV
- #define IncSubdir X11
- 
diff --git a/x11/xorg-libraries/files/patch-Xcomposite-Imakefile b/x11/xorg-libraries/files/patch-Xcomposite-Imakefile
deleted file mode 100644
index 5aab74346..000000000
--- a/x11/xorg-libraries/files/patch-Xcomposite-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Xcomposite/Imakefile.orig	Fri Oct  1 17:42:38 2004
-+++ lib/Xcomposite/Imakefile	Fri Oct  1 17:43:22 2004
-@@ -61,7 +61,7 @@
- 	RemoveFile($@)
- 	sh ../Xcursor/config-subst $(SUBSTVARS) < xcomposite.pc.in > $@
- 
--InstallNonExecFile(xcomposite.pc,$(USRLIBDIR)/pkgconfig)
-+InstallNonExecFile(xcomposite.pc,$(PROJECTROOT)/libdata/pkgconfig)
- 
- clean::
- 	RemoveFile(xcomposite.pc)
diff --git a/x11/xorg-libraries/files/patch-Xcursor-Imakefile b/x11/xorg-libraries/files/patch-Xcursor-Imakefile
deleted file mode 100644
index 2d12831b0..000000000
--- a/x11/xorg-libraries/files/patch-Xcursor-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Xcursor/Imakefile.orig	Fri May 28 11:20:24 2004
-+++ lib/Xcursor/Imakefile	Fri May 28 11:20:43 2004
-@@ -87,7 +87,7 @@
- 	RemoveFile($@)
- 	sh config-subst $(SUBSTVARS) < xcursor.pc.in > $@
- 
--InstallNonExecFile(xcursor.pc,$(USRLIBDIR)/pkgconfig)
-+InstallNonExecFile(xcursor.pc,$(PROJECTROOT)/libdata/pkgconfig)
- 
- clean::
- 	RemoveFile(xcursor.pc)
diff --git a/x11/xorg-libraries/files/patch-Xdamage-Imakefile b/x11/xorg-libraries/files/patch-Xdamage-Imakefile
deleted file mode 100644
index 316b3ba33..000000000
--- a/x11/xorg-libraries/files/patch-Xdamage-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Xdamage/Imakefile.orig	Fri Oct  1 17:42:44 2004
-+++ lib/Xdamage/Imakefile	Fri Oct  1 17:44:54 2004
-@@ -61,7 +61,7 @@
- 	RemoveFile($@)
- 	sh ../Xcursor/config-subst $(SUBSTVARS) < xdamage.pc.in > $@
- 
--InstallNonExecFile(xdamage.pc,$(USRLIBDIR)/pkgconfig)
-+InstallNonExecFile(xdamage.pc,$(PROJECTROOT)/libdata/pkgconfig)
- 
- clean::
- 	RemoveFile(xdamage.pc)
diff --git a/x11/xorg-libraries/files/patch-Xdmcp-Imakefile b/x11/xorg-libraries/files/patch-Xdmcp-Imakefile
deleted file mode 100644
index 02d5c2928..000000000
--- a/x11/xorg-libraries/files/patch-Xdmcp-Imakefile
+++ /dev/null
@@ -1,17 +0,0 @@
---- lib/Xdmcp/Imakefile.orig	Thu May 27 23:35:23 2004
-+++ lib/Xdmcp/Imakefile	Thu May 27 23:36:09 2004
-@@ -6,12 +6,13 @@
- XCOMM $XFree86: xc/lib/Xdmcp/Imakefile,v 3.4 1999/04/17 09:08:12 dawes Exp $
- 
- #define DoNormalLib NormalLibXdmcp
--#define DoSharedLib SharedLibXdmcp
-+#define DoSharedLib YES
- #define DoExtraLib SharedLibXdmcp
- #define DoDebugLib DebugLibXdmcp
- #define DoProfileLib ProfileLibXdmcp
- #define LibName Xdmcp
- #define SoRev SOXDMCPREV
-+SOXDMCPREV = 0.0
- #define IncSubdir X11
- 
- #if HasXdmAuth
diff --git a/x11/xorg-libraries/files/patch-Xevie-Imakefile b/x11/xorg-libraries/files/patch-Xevie-Imakefile
deleted file mode 100644
index 5c5dcc066..000000000
--- a/x11/xorg-libraries/files/patch-Xevie-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Xevie/Imakefile.orig	Fri Oct  1 17:42:49 2004
-+++ lib/Xevie/Imakefile	Fri Oct  1 17:44:51 2004
-@@ -66,7 +66,7 @@
- 	RemoveFile($@)
- 	sh ../Xcursor/config-subst $(SUBSTVARS) < xevie.pc.in > $@
- 
--InstallNonExecFile(xevie.pc,$(USRLIBDIR)/pkgconfig)
-+InstallNonExecFile(xevie.pc,$(PROJECTROOT)/libdata/pkgconfig)
- 
- clean::
- 	RemoveFile(xevie.pc)
diff --git a/x11/xorg-libraries/files/patch-Xfixes-Imakefile b/x11/xorg-libraries/files/patch-Xfixes-Imakefile
deleted file mode 100644
index eba3ba644..000000000
--- a/x11/xorg-libraries/files/patch-Xfixes-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Xfixes/Imakefile.orig	Fri Oct  1 17:42:54 2004
-+++ lib/Xfixes/Imakefile	Fri Oct  1 17:44:58 2004
-@@ -68,7 +68,7 @@
- 	RemoveFile($@)
- 	sh ../Xcursor/config-subst $(SUBSTVARS) < xfixes.pc.in > $@
- 
--InstallNonExecFile(xfixes.pc,$(USRLIBDIR)/pkgconfig)
-+InstallNonExecFile(xfixes.pc,$(PROJECTROOT)/libdata/pkgconfig)
- 
- clean::
- 	RemoveFile(xfixes.pc)
diff --git a/x11/xorg-libraries/files/patch-XlcDL.c b/x11/xorg-libraries/files/patch-XlcDL.c
deleted file mode 100644
index e58113dd7..000000000
--- a/x11/xorg-libraries/files/patch-XlcDL.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- lib/X11/XlcDL.c.orig	Mon Aug 15 21:55:16 2005
-+++ lib/X11/XlcDL.c	Mon Aug 15 21:56:02 2005
-@@ -56,11 +56,13 @@
- #include "XlcPublic.h"
- #include "XlcPubI.h"
- 
-+#if !defined(__FreeBSD__)
- #if defined(_LP64)  && defined(__sparcv9)
- # define	_MACH64_NAME		"sparcv9"
- #else
- # undef _MACH64_NAME
- #endif /* defined(_LP64)  && defined(__sparcv9) */
-+#endif
- 
- #ifdef _MACH64_NAME
- #  define	_MACH64_NAME_LEN	(sizeof (_MACH64_NAME) - 1)
diff --git a/x11/xorg-libraries/files/patch-Xrender-Imakefile b/x11/xorg-libraries/files/patch-Xrender-Imakefile
deleted file mode 100644
index 804b06c70..000000000
--- a/x11/xorg-libraries/files/patch-Xrender-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Xrender/Imakefile.orig	Sat Oct 16 15:41:02 2004
-+++ lib/Xrender/Imakefile	Sat Oct 16 15:42:35 2004
-@@ -161,7 +161,7 @@
- 	RemoveFile($@)
- 	sh ../Xcursor/config-subst $(SUBSTVARS) < xrender.pc.in > $@
- 
--InstallNonExecFile(xrender.pc,$(USRLIBDIR)/pkgconfig)
-+InstallNonExecFile(xrender.pc,$(PROJECTROOT)/libdata/pkgconfig)
- 
- clean::
- 	RemoveFile(xrender.pc)
diff --git a/x11/xorg-libraries/files/patch-dps-Imakefile b/x11/xorg-libraries/files/patch-dps-Imakefile
deleted file mode 100644
index f85503bf7..000000000
--- a/x11/xorg-libraries/files/patch-dps-Imakefile
+++ /dev/null
@@ -1,30 +0,0 @@
---- lib/dps/Imakefile.orig	Mon May 24 12:06:58 2004
-+++ lib/dps/Imakefile	Fri Sep 10 22:12:26 2004
-@@ -201,8 +201,6 @@
- 
- includes:: $(DPSOPSCFILES) $(PSOPSCFILES) $(HEADERS)
- 
--$(DPSOPSCFILES) $(PSOPSCFILES): HostProgramTargetName($(PSWRAP))
--
- SRCS = \
- 	${COMMONSOURCEFILES} \
- 	${XSOURCEFILES} \
-@@ -224,16 +222,11 @@
- 
- .SUFFIXES: .psw .h
- 
--.psw.c : HostProgramTargetName($(PSWRAP))
-+.psw.c :
- 	RunProgram(PSWRAP,-a -o $*.c -h $*.h $<)
- 
--.psw.h : HostProgramTargetName($(PSWRAP))
-+.psw.h :
- 	RunProgram(PSWRAP,-a -h $*.h $< > /dev/null)
--
--HostProgramTargetName($(PSWRAP)):
--	@echo "checking $@ over in $(PSWRAPSRC) first..."; \
--	test -d $(PSWRAPSRC) && cd $(PSWRAPSRC) && $(MAKE) pswraponly; \
--	echo "okay, continuing in $(CURRENT_DIR)"
- 
- includes :: $(HEADERS)
- depend :: $(DPSOPSCFILES) $(PSOPSCFILES)
diff --git a/x11/xorg-libraries/files/patch-font-FreeType-ftfuncs.c b/x11/xorg-libraries/files/patch-font-FreeType-ftfuncs.c
deleted file mode 100644
index 68e18f831..000000000
--- a/x11/xorg-libraries/files/patch-font-FreeType-ftfuncs.c
+++ /dev/null
@@ -1,231 +0,0 @@
---- lib/font/FreeType/ftfuncs.c.orig	2005-10-23 19:32:05.000000000 +0100
-+++ lib/font/FreeType/ftfuncs.c	2006-06-01 23:21:34.000000000 +0100
-@@ -54,10 +54,7 @@
- #include FT_TYPE1_TABLES_H
- #include FT_XFREE86_H
- #include FT_BBOX_H
--#include FT_INTERNAL_TRUETYPE_TYPES_H
- #include FT_TRUETYPE_TAGS_H
--#include FT_INTERNAL_SFNT_H
--#include FT_INTERNAL_STREAM_H
- /*
-  *  If you want to use FT_Outline_Get_CBox instead of 
-  *  FT_Outline_Get_BBox, define here.
-@@ -123,6 +120,46 @@
- };
- 
- 
-+/* read 2-byte value from a SFNT table */
-+static FT_UShort
-+sfnt_get_ushort( FT_Face     face,
-+                 FT_ULong    table_tag,
-+                 FT_ULong    table_offset )
-+{
-+  FT_Byte    buff[2];
-+  FT_ULong   len = sizeof(buff);
-+  FT_UShort  result = 0;
-+
-+  if ( !FT_Load_Sfnt_Table( face, table_tag, table_offset, buff, &len ) );
-+    result = (FT_UShort)( (buff[0] << 8) | buff[1] );
-+
-+  return result;
-+}
-+
-+#define  sfnt_get_short(f,t,o)  ((FT_Short)sfnt_get_ushort((f),(t),(o)))
-+
-+
-+#if 0
-+static FT_ULong
-+sfnt_get_ulong( FT_Face   face,
-+                FT_ULong  table_tag,
-+                FT_ULong  table_offset )
-+{
-+  FT_Byte    buff[4];
-+  FT_ULong   len = sizeof(buff);
-+  FT_UShort  result = 0;
-+
-+  if  ( !FT_Load_Sfnt_Table( face, table_tag, table_offset, buff, &len );
-+    result = ((FT_ULong)buff[0] << 24) | ((FT_ULong)buff[1] << 16) |
-+             ((FT_ULong)buff[2] << 8)  |  (FT_ULong)buff[3];
-+
-+  return result;
-+}
-+#endif
-+
-+
-+
-+
- static int ftypeInitP = 0;      /* is the engine initialised? */
- FT_Library ftypeLibrary;
- 
-@@ -211,6 +248,10 @@
-         if(maxp && maxp->maxContours == 0)
-             face->bitmap = 1;
-     }
-+
-+    face->num_hmetrics = (FT_UInt) sfnt_get_ushort( face->face,
-+                                                    TTAG_hhea, 34 );
-+
-     /* Insert face in hashtable and return it */
-     face->next = faceTable[bucket];
-     faceTable[bucket] = face;
-@@ -462,6 +503,29 @@
-     }
- 
-     if( FT_IS_SFNT( face->face ) ) {
-+#if 1
-+        FT_F26Dot6  tt_char_width, tt_char_height, tt_dim_x, tt_dim_y;
-+        FT_UInt     nn;
-+
-+        instance->strike_index=0xFFFFU;
-+
-+	tt_char_width  = (int)(trans->scale*(1<<6) + 0.5);
-+	tt_char_height = (int)(trans->scale*(1<<6) + 0.5);
-+
-+        tt_dim_x = ( ( tt_char_width  * trans->xres + (36+32*72) ) / 72 ) & -64;
-+        tt_dim_y = ( ( tt_char_height * trans->yres + (36+32*72) ) / 72 ) & -64;
-+
-+        for ( nn = 0; nn < face->face->num_fixed_sizes; nn++ )
-+        {
-+          FT_Bitmap_Size*  sz = &face->face->available_sizes[nn];
-+
-+          if ( tt_dim_x == sz->x_ppem && tt_dim_y == sz->y_ppem )
-+          {
-+            instance->strike_index = nn;
-+            break;
-+          }
-+        }
-+#else
- 	/* See Set_Char_Sizes() in ttdriver.c */
- 	FT_Error err;
- 	TT_Face tt_face;
-@@ -486,6 +550,7 @@
- 	sfnt   = (SFNT_Service)tt_face->sfnt;
- 	err = sfnt->set_sbit_strike(tt_face,tt_x_ppem,tt_y_ppem,&instance->strike_index);
- 	if ( err ) instance->strike_index=0xFFFFU;
-+#endif
-     }
- 
-     /* maintain a linked list of instances */
-@@ -803,31 +868,36 @@
-  * parse the htmx field in TrueType font.
-  */
- 
--/* from src/truetype/ttgload.c */
- static void
--tt_get_metrics( TT_HoriHeader*  header,
-+tt_get_metrics( FT_Face         face,
- 		FT_UInt         idx,
-+		FT_UInt         num_hmetrics,
- 		FT_Short*       bearing,
- 		FT_UShort*      advance )
--/*  Copyright 1996-2001, 2002 by                      */
--/*  David Turner, Robert Wilhelm, and Werner Lemberg. */
- {
--    TT_LongMetrics  longs_m;
--    FT_UShort       k = header->number_Of_HMetrics;
-+   /* read the metrics directly from the horizontal header, we
-+    * parse the SFNT table directly through the standard FreeType API.
-+    * this works with any version of the library and doesn't need to
-+    * peek at its internals. Maybe a bit less
-+    */
-+    FT_UInt    count = num_hmetrics;
- 
--    if ( k == 0 ) {
--	*bearing = *advance = 0;
--	return;
-+    if ( count == 0 )
-+    {
-+      *advance = 0;
-+      *bearing = 0;
-     }
-+    else if ( idx < count )
-+    {
-+      FT_ULong  offset = idx*4;
- 
--    if ( idx < (FT_UInt)k ) {
--	longs_m  = (TT_LongMetrics )header->long_metrics + idx;
--	*bearing = longs_m->bearing;
--	*advance = longs_m->advance;
-+      *advance = sfnt_get_ushort( face, TTAG_hmtx, offset );
-+      *bearing = sfnt_get_short ( face, TTAG_hmtx, offset+2 );
-     }
--    else {
--	*bearing = ((TT_ShortMetrics*)header->short_metrics)[idx - k];
--	*advance = ((TT_LongMetrics )header->long_metrics)[k - 1].advance;
-+    else
-+    {
-+      *advance = sfnt_get_ushort( face, TTAG_hmtx, (count-1)*4 );
-+      *bearing = sfnt_get_short ( face, TTAG_hmtx, (count+idx)*2 );
-     }
- }
- 
-@@ -835,6 +905,7 @@
- ft_get_very_lazy_bbox( FT_UInt index,
- 		       FT_Face face,
- 		       FT_Size size,
-+		       FT_UInt  num_hmetrics,
- 		       double slant,
- 		       FT_Matrix *matrix,
- 		       FT_BBox *bbox,
-@@ -842,14 +913,13 @@
- 		       FT_Long *vertAdvance)
- {
-     if ( FT_IS_SFNT( face ) ) {
--	TT_Face   ttface = (TT_Face)face;
- 	FT_Size_Metrics *smetrics = &size->metrics;
- 	FT_Short  leftBearing = 0;
- 	FT_UShort advance = 0;
- 	FT_Vector p0, p1, p2, p3;
- 
- 	/* horizontal */
--	tt_get_metrics(&ttface->horizontal, index,
-+	tt_get_metrics( face, num_hmetrics, index,
- 		       &leftBearing, &advance);
- 
- #if 0
-@@ -910,7 +980,27 @@
- 		    FT_UShort glyph_index, FT_Glyph_Metrics *metrics_return,
- 		    int *sbitchk_incomplete_but_exist )
- {
--#if (FREETYPE_VERSION >= 2001008)
-+#if 1
-+    if ( strike_index != 0xFFFFU && ft_face->available_sizes != 0)
-+    {
-+      FT_Error         error;
-+      FT_Bitmap_Size*  sz = &ft_face->available_sizes[strike_index];
-+
-+      error = FT_Set_Pixel_Sizes( ft_face, sz->x_ppem/64, sz->y_ppem/64 );
-+      if ( !error )
-+      {
-+        error = FT_Load_Glyph( ft_face, glyph_index, FT_LOAD_SBITS_ONLY );
-+        if ( !error )
-+        {
-+          if ( metrics_return != NULL )
-+            *metrics_return = ft_face->glyph->metrics;
-+
-+          return 0;
-+        }
-+      }
-+    }
-+    return -1;
-+#elif (FREETYPE_VERSION >= 2001008)
-     SFNT_Service       sfnt;
-     TT_Face            face;
-     FT_Error           error;
-@@ -1043,6 +1133,7 @@
- 	    if( bitmap_metrics == NULL ) {
- 		if ( sbitchk_incomplete_but_exist==0 && (instance->ttcap.flags & TTCAP_IS_VERY_LAZY) ) {
- 		    if( ft_get_very_lazy_bbox( idx, face->face, instance->size, 
-+		                               face->num_hmetrics,
- 					       instance->ttcap.vl_slant,
- 					       &instance->transformation.matrix,
- 					       &bbox, &outline_hori_advance, 
-@@ -1221,6 +1312,7 @@
- 	if( is_outline == 1 ){
- 	    if( correct ){
- 		if( ft_get_very_lazy_bbox( idx, face->face, instance->size, 
-+		                           face->num_hmetrics,
- 					   instance->ttcap.vl_slant,
- 					   &instance->transformation.matrix,
- 					   &bbox, &outline_hori_advance, 
diff --git a/x11/xorg-libraries/files/patch-font-FreeType-ftfuncs.h b/x11/xorg-libraries/files/patch-font-FreeType-ftfuncs.h
deleted file mode 100644
index 925263c00..000000000
--- a/x11/xorg-libraries/files/patch-font-FreeType-ftfuncs.h
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bj,v 1.3 2006/06/01 22:44:09 tron Exp $
-
---- lib/font/FreeType/ftfuncs.h.orig	2005-07-07 15:59:47.000000000 +0100
-+++ lib/font/FreeType/ftfuncs.h	2006-06-01 23:21:39.000000000 +0100
-@@ -47,6 +47,7 @@
-     char *filename;
-     FT_Face face;
-     int bitmap;
-+    FT_UInt num_hmetrics;
-     struct _FTInstance *instances;
-     struct _FTInstance *active_instance;
-     struct _FTFace *next;       /* link to next face in bucket */
diff --git a/x11/xorg-libraries/files/patch-font-FreeType-ftsystem.c b/x11/xorg-libraries/files/patch-font-FreeType-ftsystem.c
deleted file mode 100644
index df7c97dce..000000000
--- a/x11/xorg-libraries/files/patch-font-FreeType-ftsystem.c
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bk,v 1.3 2006/06/01 22:44:09 tron Exp $
-
---- lib/font/FreeType/ftsystem.c.orig	2005-07-09 07:36:10.000000000 +0100
-+++ lib/font/FreeType/ftsystem.c	2006-06-01 23:21:53.000000000 +0100
-@@ -35,7 +35,6 @@
- #endif
- #include <ft2build.h>
- #include FT_CONFIG_CONFIG_H
--#include FT_INTERNAL_DEBUG_H
- #include FT_SYSTEM_H
- #include FT_ERRORS_H
- #include FT_TYPES_H
diff --git a/x11/xorg-libraries/files/patch-lib-Imakefile b/x11/xorg-libraries/files/patch-lib-Imakefile
deleted file mode 100644
index 9db3ac355..000000000
--- a/x11/xorg-libraries/files/patch-lib-Imakefile
+++ /dev/null
@@ -1,22 +0,0 @@
---- lib/Imakefile.orig	Wed Sep  1 18:10:28 2004
-+++ lib/Imakefile	Wed Dec 29 13:43:31 2004
-@@ -36,6 +36,10 @@
- XKBUILIBDIR = xkbui
- #endif
- 
-+#if BuildThreadStubLibrary && BuildLibraries
-+THRSTUBLIBDIR = XThrStub
-+#endif
-+
- #if BuildXInputLib
- XINPUTLIBDIR = Xi
- #endif
-@@ -223,7 +227,7 @@
- #endif
- 
- 
--LINTSUBDIRS = $(XAULIBDIR) $(XDMCPLIBDIR) $(X11LIBDIR) \
-+LINTSUBDIRS = $(XAULIBDIR) $(XDMCPLIBDIR) $(THRSTUBLIBDIR) $(X11LIBDIR) \
-              $(OLDXLIBDIR) $(ICELIBDIR) $(SMLIBDIR) $(XEXTLIBDIR) $(XTLIBDIR) \
-              $(SSLIBDIR) $(XF86MISCLIBDIR) $(XF86VMLIBDIR) $(XF86DGALIBDIR) \
-              $(XF86RUSHLIBDIR) $(XMULIBDIR) $(XMUULIBDIR) $(XPMLIBDIR) \
diff --git a/x11/xorg-libraries/pkg-descr b/x11/xorg-libraries/pkg-descr
deleted file mode 100644
index dcd8e1cf3..000000000
--- a/x11/xorg-libraries/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-This package contains X.Org shared libraries, headers, and related files.
-
-WWW: http://www.x.org/
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/xorg-libraries/pkg-plist b/x11/xorg-libraries/pkg-plist
deleted file mode 100644
index 367766260..000000000
--- a/x11/xorg-libraries/pkg-plist
+++ /dev/null
@@ -1,783 +0,0 @@
-bin/xcursor-config
-include/DPS/ColorSB.h
-include/DPS/ColorSBP.h
-include/DPS/DPSScrollW.h
-include/DPS/DPSScrollWP.h
-include/DPS/FontCreatP.h
-include/DPS/FontCreato.h
-include/DPS/FontSB.h
-include/DPS/FontSBP.h
-include/DPS/FontSamplP.h
-include/DPS/FontSample.h
-include/DPS/PSres.h
-include/DPS/XDPS.h
-include/DPS/XDPSlib.h
-include/DPS/XDPSproto.h
-include/DPS/dpsNXargs.h
-include/DPS/dpsXclient.h
-include/DPS/dpsXcommon.h
-include/DPS/dpsXpreview.h
-include/DPS/dpsXshare.h
-include/DPS/dpsXuserpath.h
-include/DPS/dpsclient.h
-include/DPS/dpsconfig.h
-include/DPS/dpsexcept.h
-include/DPS/dpsfriends.h
-include/DPS/dpsops.h
-include/DPS/psops.h
-include/GL/GLwDrawA.h
-include/GL/GLwDrawAP.h
-include/GL/GLwMDrawA.h
-include/GL/GLwMDrawAP.h
-include/GL/gl.h
-include/GL/glext.h
-include/GL/glu.h
-include/GL/glx.h
-include/GL/glxext.h
-include/GL/glxint.h
-include/GL/glxmd.h
-include/GL/glxproto.h
-include/GL/glxtokens.h
-include/GL/osmesa.h
-include/X11/CallbackI.h
-include/X11/Composite.h
-include/X11/CompositeP.h
-include/X11/ConstrainP.h
-include/X11/Constraint.h
-include/X11/ConvertI.h
-include/X11/Core.h
-include/X11/CoreP.h
-include/X11/CreateI.h
-include/X11/DECkeysym.h
-include/X11/EventI.h
-include/X11/HPkeysym.h
-include/X11/HookObjI.h
-include/X11/ICE/ICE.h
-include/X11/ICE/ICEconn.h
-include/X11/ICE/ICElib.h
-include/X11/ICE/ICEmsg.h
-include/X11/ICE/ICEproto.h
-include/X11/ICE/ICEutil.h
-include/X11/ImUtil.h
-include/X11/InitialI.h
-include/X11/IntrinsicI.h
-include/X11/Intrinsic.h
-include/X11/IntrinsicP.h
-include/X11/Object.h
-include/X11/ObjectP.h
-include/X11/PassivGraI.h
-include/X11/RectObj.h
-include/X11/RectObjP.h
-include/X11/ResourceI.h
-include/X11/SM/SM.h
-include/X11/SM/SMlib.h
-include/X11/SM/SMproto.h
-include/X11/SelectionI.h
-include/X11/Shell.h
-include/X11/ShellI.h
-include/X11/ShellP.h
-include/X11/StringDefs.h
-include/X11/Sunkeysym.h
-include/X11/ThreadsI.h
-include/X11/TranslateI.h
-include/X11/VarargsI.h
-include/X11/Vendor.h
-include/X11/VendorP.h
-include/X11/X.h
-include/X11/X10.h
-include/X11/XF86keysym.h
-include/X11/XKBlib.h
-include/X11/XWDFile.h
-include/X11/Xalloca.h
-include/X11/Xarch.h
-include/X11/Xatom.h
-include/X11/Xauth.h
-include/X11/Xaw/AllWidgets.h
-include/X11/Xaw/AsciiSink.h
-include/X11/Xaw/AsciiSinkP.h
-include/X11/Xaw/AsciiSrc.h
-include/X11/Xaw/AsciiSrcP.h
-include/X11/Xaw/AsciiText.h
-include/X11/Xaw/AsciiTextP.h
-include/X11/Xaw/Box.h
-include/X11/Xaw/BoxP.h
-include/X11/Xaw/Cardinals.h
-include/X11/Xaw/Command.h
-include/X11/Xaw/CommandP.h
-include/X11/Xaw/Dialog.h
-include/X11/Xaw/DialogP.h
-include/X11/Xaw/Form.h
-include/X11/Xaw/FormP.h
-include/X11/Xaw/Grip.h
-include/X11/Xaw/GripP.h
-include/X11/Xaw/Label.h
-include/X11/Xaw/LabelP.h
-include/X11/Xaw/List.h
-include/X11/Xaw/ListP.h
-include/X11/Xaw/MenuButtoP.h
-include/X11/Xaw/MenuButton.h
-include/X11/Xaw/MultiSink.h
-include/X11/Xaw/MultiSinkP.h
-include/X11/Xaw/MultiSrc.h
-include/X11/Xaw/MultiSrcP.h
-include/X11/Xaw/Paned.h
-include/X11/Xaw/PanedP.h
-include/X11/Xaw/Panner.h
-include/X11/Xaw/PannerP.h
-include/X11/Xaw/Porthole.h
-include/X11/Xaw/PortholeP.h
-include/X11/Xaw/Print.h
-include/X11/Xaw/PrintSP.h
-include/X11/Xaw/Repeater.h
-include/X11/Xaw/RepeaterP.h
-include/X11/Xaw/Reports.h
-include/X11/Xaw/Scrollbar.h
-include/X11/Xaw/ScrollbarP.h
-include/X11/Xaw/Simple.h
-include/X11/Xaw/SimpleMenP.h
-include/X11/Xaw/SimpleMenu.h
-include/X11/Xaw/SimpleP.h
-include/X11/Xaw/Sme.h
-include/X11/Xaw/SmeBSB.h
-include/X11/Xaw/SmeBSBP.h
-include/X11/Xaw/SmeLine.h
-include/X11/Xaw/SmeLineP.h
-include/X11/Xaw/SmeP.h
-include/X11/Xaw/StripCharP.h
-include/X11/Xaw/StripChart.h
-include/X11/Xaw/Template.c
-include/X11/Xaw/Template.h
-include/X11/Xaw/TemplateP.h
-include/X11/Xaw/Text.h
-include/X11/Xaw/TextP.h
-include/X11/Xaw/TextSink.h
-include/X11/Xaw/TextSinkP.h
-include/X11/Xaw/TextSrc.h
-include/X11/Xaw/TextSrcP.h
-include/X11/Xaw/Tip.h
-include/X11/Xaw/TipP.h
-include/X11/Xaw/Toggle.h
-include/X11/Xaw/ToggleP.h
-include/X11/Xaw/Tree.h
-include/X11/Xaw/TreeP.h
-include/X11/Xaw/VendorEP.h
-include/X11/Xaw/Viewport.h
-include/X11/Xaw/ViewportP.h
-include/X11/Xaw/XawImP.h
-include/X11/Xaw/XawInit.h
-include/X11/Xcms.h
-include/X11/Xcursor/Xcursor.h
-include/X11/Xdefs.h
-include/X11/Xdmcp.h
-include/X11/Xfuncproto.h
-include/X11/Xfuncs.h
-include/X11/Xlib.h
-include/X11/XlibConf.h
-include/X11/Xlibint.h
-include/X11/Xlocale.h
-include/X11/Xmd.h
-include/X11/Xmu/Atoms.h
-include/X11/Xmu/CharSet.h
-include/X11/Xmu/CloseHook.h
-include/X11/Xmu/Converters.h
-include/X11/Xmu/CurUtil.h
-include/X11/Xmu/CvtCache.h
-include/X11/Xmu/DisplayQue.h
-include/X11/Xmu/Drawing.h
-include/X11/Xmu/Editres.h
-include/X11/Xmu/EditresP.h
-include/X11/Xmu/Error.h
-include/X11/Xmu/ExtAgent.h
-include/X11/Xmu/Initer.h
-include/X11/Xmu/Lookup.h
-include/X11/Xmu/Misc.h
-include/X11/Xmu/StdCmap.h
-include/X11/Xmu/StdSel.h
-include/X11/Xmu/SysUtil.h
-include/X11/Xmu/WidgetNode.h
-include/X11/Xmu/WinUtil.h
-include/X11/Xmu/Xct.h
-include/X11/Xmu/Xmu.h
-include/X11/Xos.h
-include/X11/Xos_r.h
-include/X11/Xosdefs.h
-include/X11/Xpoll.h
-include/X11/XprintAppUtil/xpapputil.h
-include/X11/XprintUtil/xprintutil.h
-include/X11/Xproto.h
-include/X11/Xprotostr.h
-include/X11/Xregion.h
-include/X11/Xresource.h
-include/X11/Xthreads.h
-include/X11/Xutil.h
-include/X11/ap_keysym.h
-include/X11/bitmaps/1x1
-include/X11/bitmaps/2x2
-include/X11/bitmaps/black
-include/X11/bitmaps/boxes
-include/X11/bitmaps/calculator
-include/X11/bitmaps/cntr_ptr
-include/X11/bitmaps/cntr_ptrmsk
-include/X11/bitmaps/cross_weave
-include/X11/bitmaps/dimple1
-include/X11/bitmaps/dimple3
-include/X11/bitmaps/dot
-include/X11/bitmaps/dropbar7
-include/X11/bitmaps/dropbar8
-include/X11/bitmaps/escherknot
-include/X11/bitmaps/flagdown
-include/X11/bitmaps/flagup
-include/X11/bitmaps/flipped_gray
-include/X11/bitmaps/gray
-include/X11/bitmaps/gray1
-include/X11/bitmaps/gray3
-include/X11/bitmaps/grid16
-include/X11/bitmaps/grid2
-include/X11/bitmaps/grid4
-include/X11/bitmaps/grid8
-include/X11/bitmaps/hlines2
-include/X11/bitmaps/hlines3
-include/X11/bitmaps/icon
-include/X11/bitmaps/keyboard16
-include/X11/bitmaps/left_ptr
-include/X11/bitmaps/left_ptrmsk
-include/X11/bitmaps/letters
-include/X11/bitmaps/light_gray
-include/X11/bitmaps/mailempty
-include/X11/bitmaps/mailemptymsk
-include/X11/bitmaps/mailfull
-include/X11/bitmaps/mailfullmsk
-include/X11/bitmaps/mensetmanus
-include/X11/bitmaps/menu10
-include/X11/bitmaps/menu12
-include/X11/bitmaps/menu16
-include/X11/bitmaps/menu6
-include/X11/bitmaps/menu8
-include/X11/bitmaps/noletters
-include/X11/bitmaps/opendot
-include/X11/bitmaps/opendotMask
-include/X11/bitmaps/plaid
-include/X11/bitmaps/right_ptr
-include/X11/bitmaps/right_ptrmsk
-include/X11/bitmaps/root_weave
-include/X11/bitmaps/scales
-include/X11/bitmaps/sipb
-include/X11/bitmaps/star
-include/X11/bitmaps/starMask
-include/X11/bitmaps/stipple
-include/X11/bitmaps/target
-include/X11/bitmaps/terminal
-include/X11/bitmaps/tie_fighter
-include/X11/bitmaps/vlines2
-include/X11/bitmaps/vlines3
-include/X11/bitmaps/weird_size
-include/X11/bitmaps/wide_weave
-include/X11/bitmaps/wingdogs
-include/X11/bitmaps/woman
-include/X11/bitmaps/xfd_icon
-include/X11/bitmaps/xlogo11
-include/X11/bitmaps/xlogo16
-include/X11/bitmaps/xlogo32
-include/X11/bitmaps/xlogo64
-include/X11/bitmaps/xsnow
-include/X11/cursorfont.h
-include/X11/extensions/MITMisc.h
-include/X11/extensions/Print.h
-include/X11/extensions/Printstr.h
-include/X11/extensions/XEVI.h
-include/X11/extensions/XEVIstr.h
-include/X11/extensions/XI.h
-include/X11/extensions/XInput.h
-include/X11/extensions/XIproto.h
-include/X11/extensions/XKB.h
-include/X11/extensions/XKBbells.h
-include/X11/extensions/XKBconfig.h
-include/X11/extensions/XKBfile.h
-include/X11/extensions/XKBgeom.h
-include/X11/extensions/XKBproto.h
-include/X11/extensions/XKBrules.h
-include/X11/extensions/XKBsrv.h
-include/X11/extensions/XKBstr.h
-include/X11/extensions/XKBui.h
-include/X11/extensions/XKM.h
-include/X11/extensions/XKMformat.h
-include/X11/extensions/XLbx.h
-include/X11/extensions/XRes.h
-include/X11/extensions/XResproto.h
-include/X11/extensions/XShm.h
-include/X11/extensions/XTest.h
-include/X11/extensions/Xag.h
-include/X11/extensions/Xagsrv.h
-include/X11/extensions/Xagstr.h
-include/X11/extensions/Xcomposite.h
-include/X11/extensions/Xcup.h
-include/X11/extensions/Xcupstr.h
-include/X11/extensions/Xdamage.h
-include/X11/extensions/Xdbe.h
-include/X11/extensions/Xdbeproto.h
-include/X11/extensions/Xevie.h
-include/X11/extensions/Xeviestr.h
-include/X11/extensions/Xext.h
-include/X11/extensions/Xfixes.h
-include/X11/extensions/Xinerama.h
-include/X11/extensions/Xrandr.h
-include/X11/extensions/Xrender.h
-include/X11/extensions/Xv.h
-include/X11/extensions/XvMC.h
-include/X11/extensions/XvMClib.h
-include/X11/extensions/XvMCproto.h
-include/X11/extensions/Xvlib.h
-include/X11/extensions/Xvproto.h
-include/X11/extensions/bigreqstr.h
-include/X11/extensions/composite.h
-include/X11/extensions/compositeproto.h
-include/X11/extensions/damageproto.h
-include/X11/extensions/damagewire.h
-include/X11/extensions/dpms.h
-include/X11/extensions/dpmsstr.h
-include/X11/extensions/extutil.h
-include/X11/extensions/lbxbuf.h
-include/X11/extensions/lbxbufstr.h
-include/X11/extensions/lbxdeltastr.h
-include/X11/extensions/lbximage.h
-include/X11/extensions/lbxopts.h
-include/X11/extensions/lbxstr.h
-include/X11/extensions/lbxzlib.h
-include/X11/extensions/mitmiscstr.h
-include/X11/extensions/multibuf.h
-include/X11/extensions/multibufst.h
-include/X11/extensions/panoramiXext.h
-include/X11/extensions/panoramiXproto.h
-include/X11/extensions/randr.h
-include/X11/extensions/randrproto.h
-include/X11/extensions/record.h
-include/X11/extensions/recordstr.h
-include/X11/extensions/render.h
-include/X11/extensions/renderproto.h
-include/X11/extensions/saver.h
-include/X11/extensions/saverproto.h
-include/X11/extensions/scrnsaver.h
-include/X11/extensions/security.h
-include/X11/extensions/securstr.h
-include/X11/extensions/shape.h
-include/X11/extensions/shapestr.h
-include/X11/extensions/shmstr.h
-include/X11/extensions/sync.h
-include/X11/extensions/syncstr.h
-include/X11/extensions/xcmiscstr.h
-include/X11/extensions/xevieplaceholder.h
-include/X11/extensions/xf86bigfont.h
-include/X11/extensions/xf86bigfstr.h
-include/X11/extensions/xf86dga.h
-include/X11/extensions/xf86dga1.h
-include/X11/extensions/xf86dga1str.h
-include/X11/extensions/xf86dgastr.h
-include/X11/extensions/xf86misc.h
-include/X11/extensions/xf86mscstr.h
-include/X11/extensions/xf86vmode.h
-include/X11/extensions/xf86vmstr.h
-include/X11/extensions/xfixesproto.h
-include/X11/extensions/xfixeswire.h
-include/X11/extensions/xtestext1.h
-include/X11/extensions/xteststr.h
-include/X11/extensions/xtrapbits.h
-include/X11/extensions/xtrapddmi.h
-include/X11/extensions/xtrapdi.h
-include/X11/extensions/xtrapemacros.h
-include/X11/extensions/xtraplib.h
-include/X11/extensions/xtraplibp.h
-include/X11/extensions/xtrapproto.h
-include/X11/extensions/vldXvMC.h
-include/X11/fonts/FS.h
-include/X11/fonts/FSlib.h
-include/X11/fonts/FSproto.h
-include/X11/fonts/bdfint.h
-include/X11/fonts/bitmap.h
-include/X11/fonts/bufio.h
-include/X11/fonts/fntfil.h
-include/X11/fonts/fntfilio.h
-include/X11/fonts/fntfilst.h
-include/X11/fonts/font.h
-include/X11/fonts/fontenc.h
-include/X11/fonts/fontencc.h
-include/X11/fonts/fontmisc.h
-include/X11/fonts/fontmod.h
-include/X11/fonts/fontshow.h
-include/X11/fonts/fontstruct.h
-include/X11/fonts/fontutil.h
-include/X11/fonts/fontxlfd.h
-include/X11/fonts/fsmasks.h
-include/X11/fonts/pcf.h
-include/X11/keysym.h
-include/X11/keysymdef.h
-include/X11/misc.h
-include/X11/os.h
-include/X11/xpm.h
-include/xf86Optrec.h
-include/xf86Parser.h
-lib/X11/XErrorDB
-lib/X11/XKeysymDB
-lib/X11/Xcms.txt
-lib/X11/locale/C/XI18N_OBJS
-lib/X11/locale/C/XLC_LOCALE
-lib/X11/locale/armscii-8/Compose
-lib/X11/locale/armscii-8/XI18N_OBJS
-lib/X11/locale/armscii-8/XLC_LOCALE
-lib/X11/locale/compose.dir
-lib/X11/locale/el_GR.UTF-8/Compose
-lib/X11/locale/en_US.UTF-8/Compose
-lib/X11/locale/en_US.UTF-8/XI18N_OBJS
-lib/X11/locale/en_US.UTF-8/XLC_LOCALE
-lib/X11/locale/georgian-academy/Compose
-lib/X11/locale/georgian-academy/XI18N_OBJS
-lib/X11/locale/georgian-academy/XLC_LOCALE
-lib/X11/locale/georgian-ps/Compose
-lib/X11/locale/georgian-ps/XI18N_OBJS
-lib/X11/locale/georgian-ps/XLC_LOCALE
-lib/X11/locale/ibm-cp1133/Compose
-lib/X11/locale/ibm-cp1133/XI18N_OBJS
-lib/X11/locale/ibm-cp1133/XLC_LOCALE
-lib/X11/locale/iscii-dev/XI18N_OBJS
-lib/X11/locale/iscii-dev/XLC_LOCALE
-lib/X11/locale/isiri-3342/XI18N_OBJS
-lib/X11/locale/isiri-3342/XLC_LOCALE
-lib/X11/locale/iso8859-1/Compose
-lib/X11/locale/iso8859-1/XI18N_OBJS
-lib/X11/locale/iso8859-1/XLC_LOCALE
-lib/X11/locale/iso8859-10/Compose
-lib/X11/locale/iso8859-10/XI18N_OBJS
-lib/X11/locale/iso8859-10/XLC_LOCALE
-lib/X11/locale/iso8859-11/XI18N_OBJS
-lib/X11/locale/iso8859-11/XLC_LOCALE
-lib/X11/locale/iso8859-13/Compose
-lib/X11/locale/iso8859-13/XI18N_OBJS
-lib/X11/locale/iso8859-13/XLC_LOCALE
-lib/X11/locale/iso8859-14/Compose
-lib/X11/locale/iso8859-14/XI18N_OBJS
-lib/X11/locale/iso8859-14/XLC_LOCALE
-lib/X11/locale/iso8859-15/Compose
-lib/X11/locale/iso8859-15/XI18N_OBJS
-lib/X11/locale/iso8859-15/XLC_LOCALE
-lib/X11/locale/iso8859-2/Compose
-lib/X11/locale/iso8859-2/XI18N_OBJS
-lib/X11/locale/iso8859-2/XLC_LOCALE
-lib/X11/locale/iso8859-3/Compose
-lib/X11/locale/iso8859-3/XI18N_OBJS
-lib/X11/locale/iso8859-3/XLC_LOCALE
-lib/X11/locale/iso8859-4/Compose
-lib/X11/locale/iso8859-4/XI18N_OBJS
-lib/X11/locale/iso8859-4/XLC_LOCALE
-lib/X11/locale/iso8859-5/Compose
-lib/X11/locale/iso8859-5/XI18N_OBJS
-lib/X11/locale/iso8859-5/XLC_LOCALE
-lib/X11/locale/iso8859-6/Compose
-lib/X11/locale/iso8859-6/XI18N_OBJS
-lib/X11/locale/iso8859-6/XLC_LOCALE
-lib/X11/locale/iso8859-7/Compose
-lib/X11/locale/iso8859-7/XI18N_OBJS
-lib/X11/locale/iso8859-7/XLC_LOCALE
-lib/X11/locale/iso8859-8/Compose
-lib/X11/locale/iso8859-8/XI18N_OBJS
-lib/X11/locale/iso8859-8/XLC_LOCALE
-lib/X11/locale/iso8859-9/Compose
-lib/X11/locale/iso8859-9/XI18N_OBJS
-lib/X11/locale/iso8859-9/XLC_LOCALE
-lib/X11/locale/iso8859-9e/Compose
-lib/X11/locale/iso8859-9e/XI18N_OBJS
-lib/X11/locale/iso8859-9e/XLC_LOCALE
-lib/X11/locale/ja.JIS/Compose
-lib/X11/locale/ja.JIS/XI18N_OBJS
-lib/X11/locale/ja.JIS/XLC_LOCALE
-lib/X11/locale/ja.SJIS/Compose
-lib/X11/locale/ja.SJIS/XI18N_OBJS
-lib/X11/locale/ja.SJIS/XLC_LOCALE
-lib/X11/locale/ja/Compose
-lib/X11/locale/ja/XI18N_OBJS
-lib/X11/locale/ja/XLC_LOCALE
-lib/X11/locale/ja_JP.UTF-8/XI18N_OBJS
-lib/X11/locale/ja_JP.UTF-8/XLC_LOCALE
-lib/X11/locale/ko/Compose
-lib/X11/locale/ko/XI18N_OBJS
-lib/X11/locale/ko/XLC_LOCALE
-lib/X11/locale/ko_KR.UTF-8/XI18N_OBJS
-lib/X11/locale/ko_KR.UTF-8/XLC_LOCALE
-lib/X11/locale/koi8-c/Compose
-lib/X11/locale/koi8-c/XI18N_OBJS
-lib/X11/locale/koi8-c/XLC_LOCALE
-lib/X11/locale/koi8-r/Compose
-lib/X11/locale/koi8-r/XI18N_OBJS
-lib/X11/locale/koi8-r/XLC_LOCALE
-lib/X11/locale/koi8-u/Compose
-lib/X11/locale/koi8-u/XI18N_OBJS
-lib/X11/locale/koi8-u/XLC_LOCALE
-lib/X11/locale/lib/common/ximcp.so.2
-lib/X11/locale/lib/common/xlcDef.so.2
-lib/X11/locale/lib/common/xlcUTF8Load.so.2
-lib/X11/locale/lib/common/xlibi18n.so.2
-lib/X11/locale/lib/common/xlocale.so.2
-lib/X11/locale/lib/common/xomGeneric.so.2
-lib/X11/locale/locale.alias
-lib/X11/locale/locale.dir
-lib/X11/locale/microsoft-cp1251/Compose
-lib/X11/locale/microsoft-cp1251/XI18N_OBJS
-lib/X11/locale/microsoft-cp1251/XLC_LOCALE
-lib/X11/locale/microsoft-cp1255/XI18N_OBJS
-lib/X11/locale/microsoft-cp1255/XLC_LOCALE
-lib/X11/locale/microsoft-cp1256/XI18N_OBJS
-lib/X11/locale/microsoft-cp1256/XLC_LOCALE
-lib/X11/locale/mulelao-1/Compose
-lib/X11/locale/mulelao-1/XI18N_OBJS
-lib/X11/locale/mulelao-1/XLC_LOCALE
-lib/X11/locale/nokhchi-1/XI18N_OBJS
-lib/X11/locale/nokhchi-1/XLC_LOCALE
-lib/X11/locale/pt_BR.UTF-8/Compose
-lib/X11/locale/pt_BR.UTF-8/XI18N_OBJS
-lib/X11/locale/pt_BR.UTF-8/XLC_LOCALE
-lib/X11/locale/tatar-cyr/XI18N_OBJS
-lib/X11/locale/tatar-cyr/XLC_LOCALE
-lib/X11/locale/th_TH.UTF-8/XI18N_OBJS
-lib/X11/locale/th_TH.UTF-8/XLC_LOCALE
-lib/X11/locale/th_TH/XI18N_OBJS
-lib/X11/locale/th_TH/XLC_LOCALE
-lib/X11/locale/tscii-0/XI18N_OBJS
-lib/X11/locale/tscii-0/XLC_LOCALE
-lib/X11/locale/vi_VN.tcvn/Compose
-lib/X11/locale/vi_VN.tcvn/XI18N_OBJS
-lib/X11/locale/vi_VN.tcvn/XLC_LOCALE
-lib/X11/locale/vi_VN.viscii/Compose
-lib/X11/locale/vi_VN.viscii/XI18N_OBJS
-lib/X11/locale/vi_VN.viscii/XLC_LOCALE
-lib/X11/locale/zh_CN.UTF-8/XI18N_OBJS
-lib/X11/locale/zh_CN.UTF-8/XLC_LOCALE
-lib/X11/locale/zh_CN.gb18030/Compose
-lib/X11/locale/zh_CN.gb18030/XI18N_OBJS
-lib/X11/locale/zh_CN.gb18030/XLC_LOCALE
-lib/X11/locale/zh_CN.gbk/Compose
-lib/X11/locale/zh_CN.gbk/XI18N_OBJS
-lib/X11/locale/zh_CN.gbk/XLC_LOCALE
-lib/X11/locale/zh_CN/Compose
-lib/X11/locale/zh_CN/XI18N_OBJS
-lib/X11/locale/zh_CN/XLC_LOCALE
-lib/X11/locale/zh_HK.big5/Compose
-lib/X11/locale/zh_HK.big5/XI18N_OBJS
-lib/X11/locale/zh_HK.big5/XLC_LOCALE
-lib/X11/locale/zh_HK.big5hkscs/Compose
-lib/X11/locale/zh_HK.big5hkscs/XI18N_OBJS
-lib/X11/locale/zh_HK.big5hkscs/XLC_LOCALE
-lib/X11/locale/zh_HK.UTF-8/XI18N_OBJS
-lib/X11/locale/zh_HK.UTF-8/XLC_LOCALE
-lib/X11/locale/zh_TW.UTF-8/XI18N_OBJS
-lib/X11/locale/zh_TW.UTF-8/XLC_LOCALE
-lib/X11/locale/zh_TW.big5/Compose
-lib/X11/locale/zh_TW.big5/XI18N_OBJS
-lib/X11/locale/zh_TW.big5/XLC_LOCALE
-lib/X11/locale/zh_TW/Compose
-lib/X11/locale/zh_TW/XI18N_OBJS
-lib/X11/locale/zh_TW/XLC_LOCALE
-lib/libFS.a
-lib/libFS.so
-lib/libFS.so.6
-lib/libGL.a
-lib/libGL.so
-lib/libGL.so.1
-lib/libGLU.a
-lib/libGLU.so
-lib/libGLU.so.1
-lib/libGLw.a
-lib/libGLw.so
-lib/libGLw.so.1
-lib/libICE.a
-lib/libICE.so
-lib/libICE.so.6
-%%OSMESA:%%lib/libOSMesa.a
-%%OSMESA:%%lib/libOSMesa.so
-%%OSMESA:%%lib/libOSMesa.so.4
-lib/libSM.a
-lib/libSM.so
-lib/libSM.so.6
-lib/libX11.a
-lib/libX11.so
-lib/libX11.so.6
-lib/libXRes.a
-lib/libXRes.so
-lib/libXRes.so.1
-lib/libXTrap.a
-lib/libXTrap.so
-lib/libXTrap.so.6
-%%XTHRSTUB:%%lib/libXThrStub.so
-%%XTHRSTUB:%%lib/libXThrStub.so.6
-lib/libXau.a
-lib/libXau.so
-lib/libXau.so.0
-lib/libXaw.a
-lib/libXaw.so
-lib/libXaw.so.6
-lib/libXaw.so.7
-lib/libXaw.so.8
-lib/libXcomposite.a
-lib/libXcomposite.so
-lib/libXcomposite.so.1
-lib/libXcursor.a
-lib/libXcursor.so
-lib/libXcursor.so.1
-lib/libXdamage.a
-lib/libXdamage.so
-lib/libXdamage.so.1
-lib/libXdmcp.a
-lib/libXdmcp.so
-lib/libXdmcp.so.0
-lib/libXevie.a
-lib/libXevie.so
-lib/libXevie.so.1
-lib/libXext.a
-lib/libXext.so
-lib/libXext.so.6
-lib/libXfixes.a
-lib/libXfixes.so
-lib/libXfixes.so.3
-lib/libXfont.a
-lib/libXfont.so
-lib/libXfont.so.1
-lib/libXi.a
-lib/libXi.so
-lib/libXi.so.6
-lib/libXinerama.a
-lib/libXinerama.so
-lib/libXinerama.so.1
-lib/libXmu.a
-lib/libXmu.so
-lib/libXmu.so.6
-lib/libXmuu.a
-lib/libXmuu.so
-lib/libXmuu.so.1
-lib/libXp.a
-lib/libXp.so
-lib/libXp.so.6
-lib/libXpm.a
-lib/libXpm.so
-lib/libXpm.so.4
-lib/libXprintAppUtil.a
-lib/libXprintUtil.a
-lib/libXrandr.a
-lib/libXrandr.so
-lib/libXrandr.so.2
-lib/libXrender.a
-lib/libXrender.so
-lib/libXrender.so.1
-lib/libXss.a
-lib/libXss.so
-lib/libXss.so.1
-lib/libXt.a
-lib/libXt.so
-lib/libXt.so.6
-lib/libXtst.a
-lib/libXtst.so
-lib/libXtst.so.6
-lib/libXv.a
-lib/libXv.so
-lib/libXv.so.1
-lib/libXvMC.a
-lib/libXvMC.so
-lib/libXvMC.so.1
-lib/libXxf86dga.a
-lib/libXxf86dga.so
-lib/libXxf86dga.so.1
-lib/libXxf86misc.a
-lib/libXxf86misc.so
-lib/libXxf86misc.so.1
-lib/libXxf86vm.a
-lib/libXxf86vm.so
-lib/libXxf86vm.so.1
-lib/libdps.a
-lib/libdps.so
-lib/libdps.so.1
-lib/libfntstubs.a
-lib/libfontenc.a
-lib/libfontenc.so
-lib/libfontenc.so.1
-lib/liboldX.a
-lib/liboldX.so
-lib/liboldX.so.6
-lib/libxf86config.a
-lib/libxkbfile.a
-lib/libxkbfile.so
-lib/libxkbfile.so.1
-lib/libxkbui.a
-lib/libxkbui.so
-lib/libxkbui.so.1
-libdata/pkgconfig/xcomposite.pc
-libdata/pkgconfig/xcursor.pc
-libdata/pkgconfig/xdamage.pc
-libdata/pkgconfig/xevie.pc
-libdata/pkgconfig/xfixes.pc
-libdata/pkgconfig/xrender.pc
-@dirrm include/X11/extensions
-@dirrm include/X11/ICE
-@dirrm include/X11/SM
-@dirrm include/X11/Xmu
-@dirrm include/X11/XprintUtil
-@dirrm include/X11/XprintAppUtil
-@dirrm include/X11/Xaw
-@dirrm include/X11/Xcursor
-@dirrm include/GL
-@dirrm include/DPS
-@dirrm lib/X11/locale/lib/common
-@dirrm lib/X11/locale/lib
-@dirrm lib/X11/locale/C
-@dirrm lib/X11/locale/armscii-8
-@dirrm lib/X11/locale/en_US.UTF-8
-@dirrm lib/X11/locale/georgian-academy
-@dirrm lib/X11/locale/georgian-ps
-@dirrm lib/X11/locale/ibm-cp1133
-@dirrm lib/X11/locale/iscii-dev
-@dirrm lib/X11/locale/isiri-3342
-@dirrm lib/X11/locale/iso8859-1
-@dirrm lib/X11/locale/iso8859-2
-@dirrm lib/X11/locale/iso8859-3
-@dirrm lib/X11/locale/iso8859-4
-@dirrm lib/X11/locale/iso8859-5
-@dirrm lib/X11/locale/iso8859-6
-@dirrm lib/X11/locale/iso8859-7
-@dirrm lib/X11/locale/iso8859-8
-@dirrm lib/X11/locale/iso8859-9
-@dirrm lib/X11/locale/iso8859-10
-@dirrm lib/X11/locale/iso8859-11
-@dirrm lib/X11/locale/iso8859-13
-@dirrm lib/X11/locale/ja
-@dirrm lib/X11/locale/iso8859-14
-@dirrm lib/X11/locale/iso8859-15
-@dirrm lib/X11/locale/iso8859-9e
-@dirrm lib/X11/locale/ja.JIS
-@dirrm lib/X11/locale/ja.SJIS
-@dirrm lib/X11/locale/ja_JP.UTF-8
-@dirrm lib/X11/locale/ko
-@dirrm lib/X11/locale/ko_KR.UTF-8
-@dirrm lib/X11/locale/koi8-r
-@dirrm lib/X11/locale/koi8-u
-@dirrm lib/X11/locale/koi8-c
-@dirrm lib/X11/locale/microsoft-cp1251
-@dirrm lib/X11/locale/microsoft-cp1255
-@dirrm lib/X11/locale/microsoft-cp1256
-@dirrm lib/X11/locale/mulelao-1
-@dirrm lib/X11/locale/nokhchi-1
-@dirrm lib/X11/locale/pt_BR.UTF-8
-@dirrm lib/X11/locale/tatar-cyr
-@dirrm lib/X11/locale/th_TH
-@dirrm lib/X11/locale/th_TH.UTF-8
-@dirrm lib/X11/locale/tscii-0
-@dirrm lib/X11/locale/vi_VN.tcvn
-@dirrm lib/X11/locale/vi_VN.viscii
-@dirrm lib/X11/locale/zh_CN
-@dirrm lib/X11/locale/zh_CN.gb18030
-@dirrm lib/X11/locale/zh_CN.gbk
-@dirrm lib/X11/locale/zh_CN.UTF-8
-@dirrm lib/X11/locale/zh_HK.big5
-@dirrm lib/X11/locale/zh_HK.big5hkscs
-@dirrm lib/X11/locale/zh_HK.UTF-8
-@dirrm lib/X11/locale/zh_TW
-@dirrm lib/X11/locale/zh_TW.big5
-@dirrm lib/X11/locale/zh_TW.UTF-8
-@dirrm lib/X11/locale/el_GR.UTF-8
-@dirrmtry include/X11/bitmaps
-@dirrmtry include/X11/fonts
-@dirrmtry lib/X11/locale
diff --git a/x11/xorg-libraries/scripts/configure b/x11/xorg-libraries/scripts/configure
deleted file mode 100644
index b7f6be7fa..000000000
--- a/x11/xorg-libraries/scripts/configure
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-LOCALDEF=$WRKDIR/.config
-
-rm -f $LOCALDEF
-echo "#define BuildServer NO"				>> $LOCALDEF
-echo "#define BuildXft1Library NO"			>> $LOCALDEF
-echo "#define BuildXftLibrary NO"			>> $LOCALDEF
-echo "#define UseInstalledPrograms YES"			>> $LOCALDEF
-echo "#define StandardIncludes -I${PREFIX}/include"	>> $LOCALDEF
-
-sh $PORTSDIR/x11-servers/xorg-server/scripts/configure.gen