Update X.org packages to 6.8.1.

To see the changes about this release, please review the "RELNOTES" file,
which is available via www or in the distribution tarballs.

These packages were tested on:

	* NetBSD 2.0/-current
	* Bluewall GNU/Linux
	* Slackware 10 GNU/Linux

I'm currently testing them on FreeBSD 5.3BETA4.

3 files changed, 9 insertions, 69 deletions

diff --git a/x11/xorg-imake/Makefile b/x11/xorg-imake/Makefile
index b58cc8a6981..9cc0726454a 100644
--- a/x11/xorg-imake/Makefile
+++ b/x11/xorg-imake/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2004/08/04 06:49:41 xtraeme Exp $
+# $NetBSD: Makefile,v 1.9 2004/09/21 17:38:53 xtraeme Exp $
 
 DISTNAME=	${DISTFILES}
 PKGNAME=	xorg-imake-${XORG_VER}
-PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG}
-DISTFILES=	X11R6.7.0-src1.tar.gz X11R6.7.0-src3.tar.gz
+DISTFILES=	X11R${XORG_VER}-src1.tar.gz X11R${XORG_VER}-src3.tar.gz
 
 MAINTAINER=	xtraeme@NetBSD.org
 HOMEPAGE=	http://www.x.org/
@@ -55,8 +54,8 @@ pre-configure:
 .undef F
 	@( \
 	${ECHO} "#define XORG_VERSION_MAJOR  6";	\
-	${ECHO} "#define XORG_VERSION_MINOR  7";	\
-	${ECHO} "#define XORG_VERSION_PATCH  0";	\
+	${ECHO} "#define XORG_VERSION_MINOR  8";	\
+	${ECHO} "#define XORG_VERSION_PATCH  1";	\
 	${ECHO} "#define XORG_VERSION_SNAP   0";	\
 	) > ${WRKSRC}/config/cf/version.def
 
diff --git a/x11/xorg-imake/distinfo b/x11/xorg-imake/distinfo
index 8c880c043ef..a76847f4b99 100644
--- a/x11/xorg-imake/distinfo
+++ b/x11/xorg-imake/distinfo
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/07/29 04:49:52 xtraeme Exp $
+$NetBSD: distinfo,v 1.2 2004/09/21 17:38:53 xtraeme Exp $
 
-SHA1 (X11R6.7.0-src1.tar.gz) = 14f282cee9dc1ff6ebc34d834892599b53195f8b
-Size (X11R6.7.0-src1.tar.gz) = 30039655 bytes
-SHA1 (X11R6.7.0-src3.tar.gz) = 4234d68bd9484baaaf29f5c58f432edb732b6451
-Size (X11R6.7.0-src3.tar.gz) = 10855793 bytes
+SHA1 (X11R6.8.1-src1.tar.gz) = 78d64a5ea4440699eefb6c7bf76f7b6ce3f2fb15
+Size (X11R6.8.1-src1.tar.gz) = 30573498 bytes
+SHA1 (X11R6.8.1-src3.tar.gz) = 8efe7a7b731eb5ea8aeaea63c4985d28b3514d16
+Size (X11R6.8.1-src3.tar.gz) = 10019766 bytes
 SHA1 (patch-aa) = f8d35ceb67df85ca04d9567d66bf99c5d292d322
 SHA1 (patch-ab) = ae90c06b50d5d8b84054cc66beec0d0e3049d0aa
 SHA1 (patch-ac) = 90584e5732fb882f431afd69f6fd1c26c9d22bee
-SHA1 (patch-ad) = b34f46d715e90159df3897cf20023b58b9deff67
 SHA1 (patch-ae) = a06752ee9f55e64a407fac6fbde3547fd096c71d
 SHA1 (patch-af) = 178d556fa11818420cd685308cf179ee5f6f7dac
 SHA1 (patch-ag) = 4545d9fd50c2a7b6f5a04da330784eaf9a5373ad
diff --git a/x11/xorg-imake/patches/patch-ad b/x11/xorg-imake/patches/patch-ad
deleted file mode 100644
index 78c5e12abf3..00000000000
--- a/x11/xorg-imake/patches/patch-ad
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2004/07/29 04:49:52 xtraeme Exp $
-
---- config/cf/FreeBSD.cf.in.orig	2004-03-03 07:40:43.000000000 +0000
-+++ config/cf/FreeBSD.cf.in	2004-03-03 07:44:05.000000000 +0000
-@@ -190,11 +190,11 @@
- # define CcCmd			$(CLIENTENVSETUP) cc
- # define CplusplusCmd		$(CLIENTENVSETUP) c++
- #else
--# define CcCmd			cc
--# define CplusplusCmd		c++
-+# define CcCmd			@@PKGSRC_CC@@
-+# define CplusplusCmd		@@PKGSRC_CXX@@
- #endif
- 
--#define CppCmd			/usr/bin/cpp
-+#define CppCmd			@@PKGSRC_CPP@@
- #define PreProcessCmd		CppCmd
- #define StandardCppOptions	-traditional
- #define StandardCppDefines	/**/
-@@ -207,7 +207,7 @@
- #else
- #define NoSystemWarn
- #endif
--#define DefaultCCOptions	-ansi -pedantic NoSystemWarn -Dasm=__asm \
-+#define DefaultCCOptions	-ansi NoSystemWarn -Dasm=__asm \
- 	GccWarningOptions
- #endif
- #endif
-@@ -439,18 +439,8 @@
- #define XawI18nDefines		-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
- #endif
- 
--/* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */
--#ifndef DefaultGcc2i386Opt
--#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5)
--#define DefaultGcc2i386Opt -O2 GccAliasingArgs
--#endif
--#endif
--
--#ifdef i386Architecture
--# define OptimizedCDebugFlags DefaultGcc2i386Opt
--#else
--# define OptimizedCDebugFlags -O
--#endif
-+#define DefaultGcc2i386Opt
-+#define OptimizedCDebugFlags   @@PKGSRC_CFLAGS@@
- 
- #ifndef PreIncDir
- # define PreIncDir	/usr/include
-@@ -476,7 +466,7 @@
-  * Compress manual pages
-  */
- #ifndef CompressManPages
--# define CompressManPages	YES
-+# define CompressManPages	NO
- #endif
- 
- #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 1)