Update xorg to 6.8.2.

Changes:

    * Render implementation fixes
    * Updated x86emu and resynced with upstream at Scitech
    * Updated SiS driver
    * Updated Nvidia driver (opensource version)
    * Render acceleration for ATI's R100 and R200-series cards
    * Substantial speedups in the software implementation of the render
      extensions when compiled with gcc 3.4 on the i386 architecture.
    * Infrastructure for rotation support in drivers
    * New Trapezoid specification for the Render extension
          o Respecify Render to include only 'normal' traps
          o Allow backward compatibility but internally covert to new format
    * Software mouse cursor is now based on the Damage extension
    * A new keyboard driver is enabled by default. The old driver is
      disabled unless explicitly compiled in by defining the macro
      |USE_DEPRECATED_KEYBOARD_DRIVER|.
    * All extensions (except Xserver-specific extensions "DMX" and
      "XpExtension")can now be enabled/disabled from the configuration
      file and from the command line.
    * Mac OS X updates:
          o Support dynamic screen configuration changes in rootless mode
          o Added option to always use Mac command key equivalents
          o Interpret scroll wheel mouse events correctly when shift is
            held down
          o Added trivial Xinput support
          o Fixed launch of X clients from Finder with a space in their path
          o Fixed some GLX rendering problems on Mac OS X 10.2 and earlier
    * Updated xterm version

7 files changed, 35 insertions, 55 deletions

diff --git a/x11/xorg-libs/Makefile b/x11/xorg-libs/Makefile
index 0839af750af..3da8230fd1e 100644
--- a/x11/xorg-libs/Makefile
+++ b/x11/xorg-libs/Makefile
@@ -1,14 +1,11 @@
-# $NetBSD: Makefile,v 1.14 2005/02/09 12:53:19 xtraeme Exp $
+# $NetBSD: Makefile,v 1.15 2005/03/01 19:00:11 xtraeme Exp $
 
 DISTNAME=		${DISTFILES}
 PKGNAME=		xorg-libs-${XORG_VER}
-PKGREVISION=		5
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_XORG}
 DISTFILES=		X11R${XORG_VER}-src1.tar.gz X11R${XORG_VER}-src2.tar.gz \
 			X11R${XORG_VER}-src3.tar.gz
-PATCH_SITES=		http://www.x.org/pub/X11R6.8.1/patches/
-PATCHFILES=		xorg-681-CAN-2004-0914.patch
 
 MAINTAINER=		xtraeme@NetBSD.org
 HOMEPAGE=		http://www.x.org/
diff --git a/x11/xorg-libs/PLIST.common b/x11/xorg-libs/PLIST.common
index 4043f59182f..87c75ab06ca 100644
--- a/x11/xorg-libs/PLIST.common
+++ b/x11/xorg-libs/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.6 2005/02/09 11:39:19 xtraeme Exp $
+@comment $NetBSD: PLIST.common,v 1.7 2005/03/01 19:00:11 xtraeme Exp $
 ${X11ROOT_PREFIX}/include/DPS/ColorSB.h
 ${X11ROOT_PREFIX}/include/DPS/ColorSBP.h
 ${X11ROOT_PREFIX}/include/DPS/DPSScrollW.h
@@ -311,7 +311,6 @@ ${X11ROOT_PREFIX}/include/X11/extensions/Xvproto.h
 ${X11ROOT_PREFIX}/include/X11/extensions/bigreqstr.h
 ${X11ROOT_PREFIX}/include/X11/extensions/composite.h
 ${X11ROOT_PREFIX}/include/X11/extensions/compositeproto.h
-${X11ROOT_PREFIX}/include/X11/extensions/damage.h
 ${X11ROOT_PREFIX}/include/X11/extensions/damageproto.h
 ${X11ROOT_PREFIX}/include/X11/extensions/damagewire.h
 ${X11ROOT_PREFIX}/include/X11/extensions/dpms.h
