18 files changed, 168 insertions, 269 deletions

diff --git a/x11/libGL/Makefile b/x11/libGL/Makefile
index af90016b6843..04f4a881bae9 100644
--- a/x11/libGL/Makefile
+++ b/x11/libGL/Makefile
@@ -43,6 +43,7 @@ post-extract:
 		xc/programs/Xserver/GL)
 
 post-install:
+	${MKDIR} ${PREFIX}/include/GL
 .for i in ${GLHEADERS}
 	${INSTALL_DATA} ${WRKSRC}/include/GL/${i} ${PREFIX}/include/GL
 .endfor
diff --git a/x11/libGL/pkg-plist b/x11/libGL/pkg-plist
index f4a50091e24c..52b3f27f8e33 100644
--- a/x11/libGL/pkg-plist
+++ b/x11/libGL/pkg-plist
@@ -9,3 +9,4 @@ include/GL/glxtokens.h
 lib/libGL.a
 lib/libGL.so
 lib/libGL.so.1
+@dirrm include/GL
diff --git a/x11/xfree86_xkb_xml/Makefile b/x11/xfree86_xkb_xml/Makefile
index 0f2bc1825c90..9d4204eee5e9 100644
--- a/x11/xfree86_xkb_xml/Makefile
+++ b/x11/xfree86_xkb_xml/Makefile
@@ -27,4 +27,12 @@ CONFIGURE_ARGS=	--with-xkb-base=${X11BASE}/lib/X11/xkb
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${X_WINDOW_SYSTEM:L} == xorg
+PLIST_SUB+=	NEWMTREE=""
+.else
+PLIST_SUB+=	NEWMTREE="@comment "
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/x11/xfree86_xkb_xml/pkg-plist b/x11/xfree86_xkb_xml/pkg-plist
index 2fc155b4aa8b..e31f5ca63962 100644
--- a/x11/xfree86_xkb_xml/pkg-plist
+++ b/x11/xfree86_xkb_xml/pkg-plist
@@ -2,3 +2,5 @@ lib/X11/xkb/rules/xfree86.xml
 lib/X11/xkb/rules/xkb.dtd
 share/locale/bg/LC_MESSAGES/xfree86_xkb_xml.mo
 share/locale/ru/LC_MESSAGES/xfree86_xkb_xml.mo
+%%NEWMTREE%%@unexec rmdir %D/lib/X11/xkb/rules 2>/dev/null || true
+%%NEWMTREE%%@unexec rmdir %D/lib/X11/xkb 2>/dev/null || true
diff --git a/x11/xorg-clients/Makefile b/x11/xorg-clients/Makefile
index 1f4555b6a6bb..9df059c6075a 100644
--- a/x11/xorg-clients/Makefile
+++ b/x11/xorg-clients/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	xorg-clients
-PORTVERSION=	6.8.1
-PORTREVISION=	1
+PORTVERSION=	6.8.2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR=	X11R6.8.1/tars
+MASTER_SITE_SUBDIR=	X11R${PORTVERSION}/src
 DISTFILES=	X11R${PORTVERSION}-src1.tar.gz \
 		X11R${PORTVERSION}-src2.tar.gz \
 		X11R${PORTVERSION}-src3.tar.gz
@@ -54,6 +53,7 @@ post-install:
 	${CHOWN} root:wheel ${PREFIX}/bin/luit
 	${CHMOD} 04711 ${PREFIX}/bin/luit
 .endif
+	${MKDIR} ${PREFIX}/lib/X11/xinit
 	${INSTALL_DATA} ${WRKSRC}/programs/xinit/xinitrc \
 		${PREFIX}/lib/X11/xinit/xinitrc.default
 .for i in ${XDMCONFDATA}
