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)

9 files changed, 42 insertions, 118 deletions

diff --git a/devel/imake-4/Makefile b/devel/imake-4/Makefile
index bb859fead7a1..607e2a835dca 100644
--- a/devel/imake-4/Makefile
+++ b/devel/imake-4/Makefile
@@ -73,7 +73,4 @@ pre-configure:
 		s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' \
 		${WRKSRC}/cf/FreeBSD.cf
 
-post-install:
-	@${MKHTMLINDEX} ${PREFIX}/lib/X11/doc/html
-
 .include <bsd.port.post.mk>
diff --git a/devel/imake-4/scripts/configure b/devel/imake-4/scripts/configure
index efbd8e1e5bee..d4fd250860b1 100644
--- a/devel/imake-4/scripts/configure
+++ b/devel/imake-4/scripts/configure
@@ -47,6 +47,7 @@ echo "#define HasFontconfig YES"		>> $F
 echo "#define FontconfigDir ${PREFIX}"		>> $F
 echo "#define HasLibpng YES"			>> $F
 echo "#define LibpngDir ${LOCALBASE}"		>> $F
+echo "#define BuildHtmlManPages NO"		>> $F
 # Never install something to outside ${X11BASE}
 echo "#define NothingOutsideProjectRoot YES"	>> $F
 
diff --git a/devel/imake-6/Makefile b/devel/imake-6/Makefile
index 0a9bc8c6150f..b9e8787133af 100644
--- a/devel/imake-6/Makefile
+++ b/devel/imake-6/Makefile
@@ -6,14 +6,12 @@
 #
 
 PORTNAME=	imake
-PORTVERSION=	6.7.0
-PORTREVISION=	2
+PORTVERSION=	6.8.1
 CATEGORIES=	devel
-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-src3.tar.gz
+MASTER_SITES=	${MASTER_SITE_XORG}
+MASTER_SITE_SUBDIR=	X11R${PORTVERSION}/tars
+DISTFILES=	X11R${PORTVERSION}-src1.tar.gz \
+		X11R${PORTVERSION}-src3.tar.gz
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Imake and other utilities from X.Org
@@ -57,9 +55,6 @@ pre-configure:
 		s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' \
 		${WRKSRC}/cf/FreeBSD.cf
 
-post-install:
-	@${MKHTMLINDEX} ${PREFIX}/lib/X11/doc/html
-
 .if ${X_WINDOW_SYSTEM:L} != xorg
 IGNORE=		is part of X.Org. For switching to X.Org, read UPDATING entry 20040723
 .endif
diff --git a/devel/imake-6/distinfo b/devel/imake-6/distinfo
index de8ed629db2a..62c1647dc07b 100644
--- a/devel/imake-6/distinfo
+++ b/devel/imake-6/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-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-src3.tar.gz) = 8578e566e909e7c40300f44b6f0e88d3
+SIZE (xorg/X11R6.8.1-src3.tar.gz) = 10014808
diff --git a/devel/imake-6/files/patch-FreeBSD.cf b/devel/imake-6/files/patch-FreeBSD.cf
index 8b0bf8f8202e..520a175ed6dd 100644
--- a/devel/imake-6/files/patch-FreeBSD.cf
+++ b/devel/imake-6/files/patch-FreeBSD.cf
@@ -1,46 +1,31 @@
---- cf/FreeBSD.cf.orig	Fri Apr  2 13:47:10 2004
-+++ cf/FreeBSD.cf	Fri Jun 18 19:26:35 2004
-@@ -109,32 +109,20 @@
- # endif
- # define HasPosixThreads	YES
- # define ThreadedX		YES
--# define SystemMTDefines	-D_REENTRANT -D_THREAD_SAFE
--/*
-- * FreeBSD has tread-safe api but no getpwnam_r yet.
-- */
-+# define SystemMTDefines	%%PTHREAD_CFLAGS%%
- # define HasThreadSafeAPI	YES
- # if OSRelVersion < 501000
- #  define MTSafeAPIDefines	-DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI
- # else
- #  define MTSafeAPIDefines	-DXUSE_MTSAFE_API
+--- cf/FreeBSD.cf.orig	Sat Aug 14 17:03:36 2004
++++ cf/FreeBSD.cf	Fri Sep 10 19:52:31 2004
+@@ -78,6 +78,7 @@
+ #define HasIssetugid		YES
+ #define HasPoll			YES
+ #endif
++#define BuildHtmlManPages	NO
+ 
+ #if OSMajorVersion >= 4
+ #define HasGetIfAddrs		YES
+@@ -117,14 +118,8 @@
+ # if (OSRelVersion < 500043)
+ #  define NeedUIThrStubs	YES
  # endif
--# if HasLibPthread
+-# if (OSRelVersion >= 502102)
 -#  define ThreadsLibraries	-lpthread
-+# define ThreadsLibraries	%%PTHREAD_LIBS%%
-+# if OSRelVersion >= 500043
-+#  define BuildThreadStubLibrary  NO
-+#  define NeedUIThrStubs          NO
- # else
--#  if OSRelVersion >= 500043
--#   define BuildThreadStubLibrary  NO
--#   define NeedUIThrStubs          NO
--#  else
--#   define BuildThreadStubLibrary  YES
--#   define NeedUIThrStubs          YES
--#  endif
--#  if (OSRelVersion >= 500016)
--#   define ThreadsLibraries	-lc_r
--#   define SharedGLReqs		$(LDPRELIBS) $(XLIB) -lc
--#  else
--#   define ThreadsLibraries	-pthread
--#  endif
-+#  define BuildThreadStubLibrary  YES
-+#  define NeedUIThrStubs          YES
- #  define SharedX11Reqs		$(LDPRELIB) $(XTHRSTUBLIB)
- #  define SharedXtReqs		$(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB)
- # endif
-@@ -359,7 +347,7 @@
+-# elif (OSRelVersion >= 500016)
+-#  define ThreadsLibraries	-lc_r
+-# else
+-#  define ThreadsLibraries	-pthread
+-# endif
+-# define SystemMTDefines	-D_THREAD_SAFE
++# define ThreadsLibraries	-lpthread
++# define SystemMTDefines	
+ #endif
+ 
+ /* This fixes linking C programs against libGLU on FreeBSD 3.x */
+@@ -338,7 +333,7 @@
  #ifndef LibraryRpathLoadFlags
  # if UseRpath
  #  if UseElfFormat