@@ -496,6 +495,9 @@ ${X11ROOT_PREFIX}/lib/X11/locale/mulelao-1/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/mulelao-1/XLC_LOCALE
 ${X11ROOT_PREFIX}/lib/X11/locale/nokhchi-1/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/nokhchi-1/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/pt_BR.UTF-8/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/pt_BR.UTF-8/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/pt_BR.UTF-8/XLC_LOCALE
 ${X11ROOT_PREFIX}/lib/X11/locale/tatar-cyr/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/tatar-cyr/XLC_LOCALE
 ${X11ROOT_PREFIX}/lib/X11/locale/th_TH.UTF-8/XI18N_OBJS
diff --git a/x11/xorg-libs/PLIST.common_end b/x11/xorg-libs/PLIST.common_end
index eda53d76537..adce365e968 100644
--- a/x11/xorg-libs/PLIST.common_end
+++ b/x11/xorg-libs/PLIST.common_end
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common_end,v 1.2 2004/09/21 17:38:53 xtraeme Exp $
+@comment $NetBSD: PLIST.common_end,v 1.3 2005/03/01 19:00:11 xtraeme Exp $
 @dirrm ${X11ROOT_PREFIX}/lib/pkgconfig
 @dirrm ${X11ROOT_PREFIX}/lib/X11/locale/zh_TW.big5
 @dirrm ${X11ROOT_PREFIX}/lib/X11/locale/zh_TW.UTF-8
@@ -10,6 +10,7 @@
 @dirrm ${X11ROOT_PREFIX}/lib/X11/locale/zh_CN
 @dirrm ${X11ROOT_PREFIX}/lib/X11/locale/vi_VN.viscii
 @dirrm ${X11ROOT_PREFIX}/lib/X11/locale/vi_VN.tcvn
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/pt_BR.UTF-8
 @dirrm ${X11ROOT_PREFIX}/lib/X11/locale/tscii-0
 @dirrm ${X11ROOT_PREFIX}/lib/X11/locale/th_TH.UTF-8
 @dirrm ${X11ROOT_PREFIX}/lib/X11/locale/th_TH
@@ -56,7 +57,6 @@
 @dirrm ${X11ROOT_PREFIX}/lib/X11/locale/C
 @dirrm ${X11ROOT_PREFIX}/lib/X11/locale
 @dirrm ${X11ROOT_PREFIX}/include/X11/fonts
-@dirrm ${X11ROOT_PREFIX}/include/X11/extensions
 @dirrm ${X11ROOT_PREFIX}/include/X11/XprintAppUtil
 @dirrm ${X11ROOT_PREFIX}/include/X11/XprintUtil
 @dirrm ${X11ROOT_PREFIX}/include/X11/Xmu
diff --git a/x11/xorg-libs/buildlink3.mk b/x11/xorg-libs/buildlink3.mk
index 15eef572831..15fa19113d5 100644
--- a/x11/xorg-libs/buildlink3.mk
+++ b/x11/xorg-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/10/09 09:51:47 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2005/03/01 19:00:11 xtraeme Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XORG_LIBS_BUILDLINK3_MK:=	${XORG_LIBS_BUILDLINK3_MK}+
@@ -18,13 +18,13 @@ BUILDLINK_PACKAGES:=	xorg-libs ${BUILDLINK_PACKAGES}
 
 .if !empty(XORG_LIBS_BUILDLINK3_MK:M+)
 
-BUILDLINK_DEPENDS.xorg-libs+=		xorg-libs>=6.8.1
-BUILDLINK_RECOMMENDED.xorg-libs?=	xorg-libs>=6.8.1nb2
+BUILDLINK_DEPENDS.xorg-libs+=		xorg-libs>=6.8.2
 BUILDLINK_PKGSRCDIR.xorg-libs?=		../../x11/xorg-libs
 BUILDLINK_TRANSFORM.xorg-libs+=	-e "s|/${X11ROOT_PREFIX}/|/|"
 
 .endif  # XORG_LIBS_BUILDLINK3_MK
 
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
diff --git a/x11/xorg-libs/distinfo b/x11/xorg-libs/distinfo
index 1991facf4e8..623950596e4 100644
--- a/x11/xorg-libs/distinfo
+++ b/x11/xorg-libs/distinfo
@@ -1,17 +1,14 @@
-$NetBSD: distinfo,v 1.12 2005/02/23 17:36:24 wiz Exp $
+$NetBSD: distinfo,v 1.13 2005/03/01 19:00:11 xtraeme Exp $
 
