13 files changed, 858 insertions, 0 deletions
diff --git a/x11/Makefile b/x11/Makefile
index e4f75fdae3e4..b6867c3dcb53 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -219,6 +219,7 @@
     SUBDIR += xmx
     SUBDIR += xnee
     SUBDIR += xnodecor
+    SUBDIR += xorg-libraries
     SUBDIR += xprompt
     SUBDIR += xproto
     SUBDIR += xrestop
diff --git a/x11/xorg-libraries/Makefile b/x11/xorg-libraries/Makefile
new file mode 100644
index 000000000000..14ede550e5fc
--- /dev/null
+++ b/x11/xorg-libraries/Makefile
@@ -0,0 +1,71 @@
+# New ports collection makefile for:    xorg-libraries
+# Date created:		29 May 2004
+# Whom:			anholt@FreeBSD.org
+#
+# $FreeBSD$
+#
+
+PORTNAME=	libraries
+PORTVERSION=	6.7.0
+CATEGORIES=	x11
+MASTER_SITES=	http://freedesktop.org/~xorg/X11R6.7.0/src/:fdo \
+		${MASTER_SITE_LOCAL:S/$/:local/}
+PKGNAMEPREFIX=	xorg-
+DISTFILES=	X11R6.7.0-src1.tar.gz:fdo \
+		X11R6.7.0-src3.tar.gz:fdo \
+		Wraphelp2.gz:local
+EXTRACT_ONLY=	X11R6.7.0-src1.tar.gz \
+		X11R6.7.0-src3.tar.gz
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X11 libraries and headers from X.Org
+
+LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
+		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
+
+CONFLICTS=	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-* 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-extract:
+	${GUNZIP_CMD} -c ${DISTDIR}/Wraphelp2.gz > ${WRKSRC}/lib/Xdmcp/Wraphelp.c
+
+post-patch:
+	${CP} ${FILESDIR}/nls-Compose-microsoft-cp1251 ${WRKSRC}/nls/Compose/microsoft-cp1251
+
+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>
+
+# BuildXF86DRI is false for FreeBSD < 4.1
+.if ${OSVERSION} < 410000
+PLIST_SUB+=	OSMESA:="@comment "
+.else
+PLIST_SUB+=	OSMESA:=""
+.endif
+
+# sparc64 doesn't have a working libc_r yet, and -current doesn't need libXThrStub.
+.if ${ARCH} == "sparc64" || ${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
new file mode 100644
index 000000000000..a07dba660207
--- /dev/null
+++ b/x11/xorg-libraries/distinfo
@@ -0,0 +1,6 @@
+MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5
+SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655
+MD5 (xorg/X11R6.7.0-src3.tar.gz) = 4c7144786522bbce383b21ace72bf669
+SIZE (xorg/X11R6.7.0-src3.tar.gz) = 10855793
+MD5 (xorg/Wraphelp2.gz) = bd1910492087442288d885412e2e5535
+SIZE (xorg/Wraphelp2.gz) = 3376
diff --git a/x11/xorg-libraries/files/nls-Compose-microsoft-cp1251 b/x11/xorg-libraries/files/nls-Compose-microsoft-cp1251
new file mode 100644
index 000000000000..b7218bdbc7d9
--- /dev/null
+++ b/x11/xorg-libraries/files/nls-Compose-microsoft-cp1251
@@ -0,0 +1,15 @@
+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
new file mode 100644
index 000000000000..d1b90e4a9fc0
--- /dev/null
+++ b/x11/xorg-libraries/files/patch-Compose-Imakefile
@@ -0,0 +1,10 @@
+--- 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-Imakefile b/x11/xorg-libraries/files/patch-GL-Imakefile
new file mode 100644
index 000000000000..7d2bb0b12e03
--- /dev/null
+++ b/x11/xorg-libraries/files/patch-GL-Imakefile
@@ -0,0 +1,11 @@
+--- 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-Xau-Imakefile b/x11/xorg-libraries/files/patch-Xau-Imakefile
new file mode 100644
index 000000000000..70119d9dadd9
--- /dev/null
+++ b/x11/xorg-libraries/files/patch-Xau-Imakefile
@@ -0,0 +1,11 @@
+--- 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-Xcursor-Imakefile b/x11/xorg-libraries/files/patch-Xcursor-Imakefile
new file mode 100644
index 000000000000..2d12831b0b09
--- /dev/null
+++ b/x11/xorg-libraries/files/patch-Xcursor-Imakefile
@@ -0,0 +1,11 @@
+--- 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-Xdmcp-Imakefile b/x11/xorg-libraries/files/patch-Xdmcp-Imakefile
new file mode 100644
index 000000000000..02d5c2928f99
--- /dev/null
+++ b/x11/xorg-libraries/files/patch-Xdmcp-Imakefile
@@ -0,0 +1,17 @@
+--- 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-dps-Imakefile b/x11/xorg-libraries/files/patch-dps-Imakefile
new file mode 100644
index 000000000000..ee16b18b7874
--- /dev/null
+++ b/x11/xorg-libraries/files/patch-dps-Imakefile
@@ -0,0 +1,38 @@
+--- lib/dps/Imakefile.orig	Thu Mar  4 09:47:01 2004
++++ lib/dps/Imakefile	Thu May 27 18:13:27 2004
+@@ -29,7 +29,6 @@
+             SED = sed
+             AWK = awk
+            SORT = sort
+-         PSWRAP = PsWrap
+ 
+ COMMONOBJECTFILES = \
+ 	dpsclient.o\
+@@ -201,7 +200,7 @@
+ 
+ includes:: $(DPSOPSCFILES) $(PSOPSCFILES) $(HEADERS)
+ 
+-$(DPSOPSCFILES) $(PSOPSCFILES): HostProgramTargetName($(PSWRAP))
++$(DPSOPSCFILES) $(PSOPSCFILES): PsWrapDependency
+ 
+ SRCS = \
+ 	${COMMONSOURCEFILES} \
+@@ -224,16 +223,11 @@
+ 
+ .SUFFIXES: .psw .h
+ 
+-.psw.c : HostProgramTargetName($(PSWRAP))
++.psw.c : PsWrapDependency
+ 	RunProgram(PSWRAP,-a -o $*.c -h $*.h $<)
+ 
+-.psw.h : HostProgramTargetName($(PSWRAP))
++.psw.h : PsWrapDependency
+ 	RunProgram(PSWRAP,-a -h $*.h $< > /dev/null)
+-
+-HostProgramTargetName($(PSWRAP)):
+-	@echo "checking $@ over in $(PSWRAPSRC) first..."; \
+-	cd $(PSWRAPSRC) && $(MAKE) pswraponly; \
+-	echo "okay, continuing in $(CURRENT_DIR)"
+ 
+ includes :: $(HEADERS)
+ depend :: $(DPSOPSCFILES) $(PSOPSCFILES)
diff --git a/x11/xorg-libraries/pkg-descr b/x11/xorg-libraries/pkg-descr
new file mode 100644
index 000000000000..dcd8e1cf3595
--- /dev/null
+++ b/x11/xorg-libraries/pkg-descr
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 000000000000..6673a8791c1b
--- /dev/null
+++ b/x11/xorg-libraries/pkg-plist
@@ -0,0 +1,649 @@
+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/Composite.h
+include/X11/CompositeP.h
+include/X11/ConstrainP.h
+include/X11/Constraint.h
+include/X11/Core.h
+include/X11/CoreP.h
+include/X11/DECkeysym.h
+include/X11/HPkeysym.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/Intrinsic.h
+include/X11/IntrinsicP.h
+include/X11/Object.h
+include/X11/ObjectP.h
+include/X11/RectObj.h
+include/X11/RectObjP.h
+include/X11/SM/SM.h
+include/X11/SM/SMlib.h
+include/X11/SM/SMproto.h
+include/X11/Shell.h
+include/X11/ShellP.h
+include/X11/StringDefs.h
+include/X11/Sunkeysym.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/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/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/Xproto.h
+include/X11/Xprotostr.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/Xcup.h
+include/X11/extensions/Xcupstr.h
+include/X11/extensions/Xdbe.h
+include/X11/extensions/Xdbeproto.h
+include/X11/extensions/Xext.h
+include/X11/extensions/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/dpms.h
+include/X11/extensions/dpmsstr.h
+include/X11/extensions/extutil.h
+include/X11/extensions/fontcache.h
+include/X11/extensions/fontcacheP.h
+include/X11/extensions/fontcachstr.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/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/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/fonts/FS.h
+include/X11/fonts/FSlib.h
+include/X11/fonts/FSproto.h
+include/X11/fonts/codeconv/cconvversion.h
+include/X11/fonts/codeconv/xttcap.h
+include/X11/fonts/codeconv/xttcconv.h
+include/X11/fonts/codeconv/xttcconvP.h
+include/X11/fonts/codeconv/xttcommon.h
+include/X11/fonts/codeconv/xttversion.h
+include/X11/fonts/fontenc.h
+include/X11/fonts/fsmasks.h
+include/X11/keysym.h
+include/X11/keysymdef.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/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.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/XLC_LOCALE
+lib/X11/locale/zh_HK.big5hkscs/XI18N_OBJS
+lib/X11/locale/zh_HK.big5hkscs/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
+%%XTHRSTUB:%%lib/libXThrStub.so
+%%XTHRSTUB:%%lib/libXThrStub.so.6
+lib/libXTrap.a
+lib/libXTrap.so
+lib/libXTrap.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/libXcursor.a
+lib/libXcursor.so
+lib/libXcursor.so.1
+lib/libXdmcp.a
+lib/libXdmcp.so
+lib/libXdmcp.so.0
+lib/libXext.a
+lib/libXext.so
+lib/libXext.so.6
+lib/libXfont.a
+lib/libXfont.so
+lib/libXfont.so.1
+lib/libXfontcache.a
+lib/libXfontcache.so
+lib/libXfontcache.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/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/libdpstk.a
+lib/libdpstk.so
+lib/libdpstk.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/libpsres.a
+lib/libpsres.so
+lib/libpsres.so.1
+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/xcursor.pc
diff --git a/x11/xorg-libraries/scripts/configure b/x11/xorg-libraries/scripts/configure
new file mode 100644
index 000000000000..b7f6be7fa513
--- /dev/null
+++ b/x11/xorg-libraries/scripts/configure
@@ -0,0 +1,12 @@
+#!/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