@@ -49,7 +34,7 @@
  #  else
  #   define LibraryRpathLoadFlags	-R $(USRLIBDIRPATH)
  #  endif
-@@ -455,14 +443,14 @@
+@@ -466,14 +461,14 @@
  /* 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)
diff --git a/devel/imake-6/files/patch-Imake.tmpl b/devel/imake-6/files/patch-Imake.tmpl
index 93412ae23182..04114110a2b9 100644
--- a/devel/imake-6/files/patch-Imake.tmpl
+++ b/devel/imake-6/files/patch-Imake.tmpl
@@ -1,6 +1,6 @@
---- cf/Imake.tmpl.orig	Fri Apr  2 13:47:10 2004
-+++ cf/Imake.tmpl	Thu Jul 22 22:51:21 2004
-@@ -1776,7 +1776,7 @@
+--- cf/Imake.tmpl.orig	Tue Jul 27 20:24:29 2004
++++ cf/Imake.tmpl	Fri Sep 10 18:45:12 2004
+@@ -1798,7 +1798,7 @@
         CXXOPTIONS = CplusplusOptions
        CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES)
         CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(DEFINES) $(CXXEXTRA_DEFINES)
@@ -9,13 +9,11 @@
  #endif
           COMPRESS = CompressCmd
            GZIPCMD = GzipCmd
-@@ -2015,8 +2015,8 @@
-  * LOCAL_LDFLAGS contains client-specific ld flags flags set in Imakefile
+@@ -2038,7 +2038,7 @@
   */
        ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES)
--       ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES) $(VENDOR_DEFINES)
+        ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
 -           CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
-+       ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
 +           CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
          LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
           LDPRELIB = LdPreLib $(INSTALLED_LIBS)
diff --git a/devel/imake-6/files/patch-cf-Imakefile b/devel/imake-6/files/patch-cf-Imakefile
deleted file mode 100644
index 67a6bbb2e345..000000000000
--- a/devel/imake-6/files/patch-cf-Imakefile
+++ /dev/null
@@ -1,12 +0,0 @@
---- cf/Imakefile.orig	Sun Jun  6 19:06:47 2004
-+++ cf/Imakefile	Sun Jun  6 19:07:11 2004
-@@ -79,7 +79,8 @@
- sv3Lib.tmpl \
- sv4Lib.tmpl \
- xf86.tmpl \
--xorg.tmpl
-+xorg.tmpl \
-+xttMod.tmpl
- 
- CFFILES = \
- Imake.cf \
diff --git a/devel/imake-6/files/patch-imake.c b/devel/imake-6/files/patch-imake.c
deleted file mode 100644
index f8117c91e000..000000000000
--- a/devel/imake-6/files/patch-imake.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- imake/imake.c.orig	Tue Dec 17 04:21:38 2002
-+++ imake/imake.c	Sat Jan  4 15:57:23 2003
-@@ -1384,6 +1384,19 @@
- 	  name = &uts_name;
-       }
- #endif
-+# ifdef __FreeBSD__
-+       /* Hack for FreeBSD ports "Cross Version" compiling system. */
-+       {
-+	 char *e;
-+	 if ((e = getenv("OSREL")) != NULL && 
-+	     strlen(name->sysname) + strlen(e) + 1 < SYS_NMLN) {
-+	  strcpy(name->release, e);
-+	  strcpy(name->version, name->sysname);
-+	  strcat(name->version, " ");
-+	  strcat(name->version, e);
-+	 }
-+       }
-+# endif
- 
- #  if defined DEFAULT_OS_NAME
- #   if defined CROSSCOMPILE
diff --git a/devel/imake-6/pkg-plist b/devel/imake-6/pkg-plist
index adf8e6fe6d06..1a45d762e398 100644
--- a/devel/imake-6/pkg-plist
+++ b/devel/imake-6/pkg-plist
@@ -121,19 +121,3 @@ lib/X11/config/xfree86.cf
 lib/X11/config/xorg.cf
 lib/X11/config/xorg.tmpl
 lib/X11/config/xorgsite.def
-lib/X11/config/xttMod.tmpl
-lib/X11/doc/html/ccmakedep.1.html
-lib/X11/doc/html/cleanlinks.1.html
-lib/X11/doc/html/gccmakedep.1.html
-lib/X11/doc/html/imake.1.html
-lib/X11/doc/html/lndir.1.html
-lib/X11/doc/html/makedepend.1.html
-lib/X11/doc/html/makeg.1.html
-lib/X11/doc/html/makestrs.1.html
-lib/X11/doc/html/mergelib.1.html
-lib/X11/doc/html/mkdirhier.1.html
-lib/X11/doc/html/mkhtmlindex.1.html
-lib/X11/doc/html/pswrap.1.html
-lib/X11/doc/html/revpath.1.html
-lib/X11/doc/html/rman.1.html
-lib/X11/doc/html/xmkmf.1.html