Update X.Org ports to 6.8.1, and the DRI port to use Mesa 6.2. Because Mesa 6.2

DRI drivers are incompatible with the old libGL in XFree86, they have been
repocopied to graphics/xfree86-dri.  Also note that with this commit the html
manpages are going away, and with it the runtime dependency on perl for the
imake port.

Release notes at: http://www.x.org/X11R6.8.1/RELNOTES.txt

Props to:	kris (multiple cluster runs and sorting through logs)
		lesi (fixing all the issues in those logs, and more)

35 files changed, 363 insertions, 595 deletions

diff --git a/x11/XFree86-4-clients/scripts/configure b/x11/XFree86-4-clients/scripts/configure
index 91b7305e1d59..6ed34b344561 100644
--- a/x11/XFree86-4-clients/scripts/configure
+++ b/x11/XFree86-4-clients/scripts/configure
@@ -47,6 +47,7 @@ for i in \
 	BuildCyrillicFonts \
 	BuildLatin2Fonts \
 	BuildPlugin \
+	BuildHtmlManPages \
 	LibHeaders \
 	LibInstall \
 	ForceNormalLib \
diff --git a/x11/XFree86-4-libraries/Makefile.inc b/x11/XFree86-4-libraries/Makefile.inc
index 06c202678136..f23204170a72 100644
--- a/x11/XFree86-4-libraries/Makefile.inc
+++ b/x11/XFree86-4-libraries/Makefile.inc
@@ -69,6 +69,5 @@ do-install:
 	@for dir in ${XINSTALL_MAN_DIRS}; do \
 		cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE} install.man; \
 	done
-	@${MKHTMLINDEX} ${PREFIX}/lib/X11/doc/html
 .endif
 
diff --git a/x11/XFree86-4-libraries/scripts/configure b/x11/XFree86-4-libraries/scripts/configure
index a78d6103fd98..ed6fff32962e 100644
--- a/x11/XFree86-4-libraries/scripts/configure
+++ b/x11/XFree86-4-libraries/scripts/configure
@@ -43,6 +43,7 @@ for i in \
 	BuildCIDFonts \
 	BuildCyrillicFonts \
 	BuildLatin2Fonts \
+	BuildHtmlManPages \
 	BuildPlugin
 do \
 	echo "#define $i NO"			>> $LOCALDEF
diff --git a/x11/XFree86-4-manuals/Makefile b/x11/XFree86-4-manuals/Makefile
index 7846831e8aac..b965bdf7a611 100644
--- a/x11/XFree86-4-manuals/Makefile
+++ b/x11/XFree86-4-manuals/Makefile
@@ -25,13 +25,19 @@ EXTRACT_AFTER_ARGS=	| ${TAR} -xf - ${EXTRACT_TARGET}
 PROJECTROOT=		-DProjectRoot=${PREFIX}
 DIST_SUBDIR=		xc
 WRKSRC=			${WRKDIR}/xc/doc/man
+CFGDIR=			${WRKDIR}/xc/config
 INSTALL_TARGET=		install.man
 