diff --git a/x11/xorg-clients/distinfo b/x11/xorg-clients/distinfo
index 0c514cc6b0f3..2833f6b9461c 100644
--- a/x11/xorg-clients/distinfo
+++ b/x11/xorg-clients/distinfo
@@ -1,6 +1,6 @@
-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
+MD5 (xorg/X11R6.8.2-src1.tar.gz) = a9cfa54ae2e65a057b9c6416befeb6ab
+SIZE (xorg/X11R6.8.2-src1.tar.gz) = 32373802
+MD5 (xorg/X11R6.8.2-src2.tar.gz) = b6f011b3131e442b8dab85d443d9a56f
+SIZE (xorg/X11R6.8.2-src2.tar.gz) = 5974936
+MD5 (xorg/X11R6.8.2-src3.tar.gz) = 057d20af30569434e2c6693c1ca66e57
+SIZE (xorg/X11R6.8.2-src3.tar.gz) = 10379299
diff --git a/x11/xorg-clients/pkg-plist b/x11/xorg-clients/pkg-plist
index 27e0adb88a33..8f470516426d 100644
--- a/x11/xorg-clients/pkg-plist
+++ b/x11/xorg-clients/pkg-plist
@@ -511,7 +511,9 @@ 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-it.lst
 lib/X11/xkb/rules/xfree86.lst
+lib/X11/xkb/rules/xfree86.xml
 lib/X11/xkb/rules/xorg
 lib/X11/xkb/rules/xorg-it.lst
 lib/X11/xkb/rules/xorg.lst
@@ -752,14 +754,6 @@ 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
@@ -768,3 +762,56 @@ bin/xterm
 lib/X11/app-defaults/UXTerm
 lib/X11/app-defaults/XTerm-color
 lib/X11/app-defaults/XTerm
+
+@dirrm include/X11/PM
+@dirrm lib/X11/proxymngr
+@dirrm lib/X11/rstart/commands/x11r6
+@dirrm lib/X11/rstart/commands
+@dirrm lib/X11/rstart/contexts
+@dirrm lib/X11/rstart
+@dirrm lib/X11/twm
+@dirrm lib/X11/x11perfcomp
+@dirrm lib/X11/xdm/pixmaps
+@dirrm lib/X11/xdm
+@dirrm lib/X11/xedit/lisp/progmodes
+@dirrm lib/X11/xedit/lisp
+@dirrm lib/X11/xedit
+@dirrm lib/X11/xkb/compat
+@dirrm lib/X11/xkb/geometry/digital
+@dirrm lib/X11/xkb/geometry/ibm
+@dirrm lib/X11/xkb/geometry/sgi
+@dirrm lib/X11/xkb/geometry
+@dirrm lib/X11/xkb/keycodes/digital
+@dirrm lib/X11/xkb/keycodes/sgi
+@dirrm lib/X11/xkb/keycodes
+@dirrm lib/X11/xkb/keymap/digital
+@dirrm lib/X11/xkb/keymap/sgi
+@dirrm lib/X11/xkb/keymap/sun
+@dirrm lib/X11/xkb/keymap
+@dirrm lib/X11/xkb/semantics
+@dirrm lib/X11/xkb/symbols/hp
+@dirrm lib/X11/xkb/symbols/digital
+@dirrm lib/X11/xkb/symbols/fujitsu
+@dirrm lib/X11/xkb/symbols/macintosh
+@dirrm lib/X11/xkb/symbols/nec
+@dirrm lib/X11/xkb/symbols/sgi
+@dirrm lib/X11/xkb/symbols/sony
+@dirrm lib/X11/xkb/symbols/sun
+@dirrm lib/X11/xkb/symbols/xfree68
+@dirrm lib/X11/xkb/symbols/pc
+@dirrm lib/X11/xkb/symbols
+@dirrm lib/X11/xkb/types
+@dirrm lib/X11/xkb/compiled
+@dirrm lib/X11/xkb/rules
+@dirrm lib/X11/xkb
+@dirrm lib/X11/xsm
+@dirrm lib/X11/icons/default
+@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
+@dirrm lib/X11/xinit
+@unexec rmdir %D/lib/X11/fonts/util 2>/dev/null || true
diff --git a/x11/xorg-clients/scripts/configure b/x11/xorg-clients/scripts/configure
index aa92ba29b024..5b2332cff3fb 100644
--- a/x11/xorg-clients/scripts/configure
+++ b/x11/xorg-clients/scripts/configure
@@ -7,6 +7,7 @@ echo "#define BuildServer NO"			>> $LOCALDEF
 echo "#define BuildLBX NO"			>> $LOCALDEF
 echo "#define BuildXterm NO"			>> $LOCALDEF
 echo "#define BuildFontServer NO"			>> $LOCALDEF
