18 files changed, 100 insertions, 593 deletions

diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index f69043a31cc9..cf6cfb301ca3 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -5,16 +5,13 @@
 # $FreeBSD$
 #
 
-PORTNAME=	server
-PORTVERSION=	6.7.0
-PORTREVISION=	9
+PORTNAME=	xorg-server
+PORTVERSION=	6.8.1
 CATEGORIES=	x11-servers
-MASTER_SITES=	http://freedesktop.org/~xorg/X11R6.7.0/src/ \
-		${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR=	R6.7/tars
-PKGNAMEPREFIX=	xorg-
-DISTFILES=	X11R6.7.0-src1.tar.gz \
-		X11R6.7.0-src3.tar.gz
+MASTER_SITES=	${MASTER_SITE_XORG}
+MASTER_SITE_SUBDIR=	X11R6.8.1/tars
+DISTFILES=	X11R${PORTVERSION}-src1.tar.gz \
+		X11R${PORTVERSION}-src3.tar.gz
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org X server and related programs
diff --git a/x11-servers/xorg-server/Makefile.inc b/x11-servers/xorg-server/Makefile.inc
index 79a81701d363..7d7e1cf76d11 100644
--- a/x11-servers/xorg-server/Makefile.inc
+++ b/x11-servers/xorg-server/Makefile.inc
@@ -16,6 +16,7 @@ DIST_SUBDIR?=	xorg
 WRKSRC?=	${WRKDIR}/xc
 USE_X_PREFIX?=	no
 PREFIX?=	${X11BASE}
+MTREE_FILE=	/etc/mtree/BSD.x11-4.dist
 
 USE_IMAKE=	YES
 .if defined(XMAN_DIRS)
@@ -41,17 +42,10 @@ CF_PATCHES=	${PORTSDIR}/x11-servers/xorg-server/files/patch-FreeBSD.cf \
 
 SERVER_PATCHES=	${PORTSDIR}/x11-servers/xorg-server/files/patch-Xserver-Imakefile \
 		${PORTSDIR}/x11-servers/xorg-server/files/patch-alpha_video.c \
-		${PORTSDIR}/x11-servers/xorg-server/files/patch-bus-Imakefile \
-		${PORTSDIR}/x11-servers/xorg-server/files/patch-fb-renderfixes.diff \
-		${PORTSDIR}/x11-servers/xorg-server/files/patch-kernel-Imakefile \
-		${PORTSDIR}/x11-servers/xorg-server/files/patch-loadmod.c \
 		${PORTSDIR}/x11-servers/xorg-server/files/patch-man-Imakefile \
 		${PORTSDIR}/x11-servers/xorg-server/files/patch-os-Imakefile \
 		${PORTSDIR}/x11-servers/xorg-server/files/patch-savage-pci-id \
-		${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86Events.c \
-		${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86fbman.c \
 		${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86sym.c \
-		${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86drmCompat.c \
 		${PORTSDIR}/x11-servers/xorg-server/files/patch-xkbout.c \
 		${PORTSDIR}/x11-servers/xorg-server/files/patch-xorgconfig.c
 
@@ -91,6 +85,5 @@ do-install:
 	@for dir in ${XMAN_DIRS}; do \
 		cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE} install.man; \
 	done
-	@${MKHTMLINDEX} ${PREFIX}/lib/X11/doc/html
 .endif
 
diff --git a/x11-servers/xorg-server/distinfo b/x11-servers/xorg-server/distinfo
index 971093cb9d9e..62c1647dc07b 100644
--- a/x11-servers/xorg-server/distinfo
+++ b/x11-servers/xorg-server/distinfo
@@ -1,8 +1,4 @@
-MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5
-SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655
-MD5 (xorg/X11R6.7.0-src2.tar.gz) = 6ef4e8f7647a28f080c10ea1bcf01f79
-SIZE (xorg/X11R6.7.0-src2.tar.gz) = 5739983
-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
+MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b
+SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401
+MD5 (xorg/X11R6.8.1-src3.tar.gz) = 8578e566e909e7c40300f44b6f0e88d3
+SIZE (xorg/X11R6.8.1-src3.tar.gz) = 10014808
diff --git a/x11-servers/xorg-server/files/patch-FreeBSD.cf b/x11-servers/xorg-server/files/patch-FreeBSD.cf
index c0139fdbeec7..391afe1b7cae 100644
--- a/x11-servers/xorg-server/files/patch-FreeBSD.cf
+++ b/x11-servers/xorg-server/files/patch-FreeBSD.cf
@@ -1,54 +1,44 @@
---- config/cf/FreeBSD.cf.orig	Fri Apr  2 13:47:10 2004
-+++ config/cf/FreeBSD.cf	Fri May  7 17:32:47 2004
-@@ -109,7 +109,7 @@
- # endif
- # define HasPosixThreads	YES
- # define ThreadedX		YES
--# define SystemMTDefines	-D_REENTRANT -D_THREAD_SAFE
-+# define SystemMTDefines	FreeBSDPTHREAD_CFLAGS
- /*
-  * FreeBSD has tread-safe api but no getpwnam_r yet.
-  */
-@@ -119,9 +119,8 @@
- # else
- #  define MTSafeAPIDefines	-DXUSE_MTSAFE_API
+--- config/cf/FreeBSD.cf.orig	Sat Aug 14 17:03:36 2004
++++ config/cf/FreeBSD.cf	Sat Sep 11 15:18:01 2004
+@@ -78,6 +78,7 @@
+ #define HasIssetugid		YES
+ #define HasPoll			YES
+ #endif
++#define BuildHtmlManPages	NO
+ 
+ #if OSMajorVersion >= 4
+ #define HasGetIfAddrs		YES
+@@ -117,14 +118,8 @@
+ # if (OSRelVersion < 500043)
+ #  define NeedUIThrStubs	YES
  # endif
--# if HasLibPthread
+-# if (OSRelVersion >= 502102)
 -#  define ThreadsLibraries	-lpthread
+-# elif (OSRelVersion >= 500016)
+-#  define ThreadsLibraries	-lc_r
 -# else
+-#  define ThreadsLibraries	-pthread
+-# endif
+-# define SystemMTDefines	-D_THREAD_SAFE
 +# define ThreadsLibraries	FreeBSDPTHREAD_LIBS
-+# if !HasLibPthread
- #  if OSRelVersion >= 500043
- #   define BuildThreadStubLibrary  NO
- #   define NeedUIThrStubs          NO
-@@ -130,10 +129,7 @@
- #   define NeedUIThrStubs          YES
- #  endif
- #  if (OSRelVersion >= 500016)
--#   define ThreadsLibraries	-lc_r
- #   define SharedGLReqs		$(LDPRELIBS) $(XLIB) -lc
--#  else
--#   define ThreadsLibraries	-pthread
- #  endif
- #  define SharedX11Reqs		$(LDPRELIB) $(XTHRSTUBLIB)
- #  define SharedXtReqs		$(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB)
-@@ -192,11 +188,11 @@
-  *    ld: warning: libXThrStub.so.6, needed by libX11.so, not found
-  */
- #if BuildThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11)
--# define CcCmd			$(CLIENTENVSETUP) cc
--# define CplusplusCmd		$(CLIENTENVSETUP) c++
-+# define CcCmd			$(CLIENTENVSETUP) FreeBSDCC
-+# define CplusplusCmd		$(CLIENTENVSETUP) FreeBSDCXX
- #else
--# define CcCmd			cc
--# define CplusplusCmd		c++
-+# define CcCmd			FreeBSDCC
-+# define CplusplusCmd		FreeBSDCXX
++# define SystemMTDefines	FreeBSDPTHREAD_CFLAGS
+ #endif
+ 
+ /* This fixes linking C programs against libGLU on FreeBSD 3.x */
+@@ -173,10 +168,10 @@
  #endif
  
+ #ifndef CcCmd
+-#define CcCmd			cc
++#define CcCmd			FreeBSDCC
+ #endif
+ #ifndef CplusplusCmd
+-#define CplusplusCmd		c++
++#define CplusplusCmd		FreeBSDCXX
+ #endif
  #define CppCmd			/usr/bin/cpp
-@@ -359,7 +355,7 @@
+ #define PreProcessCmd		CppCmd
+@@ -338,7 +333,7 @@
  #ifndef LibraryRpathLoadFlags
  # if UseRpath
  #  if UseElfFormat
@@ -57,7 +47,7 @@
  #  else
  #   define LibraryRpathLoadFlags	-R $(USRLIBDIRPATH)
  #  endif
-@@ -452,18 +450,8 @@
+@@ -463,18 +458,8 @@
  #define XawI18nDefines		-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
  #endif
  
diff --git a/x11-servers/xorg-server/files/patch-Library.tmpl b/x11-servers/xorg-server/files/patch-Library.tmpl
index bbebc76c13e0..e94aae3bfc60 100644
--- a/x11-servers/xorg-server/files/patch-Library.tmpl
+++ b/x11-servers/xorg-server/files/patch-Library.tmpl
@@ -1,21 +1,21 @@
---- 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 @@
+--- config/cf/Library.tmpl.orig	Mon May 24 12:06:57 2004
++++ config/cf/Library.tmpl	Fri Sep 10 21:46:00 2004
+@@ -389,7 +389,7 @@
   */
  
  #ifndef MakeStringsDependency
-+#if defined(UseInstalled) || defined(UseInstalledPrograms)
-+#define MakeStringsDependency						@@\
-+MAKESTRS = makestrs
-+#else
- # define MakeStringsDependency						@@\
+-# ifndef UseInstalled
++# if !defined(UseInstalled) && !defined(UseInstalledPrograms)
+ #  define MakeStringsDependency						@@\
  MAKESTRS = $(CONFIGSRC)/util/makestrs					@@\
  NoCmpScript(HostProgramTargetName($(MAKESTRS)) $(MAKESTRS).Osuf)	@@\
-@@ -308,6 +312,7 @@
- 	cd $(CONFIGSRC)/util && $(MAKE) HostProgramTargetName(makestrs)	@@\
+@@ -399,7 +399,8 @@
  									@@\
  includes:: HostProgramTargetName($(MAKESTRS))
-+#endif
+ # else
+-#  define MakeStringsDependency  /**/
++#  define MakeStringsDependency						@@\
++MAKESTRS = makestrs
+ # endif
  #endif
  
- #ifndef ToolkitMakeStrings
diff --git a/x11-servers/xorg-server/files/patch-X11.tmpl b/x11-servers/xorg-server/files/patch-X11.tmpl
index 4e1eb1b9d227..bdd12fbbb3e2 100644
--- a/x11-servers/xorg-server/files/patch-X11.tmpl
+++ b/x11-servers/xorg-server/files/patch-X11.tmpl
@@ -1,6 +1,6 @@
---- config/cf/X11.tmpl.orig	Fri Apr  2 13:47:10 2004
-+++ config/cf/X11.tmpl	Sun May 30 12:46:35 2004
-@@ -576,7 +576,7 @@
+--- config/cf/X11.tmpl.orig	Fri Sep  3 09:18:18 2004
++++ config/cf/X11.tmpl	Fri Sep 10 20:29:12 2004
+@@ -616,7 +616,7 @@
  #define BuildXft1Library	BuildRenderLibrary
  #endif
  #ifndef UseFontconfig
@@ -9,27 +9,21 @@
  #endif
  #ifndef BuildFontconfigLibrary
  #define BuildFontconfigLibrary	(UseFontconfig && !HasFontconfig)
-@@ -1543,7 +1543,14 @@
+@@ -1606,7 +1606,7 @@
  #endif
  
  #ifndef PsWrap
-+#if defined(UseInstalled) || defined(UseInstalledPrograms)
-+#define PsWrap pswrap
-+#define PsWrapDependency /**/
-+#else
- #define PsWrap $(PSWRAPSRC)/pswrap
-+#define PsWrapDependency HostProgramTargetName($(PSWRAP))
-+#endif
-+         PSWRAP = PsWrap
- #endif
- 
- #ifndef ResourceConfigurationManagement
-@@ -1615,7 +1622,7 @@
+-# ifndef UseInstalled
++# if !defined(UseInstalled) && !defined(UseInstalledPrograms)
+ #  define PsWrap $(PSWRAPSRC)/pswrap
+ # else
+ #  define PsWrap pswrap
+@@ -1683,7 +1683,7 @@
  
       INSTAPPFLAGS = $(INSTDATFLAGS)	/* XXX - this should go away - XXX */
  
 -#if UseInstalledX11
 +#if UseInstalledX11 || UseInstalledClients
-               RGB = $(BINDIR)/rgb
-             FONTC = $(BINDIR)/bdftopcf
-       MKFONTSCALE = $(BINDIR)/mkfontscale
+               RGB = $(XBINDIR)/rgb
+             FONTC = $(XBINDIR)/bdftopcf
+       MKFONTSCALE = $(XBINDIR)/mkfontscale
diff --git a/x11-servers/xorg-server/files/patch-bus-Imakefile b/x11-servers/xorg-server/files/patch-bus-Imakefile
deleted file mode 100644
index eb44640c816e..000000000000
--- a/x11-servers/xorg-server/files/patch-bus-Imakefile
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: programs/Xserver/hw/xfree86/os-support/bus/Imakefile
-===================================================================
-RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/bus/Imakefile,v
-retrieving revision 1.2
-diff -u -r1.2 Imakefile
---- programs/Xserver/hw/xfree86/os-support/bus/Imakefile	23 Apr 2004 19:54:08 -0000	1.2
-+++ programs/Xserver/hw/xfree86/os-support/bus/Imakefile	11 May 2004 07:58:43 -0000
-@@ -80,8 +80,8 @@
- PCIDRVRSRC = ix86Pci.c linuxPci.c
- PCIDRVROBJ = ix86Pci.o linuxPci.o
- 
--#elif defined(FreeBSDArchitecture) && defined(AlphaArchitecture)
--
-+#elif defined(FreeBSDArchitecture) && \
-+	(defined(AlphaArchitecture) || defined(AMD64Architecture))
- 
- XCOMM generic FreeBSD PCI driver (using /dev/pci)
- 
diff --git a/x11-servers/xorg-server/files/patch-fb-renderfixes.diff b/x11-servers/xorg-server/files/patch-fb-renderfixes.diff
deleted file mode 100644
index 6adf66689453..000000000000
--- a/x11-servers/xorg-server/files/patch-fb-renderfixes.diff
+++ /dev/null
@@ -1,320 +0,0 @@
-Index: programs/Xserver/fb/fbcompose.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/Xserver/fb/fbcompose.c,v
-retrieving revision 1.2
-diff -u -r1.2 fbcompose.c
---- programs/Xserver/fb/fbcompose.c	23 Apr 2004 19:05:14 -0000	1.2
-+++ programs/Xserver/fb/fbcompose.c	11 May 2004 22:58:12 -0000
-@@ -191,15 +191,15 @@
-     a = (*msk->fetcha) (msk);
-     if (!a)
- 	return 0;
--    
--    x = (*src->fetcha) (src);
--    if (a == 0xffffffff)
--	return x;
--    
--    m = FbInC(x,0,a,t);
--    n = FbInC(x,8,a,t);
--    o = FbInC(x,16,a,t);
--    p = FbInC(x,24,a,t);
-+
-+    x = (*src->fetch) (src) >> 24;
-+    if (x == 0xff)
-+	return a;
-+
-+    m = FbInU(a,0,x,t);
-+    n = FbInU(a,8,x,t);
-+    o = FbInU(a,16,x,t);
-+    p = FbInU(a,24,x,t);
-     return m|n|o|p;
- }
- 
-@@ -608,7 +608,7 @@
-     cs = fbCombineMaskC (src, msk);
-     d = (*dst->fetch) (dst);
-     s = cs.value;
--    ad = cs.alpha;
-+    ad = ~cs.alpha;
-     as = d >> 24;
-     m = FbGen(s,d,0,as,FbGet8(ad,0),t,u,v);
-     n = FbGen(s,d,8,as,FbGet8(ad,8),t,u,v);
-@@ -698,10 +698,10 @@
-     s = cs.value;
-     ad = ~cs.alpha;
-     as = ~d >> 24;
--    m = FbGen(s,d,0,as,ad,t,u,v);
--    n = FbGen(s,d,8,as,ad,t,u,v);
--    o = FbGen(s,d,16,as,ad,t,u,v);
--    p = FbGen(s,d,24,as,ad,t,u,v);
-+    m = FbGen(s,d,0,as,FbGet8(ad,0),t,u,v);
-+    n = FbGen(s,d,8,as,FbGet8(ad,8),t,u,v);
-+    o = FbGen(s,d,16,as,FbGet8(ad,16),t,u,v);
-+    p = FbGen(s,d,24,as,FbGet8(ad,24),t,u,v);
-     (*dst->store) (dst, m|n|o|p);
- }
- 
-@@ -763,10 +763,9 @@
- 		    FbCompositeOperand   *dst)
- {
-     CARD32  s = fbCombineMaskU (src, msk), d;
--#if 0
-     CARD16  sa, da;
-     CARD16  ad, as;
--    CARD16  t;
-+    CARD16  t, u, v;
-     CARD32  m,n,o,p;
-     
-     d = (*dst->fetch) (dst);
-@@ -789,16 +788,6 @@
- 	p = FbGen(s,d,24,as,ad,t,u,v);
-     }
-     (*dst->store) (dst, m|n|o|p);
--#else
--    if ((s >> 24) == 0xff)
--	(*dst->store) (dst, s);
--    else
--    {
--	d = (*dst->fetch) (dst);
--	if ((s >> 24) > (d >> 24))
--	    (*dst->store) (dst, s);
--    }
--#endif
- }
- 
- void
-@@ -831,7 +820,7 @@
-     else
- 	n = FbGen (s, d, 8, (da << 8) / sg, 0xff, t, u, v);
-     
--    if (sr < da)
-+    if (sr <= da)
- 	o = FbAdd(s,d,16,t);
-     else
- 	o = FbGen (s, d, 16, (da << 8) / sr, 0xff, t, u, v);
-@@ -972,8 +961,8 @@
-     FbCompSrc	cs;
-     CARD32  s, d;
-     CARD32  m,n,o,p;
--    CARD32  Fa;
--    CARD16  Fb, t, u, v;
-+    CARD32  Fa, Fb;
-+    CARD16  t, u, v;
-     CARD32  sa;
-     CARD8   da;
- 
-@@ -996,10 +985,10 @@
- 	Fa = m|n|o|p;
- 	break;
-     case CombineAIn:
--	m = fbCombineDisjointOutPart ((CARD8) (sa >> 0), da);
--	n = fbCombineDisjointOutPart ((CARD8) (sa >> 8), da) << 8;
--	o = fbCombineDisjointOutPart ((CARD8) (sa >> 16), da) << 16;
--	p = fbCombineDisjointOutPart ((CARD8) (sa >> 24), da) << 24;
-+	m = fbCombineDisjointInPart ((CARD8) (sa >> 0), da);
-+	n = fbCombineDisjointInPart ((CARD8) (sa >> 8), da) << 8;
-+	o = fbCombineDisjointInPart ((CARD8) (sa >> 16), da) << 16;
-+	p = fbCombineDisjointInPart ((CARD8) (sa >> 24), da) << 24;
- 	Fa = m|n|o|p;
- 	break;
-     case CombineA:
-@@ -1012,19 +1001,27 @@
- 	Fb = 0;
- 	break;
-     case CombineBOut:
--	Fb = fbCombineDisjointOutPart (da, sa);
-+	m = fbCombineDisjointOutPart (da, (CARD8) (sa >> 0));
-+	n = fbCombineDisjointOutPart (da, (CARD8) (sa >> 8)) << 8;
-+	o = fbCombineDisjointOutPart (da, (CARD8) (sa >> 16)) << 16;
-+	p = fbCombineDisjointOutPart (da, (CARD8) (sa >> 24)) << 24;
-+	Fb = m|n|o|p;
- 	break;
-     case CombineBIn:
--	Fb = fbCombineDisjointInPart (da, sa);
-+	m = fbCombineDisjointInPart (da, (CARD8) (sa >> 0));
-+	n = fbCombineDisjointInPart (da, (CARD8) (sa >> 8)) << 8;
-+	o = fbCombineDisjointInPart (da, (CARD8) (sa >> 16)) << 16;
-+	p = fbCombineDisjointInPart (da, (CARD8) (sa >> 24)) << 24;
-+	Fb = m|n|o|p;
- 	break;
-     case CombineB:
--	Fb = 0xff;
-+	Fb = 0xffffffff;
- 	break;
-     }
--    m = FbGen (s,d,0,FbGet8(Fa,0),Fb,t,u,v);
--    n = FbGen (s,d,8,FbGet8(Fa,8),Fb,t,u,v);
--    o = FbGen (s,d,16,FbGet8(Fa,16),Fb,t,u,v);
--    p = FbGen (s,d,24,FbGet8(Fa,24),Fb,t,u,v);
-+    m = FbGen (s,d,0,FbGet8(Fa,0),FbGet8(Fb,0),t,u,v);
-+    n = FbGen (s,d,8,FbGet8(Fa,8),FbGet8(Fb,8),t,u,v);
-+    o = FbGen (s,d,16,FbGet8(Fa,16),FbGet8(Fb,16),t,u,v);
-+    p = FbGen (s,d,24,FbGet8(Fa,24),FbGet8(Fb,24),t,u,v);
-     s = m|n|o|p;
-     (*dst->store) (dst, s);
- }
-@@ -1065,21 +1062,6 @@
-     fbCombineDisjointGeneralC (src, msk, dst, CombineAOver);
- }
- 
--void
--fbCombineDisjointOverReverseU (FbCompositeOperand    *src,
--			       FbCompositeOperand    *msk,
--			       FbCompositeOperand    *dst)
--{
--    fbCombineDisjointGeneralU (src, msk, dst, CombineBOver);
--}
--
--void
--fbCombineDisjointOverReverseC (FbCompositeOperand    *src,
--			       FbCompositeOperand    *msk,
--			       FbCompositeOperand    *dst)
--{
--    fbCombineDisjointGeneralC (src, msk, dst, CombineBOver);
--}
- 
- void
- fbCombineDisjointInU (FbCompositeOperand	    *src,
-@@ -1281,8 +1263,8 @@
-     FbCompSrc	cs;
-     CARD32  s, d;
-     CARD32  m,n,o,p;
--    CARD32  Fa;
--    CARD16  Fb, t, u, v;
-+    CARD32  Fa, Fb;
-+    CARD16  t, u, v;
-     CARD32  sa;
-     CARD8   da;
- 
-@@ -1305,10 +1287,10 @@
- 	Fa = m|n|o|p;
- 	break;
-     case CombineAIn:
--	m = fbCombineConjointOutPart ((CARD8) (sa >> 0), da);
--	n = fbCombineConjointOutPart ((CARD8) (sa >> 8), da) << 8;
--	o = fbCombineConjointOutPart ((CARD8) (sa >> 16), da) << 16;
--	p = fbCombineConjointOutPart ((CARD8) (sa >> 24), da) << 24;
-+	m = fbCombineConjointInPart ((CARD8) (sa >> 0), da);
-+	n = fbCombineConjointInPart ((CARD8) (sa >> 8), da) << 8;
-+	o = fbCombineConjointInPart ((CARD8) (sa >> 16), da) << 16;
-+	p = fbCombineConjointInPart ((CARD8) (sa >> 24), da) << 24;
- 	Fa = m|n|o|p;
- 	break;
-     case CombineA:
-@@ -1321,19 +1303,27 @@
- 	Fb = 0;
- 	break;
-     case CombineBOut:
--	Fb = fbCombineConjointOutPart (da, sa);
-+	m = fbCombineConjointOutPart (da, (CARD8) (sa >> 0));
-+	n = fbCombineConjointOutPart (da, (CARD8) (sa >> 8)) << 8;
-+	o = fbCombineConjointOutPart (da, (CARD8) (sa >> 16)) << 16;
-+	p = fbCombineConjointOutPart (da, (CARD8) (sa >> 24)) << 24;
-+	Fb = m|n|o|p;
- 	break;
-     case CombineBIn:
--	Fb = fbCombineConjointInPart (da, sa);
-+	m = fbCombineConjointInPart (da, (CARD8) (sa >> 0));
-+	n = fbCombineConjointInPart (da, (CARD8) (sa >> 8)) << 8;
-+	o = fbCombineConjointInPart (da, (CARD8) (sa >> 16)) << 16;
-+	p = fbCombineConjointInPart (da, (CARD8) (sa >> 24)) << 24;
-+	Fb = m|n|o|p;
- 	break;
-     case CombineB:
--	Fb = 0xff;
-+	Fb = 0xffffffff;
- 	break;
-     }
--    m = FbGen (s,d,0,FbGet8(Fa,0),Fb,t,u,v);
--    n = FbGen (s,d,8,FbGet8(Fa,8),Fb,t,u,v);
--    o = FbGen (s,d,16,FbGet8(Fa,16),Fb,t,u,v);
--    p = FbGen (s,d,24,FbGet8(Fa,24),Fb,t,u,v);
-+    m = FbGen (s,d,0,FbGet8(Fa,0),FbGet8(Fb,0),t,u,v);
-+    n = FbGen (s,d,8,FbGet8(Fa,8),FbGet8(Fb,8),t,u,v);
-+    o = FbGen (s,d,16,FbGet8(Fa,16),FbGet8(Fb,16),t,u,v);
-+    p = FbGen (s,d,24,FbGet8(Fa,24),FbGet8(Fb,24),t,u,v);
-     s = m|n|o|p;
-     (*dst->store) (dst, s);
- }
-@@ -1519,14 +1509,14 @@
-     fbCombineAtopReverseU,
-     fbCombineXorU,
-     fbCombineAddU,
--    fbCombineDisjointOverU, /* Saturate */
-+    fbCombineSaturateU,
-     0,
-     0,
-     fbCombineClear,
-     fbCombineSrcU,
-     fbCombineDst,
-     fbCombineDisjointOverU,
--    fbCombineDisjointOverReverseU,
-+    fbCombineSaturateU, /* DisjointOverReverse */
-     fbCombineDisjointInU,
-     fbCombineDisjointInReverseU,
-     fbCombineDisjointOutU,
-@@ -1566,14 +1556,14 @@
-     fbCombineAtopReverseC,
-     fbCombineXorC,
-     fbCombineAddC,
--    fbCombineDisjointOverC, /* Saturate */
-+    fbCombineSaturateC,
-     0,
-     0,
-     fbCombineClear,	    /* 0x10 */
-     fbCombineSrcC,
-     fbCombineDst,
-     fbCombineDisjointOverC,
--    fbCombineDisjointOverReverseC,
-+    fbCombineSaturateC, /* DisjointOverReverse */
-     fbCombineDisjointInC,
-     fbCombineDisjointInReverseC,
-     fbCombineDisjointOutC,
-Index: programs/Xserver/fb/fbpict.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/Xserver/fb/fbpict.c,v
-retrieving revision 1.2
-diff -u -r1.2 fbpict.c
---- programs/Xserver/fb/fbpict.c	23 Apr 2004 19:05:14 -0000	1.2
-+++ programs/Xserver/fb/fbpict.c	12 May 2004 00:45:56 -0000
-@@ -1001,7 +1001,6 @@
- 	{
- 	    switch (pSrc->format) {
- 	    case PICT_a8r8g8b8:
--	    case PICT_x8r8g8b8:
- 		switch (pDst->format) {
- 		case PICT_a8r8g8b8:
- 		case PICT_x8r8g8b8:
-@@ -1016,7 +1015,6 @@
- 		}
- 		break;
- 	    case PICT_a8b8g8r8:
--	    case PICT_x8b8g8r8:
- 		switch (pDst->format) {
- 		case PICT_a8b8g8r8:
- 		case PICT_x8b8g8r8:
-Index: programs/Xserver/fb/fbpict.h
-===================================================================
-RCS file: /cvs/xorg/xc/programs/Xserver/fb/fbpict.h,v
-retrieving revision 1.2
-diff -u -r1.2 fbpict.h
---- programs/Xserver/fb/fbpict.h	23 Apr 2004 19:05:14 -0000	1.2
-+++ programs/Xserver/fb/fbpict.h	11 May 2004 18:46:20 -0000
-@@ -333,15 +333,8 @@
- 			FbCompositeOperand   *msk,
- 			FbCompositeOperand   *dst);
- 
--void
--fbCombineDisjointOverReverseU (FbCompositeOperand    *src,
--			       FbCompositeOperand    *msk,
--			       FbCompositeOperand    *dst);
--
--void
--fbCombineDisjointOverReverseC (FbCompositeOperand    *src,
--			       FbCompositeOperand    *msk,
--			       FbCompositeOperand    *dst);
-+#define fbCombineDisjointOverReverseU fbCombineSaturateU
-+#define fbCombineDisjointOverReverseC fbCombineSaturateC
- 
- void
- fbCombineDisjointInU (FbCompositeOperand	    *src,
diff --git a/x11-servers/xorg-server/files/patch-kernel-Imakefile b/x11-servers/xorg-server/files/patch-kernel-Imakefile
deleted file mode 100644
index ab5ca0b01406..000000000000
--- a/x11-servers/xorg-server/files/patch-kernel-Imakefile
+++ /dev/null
@@ -1,18 +0,0 @@
---- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Imakefile.orig	Sun May  9 21:27:57 2004
-+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Imakefile	Sun May  9 21:28:16 2004
-@@ -20,6 +20,7 @@
- 	@echo 'Use "make -f Makefile.bsd" to manually build the modules'
- #endif
- 
-+#if 0
- SRCS_DRM = \
- 	drm.h \
- 	drmP.h \
-@@ -130,6 +131,7 @@
- InstallNamedNonExec(radeon/Makefile,Makefile,$(DRMSRCDIR)/radeon)
- InstallNamedNonExec(sis/Makefile,Makefile,$(DRMSRCDIR)/sis)
- InstallNamedNonExec(tdfx/Makefile,Makefile,$(DRMSRCDIR)/tdfx)
-+#endif /* 0 */
- 
- LinkSourceFile(drm.h,$(XF86OSSRC)/shared/drm/kernel)
- LinkSourceFile(drm_sarea.h,$(XF86OSSRC)/shared/drm/kernel)
diff --git a/x11-servers/xorg-server/files/patch-linux.cf b/x11-servers/xorg-server/files/patch-linux.cf
deleted file mode 100644
index 4d6ff268910b..000000000000
--- a/x11-servers/xorg-server/files/patch-linux.cf
+++ /dev/null
@@ -1,11 +0,0 @@
---- config/cf/linux.cf.orig	Fri May  7 15:51:10 2004
-+++ config/cf/linux.cf	Fri May  7 15:51:17 2004
-@@ -747,7 +747,7 @@
- #endif
- 
- #ifndef XF86OSCardDrivers
--# define XF86OSCardDrivers	v4l
-+# define XF86OSCardDrivers	fbdev v4l
- #endif
- 
- #ifndef OSXInputDrivers
diff --git a/x11-servers/xorg-server/files/patch-loadmod.c b/x11-servers/xorg-server/files/patch-loadmod.c
deleted file mode 100644
index ea1c4862bfe4..000000000000
--- a/x11-servers/xorg-server/files/patch-loadmod.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- programs/Xserver/hw/xfree86/loader/loadmod.c.orig	Fri May  7 18:46:10 2004
-+++ programs/Xserver/hw/xfree86/loader/loadmod.c	Fri May  7 18:46:12 2004
-@@ -62,7 +62,6 @@
- #include "xf86Xinput.h"
- #endif
- #include "loader.h"
--#include "xf86Optrec.h"
- 
- #include <sys/types.h>
- #include <regex.h>
diff --git a/x11-servers/xorg-server/files/patch-xf86cfg-Imakefile b/x11-servers/xorg-server/files/patch-xf86cfg-Imakefile
new file mode 100644
index 000000000000..5728d915fb48
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-xf86cfg-Imakefile
@@ -0,0 +1,11 @@
+--- programs/Xserver/hw/xfree86/xf86cfg/Imakefile.orig	Sat Sep 11 15:11:04 2004
++++ programs/Xserver/hw/xfree86/xf86cfg/Imakefile	Sat Sep 11 15:11:07 2004
+@@ -25,6 +25,8 @@
+ SNPRINTFOBJS = snprintf.o
+ #endif
+ 
++XAWLIB = -lXaw
++
+ SRCS	=\
+ 	accessx.c\
+ 	card-cfg.c\
diff --git a/x11-servers/xorg-server/files/patch-xf86drmCompat.c b/x11-servers/xorg-server/files/patch-xf86drmCompat.c
deleted file mode 100644
index 98d4c84a0a03..000000000000
--- a/x11-servers/xorg-server/files/patch-xf86drmCompat.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmCompat.c.orig	Sun Aug 22 17:35:50 2004
-+++ programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmCompat.c	Sun Aug 22 17:36:11 2004
-@@ -77,8 +77,8 @@
- #include "mga_drm.h"
- #include "r128_drm.h"
- #include "radeon_drm.h"
--#ifndef __FreeBSD__
- #include "sis_drm.h"
-+#ifndef __FreeBSD__
- #include "i810_drm.h"
- #include "i830_drm.h"
- #endif
-@@ -1012,7 +1012,6 @@
-    }
- }
- 
--#ifndef __FreeBSD__
- /* SiS */
- 
- Bool drmSiSAgpInit(int driSubFD, int offset, int size)
-@@ -1026,6 +1025,7 @@
-    return 1; /* TRUE */
- }
- 
-+#ifndef __FreeBSD__
- /* I830 */
- 
- Bool drmI830CleanupDma(int driSubFD)
diff --git a/x11-servers/xorg-server/files/patch-xf86fbman.c b/x11-servers/xorg-server/files/patch-xf86fbman.c
deleted file mode 100644
index 1d6fcc88f041..000000000000
--- a/x11-servers/xorg-server/files/patch-xf86fbman.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- programs/Xserver/hw/xfree86/common/xf86fbman.c.orig	Wed Nov 26 23:48:58 2003
-+++ programs/Xserver/hw/xfree86/common/xf86fbman.c	Wed Sep  1 21:15:58 2004
-@@ -1095,12 +1095,10 @@
- 
-     *size = 0;
-     
--    if (!offman->LinearAreas) return FALSE;
--
-     pLink = offman->LinearAreas;
--    pLinkRet = pLink;
- 
--    if (!pLink->area) {
-+    if (pLink && !pLink->area) {
-+	pLinkRet = pLink;
- 	while (pLink) {
- 	    if (pLink->free) {
- 		if (pLink->linear.size > pLinkRet->linear.size)
diff --git a/x11-servers/xorg-server/files/patch-xorg.cf b/x11-servers/xorg-server/files/patch-xorg.cf
deleted file mode 100644
index b3f55760761f..000000000000
--- a/x11-servers/xorg-server/files/patch-xorg.cf
+++ /dev/null
@@ -1,29 +0,0 @@
---- config/cf/xorg.cf.orig	Wed Aug 25 04:46:40 2004
-+++ config/cf/xorg.cf	Wed Aug 25 04:53:17 2004
-@@ -388,7 +388,7 @@
- 				GlideDriver i128 NscDriver \
- 				ati i810 AgpGartDrivers DevelDrivers ark \
- 				cyrix siliconmotion via \
--				fbdev vesa vga \
-+				vesa vga \
- 				dummy XF86OSCardDrivers XF86ExtraCardDrivers
- # endif
- 
-@@ -485,7 +485,7 @@
- #  define XF86CardDrivers	mga glint nv tga s3 s3virge sis rendition \
- 				neomagic tdfx savage cirrus tseng trident \
- 				chips apm i128 ati ark cyrix siliconmotion \
--				vga dummy fbdev vesa
-+				vga dummy vesa
- # endif
- 
- /* DRI tdfx driver needs Glide, which is not available for AMD64 */
-@@ -589,7 +589,7 @@
- /* Pure SBUS and PCI drivers should go first */
- # ifndef XF86CardDrivers
- #  define XF86CardDrivers	sunffb sunleo suncg6 suncg3 suncg14 suntcx \
--				sunbw2 glint mga tdfx ati vesa vga fbdev \
-+				sunbw2 glint mga tdfx ati vesa vga \
- 				XF86OSCardDrivers XF86ExtraCardDrivers \
- 				DevelDrivers
- # endif
diff --git a/x11-servers/xorg-server/files/patch-xorgconfig.c b/x11-servers/xorg-server/files/patch-xorgconfig.c
index c1391e8c1b63..650360ec75fe 100644
--- a/x11-servers/xorg-server/files/patch-xorgconfig.c
+++ b/x11-servers/xorg-server/files/patch-xorgconfig.c
@@ -1,11 +1,11 @@
---- programs/Xserver/hw/xfree86/xf86config/xorgconfig.c.orig	Wed Nov  3 20:05:48 2004
-+++ programs/Xserver/hw/xfree86/xf86config/xorgconfig.c	Wed Nov  3 20:06:16 2004
-@@ -838,8 +838,7 @@
+--- programs/Xserver/hw/xfree86/xf86config/xorgconfig.c.orig	Mon Nov  8 22:18:58 2004
++++ programs/Xserver/hw/xfree86/xf86config/xorgconfig.c	Mon Nov  8 22:19:22 2004
+@@ -854,8 +854,7 @@
  "which is the rate at which scanlines are displayed.\n"
  "\n"
  "The valid range for horizontal sync and vertical sync should be documented\n"
 -"in the manual of your monitor. If in doubt, check the monitor database\n"
--TREEROOTLX "/doc/Monitors to see if your monitor is there.\n"
+-TREEROOTDOC "/Monitors to see if your monitor is there.\n"
 +"in the manual of your monitor.\n"
  "\n";
  
diff --git a/x11-servers/xorg-server/pkg-plist b/x11-servers/xorg-server/pkg-plist
index 56a3728fbaa8..e69e46d0ec56 100644
--- a/x11-servers/xorg-server/pkg-plist
+++ b/x11-servers/xorg-server/pkg-plist
@@ -36,18 +36,23 @@ include/X11/pixmaps/monitor.xpm
 include/X11/pixmaps/mouse.xpm
 lib/X11/Cards
 lib/X11/Options
-lib/X11/XF86Config.98
-lib/X11/XF86Config.eg
 lib/X11/app-defaults/XOrgCfg
 lib/X11/doc/BUILD
 lib/X11/doc/BugReport
 lib/X11/doc/DESIGN
 lib/X11/doc/Install
 lib/X11/doc/LICENSE
+lib/X11/doc/OS2.Notes
 lib/X11/doc/README
 lib/X11/doc/README.DECtga
+lib/X11/doc/README.Darwin
 lib/X11/doc/README.I128
+lib/X11/doc/README.LynxOS
+lib/X11/doc/README.NetBSD
+lib/X11/doc/README.OpenBSD
+lib/X11/doc/README.SCO
 lib/X11/doc/README.SiS
+lib/X11/doc/README.Solaris
 lib/X11/doc/README.XKB-Config
 lib/X11/doc/README.XKB-Enhancing
 lib/X11/doc/README.apm
@@ -72,38 +77,6 @@ lib/X11/etc/xmodmap.std
 lib/X11/getconfig/cfg.sample
 lib/X11/getconfig/xorg.cfg
 lib/X11/xserver/SecurityPolicy
-lib/modules/codeconv/libARABIC.a
-lib/modules/codeconv/libARMSCII8.a
-lib/modules/codeconv/libBIG5.a
-lib/modules/codeconv/libBIG5HKSCS.a
-lib/modules/codeconv/libDOSENCODING.a
-lib/modules/codeconv/libGB18030.a
-lib/modules/codeconv/libGB2312.a
-lib/modules/codeconv/libGBK.a
-lib/modules/codeconv/libGEORGIAN.a
-lib/modules/codeconv/libISO8859_1.a
-lib/modules/codeconv/libISO8859_10.a
-lib/modules/codeconv/libISO8859_11.a
-lib/modules/codeconv/libISO8859_13.a
-lib/modules/codeconv/libISO8859_14.a
-lib/modules/codeconv/libISO8859_15.a
-lib/modules/codeconv/libISO8859_2.a
-lib/modules/codeconv/libISO8859_3.a
-lib/modules/codeconv/libISO8859_4.a
-lib/modules/codeconv/libISO8859_5.a
-lib/modules/codeconv/libISO8859_6.a
-lib/modules/codeconv/libISO8859_7.a
-lib/modules/codeconv/libISO8859_8.a
-lib/modules/codeconv/libISO8859_9.a
-lib/modules/codeconv/libJISX0201.a
-lib/modules/codeconv/libJISX0208.a
-lib/modules/codeconv/libJISX0212.a
-lib/modules/codeconv/libKOI8.a
-lib/modules/codeconv/libKSC5601.a
-lib/modules/codeconv/libKSCJOHAB.a
-lib/modules/codeconv/libMULEENCODING.a
-lib/modules/codeconv/libTCVN.a
-lib/modules/codeconv/libVISCII.a
 %%AMD64_I386%%lib/modules/drivers/apm_drv.o
 %%AMD64_I386%%lib/modules/drivers/ark_drv.o
 lib/modules/drivers/ati_drv.o
@@ -155,9 +128,7 @@ lib/modules/extensions/librecord.a
 lib/modules/extensions/libxtrap.a
 lib/modules/fonts/libbitmap.a
 lib/modules/fonts/libfreetype.so
-lib/modules/fonts/libspeedo.a
 lib/modules/fonts/libtype1.a
-lib/modules/fonts/libxtt.a
 lib/modules/freebsd/libdrm.a
 lib/modules/input/acecad_drv.o
 lib/modules/input/calcomp_drv.o
@@ -170,6 +141,7 @@ lib/modules/input/fpit_drv.o
 lib/modules/input/hyperpen_drv.o
 lib/modules/input/js_x_drv.o
 lib/modules/input/kbd_drv.o
+lib/modules/input/keyboard_drv.o
 lib/modules/input/magellan_drv.o
 lib/modules/input/microtouch_drv.o
 lib/modules/input/mouse_drv.o
@@ -181,11 +153,13 @@ lib/modules/input/summa_drv.o
 lib/modules/input/tek4957_drv.o
 lib/modules/input/void_drv.o
 lib/modules/input/wacom_drv.o
-%%I386%%lib/modules/libafb.a
+%%ALPHA_NA%%lib/modules/libafb.a
 lib/modules/libcfb.a
 lib/modules/libcfb16.a
 lib/modules/libcfb24.a
 lib/modules/libcfb32.a
+lib/modules/libcw.a
+lib/modules/libdamage.a
 lib/modules/libddc.a
 lib/modules/libfb.a
 lib/modules/libi2c.a
@@ -209,3 +183,4 @@ lib/modules/libxf8_32bpp.a
 %%SPARC64%%lib/modules/libxf8_32wid.a
 %%SPARC64_NA%%lib/modules/v10002d.uc
 %%SPARC64_NA%%lib/modules/v20002d.uc
+@dirrm lib/X11/getconfig
diff --git a/x11-servers/xorg-server/scripts/configure b/x11-servers/xorg-server/scripts/configure
index 02215f320916..ba6b214f80d3 100644
--- a/x11-servers/xorg-server/scripts/configure
+++ b/x11-servers/xorg-server/scripts/configure
@@ -14,6 +14,8 @@ echo "#define LibInstall NO"			>> $LOCALDEF
 echo "#define ForceNormalLib NO"		>> $LOCALDEF
 echo "#define XTrueTypeInstallCConvHeaders NO"	>> $LOCALDEF
 echo "#define BuildServer YES"			>> $LOCALDEF
+echo "#define BuildXprint NO"			>> $LOCALDEF
+echo "#define BuildLibraries NO"		>> $LOCALDEF
 echo "#define LibInstallBuild YES"		>> $LOCALDEF
 echo "#define ModInstall YES"			>> $LOCALDEF
 echo "#define XF86Server NO"			>> $LOCALDEF