+pre-configure:
+	@${MKDIR} ${CFGDIR}
+	@${CP} ${PREFIX}/lib/X11/config/* ${CFGDIR}
+	@${ECHO} "#define BuildHtmlManPages NO" >>${CFGDIR}/xf86site.def
+
 do-configure:
 	(cd ${WRKSRC} && \
-	 imake -DUseInstalled ${PROJECTROOT} -I${PREFIX}/lib/X11/config \
+	 imake -DUseInstalled ${PROJECTROOT} -I${CFGDIR} \
 		-DTOPDIR=../.. -DCURDIR=.; \
-	 ${MAKE} Makefiles ; \
+	 ${MAKE} Makefiles CONFIGDIR=${CFGDIR} ; \
 	 ${MAKE} includes ; \
 	 ${MAKE} depend)
 
diff --git a/x11/XFree86-4/Makefile b/x11/XFree86-4/Makefile
index 22792f171ecd..aba5780232b0 100644
--- a/x11/XFree86-4/Makefile
+++ b/x11/XFree86-4/Makefile
@@ -20,7 +20,7 @@ COMMENT=	X11/XFree86 core distribution (complete, using mini/meta-ports)
 LIB_DEPENDS=	X11.6:${PORTSDIR}/x11/XFree86-4-libraries
 RUN_DEPENDS=	xvinfo:${PORTSDIR}/x11/XFree86-4-clients \
 	${X11BASE}/lib/X11/doc/ddx.txt:${PORTSDIR}/x11/XFree86-4-documents \
-	${X11BASE}/lib/X11/doc/html/X.7.html:${PORTSDIR}/x11/XFree86-4-manuals \
+	${X11BASE}/man/man7/X.7.gz:${PORTSDIR}/x11/XFree86-4-manuals \
 	${FONT100DPI}:${PORTSDIR}/x11-fonts/XFree86-4-font100dpi \
 	${FONT75DPI}:${PORTSDIR}/x11-fonts/XFree86-4-font75dpi \
 	${FONTCYR}:${PORTSDIR}/x11-fonts/XFree86-4-fontCyrillic \
diff --git a/x11/libGL/Makefile b/x11/libGL/Makefile
index 2cdea87d155a..af90016b6843 100644
--- a/x11/libGL/Makefile
+++ b/x11/libGL/Makefile
@@ -7,11 +7,13 @@
 
 PORTNAME=	libGL
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	x11
-MASTER_SITES=	http://freedesktop.org/~xorg/X11R6.7.0/src/
-DISTFILES=	X11R6.7.0-src1.tar.gz \
-		X11R6.7.0-src3.tar.gz
-EXTRACT_ONLY=	X11R6.7.0-src1.tar.gz
+MASTER_SITES=	${MASTER_SITE_XORG}
+MASTER_SITE_SUBDIR=	X11R6.8.1/tars
+DISTFILES=	X11R6.8.1-src1.tar.gz \
+		X11R6.8.1-src3.tar.gz
+EXTRACT_ONLY=	X11R6.8.1-src1.tar.gz
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	OpenGL library that renders using GLX or DRI
@@ -36,7 +38,7 @@ BROKEN=	Requires libXThrStub, which should be part of libX11
 
 post-extract:
 	(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
-		${DISTDIR}/${DIST_SUBDIR}/X11R6.7.0-src3.tar.gz | \
+		${DISTDIR}/${DIST_SUBDIR}/X11R6.8.1-src3.tar.gz | \
 		${TAR} -xf - xc/programs/Xserver/hw/xfree86/os-support \
 		xc/programs/Xserver/GL)
 
diff --git a/x11/libGL/distinfo b/x11/libGL/distinfo
index b9025936ccb4..62c1647dc07b 100644
--- a/x11/libGL/distinfo
+++ b/x11/libGL/distinfo
@@ -1,4 +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-src3.tar.gz) = 4c7144786522bbce383b21ace72bf669
-SIZE (xorg/X11R6.7.0-src3.tar.gz) = 10855793
+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/xorg-clients/Makefile b/x11/xorg-clients/Makefile
index f2eec453b845..83a0d933bc04 100644
--- a/x11/xorg-clients/Makefile
+++ b/x11/xorg-clients/Makefile
@@ -6,15 +6,13 @@
 #
 
 PORTNAME=	xorg-clients
-PORTVERSION=	6.7.0
-PORTREVISION=	5
+PORTVERSION=	6.8.1
 CATEGORIES=	x11
-MASTER_SITES=	http://freedesktop.org/~xorg/X11R6.7.0/src/ \
-		${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR=	R6.7/tars
-DISTFILES=	X11R6.7.0-src1.tar.gz \
-		X11R6.7.0-src2.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}-src2.tar.gz \
+		X11R${PORTVERSION}-src3.tar.gz
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X client programs and related files from X.Org
diff --git a/x11/xorg-clients/distinfo b/x11/xorg-clients/distinfo
index de8ed629db2a..0c514cc6b0f3 100644
--- a/x11/xorg-clients/distinfo
+++ b/x11/xorg-clients/distinfo
@@ -1,6 +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-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/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b
+SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401
+MD5 (xorg/X11R6.8.1-src2.tar.gz) = 6ba36becf1133c61a88c92e1d60c19ed
+SIZE (xorg/X11R6.8.1-src2.tar.gz) = 5808949
+MD5 (xorg/X11R6.8.1-src3.tar.gz) = 8578e566e909e7c40300f44b6f0e88d3
+SIZE (xorg/X11R6.8.1-src3.tar.gz) = 10014808
diff --git a/x11/xorg-clients/files/manpages b/x11/xorg-clients/files/manpages
index 483513027ba4..f7708cfc60b1 100644
--- a/x11/xorg-clients/files/manpages
+++ b/x11/xorg-clients/files/manpages
@@ -50,6 +50,7 @@ MAN1=	Xmark.1 \
 	xditview.1 \
 	xdm.1 \
 	xdpyinfo.1 \
+	xdriinfo.1 \
 	xedit.1 \
 	xev.1 \
 	xeyes.1 \
@@ -76,8 +77,14 @@ MAN1=	Xmark.1 \
 	xmessage.1 \
 	xmh.1 \
 	xmodmap.1 \
+	xmore.1 \
 	xon.1 \
+	xphelloworld.1 \
+	xplsprinters.1 \
+	xprehashprinterlist.1 \
 	xprop.1 \
+	xpsimplehelloworld.1 \
+	xpxthelloworld.1 \
 	xrandr.1 \
 	xrdb.1 \
 	xrefresh.1 \
diff --git a/x11/xorg-clients/files/patch-dpsinfo-Imakefile b/x11/xorg-clients/files/patch-dpsinfo-Imakefile
index 03f08a4f2138..b8bb1b853432 100644
--- a/x11/xorg-clients/files/patch-dpsinfo-Imakefile
+++ b/x11/xorg-clients/files/patch-dpsinfo-Imakefile
@@ -1,23 +1,15 @@
---- programs/dpsinfo/Imakefile.orig	Thu Mar  4 09:48:47 2004
-+++ programs/dpsinfo/Imakefile	Sat May 29 16:21:20 2004
-@@ -3,7 +3,6 @@
- 
-         DEPLIBS = $(DEPDPSLIB) $(DEPXTOOLLIB) $(DEPXONLYLIB)
- LOCAL_LIBRARIES = $(DPSLIB) $(XTOOLLIB) $(XONLYLIB)
--         PSWRAP = PsWrap
- 
- SRCS = iwraps.psw dpsinfo.c
- 
-@@ -13,10 +12,10 @@
+--- programs/dpsinfo/Imakefile.orig	Fri Apr 23 12:54:31 2004
++++ programs/dpsinfo/Imakefile	Tue Oct 19 20:05:08 2004
+@@ -13,10 +13,10 @@
  
  .SUFFIXES: .psw .h
  
 -.psw.c : ProgramTargetName($(PSWRAP))
-+.psw.c : PsWrapDependency
++.psw.c : 
  	RunProgram(PSWRAP,-a -o $*.c -h $*.h $<)
  
 -.psw.h : ProgramTargetName($(PSWRAP))
-+.psw.h : PsWrapDependency
++.psw.h : 
  	RunProgram(PSWRAP,-a -h $*.h $< > /dev/null)
  
  depend:: $(DERIVED_FILES)
diff --git a/x11/xorg-clients/files/patch-programs_Imakefile b/x11/xorg-clients/files/patch-programs_Imakefile
deleted file mode 100644
index b2d7c924544b..000000000000
--- a/x11/xorg-clients/files/patch-programs_Imakefile
+++ /dev/null
@@ -1,22 +0,0 @@
-
-$FreeBSD$
-
---- programs/Imakefile.orig	Sat Jul 24 02:13:01 2004
-+++ programs/Imakefile	Sat Jul 24 02:13:23 2004
-@@ -57,7 +57,6 @@
-        XRXSRCDIR = xrx
- #endif
-        XSMSRCDIR = xsm
--     XTERMSRCDIR = xterm
-       SCRIPTSDIR = scripts
- #endif
- #if BuildCID
-@@ -129,7 +128,7 @@
- 	xlsclients xlsfonts xmag xman xmessage xmh xmodmap xprop xrdb \
- 	xrefresh $(XRXSRCDIR) xset \
- 	xsetroot $(XSMSRCDIR) xstdcmap $(XINPUTCLIENTDIRS) \
--	$(XTERMSRCDIR) $(XTRAPCLIENTDIRS) $(XVIDTUNESRCDIR) xwd xwininfo xwud \
-+	$(XTRAPCLIENTDIRS) $(XVIDTUNESRCDIR) xwd xwininfo xwud \
- 	$(XPMCLIENTDIRS) $(XVINFOSRCDIR) \
- 	$(XSSRCDIR) $(XASSRCDIR) $(LBXPROXYSRCDIR) $(SCRIPTSDIR) \
- 	$(GLXCLIENTDIRS) $(XRANDRDIR) $(XCURSORGENDIR) 
diff --git a/x11/xorg-clients/files/patch-texteroids b/x11/xorg-clients/files/patch-texteroids
index 335883a8dde4..13240cf33c2a 100644
--- a/x11/xorg-clients/files/patch-texteroids
+++ b/x11/xorg-clients/files/patch-texteroids
@@ -1,23 +1,15 @@
---- programs/texteroids/Imakefile.orig	Mon Sep  2 13:23:43 2002
-+++ programs/texteroids/Imakefile	Mon Sep  2 13:27:13 2002
-@@ -3,7 +3,6 @@
-         DEPLIBS = $(DEPDPSLIB) $(DEPXTOOLLIB) $(DEPXLIB)
- LOCAL_LIBRARIES = $(XTOOLLIB) $(DPSLIB) $(XLIB)
-   SYS_LIBRARIES = MathLibrary
--         PSWRAP = PsWrap
- 
- SRCS = twraps.psw texteroids.c
- 
-@@ -13,10 +12,10 @@
+--- programs/texteroids/Imakefile.orig	Fri Apr 23 12:54:37 2004
++++ programs/texteroids/Imakefile	Tue Oct 19 20:07:40 2004
+@@ -13,10 +13,10 @@
  
  .SUFFIXES: .psw .h
  
 -.psw.c : ProgramTargetName($(PSWRAP))
-+.psw.c : PsWrapDependency
++.psw.c :
  	RunProgram(PSWRAP,-a -o $*.c -h $*.h $<)
  
 -.psw.h : ProgramTargetName($(PSWRAP))
-+.psw.h : PsWrapDependency
++.psw.h :
  	RunProgram(PSWRAP,-a -h $*.h $< > /dev/null)
  
  depend:: $(DERIVED_FILES)
diff --git a/x11/xorg-clients/files/patch-xdm-socket.c b/x11/xorg-clients/files/patch-xdm-socket.c
deleted file mode 100644
index 01c00e51e607..000000000000
--- a/x11/xorg-clients/files/patch-xdm-socket.c
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: programs/xdm/socket.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/xdm/socket.c,v
-retrieving revision 1.2
-diff -u -r1.2 socket.c
---- programs/xdm/socket.c	23 Apr 2004 19:54:42 -0000	1.2
-+++ programs/xdm/socket.c	6 Jul 2004 00:28:43 -0000
-@@ -67,6 +67,9 @@
-     char *name = localHostname ();
-     registerHostname (name, strlen (name));
- 
-+    if (request_port == 0)
-+	return;
-+
- #if defined(IPv6) && defined(AF_INET6)
-     chooserFd = socket (AF_INET6, SOCK_STREAM, 0);
-     if (chooserFd == -1)
diff --git a/x11/xorg-clients/pkg-plist b/x11/xorg-clients/pkg-plist
index e3f83b4a5a4b..27e0adb88a33 100644
--- a/x11/xorg-clients/pkg-plist
+++ b/x11/xorg-clients/pkg-plist
@@ -52,6 +52,7 @@ bin/xcutsel
 bin/xditview
 bin/xdm
 bin/xdpyinfo
+bin/xdriinfo
 bin/xedit
 bin/xev
 bin/xeyes
@@ -81,8 +82,14 @@ bin/xman
 bin/xmessage
 bin/xmh
 bin/xmodmap
+bin/xmore
 bin/xon
+bin/xphelloworld
+bin/xplsprinters
+bin/xprehashprinterlist
 bin/xprop
+bin/xpsimplehelloworld
+bin/xpxthelloworld
 bin/xrandr
 bin/xrdb
 bin/xrefresh
@@ -141,6 +148,7 @@ lib/X11/app-defaults/XFontSel
 lib/X11/app-defaults/XLoad
 lib/X11/app-defaults/XLogo
 lib/X11/app-defaults/XLogo-color
+lib/X11/app-defaults/XMore
 lib/X11/app-defaults/XSm
 lib/X11/app-defaults/Xditview
 lib/X11/app-defaults/Xditview-chrtr
@@ -344,17 +352,26 @@ lib/X11/twm/system.twmrc
 lib/X11/x11perfcomp/fillblnk
 lib/X11/x11perfcomp/perfboth
 lib/X11/x11perfcomp/perfratio
+@unexec if cmp -s %D/lib/X11/xdm/GiveConsole.default %D/lib/X11/xdm/GiveConsole; then rm -f %D/lib/X11/xdm/GiveConsole; fi
 lib/X11/xdm/GiveConsole.default
+@unexec if cmp -s %D/lib/X11/xdm/TakeConsole.default %D/lib/X11/xdm/TakeConsole; then rm -f %D/lib/X11/xdm/TakeConsole; fi
 lib/X11/xdm/TakeConsole.default
+@unexec if cmp -s %D/lib/X11/xdm/Xaccess.default %D/lib/X11/xdm/Xaccess; then rm -f %D/lib/X11/xdm/Xaccess; fi
 lib/X11/xdm/Xaccess.default
+@unexec if cmp -s %D/lib/X11/xdm/Xresources.default %D/lib/X11/xdm/Xresources; then rm -f %D/lib/X11/xdm/Xresources; fi
 lib/X11/xdm/Xresources.default
+@unexec if cmp -s %D/lib/X11/xdm/Xservers.default %D/lib/X11/xdm/Xservers; then rm -f %D/lib/X11/xdm/Xservers; fi
 lib/X11/xdm/Xservers.default
+@unexec if cmp -s %D/lib/X11/xdm/Xsession.default %D/lib/X11/xdm/Xsession; then rm -f %D/lib/X11/xdm/Xsession; fi
 lib/X11/xdm/Xsession.default
+@unexec if cmp -s %D/lib/X11/xdm/Xsetup_0.default %D/lib/X11/xdm/Xsetup_0; then rm -f %D/lib/X11/xdm/Xsetup_0; fi
 lib/X11/xdm/Xsetup_0.default
+@unexec if cmp -s %D/lib/X11/xdm/Xwilling.default %D/lib/X11/xdm/Xwilling; then rm -f %D/lib/X11/xdm/Xwilling; fi
 lib/X11/xdm/Xwilling.default
 lib/X11/xdm/chooser
 lib/X11/xdm/pixmaps/xorg-bw.xpm
 lib/X11/xdm/pixmaps/xorg.xpm
+@unexec if cmp -s %D/lib/X11/xdm/xdm-config.default %D/lib/X11/xdm/xdm-config; then rm -f %D/lib/X11/xdm/xdm-config; fi
 lib/X11/xdm/xdm-config.default
 lib/X11/xedit/lisp/indent.lsp
 lib/X11/xedit/lisp/lisp.lsp
@@ -373,6 +390,7 @@ lib/X11/xedit/lisp/progmodes/xlog.lsp
 lib/X11/xedit/lisp/progmodes/xrdb.lsp
 lib/X11/xedit/lisp/syntax.lsp
 lib/X11/xedit/lisp/xedit.lsp
+@unexec if cmp -s %D/lib/X11/xinit/xinitrc.default %D/lib/X11/xinit/xinitrc; then rm -f %D/lib/X11/xinit/xinitrc; fi
 lib/X11/xinit/xinitrc.default
 lib/X11/xkb/README
 lib/X11/xkb/README.config
@@ -493,6 +511,7 @@ lib/X11/xkb/rules/sgi.lst
 lib/X11/xkb/rules/sun
 lib/X11/xkb/rules/sun.lst
 lib/X11/xkb/rules/xfree86
+lib/X11/xkb/rules/xfree86.lst
 lib/X11/xkb/rules/xorg
 lib/X11/xkb/rules/xorg-it.lst
 lib/X11/xkb/rules/xorg.lst
@@ -733,6 +752,14 @@ lib/X11/xkb/types/pc
 lib/X11/xkb/xkbcomp
 lib/X11/xman.help
 lib/X11/xsm/system.xsm
+@dirrm lib/X11/icons/redglass/cursors
+@dirrm lib/X11/icons/redglass
+@dirrm lib/X11/icons/whiteglass/cursors
+@dirrm lib/X11/icons/whiteglass
+@dirrm lib/X11/icons/handhelds/cursors
+@dirrm lib/X11/icons/handhelds
+@dirrm lib/X11/icons/default
+@dirrm lib/X11/xkb/geometry/ibm
 
 @comment xterm workaround
 bin/resize
diff --git a/x11/xorg-clients/scripts/configure b/x11/xorg-clients/scripts/configure
index 139d289c805b..aa92ba29b024 100644
--- a/x11/xorg-clients/scripts/configure
+++ b/x11/xorg-clients/scripts/configure
@@ -5,6 +5,7 @@ LOCALDEF=$WRKDIR/.config
 rm -f $LOCALDEF
 echo "#define BuildServer NO"			>> $LOCALDEF
 echo "#define BuildLBX NO"			>> $LOCALDEF
+echo "#define BuildXterm NO"			>> $LOCALDEF
 echo "#define BuildFontServer NO"			>> $LOCALDEF
 echo "#define UseInstalledPrograms YES"			>> $LOCALDEF
 echo "#define UseInstalledLibraries YES"	>> $LOCALDEF
diff --git a/x11/xorg-documents/Makefile b/x11/xorg-documents/Makefile
index ba5e046c81df..b15c0d59786c 100644
--- a/x11/xorg-documents/Makefile
+++ b/x11/xorg-documents/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	xorg-documents
-PORTVERSION=	6.7.0
+PORTVERSION=	6.8.1
 CATEGORIES=	x11
-MASTER_SITES=	http://freedesktop.org/~xorg/X11R6.7.0/src/ \
-		${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR=	R6.7/tars
-DISTFILES=	X11R6.7.0-src1.tar.gz \
-		X11R6.7.0-src6.tar.gz
+MASTER_SITES=	${MASTER_SITE_XORG}
+MASTER_SITE_SUBDIR=	X11R6.8.1/tars
+DISTFILES=	X11R${PORTVERSION}-src1.tar.gz \
+		X11R${PORTVERSION}-src6.tar.gz
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Documentation of X11 protocol and libraries from X.Org
diff --git a/x11/xorg-documents/distinfo b/x11/xorg-documents/distinfo
index 4b420ce9b34b..f1dbf971ca94 100644
--- a/x11/xorg-documents/distinfo
+++ b/x11/xorg-documents/distinfo
@@ -1,4 +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-src6.tar.gz) = f52fe308e14525e3fa1eeb9dcd6d83a6
-SIZE (xorg/X11R6.7.0-src6.tar.gz) = 3181606
+MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b
+SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401
+MD5 (xorg/X11R6.8.1-src6.tar.gz) = 13d9a1ebf811261434eb8a771d826c3c
+SIZE (xorg/X11R6.8.1-src6.tar.gz) = 3180972
diff --git a/x11/xorg-documents/pkg-plist b/x11/xorg-documents/pkg-plist
index 373ba65d9c58..0d875b15c9f7 100644
--- a/x11/xorg-documents/pkg-plist
+++ b/x11/xorg-documents/pkg-plist
@@ -91,3 +91,7 @@ share/doc/X11/xsmp.txt
 share/doc/X11/xtest.txt
 share/doc/X11/xtestlib.txt
 share/doc/X11/xv-protocol-v2.txt
+@unexec rmdir %D/share/doc/X11/PDF 2>/dev/null || true
+@unexec rmdir %D/share/doc/X11/PostScript 2>/dev/null || true
+@unexec rmdir %D/share/doc/X11/html 2>/dev/null || true
+@unexec rmdir %D/share/doc/X11 2>/dev/null || true
diff --git a/x11/xorg-libraries/Makefile b/x11/xorg-libraries/Makefile
index 99467852413a..70a214ea89a2 100644
--- a/x11/xorg-libraries/Makefile
+++ b/x11/xorg-libraries/Makefile
@@ -5,21 +5,13 @@
 # $FreeBSD$
 #
 
-PORTNAME=	libraries
-PORTVERSION=	6.7.0
-PORTREVISION=	3
+PORTNAME=	xorg-libraries
+PORTVERSION=	6.8.1
 CATEGORIES=	x11
-MASTER_SITES=	http://freedesktop.org/~xorg/X11R6.7.0/src/:xorg \
-		${MASTER_SITE_XORG:S/$/:xorg/} \
-		${MASTER_SITE_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR=	R6.7/tars/:xorg \
-			anholt/:local
-PKGNAMEPREFIX=	xorg-
-DISTFILES=	X11R6.7.0-src1.tar.gz:xorg \
-		X11R6.7.0-src3.tar.gz:xorg \
-		Wraphelp2.gz:local
-EXTRACT_ONLY=	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=	X11 libraries and headers from X.Org
@@ -44,9 +36,6 @@ XINSTALL_DIRS=	include lib nls programs/Xserver/include \
 
 INSTALLS_SHLIB=	yes
 
-post-extract:
-	${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp2.gz > ${WRKSRC}/lib/Xdmcp/Wraphelp.c
-
 post-patch:
 	${CP} ${FILESDIR}/nls-Compose-microsoft-cp1251 ${WRKSRC}/nls/Compose/microsoft-cp1251
 
@@ -69,11 +58,4 @@ PLIST_SUB+=	OSMESA:="@comment "
 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
index a07dba660207..62c1647dc07b 100644
--- a/x11/xorg-libraries/distinfo
+++ b/x11/xorg-libraries/distinfo
@@ -1,6 +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-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/xorg-libraries/files/patch-UIThrStubs.c b/x11/xorg-libraries/files/patch-UIThrStubs.c
new file mode 100644
index 000000000000..a2c94e643ad8
--- /dev/null
+++ b/x11/xorg-libraries/files/patch-UIThrStubs.c
@@ -0,0 +1,17 @@
+Index: lib/X11/UIThrStubs.c
+===================================================================
+RCS file: /cvs/xorg/xc/lib/X11/UIThrStubs.c,v
+retrieving revision 1.3
+retrieving revision 1.4
+diff -u -u -r1.3 -r1.4
+--- lib/X11/UIThrStubs.c	28 May 2004 23:26:44 -0000	1.3
++++ lib/X11/UIThrStubs.c	13 Oct 2004 07:38:00 -0000	1.4
+@@ -99,7 +99,7 @@
+ #else
+ #include <pthread.h>
+ typedef pthread_t xthread_t;
+-#if __GNUC__ >= 3
++#if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
+ xthread_t pthread_self()    __attribute__ ((weak, alias ("_Xthr_self_stub_")));
+ int pthread_mutex_init()    __attribute__ ((weak, alias ("_Xthr_zero_stub_")));
+ int pthread_mutex_destroy() __attribute__ ((weak, alias ("_Xthr_zero_stub_")));
diff --git a/x11/xorg-libraries/files/patch-Xcomposite-Imakefile b/x11/xorg-libraries/files/patch-Xcomposite-Imakefile
new file mode 100644
index 000000000000..5aab74346231
--- /dev/null
+++ b/x11/xorg-libraries/files/patch-Xcomposite-Imakefile
@@ -0,0 +1,11 @@
+--- 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-Xdamage-Imakefile b/x11/xorg-libraries/files/patch-Xdamage-Imakefile
new file mode 100644
index 000000000000..316b3ba332fe
--- /dev/null
+++ b/x11/xorg-libraries/files/patch-Xdamage-Imakefile
@@ -0,0 +1,11 @@
+--- 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-Xevie-Imakefile b/x11/xorg-libraries/files/patch-Xevie-Imakefile
new file mode 100644
index 000000000000..5c5dcc066606
--- /dev/null
+++ b/x11/xorg-libraries/files/patch-Xevie-Imakefile
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..eba3ba644ed9
--- /dev/null
+++ b/x11/xorg-libraries/files/patch-Xfixes-Imakefile
@@ -0,0 +1,11 @@
+--- 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-Xrender-Imakefile b/x11/xorg-libraries/files/patch-Xrender-Imakefile
index 6df9d6bb0658..804b06c709ea 100644
--- a/x11/xorg-libraries/files/patch-Xrender-Imakefile
+++ b/x11/xorg-libraries/files/patch-Xrender-Imakefile
@@ -1,39 +1,11 @@
-Index: lib/Xrender/Imakefile
-===================================================================
-RCS file: /cvs/xorg/xc/lib/Xrender/Imakefile,v
-retrieving revision 1.2
-diff -u -r1.2 Imakefile
---- lib/Xrender/Imakefile	23 Apr 2004 18:43:50 -0000	1.2
-+++ lib/Xrender/Imakefile	7 Jul 2004 19:01:02 -0000
-@@ -133,6 +133,16 @@
+--- 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 > $@
  
- HEADERS = Xrender.h $(NONSTANDARD_HEADERS)
- 
-+SUBSTVARS=prefix="$(PROJECTROOT)" \
-+          exec_prefix="$(BINDIR)" \
-+          libdir="$(USRLIBDIR)" \
-+          includedir="$(INCROOT)" \
-+          VERSION="0.8.4" \
-+          X_REQUIRES="" \
-+          RENDER_CFLAGS="" \
-+          X_NON_PKG_CFLAGS="" \
-+          X_NON_PKG_LIBS="-lX11 -lXext"
-+
- #include <Library.tmpl>
- 
- DependTarget()
-@@ -142,3 +152,14 @@
- distclean:: clean
- 	RemoveFile(Makefile)
- #endif
-+
-+all:: xrender.pc
-+
-+xrender.pc: xrender.pc.in
-+	RemoveFile($@)
-+	sh ../Xcursor/config-subst $(SUBSTVARS) < xrender.pc.in > $@
-+
+-InstallNonExecFile(xrender.pc,$(USRLIBDIR)/pkgconfig)
 +InstallNonExecFile(xrender.pc,$(PROJECTROOT)/libdata/pkgconfig)
-+
-+clean::
-+	RemoveFile(xrender.pc)
+ 
+ clean::
+ 	RemoveFile(xrender.pc)
diff --git a/x11/xorg-libraries/files/patch-dps-Imakefile b/x11/xorg-libraries/files/patch-dps-Imakefile
index ee16b18b7874..f85503bf79c0 100644
--- a/x11/xorg-libraries/files/patch-dps-Imakefile
+++ b/x11/xorg-libraries/files/patch-dps-Imakefile
@@ -1,37 +1,29 @@
---- 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 @@
+--- 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))
-+$(DPSOPSCFILES) $(PSOPSCFILES): PsWrapDependency
- 
+-
  SRCS = \
  	${COMMONSOURCEFILES} \
-@@ -224,16 +223,11 @@
+ 	${XSOURCEFILES} \
+@@ -224,16 +222,11 @@
  
  .SUFFIXES: .psw .h
  
 -.psw.c : HostProgramTargetName($(PSWRAP))
-+.psw.c : PsWrapDependency
++.psw.c :
  	RunProgram(PSWRAP,-a -o $*.c -h $*.h $<)
  
 -.psw.h : HostProgramTargetName($(PSWRAP))
-+.psw.h : PsWrapDependency
++.psw.h :
  	RunProgram(PSWRAP,-a -h $*.h $< > /dev/null)
 -
 -HostProgramTargetName($(PSWRAP)):
 -	@echo "checking $@ over in $(PSWRAPSRC) first..."; \
--	cd $(PSWRAPSRC) && $(MAKE) pswraponly; \
+-	test -d $(PSWRAPSRC) && cd $(PSWRAPSRC) && $(MAKE) pswraponly; \
 -	echo "okay, continuing in $(CURRENT_DIR)"
  
  includes :: $(HEADERS)
diff --git a/x11/xorg-libraries/files/patch-xpm-sec b/x11/xorg-libraries/files/patch-xpm-sec
index 347ab0563d6e..fcb22f47be46 100644
--- a/x11/xorg-libraries/files/patch-xpm-sec
+++ b/x11/xorg-libraries/files/patch-xpm-sec
@@ -1,161 +1,82 @@
+? extras/Xpm/lib/xorg681-xpm-secadd.patch
 Index: extras/Xpm/lib/Attrib.c
 ===================================================================
 RCS file: /cvs/xorg/xc/extras/Xpm/lib/Attrib.c,v
-retrieving revision 1.1
-diff -u -r1.1 Attrib.c
---- extras/Xpm/lib/Attrib.c	14 Nov 2003 16:48:24 -0000	1.1
-+++ extras/Xpm/lib/Attrib.c	31 Oct 2004 20:12:38 -0000
-@@ -35,7 +35,7 @@
- #include "XpmI.h"
- 
- /* 3.2 backward compatibility code */
--LFUNC(CreateOldColorTable, int, (XpmColor *ct, int ncolors,
-+LFUNC(CreateOldColorTable, int, (XpmColor *ct, unsigned int ncolors,
- 				 XpmColor ***oldct));
- 
- LFUNC(FreeOldColorTable, void, (XpmColor **colorTable, int ncolors));
-@@ -46,12 +46,15 @@
- static int
- CreateOldColorTable(ct, ncolors, oldct)
-     XpmColor *ct;
--    int ncolors;
-+    unsigned int ncolors;
-     XpmColor ***oldct;
- {
+retrieving revision 1.1.1.1.6.1
+diff -u -r1.1.1.1.6.1 Attrib.c
+--- extras/Xpm/lib/Attrib.c	15 Sep 2004 15:47:39 -0000	1.1.1.1.6.1
++++ extras/Xpm/lib/Attrib.c	5 Nov 2004 03:21:02 -0000
+@@ -52,7 +52,7 @@
      XpmColor **colorTable, **color;
      int a;
  
+-    if (ncolors >= SIZE_MAX / sizeof(XpmColor *)) 
 +    if (ncolors >= UINT_MAX / sizeof(XpmColor *)) 
-+	return XpmNoMemory;
-+
+ 	return XpmNoMemory;
+ 
      colorTable = (XpmColor **) XpmMalloc(ncolors * sizeof(XpmColor *));
-     if (!colorTable) {
- 	*oldct = NULL;
 Index: extras/Xpm/lib/CrDatFrI.c
 ===================================================================
 RCS file: /cvs/xorg/xc/extras/Xpm/lib/CrDatFrI.c,v
-retrieving revision 1.1.10.1
-diff -u -r1.1.10.1 CrDatFrI.c
---- extras/Xpm/lib/CrDatFrI.c	4 Mar 2004 17:46:10 -0000	1.1.10.1
-+++ extras/Xpm/lib/CrDatFrI.c	31 Oct 2004 20:12:38 -0000
-@@ -124,6 +124,8 @@
+retrieving revision 1.2.4.1
+diff -u -r1.2.4.1 CrDatFrI.c
+--- extras/Xpm/lib/CrDatFrI.c	15 Sep 2004 15:47:39 -0000	1.2.4.1
++++ extras/Xpm/lib/CrDatFrI.c	5 Nov 2004 03:21:02 -0000
+@@ -124,7 +124,7 @@
       */
      header_nlines = 1 + image->ncolors;
      header_size = sizeof(char *) * header_nlines;
+-    if (header_size >= SIZE_MAX / sizeof(char *))
 +    if (header_size >= UINT_MAX / sizeof(char *))
-+	return (XpmNoMemory);
+ 	return (XpmNoMemory);
      header = (char **) XpmCalloc(header_size, sizeof(char *));
      if (!header)
- 	return (XpmNoMemory);
-Index: extras/Xpm/lib/WrFFrI.c
-===================================================================
-RCS file: /cvs/xorg/xc/extras/Xpm/lib/WrFFrI.c,v
-retrieving revision 1.1.10.1
-diff -u -r1.1.10.1 WrFFrI.c
---- extras/Xpm/lib/WrFFrI.c	4 Mar 2004 17:46:10 -0000	1.1.10.1
-+++ extras/Xpm/lib/WrFFrI.c	31 Oct 2004 20:12:26 -0000
-@@ -248,6 +248,8 @@
-     unsigned int x, y, h;
- 
-     h = height - 1;
-+    if (cpp != 0 && width >= (SIZE_MAX - 3)/cpp) 
-+	return XpmNoMemory;    
-     p = buf = (char *) XpmMalloc(width * cpp + 3);
-     if (!buf)
- 	return (XpmNoMemory);
-Index: extras/Xpm/lib/XpmI.h
-===================================================================
-RCS file: /cvs/xorg/xc/extras/Xpm/lib/XpmI.h,v
-retrieving revision 1.1.4.1.6.1
-diff -u -r1.1.4.1.6.1 XpmI.h
---- extras/Xpm/lib/XpmI.h	4 Mar 2004 17:46:10 -0000	1.1.4.1.6.1
-+++ extras/Xpm/lib/XpmI.h	31 Oct 2004 20:12:26 -0000
-@@ -86,6 +86,18 @@
- 		boundCheckingCalloc((long)(nelem),(long) (elsize))
- #endif
- 
-+#if defined(SCO) || defined(__USLC__)
-+#include <stdint.h>	/* For SIZE_MAX */
-+#endif
-+#include <limits.h>
-+#ifndef SIZE_MAX
-+# ifdef ULONG_MAX
-+#  define SIZE_MAX ULONG_MAX
-+# else 
-+#  define SIZE_MAX UINT_MAX
-+# endif
-+#endif
-+
- #define XPMMAXCMTLEN BUFSIZ
- typedef struct {
-     unsigned int type;
-@@ -187,9 +199,9 @@
- }      *xpmHashAtom;
- 
- typedef struct {
--    int size;
--    int limit;
--    int used;
-+    unsigned int size;
-+    unsigned int limit;
-+    unsigned int used;
-     xpmHashAtom *atomTable;
- }      xpmHashTable;
- 
 Index: extras/Xpm/lib/create.c
 ===================================================================
 RCS file: /cvs/xorg/xc/extras/Xpm/lib/create.c,v
-retrieving revision 1.1.4.1.6.1
-diff -u -r1.1.4.1.6.1 create.c
---- extras/Xpm/lib/create.c	4 Mar 2004 17:46:10 -0000	1.1.4.1.6.1
-+++ extras/Xpm/lib/create.c	31 Oct 2004 20:12:38 -0000
-@@ -1,3 +1,4 @@
+retrieving revision 1.2.4.1
+diff -u -r1.2.4.1 create.c
+--- extras/Xpm/lib/create.c	15 Sep 2004 15:47:39 -0000	1.2.4.1
++++ extras/Xpm/lib/create.c	5 Nov 2004 03:21:03 -0000
+@@ -1,4 +1,4 @@
+-/* $XdotOrg: xc/extras/Xpm/lib/create.c,v 1.2.4.1 2004/09/15 15:47:39 daniel Exp $ */
 +/* $XdotOrg: pre-CVS proposed fix for CESA-2004-003 alanc 7/25/2004 $ */
  /*
   * Copyright (C) 1989-95 GROUPE BULL
   *
-@@ -816,6 +817,9 @@
+@@ -817,7 +817,7 @@
  
      ErrorStatus = XpmSuccess;
  
+-    if (image->ncolors >= SIZE_MAX / sizeof(Pixel)) 
 +    if (image->ncolors >= UINT_MAX / sizeof(Pixel)) 
-+	return (XpmNoMemory);
-+
+ 	return (XpmNoMemory);
+ 
      /* malloc pixels index tables */
-     image_pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * image->ncolors);
-     if (!image_pixels)
-@@ -988,6 +992,10 @@
+@@ -992,8 +992,10 @@
  	return (XpmNoMemory);
  
  #if !defined(FOR_MSW) && !defined(AMIGA)
+-    if (height != 0 && (*image_return)->bytes_per_line >= SIZE_MAX / height)
 +    if (height != 0 && (*image_return)->bytes_per_line >= SIZE_MAX / height) {
 +	XDestroyImage(*image_return);
-+	return XpmNoMemory;
+ 	return XpmNoMemory;
 +    }
      /* now that bytes_per_line must have been set properly alloc data */
      (*image_return)->data =
  	(char *) XpmMalloc((*image_return)->bytes_per_line * height);
-@@ -2055,6 +2063,9 @@
+@@ -2061,8 +2063,8 @@
  	xpmGetCmt(data, &colors_cmt);
  
      /* malloc pixels index tables */
+-    if (ncolors >= SIZE_MAX / sizeof(Pixel)) 
+-	return XpmNoMemory;
 +    if (ncolors >= UINT_MAX / sizeof(Pixel)) 
 +	RETURN(XpmNoMemory);
-+
+ 
      image_pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * ncolors);
      if (!image_pixels)
- 	RETURN(XpmNoMemory);
-@@ -2309,7 +2320,8 @@
- 	    }
- 	    obm = SelectObject(*dc, image->bitmap);
- #endif
--
-+	    if (ncolors > 256)
-+		return (XpmFileInvalid);
- 
- 	    bzero((char *)colidx, 256 * sizeof(short));
- 	    for (a = 0; a < ncolors; a++)
-@@ -2356,7 +2368,7 @@
+@@ -2366,7 +2368,7 @@
  
  	    /* array of pointers malloced by need */
  	    unsigned short *cidx[256];
@@ -164,45 +85,15 @@ diff -u -r1.1.4.1.6.1 create.c
  
  	    bzero((char *)cidx, 256 * sizeof(unsigned short *)); /* init */
  	    for (a = 0; a < ncolors; a++) {
-@@ -2415,6 +2427,9 @@
- 	    char *s;
- 	    char buf[BUFSIZ];
- 
-+	    if (cpp >= sizeof(buf))
-+		return (XpmFileInvalid);
-+
- 	    buf[cpp] = '\0';
- 	    if (USE_HASHTABLE) {
- 		xpmHashAtom *slot;
-Index: extras/Xpm/lib/data.c
-===================================================================
-RCS file: /cvs/xorg/xc/extras/Xpm/lib/data.c,v
-retrieving revision 1.1.10.1
-diff -u -r1.1.10.1 data.c
---- extras/Xpm/lib/data.c	4 Mar 2004 17:46:10 -0000	1.1.10.1
-+++ extras/Xpm/lib/data.c	31 Oct 2004 20:12:26 -0000
-@@ -375,7 +375,7 @@
- {
-     if (!data->type)
- 	*cmt = NULL;
--    else if (data->CommentLength) {
-+    else if (data->CommentLength != 0 && data->CommentLength < SIZE_MAX - 1) {
- 	*cmt = (char *) XpmMalloc(data->CommentLength + 1);
- 	strncpy(*cmt, data->Comment, data->CommentLength);
- 	(*cmt)[data->CommentLength] = '\0';
 Index: extras/Xpm/lib/hashtab.c
 ===================================================================
 RCS file: /cvs/xorg/xc/extras/Xpm/lib/hashtab.c,v
-retrieving revision 1.1
-diff -u -r1.1 hashtab.c
---- extras/Xpm/lib/hashtab.c	14 Nov 2003 16:48:24 -0000	1.1
-+++ extras/Xpm/lib/hashtab.c	31 Oct 2004 20:12:38 -0000
-@@ -135,15 +135,17 @@
-     xpmHashTable *table;
- {
-     xpmHashAtom *atomTable = table->atomTable;
--    int size = table->size;
-+    unsigned int size = table->size;
+retrieving revision 1.1.1.1.6.1
+diff -u -r1.1.1.1.6.1 hashtab.c
+--- extras/Xpm/lib/hashtab.c	15 Sep 2004 15:47:39 -0000	1.1.1.1.6.1
++++ extras/Xpm/lib/hashtab.c	5 Nov 2004 03:21:03 -0000
+@@ -138,13 +138,13 @@
+     unsigned int size = table->size;
      xpmHashAtom *t, *p;
      int i;
 -    int oldSize = size;
@@ -212,198 +103,70 @@ diff -u -r1.1 hashtab.c
      HASH_TABLE_GROWS
  	table->size = size;
      table->limit = size / 3;
+-    if (size >= SIZE_MAX / sizeof(*atomTable)) 
 +    if (size >= UINT_MAX / sizeof(*atomTable)) 
-+	return (XpmNoMemory);
+ 	return (XpmNoMemory);
      atomTable = (xpmHashAtom *) XpmMalloc(size * sizeof(*atomTable));
      if (!atomTable)
- 	return (XpmNoMemory);
-@@ -204,6 +206,8 @@
+@@ -206,7 +206,7 @@
      table->size = INITIAL_HASH_SIZE;
      table->limit = table->size / 3;
      table->used = 0;
+-    if (table->size >= SIZE_MAX / sizeof(*atomTable))
 +    if (table->size >= UINT_MAX / sizeof(*atomTable))
-+	return (XpmNoMemory);
+ 	return (XpmNoMemory);
      atomTable = (xpmHashAtom *) XpmMalloc(table->size * sizeof(*atomTable));
      if (!atomTable)
- 	return (XpmNoMemory);
 Index: extras/Xpm/lib/parse.c
 ===================================================================
 RCS file: /cvs/xorg/xc/extras/Xpm/lib/parse.c,v
-retrieving revision 1.1.10.1
-diff -u -r1.1.10.1 parse.c
---- extras/Xpm/lib/parse.c	4 Mar 2004 17:46:10 -0000	1.1.10.1
-+++ extras/Xpm/lib/parse.c	31 Oct 2004 20:12:38 -0000
-@@ -1,3 +1,4 @@
+retrieving revision 1.2.4.1
+diff -u -r1.2.4.1 parse.c
+--- extras/Xpm/lib/parse.c	15 Sep 2004 15:47:39 -0000	1.2.4.1
++++ extras/Xpm/lib/parse.c	5 Nov 2004 03:21:03 -0000
+@@ -1,4 +1,4 @@
+-/* $XdotOrg: xc/extras/Xpm/lib/parse.c,v 1.2.4.1 2004/09/15 15:47:39 daniel Exp $ */
 +/* $XdotOrg: pre-CVS proposed fix for CESA-2004-003 alanc 7/25/2004 $ */
  /*
   * Copyright (C) 1989-95 GROUPE BULL
   *
-@@ -44,6 +45,24 @@
- #include <ctype.h>
- #include <string.h>
- 
-+#ifdef HAS_STRLCAT
-+# define STRLCAT(dst, src, dstsize) { \
-+  	if (strlcat(dst, src, dstsize) >= (dstsize)) \
-+	    return (XpmFileInvalid); }
-+# define STRLCPY(dst, src, dstsize) { \
-+  	if (strlcpy(dst, src, dstsize) >= (dstsize)) \
-+	    return (XpmFileInvalid); }
-+#else
-+# define STRLCAT(dst, src, dstsize) { \
-+	if ((strlen(dst) + strlen(src)) < (dstsize)) \
-+ 	    strcat(dst, src); \
-+	else return (XpmFileInvalid); }
-+# define STRLCPY(dst, src, dstsize) { \
-+	if (strlen(src) < (dstsize)) \
-+ 	    strcpy(dst, src); \
-+	else return (XpmFileInvalid); }
-+#endif
-+
- LFUNC(ParsePixels, int, (xpmData *data, unsigned int width,
- 			 unsigned int height, unsigned int ncolors,
- 			 unsigned int cpp, XpmColor *colorTable,
-@@ -66,7 +85,7 @@
-     unsigned int *extensions;
- {
-     unsigned int l;
--    char buf[BUFSIZ];
-+    char buf[BUFSIZ + 1];
- 
-     if (!data->format) {		/* XPM 2 or 3 */
- 
-@@ -175,10 +194,10 @@
-     XpmColor **colorTablePtr;
-     xpmHashTable *hashtable;
- {
--    unsigned int key = 0, l, a, b;
-+    unsigned int key = 0, l, a, b, len;
-     unsigned int curkey;		/* current color key */
-     unsigned int lastwaskey;		/* key read */
--    char buf[BUFSIZ];
-+    char buf[BUFSIZ+1];
-     char curbuf[BUFSIZ];		/* current buffer */
-     char **sptr, *s;
-     XpmColor *color;
-@@ -186,6 +205,8 @@
+@@ -205,7 +205,7 @@
      char **defaults;
      int ErrorStatus;
  
+-    if (ncolors >= SIZE_MAX / sizeof(XpmColor))
 +    if (ncolors >= UINT_MAX / sizeof(XpmColor))
-+	return (XpmNoMemory);
+ 	return (XpmNoMemory);
      colorTable = (XpmColor *) XpmCalloc(ncolors, sizeof(XpmColor));
      if (!colorTable)
- 	return (XpmNoMemory);
-@@ -197,6 +218,10 @@
+@@ -218,7 +218,7 @@
  	    /*
  	     * read pixel value
  	     */
+-	    if (cpp >= SIZE_MAX - 1) {
 +	    if (cpp >= UINT_MAX - 1) {
-+		xpmFreeColorTable(colorTable, ncolors);
-+		return (XpmNoMemory);
-+	    }
- 	    color->string = (char *) XpmMalloc(cpp + 1);
- 	    if (!color->string) {
- 		xpmFreeColorTable(colorTable, ncolors);
-@@ -234,13 +259,14 @@
- 		}
- 		if (!lastwaskey && key < NKEYS) {	/* open new key */
- 		    if (curkey) {	/* flush string */
--			s = (char *) XpmMalloc(strlen(curbuf) + 1);
-+			len = strlen(curbuf) + 1;
-+			s = (char *) XpmMalloc(len);
- 			if (!s) {
- 			    xpmFreeColorTable(colorTable, ncolors);
- 			    return (XpmNoMemory);
- 			}
- 			defaults[curkey] = s;
--			strcpy(s, curbuf);
-+			memcpy(s, curbuf, len);
- 		    }
- 		    curkey = key + 1;	/* set new key  */
- 		    *curbuf = '\0';	/* reset curbuf */
-@@ -251,9 +277,9 @@
- 			return (XpmFileInvalid);
- 		    }
- 		    if (!lastwaskey)
--			strcat(curbuf, " ");	/* append space */
-+			STRLCAT(curbuf, " ", sizeof(curbuf)); /* append space */
- 		    buf[l] = '\0';
--		    strcat(curbuf, buf);/* append buf */
-+		    STRLCAT(curbuf, buf, sizeof(curbuf));/* append buf */
- 		    lastwaskey = 0;
- 		}
- 	    }
-@@ -261,12 +287,13 @@
- 		xpmFreeColorTable(colorTable, ncolors);
- 		return (XpmFileInvalid);
- 	    }
--	    s = defaults[curkey] = (char *) XpmMalloc(strlen(curbuf) + 1);
-+	    len = strlen(curbuf) + 1;
-+	    s = defaults[curkey] = (char *) XpmMalloc(len);
- 	    if (!s) {
  		xpmFreeColorTable(colorTable, ncolors);
  		return (XpmNoMemory);
  	    }
--	    strcpy(s, curbuf);
-+	    memcpy(s, curbuf, len);
- 	}
-     } else {				/* XPM 1 */
- 	/* get to the beginning of the first string */
-@@ -279,6 +306,10 @@
+@@ -306,7 +306,7 @@
  	    /*
  	     * read pixel value
  	     */
+-	    if (cpp >= SIZE_MAX - 1) {
 +	    if (cpp >= UINT_MAX - 1) {
-+		xpmFreeColorTable(colorTable, ncolors);
-+		return (XpmNoMemory);
-+	    }
- 	    color->string = (char *) XpmMalloc(cpp + 1);
- 	    if (!color->string) {
- 		xpmFreeColorTable(colorTable, ncolors);
-@@ -307,16 +338,17 @@
- 	    *curbuf = '\0';		/* init curbuf */
- 	    while ((l = xpmNextWord(data, buf, BUFSIZ))) {
- 		if (*curbuf != '\0')
--		    strcat(curbuf, " ");/* append space */
-+		    STRLCAT(curbuf, " ", sizeof(curbuf));/* append space */
- 		buf[l] = '\0';
--		strcat(curbuf, buf);	/* append buf */
-+		STRLCAT(curbuf, buf, sizeof(curbuf));	/* append buf */
- 	    }
--	    s = (char *) XpmMalloc(strlen(curbuf) + 1);
-+	    len = strlen(curbuf) + 1;
-+	    s = (char *) XpmMalloc(len);
- 	    if (!s) {
  		xpmFreeColorTable(colorTable, ncolors);
  		return (XpmNoMemory);
  	    }
--	    strcpy(s, curbuf);
-+	    memcpy(s, curbuf, len);
- 	    color->c_color = s;
- 	    *curbuf = '\0';		/* reset curbuf */
- 	    if (a < ncolors - 1)
-@@ -341,6 +373,9 @@
-     unsigned int *iptr, *iptr2;
+@@ -374,7 +374,7 @@
      unsigned int a, x, y;
  
-+    if ((height > 0 && width >= SIZE_MAX / height) ||
+     if ((height > 0 && width >= SIZE_MAX / height) ||
+-	width * height >= SIZE_MAX / sizeof(unsigned int)) 
 +	width * height >= UINT_MAX / sizeof(unsigned int)) 
-+	return XpmNoMemory;
+ 	return XpmNoMemory;
  #ifndef FOR_MSW
      iptr2 = (unsigned int *) XpmMalloc(sizeof(unsigned int) * width * height);
- #else
-@@ -364,6 +399,9 @@
- 	{
- 	    unsigned short colidx[256];
- 
-+	    if (ncolors > 256)
-+		return (XpmFileInvalid);
-+
- 	    bzero((char *)colidx, 256 * sizeof(short));
- 	    for (a = 0; a < ncolors; a++)
- 		colidx[(unsigned char)colorTable[a].string[0]] = a + 1;
-@@ -394,7 +432,7 @@
+@@ -432,7 +432,7 @@
  
  	    /* array of pointers malloced by need */
  	    unsigned short *cidx[256];
@@ -412,110 +175,54 @@ diff -u -r1.1.10.1 parse.c
  
  	    bzero((char *)cidx, 256 * sizeof(unsigned short *)); /* init */
  	    for (a = 0; a < ncolors; a++) {
-@@ -442,6 +480,9 @@
- 	    char *s;
- 	    char buf[BUFSIZ];
- 
-+	    if (cpp >= sizeof(buf))
-+		return (XpmFileInvalid);
-+
- 	    buf[cpp] = '\0';
- 	    if (USE_HASHTABLE) {
- 		xpmHashAtom *slot;
 Index: extras/Xpm/lib/scan.c
 ===================================================================
 RCS file: /cvs/xorg/xc/extras/Xpm/lib/scan.c,v
-retrieving revision 1.1.10.1
-diff -u -r1.1.10.1 scan.c
---- extras/Xpm/lib/scan.c	4 Mar 2004 17:46:10 -0000	1.1.10.1
-+++ extras/Xpm/lib/scan.c	31 Oct 2004 20:12:38 -0000
-@@ -107,7 +107,8 @@
- LFUNC(ScanTransparentColor, int, (XpmColor *color, unsigned int cpp,
- 				  XpmAttributes *attributes));
- 
--LFUNC(ScanOtherColors, int, (Display *display, XpmColor *colors, int ncolors,
-+LFUNC(ScanOtherColors, int, (Display *display, XpmColor *colors, 
-+			     unsigned int ncolors, 
- 			     Pixel *pixels, unsigned int mask,
- 			     unsigned int cpp, XpmAttributes *attributes));
- 
-@@ -232,11 +233,17 @@
-     else
+retrieving revision 1.2.4.1
+diff -u -r1.2.4.1 scan.c
+--- extras/Xpm/lib/scan.c	15 Sep 2004 15:47:39 -0000	1.2.4.1
++++ extras/Xpm/lib/scan.c	5 Nov 2004 03:21:03 -0000
+@@ -234,14 +234,14 @@
  	cpp = 0;
  
-+    if ((height > 0 && width >= SIZE_MAX / height) ||
+     if ((height > 0 && width >= SIZE_MAX / height) ||
+-	width * height >= SIZE_MAX / sizeof(unsigned int))
 +	width * height >= UINT_MAX / sizeof(unsigned int))
-+	RETURN(XpmNoMemory);
+ 	RETURN(XpmNoMemory);
      pmap.pixelindex =
  	(unsigned int *) XpmCalloc(width * height, sizeof(unsigned int));
      if (!pmap.pixelindex)
  	RETURN(XpmNoMemory);
  
+-    if (pmap.size >= SIZE_MAX / sizeof(Pixel)) 
 +    if (pmap.size >= UINT_MAX / sizeof(Pixel)) 
-+	RETURN(XpmNoMemory);
-+
-     pmap.pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * pmap.size);
-     if (!pmap.pixels)
  	RETURN(XpmNoMemory);
-@@ -301,7 +308,8 @@
+ 
+     pmap.pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * pmap.size);
+@@ -308,7 +308,7 @@
       * get rgb values and a string of char, and possibly a name for each
       * color
       */
--
+-    if (pmap.ncolors >= SIZE_MAX / sizeof(XpmColor))
 +    if (pmap.ncolors >= UINT_MAX / sizeof(XpmColor))
-+	RETURN(XpmNoMemory);
+ 	RETURN(XpmNoMemory);
      colorTable = (XpmColor *) XpmCalloc(pmap.ncolors, sizeof(XpmColor));
      if (!colorTable)
- 	RETURN(XpmNoMemory);
-@@ -360,6 +368,8 @@
+@@ -368,7 +368,7 @@
  
      /* first get a character string */
      a = 0;
+-    if (cpp >= SIZE_MAX - 1)
 +    if (cpp >= UINT_MAX - 1)
-+	return (XpmNoMemory);
+ 	return (XpmNoMemory);
      if (!(s = color->string = (char *) XpmMalloc(cpp + 1)))
  	return (XpmNoMemory);
-     *s++ = printable[c = a % MAXPRINTABLE];
-@@ -407,7 +417,7 @@
- ScanOtherColors(display, colors, ncolors, pixels, mask, cpp, attributes)
-     Display *display;
-     XpmColor *colors;
--    int ncolors;
-+    unsigned int ncolors;
-     Pixel *pixels;
-     unsigned int mask;
-     unsigned int cpp;
-@@ -451,6 +461,8 @@
+@@ -461,7 +461,7 @@
      }
  
      /* first get character strings and rgb values */
+-    if (ncolors >= SIZE_MAX / sizeof(XColor) || cpp >= SIZE_MAX - 1)
 +    if (ncolors >= UINT_MAX / sizeof(XColor) || cpp >= UINT_MAX - 1)
-+	return (XpmNoMemory);
+ 	return (XpmNoMemory);
      xcolors = (XColor *) XpmMalloc(sizeof(XColor) * ncolors);
      if (!xcolors)
- 	return (XpmNoMemory);
-Index: lib/Xpm/Imakefile
-===================================================================
-RCS file: /cvs/xorg/xc/lib/Xpm/Imakefile,v
-retrieving revision 1.1.10.1
-diff -u -r1.1.10.1 Imakefile
---- lib/Xpm/Imakefile	4 Mar 2004 17:46:58 -0000	1.1.10.1
-+++ lib/Xpm/Imakefile	31 Oct 2004 20:12:26 -0000
-@@ -42,11 +42,16 @@
- SPRINTFDEF = -DVOID_SPRINTF
- #endif
- 
-+#if HasStrlcat
-+STRLCATDEF = -DHAS_STRLCAT
-+#endif
-+
- #if defined(Win32Architecture)
- ZPIPEDEF = -DNO_ZPIPE
- #endif
- 
--DEFINES = $(STRDUPDEF) $(STRCASECMPDEF) $(SPRINTFDEF) $(ZPIPEDEF) $(ZFILEDEF)
-+DEFINES = $(STRDUPDEF) $(STRCASECMPDEF) $(SPRINTFDEF) $(STRLCATDEF) \
-+		$(ZPIPEDEF) $(ZFILEDEF)
- 
- HEADERS = xpm.h
- 
diff --git a/x11/xorg-libraries/pkg-plist b/x11/xorg-libraries/pkg-plist
index 6f7115e3d8db..22b530f0ce65 100644
--- a/x11/xorg-libraries/pkg-plist
+++ b/x11/xorg-libraries/pkg-plist
@@ -111,6 +111,8 @@ 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
@@ -184,6 +186,8 @@ 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/Xresource.h
@@ -288,11 +292,16 @@ 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
@@ -303,12 +312,14 @@ 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/damage.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/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
@@ -338,6 +349,7 @@ 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
@@ -348,6 +360,8 @@ 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
@@ -360,12 +374,6 @@ 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
@@ -548,8 +556,6 @@ 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
@@ -560,21 +566,31 @@ 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/libXfontcache.a
-lib/libXfontcache.so
-lib/libXfontcache.so.1
 lib/libXi.a
 lib/libXi.so
 lib/libXi.so.6
@@ -593,6 +609,8 @@ 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
@@ -646,5 +664,12 @@ 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/XprintAppUtil
+@dirrm include/X11/XprintUtil
+@dirrm lib/X11/locale/zh_CN.UTF-8
diff --git a/x11/xorg-manpages/Makefile b/x11/xorg-manpages/Makefile
index 6a54b97cc46b..7900a6d2be85 100644
--- a/x11/xorg-manpages/Makefile
+++ b/x11/xorg-manpages/Makefile
@@ -5,16 +5,14 @@
 # $FreeBSD$
 #
 
-PORTNAME=	manpages
-PORTVERSION=	6.7.0
+PORTNAME=	xorg-manpages
+PORTVERSION=	6.8.1
 CATEGORIES=	x11
-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
-EXTRACT_ONLY=	X11R6.7.0-src1.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
+EXTRACT_ONLY=	X11R${PORTVERSION}-src1.tar.gz
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org library manual pages
@@ -28,7 +26,7 @@ XINCLUDE_DIRS=	${XMAN_DIRS}
 
 post-extract:
 	(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
-		${DISTDIR}/${DIST_SUBDIR}/X11R6.7.0-src3.tar.gz | \
+		${DISTDIR}/${DIST_SUBDIR}/X11R6.8.1-src3.tar.gz | \
 		${TAR} -xf - xc/programs/Xserver);
 
 .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc"
diff --git a/x11/xorg-manpages/distinfo b/x11/xorg-manpages/distinfo
index 6fd5e5d75a0d..62c1647dc07b 100644
--- a/x11/xorg-manpages/distinfo
+++ b/x11/xorg-manpages/distinfo
@@ -1,6 +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-src3.tar.gz) = 4c7144786522bbce383b21ace72bf669
-SIZE (xorg/X11R6.7.0-src3.tar.gz) = 10855793
-MD5 (xorg/X11R6.7.0-src4.tar.gz) = 4f2ed6fe4378fe60b58b8b4c8487cab0
-SIZE (xorg/X11R6.7.0-src4.tar.gz) = 13044107
+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/xorg-manpages/files/manpages b/x11/xorg-manpages/files/manpages
index 2cdddab3e21f..c2016c272820 100644
--- a/x11/xorg-manpages/files/manpages
+++ b/x11/xorg-manpages/files/manpages
@@ -645,6 +645,39 @@ MAN3=	AllPlanes.3 \
 	XmbufGetVersion.3 \
 	XmbufGetWindowAttributes.3 \
 	XmbufQueryExtension.3 \
+	XpCancelDoc.3 \
+	XpCancelJob.3 \
+	XpCancelPage.3 \
+	XpCreateContext.3 \
+	XpDestroyContext.3 \
+	XpEndDoc.3 \
+	XpEndJob.3 \
+	XpEndPage.3 \
+	XpFreePrinterList.3 \
+	XpGetAttributes.3 \
+	XpGetContext.3 \
+	XpGetDocumentData.3 \
+	XpGetImageResolution.3 \
+	XpGetLocaleHinter.3 \
+	XpGetOneAttribute.3 \
+	XpGetPageDimensions.3 \
+	XpGetPdmStartParams.3 \
+	XpGetPrinterList.3 \
+	XpGetScreenOfContext.3 \
+	XpInputSelected.3 \
+	XpPutDocumentData.3 \
+	XpQueryExtension.3 \
+	XpQueryScreens.3 \
+	XpQueryVersion.3 \
+	XpRehashPrinterList.3 \
+	XpSelectInput.3 \
+	XpSetAttributes.3 \
+	XpSetContext.3 \
+	XpSetImageResolution.3 \
+	XpSetLocaleHinter.3 \
+	XpStartDoc.3 \
+	XpStartJob.3 \
+	XpStartPage.3 \
 	Xrandr.3 \
 	XrmCombineDatabase.3 \
 	XrmCombineFileDatabase.3 \
@@ -1503,7 +1536,9 @@ MAN3=	AllPlanes.3 \
 	gluTessNormal.3 \
 	gluTessProperty.3 \
 	gluTessVertex.3 \
-	gluUnProject.3
+	gluUnProject.3 \
+	libXp.3
+
 MAN7=	X.7 \
 	X.Org.7 \
 	XConsortium.7 \
diff --git a/x11/xorg-manpages/files/patch-man-Imakefile b/x11/xorg-manpages/files/patch-man-Imakefile
new file mode 100644
index 000000000000..ece1a93fc226
--- /dev/null
+++ b/x11/xorg-manpages/files/patch-man-Imakefile
@@ -0,0 +1,11 @@
+--- doc/man/Imakefile.orig	Thu Nov 11 17:13:20 2004
++++ doc/man/Imakefile	Thu Nov 11 17:13:56 2004
+@@ -33,7 +33,7 @@
+ LIBMANDIRS = X11 Xt Xext Xi Xau $(XVDIR) $(GLXDIRS) $(GLUDIRS) $(DMXDIR) $(XPRINTLIBDIRS)
+ #endif
+ 
+-SUBDIRS = general $(LIBMANDIRS) $(MISCDIR)
++SUBDIRS = general $(LIBMANDIRS)
+ 
+ all::
+ 
diff --git a/x11/xorg/Makefile b/x11/xorg/Makefile
index dd9a14158ca1..d6d61aa95422 100644
--- a/x11/xorg/Makefile
+++ b/x11/xorg/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xorg
-PORTVERSION=	6.7.0
-PORTREVISION=	1
+PORTVERSION=	6.8.1
 CATEGORIES=	x11
 MASTER_SITES=	# none
 DISTFILES=	# none