+echo "#define BuildPlugin NO"			>> $LOCALDEF
 echo "#define UseInstalledPrograms YES"			>> $LOCALDEF
 echo "#define UseInstalledLibraries YES"	>> $LOCALDEF
 echo "#define StandardIncludes -I${PREFIX}/include"	>> $LOCALDEF
diff --git a/x11/xorg-documents/Makefile b/x11/xorg-documents/Makefile
index b15c0d59786c..8a02646c6653 100644
--- a/x11/xorg-documents/Makefile
+++ b/x11/xorg-documents/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	xorg-documents
-PORTVERSION=	6.8.1
+PORTVERSION=	6.8.2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR=	X11R6.8.1/tars
+MASTER_SITE_SUBDIR=	X11R${PORTVERSION}/src
 DISTFILES=	X11R${PORTVERSION}-src1.tar.gz \
 		X11R${PORTVERSION}-src6.tar.gz
 
diff --git a/x11/xorg-documents/distinfo b/x11/xorg-documents/distinfo
index f1dbf971ca94..4ae7a9fead90 100644
--- a/x11/xorg-documents/distinfo
+++ b/x11/xorg-documents/distinfo
@@ -1,4 +1,4 @@
-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
+MD5 (xorg/X11R6.8.2-src1.tar.gz) = a9cfa54ae2e65a057b9c6416befeb6ab
+SIZE (xorg/X11R6.8.2-src1.tar.gz) = 32373802
+MD5 (xorg/X11R6.8.2-src6.tar.gz) = edfb5acc726fb7ce3634e5d9725deaf3
+SIZE (xorg/X11R6.8.2-src6.tar.gz) = 3205143
diff --git a/x11/xorg-libraries/Makefile b/x11/xorg-libraries/Makefile
index 138e45a9bc1d..2dba31eac5a4 100644
--- a/x11/xorg-libraries/Makefile
+++ b/x11/xorg-libraries/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	xorg-libraries
-PORTVERSION=	6.8.1
-PORTREVISION=	1
+PORTVERSION=	6.8.2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR=	X11R6.8.1/tars
+MASTER_SITE_SUBDIR=	X11R${PORTVERSION}/src
 DISTFILES=	X11R${PORTVERSION}-src1.tar.gz \
 		X11R${PORTVERSION}-src3.tar.gz
 