-SHA1 (X11R6.8.1-src1.tar.gz) = 027d16317e07d9df166c0176a1f28b2614f38cc9
-RMD160 (X11R6.8.1-src1.tar.gz) = 3873afcaff4d5eece7b8243d26211c86c138c849
-Size (X11R6.8.1-src1.tar.gz) = 30562401 bytes
-SHA1 (X11R6.8.1-src2.tar.gz) = 17f543f49599290b6e4cd4d963c643cd8c19158a
-RMD160 (X11R6.8.1-src2.tar.gz) = adcc1bf6dcb61cb9e5f1ecb1c15b4bc29404ac67
-Size (X11R6.8.1-src2.tar.gz) = 5808949 bytes
-SHA1 (X11R6.8.1-src3.tar.gz) = e17afc90b0c43f4f40b2ff7410f4ff5d4297de28
-RMD160 (X11R6.8.1-src3.tar.gz) = 46144cd9dd47569509fe7255c7148231d8098731
-Size (X11R6.8.1-src3.tar.gz) = 10014808 bytes
-SHA1 (xorg-681-CAN-2004-0914.patch) = 56b8db629045942c84c13d48192a1e8722b330ca
-RMD160 (xorg-681-CAN-2004-0914.patch) = e42f3f19c9f8aa793d06f76e9779efe01f6d0e76
-Size (xorg-681-CAN-2004-0914.patch) = 55411 bytes
+SHA1 (X11R6.8.2-src1.tar.gz) = 23c60680274062a1db17f646a8388149309dc45c
+RMD160 (X11R6.8.2-src1.tar.gz) = bb170d7a11416c3d9bd1d23d461ba4cea9b1b2c8
+Size (X11R6.8.2-src1.tar.gz) = 32373802 bytes
+SHA1 (X11R6.8.2-src2.tar.gz) = af6190fd2619cc60e70c0a8c00dee6826e1fb726
+RMD160 (X11R6.8.2-src2.tar.gz) = 0c8bb311c279c9b26688f8a6ec5dfbe56c28801e
+Size (X11R6.8.2-src2.tar.gz) = 5974936 bytes
+SHA1 (X11R6.8.2-src3.tar.gz) = de1569856b8023c58fc92bd0b3c8406214451fce
+RMD160 (X11R6.8.2-src3.tar.gz) = d3c90401ba81dfeea843373d0d0d386962b636a6
+Size (X11R6.8.2-src3.tar.gz) = 10379299 bytes
 SHA1 (patch-aa) = 009b7a2679ae98ebd7071e4fa6169c3401273ca1
 SHA1 (patch-ac) = 9ada5ad89af7f744a7951b0919a09f0b26d949e3
 SHA1 (patch-ad) = 7843332769ee47bc8a52a9adb1047b1a637af71b
@@ -32,5 +29,4 @@ SHA1 (patch-at) = bc375171b6f0a8141621009767b5457962967112
 SHA1 (patch-au) = fd2bcdb1c37ce0cc748b0f5c2a12d226e4486d0d
 SHA1 (patch-av) = 99e9764ca1afdfb5882d62e453ccaea7dfa7f182
 SHA1 (patch-aw) = d305ea935ba10d443f9bfdcfc2c74bab5a03ba60