diff --git a/x11/xorg-libraries/distinfo b/x11/xorg-libraries/distinfo
index 62c1647dc07b..00c3b2d7e408 100644
--- a/x11/xorg-libraries/distinfo
+++ b/x11/xorg-libraries/distinfo
@@ -1,4 +1,4 @@
-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
+MD5 (xorg/X11R6.8.2-src1.tar.gz) = a9cfa54ae2e65a057b9c6416befeb6ab
+SIZE (xorg/X11R6.8.2-src1.tar.gz) = 32373802
+MD5 (xorg/X11R6.8.2-src3.tar.gz) = 057d20af30569434e2c6693c1ca66e57
+SIZE (xorg/X11R6.8.2-src3.tar.gz) = 10379299
diff --git a/x11/xorg-libraries/files/patch-xpm-sec b/x11/xorg-libraries/files/patch-xpm-sec
deleted file mode 100644
index fcb22f47be46..000000000000
--- a/x11/xorg-libraries/files/patch-xpm-sec
+++ /dev/null
@@ -1,228 +0,0 @@
-? 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.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;
- 
-     colorTable = (XpmColor **) XpmMalloc(ncolors * sizeof(XpmColor *));
-Index: extras/Xpm/lib/CrDatFrI.c
-===================================================================
-RCS file: /cvs/xorg/xc/extras/Xpm/lib/CrDatFrI.c,v
-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);
-     header = (char **) XpmCalloc(header_size, sizeof(char *));
-     if (!header)
-Index: extras/Xpm/lib/create.c
-===================================================================
-RCS file: /cvs/xorg/xc/extras/Xpm/lib/create.c,v
-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
-  *
-@@ -817,7 +817,7 @@
- 
-     ErrorStatus = XpmSuccess;
- 
--    if (image->ncolors >= SIZE_MAX / sizeof(Pixel)) 
-+    if (image->ncolors >= UINT_MAX / sizeof(Pixel)) 
- 	return (XpmNoMemory);
- 
-     /* malloc pixels index tables */
-@@ -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;
-+    }
-     /* now that bytes_per_line must have been set properly alloc data */
-     (*image_return)->data =
- 	(char *) XpmMalloc((*image_return)->bytes_per_line * height);
-@@ -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)
-@@ -2366,7 +2368,7 @@
- 
- 	    /* array of pointers malloced by need */
- 	    unsigned short *cidx[256];
--	    int char1;
-+	    unsigned int char1;
- 
- 	    bzero((char *)cidx, 256 * sizeof(unsigned short *)); /* init */
- 	    for (a = 0; a < ncolors; a++) {
-Index: extras/Xpm/lib/hashtab.c
-===================================================================
-RCS file: /cvs/xorg/xc/extras/Xpm/lib/hashtab.c,v
-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;
-+    unsigned int oldSize = size;
- 
-     t = atomTable;
-     HASH_TABLE_GROWS
- 	table->size = size;
-     table->limit = size / 3;
--    if (size >= SIZE_MAX / sizeof(*atomTable)) 
-+    if (size >= UINT_MAX / sizeof(*atomTable)) 
- 	return (XpmNoMemory);
-     atomTable = (xpmHashAtom *) XpmMalloc(size * sizeof(*atomTable));
-     if (!atomTable)
-@@ -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);
-     atomTable = (xpmHashAtom *) XpmMalloc(table->size * sizeof(*atomTable));
-     if (!atomTable)
-Index: extras/Xpm/lib/parse.c
-===================================================================
-RCS file: /cvs/xorg/xc/extras/Xpm/lib/parse.c,v
-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
-  *
-@@ -205,7 +205,7 @@
-     char **defaults;
-     int ErrorStatus;
- 
--    if (ncolors >= SIZE_MAX / sizeof(XpmColor))
-+    if (ncolors >= UINT_MAX / sizeof(XpmColor))
- 	return (XpmNoMemory);
-     colorTable = (XpmColor *) XpmCalloc(ncolors, sizeof(XpmColor));
-     if (!colorTable)
-@@ -218,7 +218,7 @@
- 	    /*
- 	     * read pixel value
- 	     */
--	    if (cpp >= SIZE_MAX - 1) {
-+	    if (cpp >= UINT_MAX - 1) {
- 		xpmFreeColorTable(colorTable, ncolors);
- 		return (XpmNoMemory);
- 	    }
-@@ -306,7 +306,7 @@
- 	    /*
- 	     * read pixel value
- 	     */
--	    if (cpp >= SIZE_MAX - 1) {
-+	    if (cpp >= UINT_MAX - 1) {
- 		xpmFreeColorTable(colorTable, ncolors);
- 		return (XpmNoMemory);
- 	    }
-@@ -374,7 +374,7 @@
-     unsigned int a, x, y;
- 
-     if ((height > 0 && width >= SIZE_MAX / height) ||
--	width * height >= SIZE_MAX / sizeof(unsigned int)) 
-+	width * height >= UINT_MAX / sizeof(unsigned int)) 
- 	return XpmNoMemory;
- #ifndef FOR_MSW
-     iptr2 = (unsigned int *) XpmMalloc(sizeof(unsigned int) * width * height);
-@@ -432,7 +432,7 @@
- 
- 	    /* array of pointers malloced by need */
- 	    unsigned short *cidx[256];
--	    int char1;
-+	    unsigned int char1;
- 
- 	    bzero((char *)cidx, 256 * sizeof(unsigned short *)); /* init */
- 	    for (a = 0; a < ncolors; a++) {
-Index: extras/Xpm/lib/scan.c
-===================================================================
-RCS file: /cvs/xorg/xc/extras/Xpm/lib/scan.c,v
-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) ||
--	width * height >= SIZE_MAX / sizeof(unsigned int))
-+	width * height >= UINT_MAX / sizeof(unsigned int))
- 	RETURN(XpmNoMemory);
-     pmap.pixelindex =
- 	(unsigned int *) XpmCalloc(width * height, sizeof(unsigned int));
-     if (!pmap.pixelindex)
- 	RETURN(XpmNoMemory);
- 
--    if (pmap.size >= SIZE_MAX / sizeof(Pixel)) 
-+    if (pmap.size >= UINT_MAX / sizeof(Pixel)) 
- 	RETURN(XpmNoMemory);
- 
-     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);
-     colorTable = (XpmColor *) XpmCalloc(pmap.ncolors, sizeof(XpmColor));
-     if (!colorTable)
-@@ -368,7 +368,7 @@
- 
-     /* first get a character string */
-     a = 0;
--    if (cpp >= SIZE_MAX - 1)
-+    if (cpp >= UINT_MAX - 1)
- 	return (XpmNoMemory);
-     if (!(s = color->string = (char *) XpmMalloc(cpp + 1)))
- 	return (XpmNoMemory);
-@@ -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);
-     xcolors = (XColor *) XpmMalloc(sizeof(XColor) * ncolors);
-     if (!xcolors)
diff --git a/x11/xorg-libraries/pkg-plist b/x11/xorg-libraries/pkg-plist
index 46c44c9b6ff6..7eaee36b0459 100644
--- a/x11/xorg-libraries/pkg-plist
+++ b/x11/xorg-libraries/pkg-plist
@@ -314,7 +314,6 @@ 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
@@ -496,6 +495,9 @@ lib/X11/locale/mulelao-1/XI18N_OBJS
 lib/X11/locale/mulelao-1/XLC_LOCALE
 lib/X11/locale/nokhchi-1/XI18N_OBJS
 lib/X11/locale/nokhchi-1/XLC_LOCALE