-SHA1 (patch-ax) = 5a340661ded23816334b6af67068680a8de73cda
-SHA1 (patch-ay) = e83713c5e0c35c4935101df9432c6f125cdd1478
+SHA1 (patch-ay) = b154d0d4e95ea15c79921b605266701ee773d144
diff --git a/x11/xorg-libs/patches/patch-ax b/x11/xorg-libs/patches/patch-ax
deleted file mode 100644
index 7d6ceb4ef4d..00000000000
--- a/x11/xorg-libs/patches/patch-ax
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ax,v 1.1 2005/01/07 16:57:36 reed Exp $
-
-from http://cvs.freedesktop.org/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i830_video.c?r1=1.5&r2=1.6
-Xorg Bug #1488: Fix crash on i830 during startup.  (Eric Anholt)
-
---- programs/Xserver/hw/xfree86/drivers/i810/i830_video.c.orig	2004-08-25 22:10:56.000000000 -0700
-+++ programs/Xserver/hw/xfree86/drivers/i810/i830_video.c
-@@ -632,7 +632,7 @@ I830SetupImageVideo(ScreenPtr pScreen)
-    pPriv->gamma0 = 0x080808;
- 
-    /* gotta uninit this someplace */
--   REGION_INIT(pScreen, &pPriv->clip, NullBox, 0);
-+   REGION_NULL(pScreen, &pPriv->clip);
- 
-    pI830->adaptor = adapt;
- 
diff --git a/x11/xorg-libs/patches/patch-ay b/x11/xorg-libs/patches/patch-ay
index d2678b2688f..47c19cd9ec1 100644
--- a/x11/xorg-libs/patches/patch-ay
+++ b/x11/xorg-libs/patches/patch-ay
@@ -1,13 +1,13 @@
-$NetBSD: patch-ay,v 1.1 2005/02/21 16:45:40 hira Exp $
+$NetBSD: patch-ay,v 1.2 2005/03/01 19:00:11 xtraeme Exp $
 
---- programs/Xserver/hw/xfree86/loader/elfloader.c.orig	2005-02-20 23:45:37.000000000 +0900
-+++ programs/Xserver/hw/xfree86/loader/elfloader.c	2005-02-20 23:45:46.000000000 +0900
+--- programs/Xserver/hw/xfree86/loader/elfloader.c.orig	2005-03-01 16:52:41.000000000 +0000
++++ programs/Xserver/hw/xfree86/loader/elfloader.c	2005-03-01 16:53:55.000000000 +0000
 @@ -922,7 +922,7 @@
  	    ErrorF("ELFCreateGOT() Unable to reallocate memory!!!!\n");
  	    return FALSE;
  	}
--#   if defined(linux) || defined(__OpenBSD__)
-+#   if defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__)
+-#   if defined(linux) || defined(__OpenBSD__) || defined(sun)
++#   if defined(linux) || defined(__OpenBSD__) || defined(sun) || defined(__NetBSD__)
  	{
  	    unsigned long page_size = getpagesize();
  	    unsigned long round;
@@ -15,26 +15,27 @@ $NetBSD: patch-ay,v 1.1 2005/02/21 16:45:40 hira Exp $
  	ErrorF("ELFCreatePLT() Unable to allocate memory!!!!\n");
  	return;
      }
--#   if defined(linux) || defined(__OpenBSD__)
-+#   if defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__)
+-#   if defined(linux) || defined(__OpenBSD__) || defined(sun)
++#   if defined(linux) || defined(__OpenBSD__) || defined(sun) || defined(__NetBSD__)
      {
  	unsigned long page_size = getpagesize();
  	unsigned long round;
-@@ -2775,7 +2775,7 @@
+@@ -2775,7 +2775,8 @@
  	elffile->lsection[j].size = SecSize(i);
  	elffile->lsection[j].flags = flags;
  	switch (SecType(i)) {
--#if defined(linux) || defined(__OpenBSD__)
-+#if defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__)
+-#if defined(linux) || defined(__OpenBSD__) || defined(sun)
++
++#if defined(linux) || defined(__OpenBSD__) || defined(sun) || defined(__NetBSD__)
  	case SHT_PROGBITS:
  	    {
  		unsigned long page_size = getpagesize();
-@@ -2979,7 +2979,7 @@
+@@ -2979,7 +2980,7 @@
  	ErrorF("Unable to allocate ELF sections\n");
  	return NULL;
      }
--#  if defined(linux) || defined(__OpenBSD__)
-+#  if defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__)
+-#  if defined(linux) || defined(__OpenBSD__) || defined(sun)
++#  if defined(linux) || defined(__OpenBSD__) || defined(sun) || defined(__NetBSD__)
      {
  	unsigned long page_size = getpagesize();
  	unsigned long round;