+lib/X11/locale/pt_BR.UTF-8/Compose
+lib/X11/locale/pt_BR.UTF-8/XI18N_OBJS
+lib/X11/locale/pt_BR.UTF-8/XLC_LOCALE
 lib/X11/locale/tatar-cyr/XI18N_OBJS
 lib/X11/locale/tatar-cyr/XLC_LOCALE
 lib/X11/locale/th_TH.UTF-8/XI18N_OBJS
@@ -672,6 +674,70 @@ libdata/pkgconfig/xdamage.pc
 libdata/pkgconfig/xevie.pc
 libdata/pkgconfig/xfixes.pc
 libdata/pkgconfig/xrender.pc
-@dirrm include/X11/XprintAppUtil
+@dirrm include/X11/extensions
+@dirrm include/X11/ICE
+@dirrm include/X11/SM
+@dirrm include/X11/Xmu
 @dirrm include/X11/XprintUtil
+@dirrm include/X11/XprintAppUtil
+@dirrm include/X11/Xaw
+@dirrm include/X11/Xcursor
+@dirrm include/GL
+@dirrm include/DPS
+@dirrm lib/X11/locale/lib/common
+@dirrm lib/X11/locale/lib
+@dirrm lib/X11/locale/C
+@dirrm lib/X11/locale/armscii-8
+@dirrm lib/X11/locale/en_US.UTF-8
+@dirrm lib/X11/locale/georgian-academy
+@dirrm lib/X11/locale/georgian-ps
+@dirrm lib/X11/locale/ibm-cp1133
+@dirrm lib/X11/locale/iscii-dev
+@dirrm lib/X11/locale/isiri-3342
+@dirrm lib/X11/locale/iso8859-1
+@dirrm lib/X11/locale/iso8859-2
+@dirrm lib/X11/locale/iso8859-3
+@dirrm lib/X11/locale/iso8859-4
+@dirrm lib/X11/locale/iso8859-5
+@dirrm lib/X11/locale/iso8859-6
+@dirrm lib/X11/locale/iso8859-7
+@dirrm lib/X11/locale/iso8859-8
+@dirrm lib/X11/locale/iso8859-9
+@dirrm lib/X11/locale/iso8859-10
+@dirrm lib/X11/locale/iso8859-11
+@dirrm lib/X11/locale/iso8859-13
+@dirrm lib/X11/locale/ja
+@dirrm lib/X11/locale/iso8859-14
+@dirrm lib/X11/locale/iso8859-15
+@dirrm lib/X11/locale/iso8859-9e
+@dirrm lib/X11/locale/ja.JIS
+@dirrm lib/X11/locale/ja.SJIS
+@dirrm lib/X11/locale/ja_JP.UTF-8
+@dirrm lib/X11/locale/ko
+@dirrm lib/X11/locale/ko_KR.UTF-8
+@dirrm lib/X11/locale/koi8-r
+@dirrm lib/X11/locale/koi8-u
+@dirrm lib/X11/locale/koi8-c
+@dirrm lib/X11/locale/microsoft-cp1251
+@dirrm lib/X11/locale/microsoft-cp1255
+@dirrm lib/X11/locale/microsoft-cp1256
+@dirrm lib/X11/locale/mulelao-1
+@dirrm lib/X11/locale/nokhchi-1
+@dirrm lib/X11/locale/pt_BR.UTF-8
+@dirrm lib/X11/locale/tatar-cyr
+@dirrm lib/X11/locale/th_TH
+@dirrm lib/X11/locale/th_TH.UTF-8
+@dirrm lib/X11/locale/tscii-0
+@dirrm lib/X11/locale/vi_VN.tcvn
+@dirrm lib/X11/locale/vi_VN.viscii
+@dirrm lib/X11/locale/zh_CN
+@dirrm lib/X11/locale/zh_CN.gbk
 @dirrm lib/X11/locale/zh_CN.UTF-8
+@dirrm lib/X11/locale/zh_HK.big5
+@dirrm lib/X11/locale/zh_HK.big5hkscs
+@dirrm lib/X11/locale/zh_TW
+@dirrm lib/X11/locale/zh_TW.big5
+@dirrm lib/X11/locale/zh_TW.UTF-8
+@dirrm lib/X11/locale/el_GR.UTF-8
+@unexec rmdir %D/include/X11/fonts 2>/dev/null || true
+@unexec rmdir %D/lib/X11/locale 2>/dev/null || true
diff --git a/x11/xorg-manpages/Makefile b/x11/xorg-manpages/Makefile
index 7900a6d2be85..245848ceebcc 100644
--- a/x11/xorg-manpages/Makefile
+++ b/x11/xorg-manpages/Makefile
@@ -6,10 +6,11 @@
 #
 
 PORTNAME=	xorg-manpages
-PORTVERSION=	6.8.1
+PORTVERSION=	6.8.2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR=	X11R6.8.1/tars
+MASTER_SITE_SUBDIR=	X11R${PORTVERSION}/src
+DISTNAME=	X11R${PORTVERSION}-src
 DISTFILES=	X11R${PORTVERSION}-src1.tar.gz \
 		X11R${PORTVERSION}-src3.tar.gz
 EXTRACT_ONLY=	X11R${PORTVERSION}-src1.tar.gz
@@ -26,7 +27,7 @@ XINCLUDE_DIRS=	${XMAN_DIRS}
 
 post-extract:
 	(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
-		${DISTDIR}/${DIST_SUBDIR}/X11R6.8.1-src3.tar.gz | \
+		${DISTDIR}/${DIST_SUBDIR}/X11R${PORTVERSION}-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 62c1647dc07b..00c3b2d7e408 100644
--- a/x11/xorg-manpages/distinfo
+++ b/x11/xorg-manpages/distinfo
@@ -1,4 +1,4 @@
-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
+MD5 (xorg/X11R6.8.2-src1.tar.gz) = a9cfa54ae2e65a057b9c6416befeb6ab
+SIZE (xorg/X11R6.8.2-src1.tar.gz) = 32373802
+MD5 (xorg/X11R6.8.2-src3.tar.gz) = 057d20af30569434e2c6693c1ca66e57
+SIZE (xorg/X11R6.8.2-src3.tar.gz) = 10379299
diff --git a/x11/xorg-manpages/files/manpages b/x11/xorg-manpages/files/manpages
index c2016c272820..bc50600695cd 100644
--- a/x11/xorg-manpages/files/manpages
+++ b/x11/xorg-manpages/files/manpages
@@ -1544,4 +1544,5 @@ MAN7=	X.7 \
 	XConsortium.7 \
 	XProjectTeam.7 \
 	XStandards.7 \
+	Xprint.7 \
 	Xsecurity.7
diff --git a/x11/xorg/Makefile b/x11/xorg/Makefile
index 3082b789bab6..17478cf4445c 100644
--- a/x11/xorg/Makefile
+++ b/x11/xorg/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xorg
-PORTVERSION=	6.8.1
+PORTVERSION=	6.8.2
 CATEGORIES=	x11
 MASTER_SITES=	# none
 DISTFILES=	# none