16 files changed, 168 insertions, 1042 deletions

diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile
index 5af3dc5b1890..9b4b897d27d5 100644
--- a/x11/XFree86-4-libraries/Makefile
+++ b/x11/XFree86-4-libraries/Makefile
@@ -6,21 +6,14 @@
 #
 
 PORTNAME=	libraries
-PORTVERSION=	4.4.0
-PORTREVISION=	3
+PORTVERSION=	4.5.0
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_XFREE:S/$/:x/} \
-		${MASTER_SITE_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR=	${PORTVERSION}/:x \
-			anholt/:local
+MASTER_SITES=	${MASTER_SITE_XFREE}
+MASTER_SITE_SUBDIR=	${PORTVERSION}
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	XFree86-4.4.0-src-1.tgz:x \
-		XFree86-4.4.0-src-2.tgz:x \
-		XFree86-4.4.0-src-3.tgz:x \
-		Wraphelp2.gz:local
-EXTRACT_ONLY=	XFree86-4.4.0-src-1.tgz \
-		XFree86-4.4.0-src-2.tgz \
-		XFree86-4.4.0-src-3.tgz
+DISTFILES=	XFree86-${PORTVERSION}-src-1.tgz \
+		XFree86-${PORTVERSION}-src-2.tgz \
+		XFree86-${PORTVERSION}-src-3.tgz
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	XFree86-4 libraries and headers
@@ -28,12 +21,16 @@ COMMENT=	XFree86-4 libraries and headers
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
 		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
 
-CONFLICTS=	Mesa-* libX11-* libGL-* libGLU-* libICE-* libSM-* libXau-* \
-		libXaw-* libXcursor-* libXdmcp-* libXext-* libXfont-* libXi-* \
-		libXinerama-* libXmu-* libXp-* libXpm-* libXrandr-* \
-		libXrender-* libXres-* libXt-* libXv-* libXxf86-* libxkbfile-* \
-		panoramixext-* printext-* randrext-* renderext-* resourceext-* \
-		xextensions-* xf86ext-* xlibs-* xorg-libraries-* xpm-* xproto-*
+CONFLICTS=	Mesa-[0-9]* libX11-[0-9]* libGL-[0-9]* libGLU-[0-9]* \
+		libICE-[0-9]* libSM-[0-9]* libXau-[0-9]* libXaw-[0-9]* \
+		libXcursor-[0-9]* libXdmcp-[0-9]* libXext-[0-9]* \
+		libXfont-[0-9]* libXi-[0-9]* libXinerama-[0-9]* libXmu-[0-9]* \
+		libXp-[0-9]* libXpm-[0-9]* libXrandr-[0-9]* libXrender-[0-9]* \
+		libXres-[0-9]* libXt-[0-9]* libXv-[0-9]* libXxf86-[0-9]* \
+		libxkbfile-[0-9]* panoramixext-[0-9]* printext-[0-9]* \
+		randrext-[0-9]* renderext-[0-9]* resourceext-[0-9]* \
+		xextensions-[0-9]* xf86ext-[0-9]* xlibs-[0-9]* \
+		xorg-libraries-[0-9]* xpm-[0-9]* xproto-[0-9]*
 
 USE_X_PREFIX=		no
 PREFIX?=		${X11BASE}
@@ -96,7 +93,8 @@ XINSTALL_DIRS=		include lib nls programs/Xserver/include \
 XINSTALL_MAN_DIRS=	${XINSTALL_DIRS}
 
 # XFree86 User Config:
-# DebuggableLibraries NO	build with debug libs (require FreeBSD-4 or later)
+# DebuggableLibraries NO	build with debug libs
+#				(requires FreeBSD 4.X or later)
 # ----------------------------------------------------------------------------
 DebuggableLibraries?=	NO
 # End of XFree86 User Config
@@ -108,7 +106,7 @@ DebuggableLibraries?=	NO
 .include "Makefile.inc"
 .include <bsd.port.pre.mk>
 .if ${X_WINDOW_SYSTEM:L} != xfree86-4
-IGNORE= is part of XFree86-4
+IGNORE=	is part of XFree86-4
 .endif
 
 # BuildXF86DRI is false for FreeBSD < 4.1
@@ -118,27 +116,29 @@ PLIST_SUB+=	OSMESA:="@comment "
 PLIST_SUB+=	OSMESA:=""
 .endif
 
-# sparc64 doesn't have a working libc_r yet, and -current doesn't need libXThrStub.
-.if ${MACHINE_ARCH} == "sparc64" || ${OSVERSION} >= 500043
-PLIST_SUB+=	XTHRSTUB:="@comment "
-.else
-PLIST_SUB+=	XTHRSTUB:=""
-.endif
-
-post-extract:
-	${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp2.gz > \
-		${WRKSRC}/lib/Xdmcp/Wraphelp.c
+# 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
 
 post-patch:
-	${CP} ${FILESDIR}/nls::Compose::microsoft-cp1251 ${WRKSRC}/nls/Compose/microsoft-cp1251
+	${CP} ${FILESDIR}/nls::Compose::microsoft-cp1251 \
+	    ${WRKSRC}/nls/Compose/microsoft-cp1251
 
 post-install:
+	${MKDIR} ${PREFIX}/include/X11/PM
 	${INSTALL_DATA} ${WRKSRC}/programs/proxymngr/PM.h \
-		${PREFIX}/include/X11/PM
+	    ${PREFIX}/include/X11/PM
 	${INSTALL_DATA} ${WRKSRC}/programs/proxymngr/PMproto.h \
-		${PREFIX}/include/X11/PM
+	    ${PREFIX}/include/X11/PM
 	${MKDIR} ${PREFIX}/libdata/pkgconfig
 	${INSTALL_DATA} ${WRKSRC}/lib/Xcursor/xcursor.pc \
-		${PREFIX}/libdata/pkgconfig
+	    ${PREFIX}/libdata/pkgconfig
+	${MKDIR} ${PREFIX}/lib/X11/xserver
+	${INSTALL_DATA} ${WRKSRC}/programs/Xserver/Xext/SecurityPolicy \
+	    ${PREFIX}/lib/X11/xserver/SecurityPolicy.default
 
 .include <bsd.port.post.mk>
diff --git a/x11/XFree86-4-libraries/distinfo b/x11/XFree86-4-libraries/distinfo
index edbe3d91944d..5cb3430994ae 100644
--- a/x11/XFree86-4-libraries/distinfo
+++ b/x11/XFree86-4-libraries/distinfo
@@ -1,8 +1,6 @@
-MD5 (xc/XFree86-4.4.0-src-1.tgz) = 97cea3d9e1197dde32ca34e3b6086469
-SIZE (xc/XFree86-4.4.0-src-1.tgz) = 11760814
-MD5 (xc/XFree86-4.4.0-src-2.tgz) = b9b6c74a03e314569e01d5fd4ff59523
-SIZE (xc/XFree86-4.4.0-src-2.tgz) = 5745538
-MD5 (xc/XFree86-4.4.0-src-3.tgz) = 703404f48d3a15f58389a879d47c769d
-SIZE (xc/XFree86-4.4.0-src-3.tgz) = 11239253
-MD5 (xc/Wraphelp2.gz) = bd1910492087442288d885412e2e5535
-SIZE (xc/Wraphelp2.gz) = 3376
+MD5 (xc/XFree86-4.5.0-src-1.tgz) = 6c0fcf8069c13d068276016bbf6ad712
+SIZE (xc/XFree86-4.5.0-src-1.tgz) = 10507331
+MD5 (xc/XFree86-4.5.0-src-2.tgz) = cc296c71cbe58edc3ffdec1084e58f4c
+SIZE (xc/XFree86-4.5.0-src-2.tgz) = 5826556
+MD5 (xc/XFree86-4.5.0-src-3.tgz) = c0ad630bfec4545857c2877b3e2dcbeb
+SIZE (xc/XFree86-4.5.0-src-3.tgz) = 12086763
diff --git a/x11/XFree86-4-libraries/files/patch-amd64 b/x11/XFree86-4-libraries/files/patch-amd64
deleted file mode 100644
index bf1674147090..000000000000
--- a/x11/XFree86-4-libraries/files/patch-amd64
+++ /dev/null
@@ -1,300 +0,0 @@
---- config/imake/imakemdep.h.orig	Mon Dec 29 20:53:52 2003
-+++ config/imake/imakemdep.h	Tue Mar  2 11:05:16 2004
-@@ -374,6 +374,9 @@
- # ifdef __AMD64__
- 	"-D__AMD64__",
- # endif
-+# ifdef __amd64__
-+	"-D__amd64__",
-+# endif
- # ifdef __x86_64__
- 	"-D__AMD64__",
- # endif
-@@ -1271,6 +1274,9 @@
- # if defined (__AMD64__) || defined (__x86_64__)
- 	{"__AMD64__", "1"},
- 	{"__x86_64__", "1"},
-+# endif
-+# if defined (__amd64__)
-+	{"__amd64__", "1"},
- # endif
- # ifdef __i386
- 	{"__i386", "1"},
---- extras/Mesa/src/mmath.h.orig	Wed Oct 22 11:44:41 2003
-+++ extras/Mesa/src/mmath.h	Thu Mar  4 14:25:57 2004
-@@ -205,7 +205,7 @@
- 
- 
- #if defined(__i386__) || defined(__sparc__) || defined(__s390x__) || \
--    defined(__powerpc__) || defined(__AMD64__) || \
-+    defined(__powerpc__) || defined(__AMD64__) || defined(__amd64__) || \
-     ( defined(__alpha__) && ( defined(__IEEE_FLOAT) || !defined(VMS) ) )
- #define USE_IEEE
- #endif
---- extras/x86emu/include/x86emu/types.h.orig	Mon Jul  7 11:34:21 2003
-+++ extras/x86emu/include/x86emu/types.h	Thu Mar  4 14:29:56 2004
-@@ -76,7 +76,7 @@
-     defined(__sparc64__) || \
-     defined(__s390x__) || \
-     (defined(__hppa__) && defined(__LP64)) || \
--    defined(__AMD64__) || defined(AMD64) || \
-+    defined(__AMD64__) || defined(AMD64) || defined(__amd64__) || \
-     (defined(__sgi) && (_MIPS_SZLONG == 64))
- #define NUM32 int
- #else
---- include/DPS/dpsconfig.h.orig	Thu Mar  4 14:33:19 2004
-+++ include/DPS/dpsconfig.h	Thu Mar  4 14:33:14 2004
-@@ -89,7 +89,7 @@
- #if defined(__alpha) || defined(__alpha__) || \
-     defined(__ia64__) || defined(ia64) || \
-     defined(__s390x__) || \
--    defined(__AMD64__) || defined(AMD64)
-+    defined(__AMD64__) || defined(AMD64) || defined(__amd64__)
- #define IEEEFLOAT 1
- #endif
- 
---- include/Xmd.h.orig	Thu Oct 23 11:19:01 2003
-+++ include/Xmd.h	Wed Mar  3 19:29:07 2004
-@@ -64,7 +64,7 @@
-     defined(__sparc64__) || \
-     defined(__s390x__) || \
-     (defined(__hppa__) && defined(__LP64__)) || \
--    defined(__AMD64__) || defined(AMD64) || \
-+    defined(__AMD64__) || defined(AMD64) || defined(__amd64__) || \
-     (defined(sgi) && (_MIPS_SZLONG == 64))
- #define LONG64				/* 32/64-bit architecture */
- #endif
---- lib/Xt/Xtos.h.orig	Fri Oct 24 11:47:35 2003
-+++ lib/Xt/Xtos.h	Thu Mar  4 14:37:00 2004
-@@ -67,7 +67,7 @@
-     defined(__sparc64__) || \
-     defined(__s390x__) || \
-     (defined(__hppa__) && defined(__LP64__)) || \
--    defined(__AMD64__) || defined(AMD64) || \
-+    defined(__AMD64__) || defined(AMD64) || defined(__amd64__) || \
-     (defined(sgi) && (_MIPS_SZLONG == 64))
- #define LONG64
- #endif
---- lib/font/util/fontxlfd.c.orig	Fri Oct 24 12:11:52 2003
-+++ lib/font/util/fontxlfd.c	Thu Mar  4 14:39:56 2004
-@@ -197,7 +197,7 @@
-     defined(ia64) || defined(__ia64__) || \
-     defined(__alpha__) || defined(__alpha) || \
-     defined(__hppa__) || \
--    defined(__AMD64__) || defined(__AMD64) || \
-+    defined(__AMD64__) || defined(__AMD64) || defined(__amd64__) || \
-     defined(sgi)
- #if !defined(__UNIXOS2__)
- #include <float.h>
---- programs/Xserver/fb/fb.h.orig	Mon Nov  3 00:11:00 2003
-+++ programs/Xserver/fb/fb.h	Wed Mar  3 19:14:52 2004
-@@ -105,7 +105,7 @@
-       defined(ia64) || defined(__ia64__) || \
-       defined(__sparc64__) || \
-       defined(__s390x__) || \
--      defined(AMD64) || defined (__AMD64__) || \
-+      defined(AMD64) || defined (__AMD64__) || defined (__amd64__) \
-       (defined(sgi) && (_MIPS_SZLONG == 64))
- typedef unsigned long	    FbBits;
- #  else
---- programs/Xserver/hw/xfree86/loader/elfloader.c.orig	Thu Nov  6 13:38:13 2003
-+++ programs/Xserver/hw/xfree86/loader/elfloader.c	Thu Mar  4 14:46:17 2004
-@@ -137,7 +137,7 @@
- # if !defined(linux)
- #  error    No MAP_ANON?
- # endif
--# if !defined (__AMD64__) || !defined(__linux__)
-+# if !(defined (__AMD64__) || defined (__amd64__)) || !defined(__linux__)
- # define MMAP_FLAGS     (MAP_PRIVATE | MAP_ANON)
- # else
- # define MMAP_FLAGS     (MAP_PRIVATE | MAP_ANON | MAP_32BIT)
-@@ -156,6 +156,7 @@
- #if defined (__alpha__) || \
-     defined (__ia64__) || \
-     defined (__AMD64__) || \
-+    defined (__amd64__) || \
-     (defined (__sparc__) && \
-      (defined (__arch64__) || \
-       defined (__sparcv9)))
-@@ -247,7 +248,8 @@
-     defined(__alpha__) || \
-     defined(__sparc__) || \
-     defined(__ia64__) || \
--    defined(__AMD64__)
-+    defined(__AMD64__) || \
-+    defined(__amd64__)
- typedef Elf_Rela Elf_Rel_t;
- #else
- typedef Elf_Rel Elf_Rel_t;
-@@ -441,7 +443,8 @@
-     defined(__alpha__) || \
-     defined(__sparc__) || \
-     defined(__ia64__) || \
--    defined(__AMD64__)
-+    defined(__AMD64__) || \
-+    defined(__amd64__)
-     ELFDEBUG(", r_addend 0x%lx", rel->r_addend);
- # endif
-     ELFDEBUG("\n");
-@@ -477,6 +480,7 @@
- #if defined(__alpha__) || \
-     defined(__ia64__) || \
-     defined(__AMD64__) || \
-+    defined(__amd64__) || \
-     (defined(__sparc__) && \
-      (defined(__arch64__) || \
-       defined(__sparcv9)))
-@@ -501,6 +505,7 @@
- #if defined(__alpha__) || \
-     defined(__ia64__) || \
-     defined(__AMD64__) || \
-+    defined(__amd64__) || \
-     (defined(__sparc__) && \
-      (defined(__arch64__) || \
-       defined(__sparcv9)))
-@@ -556,6 +561,7 @@
- #if defined(__alpha__) || \
-     defined(__ia64__) || \
-     defined(__AMD64__) || \
-+    defined(__amd64__) || \
-     (defined(__sparc__) && \
-      (defined(__arch64__) || \
-       defined(__sparcv9)))
-@@ -1216,7 +1222,7 @@
-     unsigned long *dest64;
-     unsigned short *dest16;
- #endif
--#if  defined(__AMD64__)
-+#if defined(__AMD64__) || defined(__amd64__)
-     unsigned long *dest64;
-     int *dest32s;
- #endif
-@@ -1234,7 +1240,8 @@
-     defined(__alpha__) || \
-     defined(__sparc__) || \
-     defined(__ia64__) || \
--    defined(__AMD64__)
-+    defined(__AMD64__) || \
-+    defined(__amd64__)
-     ELFDEBUG("%lx", rel->r_addend);
- # endif
-     ELFDEBUG("\n");
-@@ -1293,7 +1300,7 @@
- 
- 	break;
- #endif /* i386 */
--#if defined(__AMD64__)
-+#if defined(__AMD64__) || defined(__amd64__)
-     case R_X86_64_32:
- 	dest32 = (unsigned int *)(secp + rel->r_offset);
- # ifdef ELFDEBUG
---- programs/Xserver/hw/xfree86/loader/loader.c.orig	Fri Feb 13 18:58:45 2004
-+++ programs/Xserver/hw/xfree86/loader/loader.c	Thu Mar  4 14:50:15 2004
-@@ -507,7 +507,7 @@
-     if ((new_off_bias + size) > new_size)
- 	new_size += pagesize;
-     ret = (unsigned long)mmap(0, new_size, MMAP_PROT, MAP_PRIVATE
--#  ifdef __AMD64__
-+#  if defined(__AMD64__) || defined(__amd64__)
- 			      | MAP_32BIT
- #  endif
- 			      , fd, new_off);
-@@ -516,7 +516,7 @@
-     return (void *)(ret + new_off_bias);
- # else
-     ret = (unsigned long)mmap(0, size, MMAP_PROT, MAP_PRIVATE
--#  ifdef __AMD64__
-+#  if defined(__AMD64__) || defined(__amd64__)
- 			      | MAP_32BIT
- #  endif
- 			      , fd, offset + offsetbias);
---- programs/Xserver/hw/xfree86/os-support/bus/Imakefile.orig	Thu Oct  2 09:30:06 2003
-+++ programs/Xserver/hw/xfree86/os-support/bus/Imakefile	Thu Mar  4 01:46:09 2004
-@@ -80,7 +80,8 @@
- PCIDRVRSRC = ix86Pci.c linuxPci.c
- PCIDRVROBJ = ix86Pci.o linuxPci.o
- 
--#elif defined(FreeBSDArchitecture) && defined(AlphaArchitecture)
-+#elif defined(FreeBSDArchitecture) && \
-+     (defined(AlphaArchitecture) || defined(AMD64Architecture))
- 
- 
- XCOMM generic FreeBSD PCI driver (using /dev/pci)
---- programs/Xserver/hw/xfree86/os-support/bus/Pci.h.orig	Fri Feb 13 18:58:47 2004
-+++ programs/Xserver/hw/xfree86/os-support/bus/Pci.h	Wed Mar  3 19:39:52 2004
-@@ -347,7 +347,7 @@
- # if !defined(__FreeBSD__)
- #  define ARCH_PCI_PCI_BRIDGE sparcPciPciBridge
- # endif
--#elif defined(__AMD64__)
-+#elif defined(__AMD64__) || defined(__amd64__)
- # if defined(__FreeBSD__)
- #  define ARCH_PCI_INIT freebsdPciInit
- # else
---- programs/Xserver/hw/xfree86/os-support/xf86drm.h.orig	Wed Oct 29 05:57:47 2003
-+++ programs/Xserver/hw/xfree86/os-support/xf86drm.h	Wed Mar  3 20:13:22 2004
-@@ -289,7 +289,7 @@
- #define DRM_LOCK_CONT  0x40000000 /**< Hardware lock is contended */
- 
- #if defined(__GNUC__) && (__GNUC__ >= 2)
--# if defined(__i386) || defined(__AMD64__)
-+# if defined(__i386) || defined(__AMD64__) || defined(__amd64__)
- 				/* Reflect changes here to drmP.h */
- #define DRM_CAS(lock,old,new,__ret)                                    \
- 	do {                                                           \
---- programs/Xserver/hw/xfree86/xf86cfg/loadmod.c.orig	Thu Jun 12 10:12:38 2003
-+++ programs/Xserver/hw/xfree86/xf86cfg/loadmod.c	Thu Mar  4 14:54:57 2004
-@@ -182,7 +182,7 @@
-    SYMFUNC(xf86memchr)
-    SYMFUNC(xf86memcmp)
-    SYMFUNC(xf86memcpy)
--#if (defined(__powerpc__) && (defined(Lynx) || defined(linux))) || defined(__sparc__) || defined(__ia64__) || defined (__AMD64__)
-+#if (defined(__powerpc__) && (defined(Lynx) || defined(linux))) || defined(__sparc__) || defined(__ia64__) || defined (__AMD64__) || defined (__amd64__)
-    /*
-     * Some PPC, SPARC, and IA64 compilers generate calls to memcpy to handle
-     * structure copies.  This causes a problem both here and in shared
---- programs/Xserver/include/servermd.h.orig	Mon Nov  3 00:11:59 2003
-+++ programs/Xserver/include/servermd.h	Tue Mar  2 10:55:03 2004
-@@ -389,7 +389,8 @@
- 
- #endif /* ia64 */
- 
--#if defined(__AMD64__) || defined(AMD64)
-+#if defined(__AMD64__) || defined(AMD64) || \
-+    defined(__amd64__)
- # define IMAGE_BYTE_ORDER	LSBFirst
- 
- # if defined(XF86MONOVGA) || defined(XF86VGA16) || defined(XF86MONO)
---- programs/Xserver/mi/micoord.h.orig	Fri Feb 13 18:58:52 2004
-+++ programs/Xserver/mi/micoord.h	Thu Mar  4 14:57:05 2004
-@@ -70,7 +70,7 @@
-     defined(__i386__) || defined(i386) || \
-     defined(__ia64__) || defined(ia64) || \
-     defined(__s390x__) || defined(__s390__) || \
--    defined(__AMD64__) || defined(AMD64)
-+    defined(__AMD64__) || defined(AMD64) || defined(__amd64__)
- #define GetHighWord(x) (((int) (x)) >> 16)
- #else
- #define GetHighWord(x) (((int) (x)) / 65536)
---- programs/Xserver/os/xalloc.c.orig	Mon Nov  3 00:12:00 2003
-+++ programs/Xserver/os/xalloc.c	Thu Mar  4 15:00:10 2004
-@@ -184,7 +184,7 @@
-     defined(__ia64__) || defined(ia64) || \
-     defined(__sparc64__) || \
-     defined(__s390x__) || \
--    defined(__AMD64__) || defined(AMD64) || \
-+    defined(__AMD64__) || defined(AMD64) || defined(__amd64__) || \
-     (defined(sgi) && _MIPS_SZLONG == 64))
- #define MAGIC			0x1404196414071968
- #define MAGIC_FREE              0x1506196615061966
---- programs/Xserver/render/picture.h.orig	Mon Nov  3 00:12:01 2003
-+++ programs/Xserver/render/picture.h	Thu Mar  4 15:08:31 2004
-@@ -170,7 +170,7 @@
-       defined(ia64) || defined(__ia64__) || \
-       defined(__sparc64__) || \
-       defined(__s390x__) || \
--      defined(AMD64) || defined (__AMD64__) || \
-+      defined(AMD64) || defined (__AMD64__) || defined (__amd64__) || \
-       (defined(sgi) && (_MIPS_SZLONG == 64))
- typedef long		xFixed_32_32;
- # else
diff --git a/x11/XFree86-4-libraries/files/patch-dri-Imakefile b/x11/XFree86-4-libraries/files/patch-dri-Imakefile
deleted file mode 100644
index 3e6ea5970d3c..000000000000
--- a/x11/XFree86-4-libraries/files/patch-dri-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- programs/Xserver/GL/dri/Imakefile.orig	Mon Mar  3 20:21:30 2003
-+++ programs/Xserver/GL/dri/Imakefile	Mon Mar  3 20:21:31 2003
-@@ -13,7 +13,7 @@
- 
-      INCLUDES = -I$(SERVERSRC)/include -I$(INCLUDESRC) -I$(XINCLUDESRC) \
- 		-I$(EXTINCSRC) \
--		-I$(XF86OSSRC) -I$(XF86COMSRC) \
-+		-I$(XF86OSSRC) -I$(XF86OSSRC)/bus -I$(XF86COMSRC) \
- 		-I../include -I../glx -I$(LIBSRC)/GL/include \
- 		-I$(SERVERSRC)/mi -I$(FONTINCSRC)
-       DEFINES = $(GLX_DEFINES)
diff --git a/x11/XFree86-4-libraries/files/patch-glheader b/x11/XFree86-4-libraries/files/patch-glheader
deleted file mode 100644
index f10ac02f2f17..000000000000
--- a/x11/XFree86-4-libraries/files/patch-glheader
+++ /dev/null
@@ -1,16 +0,0 @@
---- extras/Mesa/src/glheader.h	Wed Nov  6 12:19:39 2002
-+++ extras/Mesa/src/glheader.h	Sun Nov  2 12:22:42 2003
-@@ -222,5 +222,5 @@
-  */
- #ifndef _ASMAPI
--#if !defined( __GNUC__ ) && !defined( VMS )
-+#if !defined( __GNUC__ ) && !defined( VMS ) && !defined(__INTEL_COMPILER)
- #define _ASMAPI __cdecl
- #else
-@@ -252,4 +252,6 @@
- #elif defined(__ICL)
- #  define INLINE __inline
-+#elif defined(__INTEL_COMPILER)
-+#  define INLINE inline
- #else
- #  define INLINE
diff --git a/x11/XFree86-4-libraries/files/patch-z44 b/x11/XFree86-4-libraries/files/patch-lib_GL_GL_Imakefile
index 9b6f755f2e6c..eb52f912cad7 100644
--- a/x11/XFree86-4-libraries/files/patch-z44
+++ b/x11/XFree86-4-libraries/files/patch-lib_GL_GL_Imakefile
@@ -1,10 +1,7 @@
---- lib/GL/GL/Imakefile.orig	Tue Apr  3 11:29:31 2001
-+++ lib/GL/GL/Imakefile	Sat Oct 20 10:14:30 2001
-@@ -214,14 +214,17 @@
- #undef _LinkBuildLibrary
- #define _LinkBuildLibrary(lib) LinkBuildLibrary(lib)
+--- lib/GL/GL/Imakefile.orig	Sun Jan  9 03:58:13 2005
++++ lib/GL/GL/Imakefile	Sun Jan  9 04:01:26 2005
+@@ -294,11 +294,15 @@
  
--
  #if NormalLibGlx
  NormalLibraryTarget($(LIBNAME),$(UOBJS))
 +#if !defined(LibInstall) || LibInstall
@@ -19,7 +16,7 @@
  #if LinkGLToUsrLib && AlternateUsrLibDir
  install::
  	MakeDir($(DESTDIR)$(SYSTEMUSRLIBDIR))
-@@ -233,11 +236,14 @@
+@@ -310,8 +314,10 @@
  #endif
  #if DebugLibGlx
  DebuggedLibraryTarget($(LIBNAME),$(DOBJS))
@@ -27,11 +24,16 @@
  InstallLibrary($(LIBNAME)_d,$(USRLIBDIR))
  #endif
 +#endif
+ #if ExtraLibGlx && defined(ExtraLibRules)
+ all::
+ 	ExtraLibMkdir()
+@@ -322,7 +328,9 @@
+ #endif
  #if ProfileLibGlx
  ProfiledLibraryTarget($(LIBNAME),$(POBJS))
 +#if !defined(LibInstall) || LibInstall
  InstallLibrary($(LIBNAME)_p,$(USRLIBDIR))
- #endif
--
 +#endif
+ #endif
+ 
  
diff --git a/x11/XFree86-4-libraries/files/patch-z30 b/x11/XFree86-4-libraries/files/patch-lib_GL_mesa_drivers_dri_Imakefile
index 2365d8400d98..156ed4c1189d 100644
--- a/x11/XFree86-4-libraries/files/patch-z30
+++ b/x11/XFree86-4-libraries/files/patch-lib_GL_mesa_drivers_dri_Imakefile
@@ -1,8 +1,8 @@
---- lib/GL/mesa/src/drv/Imakefile.orig	Tue Dec  5 10:17:23 2000
-+++ lib/GL/mesa/src/drv/Imakefile	Tue Dec  5 13:29:59 2000
-@@ -70,6 +70,10 @@
+--- lib/GL/mesa/drivers/dri/Imakefile.orig	Sun Jan  9 22:27:16 2005
++++ lib/GL/mesa/drivers/dri/Imakefile	Sun Jan  9 22:27:59 2005
+@@ -7,6 +7,10 @@
  
- #endif /* GlxUseBuiltInDRIDriver */
+ SUBDIRS = common DriDrivers
  
 +#if (defined(FreeBSDBuildXlib) && FreeBSDBuildXlib) || (defined(ModInstall) && !ModInstall)
 +SUBDIRS = common
diff --git a/x11/XFree86-4-libraries/files/patch-z32 b/x11/XFree86-4-libraries/files/patch-lib_GL_mesa_drivers_osmesa_Imakefile
index 7ac43bf1cd09..71b6bb04bc08 100644
--- a/x11/XFree86-4-libraries/files/patch-z32
+++ b/x11/XFree86-4-libraries/files/patch-lib_GL_mesa_drivers_osmesa_Imakefile
@@ -1,15 +1,14 @@
---- lib/GL/mesa/src/OSmesa/Imakefile.orig	Tue Apr  3 11:29:33 2001
-+++ lib/GL/mesa/src/OSmesa/Imakefile	Thu Jun  7 02:58:09 2001
-@@ -58,7 +58,7 @@
- LIBNAME = OSMesa
- SOREV = 3.3
+--- lib/GL/mesa/drivers/osmesa/Imakefile.orig	Sun Jan  9 03:32:47 2005
++++ lib/GL/mesa/drivers/osmesa/Imakefile	Sun Jan  9 03:34:41 2005
+@@ -131,6 +131,7 @@
+ #endif
+ 
  
--
 +#if !defined(LibInstall) || LibInstall || (!defined(ModInstall) || ModInstall)
  #if DoNormalLib
  NormalLibraryTarget($(LIBNAME), $(UOBJS))
  InstallLibrary($(LIBNAME),$(USRLIBDIR))
-@@ -77,6 +77,7 @@
+@@ -158,6 +159,7 @@
  #if DoProfileLib
  ProfiledLibraryTarget($(LIBNAME), $(POBJS))
  InstallLibrary($(LIBNAME)_p,$(USRLIBDIR))
diff --git a/x11/XFree86-4-libraries/files/patch-lib-Imakefile b/x11/XFree86-4-libraries/files/patch-lib_Imakefile
index f0ebcfc94004..9e23e6c01608 100644
--- a/x11/XFree86-4-libraries/files/patch-lib-Imakefile
+++ b/x11/XFree86-4-libraries/files/patch-lib_Imakefile
@@ -1,11 +1,11 @@
---- lib/Imakefile.orig	Thu Apr  8 23:24:13 2004
-+++ lib/Imakefile	Thu Apr  8 23:25:07 2004
-@@ -207,7 +207,7 @@
+--- lib/Imakefile.orig	Sun Jan  9 22:24:32 2005
++++ lib/Imakefile	Sun Jan  9 22:25:09 2005
+@@ -249,7 +249,7 @@
               $(DPSLIBDIR) $(DPSTKLIBDIR) $(PSRESLIBDIR) $(XINERAMADIR) \
               $(ZLIBDIR) $(REGEXDIR) $(RENDERLIBDIR) $(FREETYPE2BUILDDIR) \
-              $(LIBXML2BUILDDIR) $(EXPATBUILDDIR) $(FONTCONFIGBUILDDIR) \
+              $(LIBXML2BUILDDIR) $(FONTCONFIGBUILDDIR) \
 -             $(XFT1LIBDIR) $(XFTLIBDIR) $(XVMCLIBDIR) $(RANDRLIBDIR) \
 +             $(XVMCLIBDIR) $(RANDRLIBDIR) \
-              $(XTRAPLIBDIR) $(XRESLIBDIR) $(XCURSORLIBDIR) $(APPLELIBDIR)
+              $(XTRAPLIBDIR) $(XRESLIBDIR) $(XCURSORLIBDIR) $(APPLELIBDIR) \
+ 	     $(DMXLIBDIR)
  
- SUBDIRS = $(BERKDIR) xtrans $(LINTSUBDIRS) $(FONTSUBDIR) $(FONTENCSUBDIR) \
diff --git a/x11/XFree86-4-libraries/files/patch-z04 b/x11/XFree86-4-libraries/files/patch-lib_X11_Imakefile
index 24ac35c46c1b..1cc81756d39a 100644
--- a/x11/XFree86-4-libraries/files/patch-z04
+++ b/x11/XFree86-4-libraries/files/patch-lib_X11_Imakefile
@@ -1,15 +1,15 @@
---- lib/X11/Imakefile.orig	Thu Apr  8 23:51:16 2004
-+++ lib/X11/Imakefile	Thu Apr  8 23:53:08 2004
+--- lib/X11/Imakefile.orig	Sun Jan  9 02:58:04 2005
++++ lib/X11/Imakefile	Sun Jan  9 02:59:57 2005
 @@ -10,7 +10,7 @@
          HEADERS = Xlib.h Xresource.h Xutil.h cursorfont.h Xlibint.h \
  			Xcms.h Xlocale.h XKBlib.h
  
--#if BuildServersOnly && !XnestServer && !BuildGLXLibrary && !BuildClients
-+#if BuildServersOnly && !XnestServer && !BuildGLXLibrary && !BuildClients && !FreeBSDBuildXxserv
+-#if BuildServersOnly && !XnestServer && !BuildGLXLibrary && !BuildClients && !XdmxServer
++#if BuildServersOnly && !XnestServer && !BuildGLXLibrary && !BuildClients && !XdmxServer && !FreeBSDBuildXxserv
  all::
  
- BuildIncludes($(HEADERS),IncSubdir,..)
-@@ -1041,8 +1041,10 @@
+ depend::
+@@ -1043,8 +1043,10 @@
  #if InstallXcmsTxt
  InstallNonExecFile(Xcms.txt,$(LIBDIR))
  #endif
diff --git a/x11/XFree86-4-libraries/files/patch-luit b/x11/XFree86-4-libraries/files/patch-luit
deleted file mode 100644
index a5e858bc67f2..000000000000
--- a/x11/XFree86-4-libraries/files/patch-luit
+++ /dev/null
@@ -1,79 +0,0 @@
---- programs/luit/luit.c	Fri Mar  5 01:48:51 2004
-+++ /tmp/luit/luit.c	Sun Jul 18 09:01:22 2004
-@@ -45,6 +45,8 @@
- #include "charset.h"
- #include "iso2022.h"
- 
-+static int p2c_waitpipe[2];
-+static int c2p_waitpipe[2];
- static Iso2022Ptr inputState = NULL, outputState = NULL;
- 
- static char *child_argv0 = NULL;
-@@ -462,6 +464,8 @@
-         exit(1);
-     }
- 
-+    pipe(p2c_waitpipe);
-+    pipe(c2p_waitpipe);
-     pid = fork();
-     if(pid < 0) {
-         perror("Couldn't fork");
-@@ -470,8 +474,12 @@
- 
-     if(pid == 0) {
-         close(pty);
-+	close(p2c_waitpipe[1]);
-+	close(c2p_waitpipe[0]);
-         child(line, path, child_argv);
-     } else {
-+	close(p2c_waitpipe[0]);
-+	close(c2p_waitpipe[1]);
-         free(child_argv);
-         free(path);
-         free(line);
-@@ -486,6 +494,7 @@
- {
-     int tty;
-     int pgrp;
-+    char tmp[10];
- 
-     close(0);
-     close(1);
-@@ -501,6 +510,7 @@
-         kill(getppid(), SIGABRT);
-         exit(1);
-     }
-+    write(c2p_waitpipe[1],"1",1);
-     
-     if(tty != 0)
-         dup2(tty, 0);
-@@ -512,6 +522,9 @@
-     if(tty > 2)
-         close(tty);
-     
-+    read(p2c_waitpipe[0],tmp,1);
-+    close(c2p_waitpipe[1]);
-+    close(p2c_waitpipe[0]);
-     execvp(path, argv);
-     perror("Couldn't exec");
-     exit(1);
-@@ -535,7 +548,9 @@
-     int i;
-     int val;
-     int rc;
-+    char tmp[10];
- 
-+    read(c2p_waitpipe[0],tmp,1);
-     if(verbose) {
-         reportIso2022(outputState);
-     }
-@@ -564,6 +579,9 @@
- 
-     setWindowSize(0, pty);
- 
-+    write(p2c_waitpipe[1],"1",1);
-+    close(c2p_waitpipe[0]);
-+    close(p2c_waitpipe[1]);
-     for(;;) {
-         rc = waitForInput(0, pty);
- 
diff --git a/x11/XFree86-4-libraries/files/patch-programs_Xserver_GL_dri_Imakefile b/x11/XFree86-4-libraries/files/patch-programs_Xserver_GL_dri_Imakefile
new file mode 100644
index 000000000000..fa3f34e36ccc
--- /dev/null
+++ b/x11/XFree86-4-libraries/files/patch-programs_Xserver_GL_dri_Imakefile
@@ -0,0 +1,11 @@
+--- programs/Xserver/GL/dri/Imakefile.orig	Sun Jan 23 01:48:51 2005
++++ programs/Xserver/GL/dri/Imakefile	Sun Jan 23 01:49:41 2005
+@@ -59,7 +59,7 @@
+ 
+      INCLUDES = -I$(SERVERSRC)/include -I$(INCLUDESRC) -I$(XINCLUDESRC) \
+ 		-I$(EXTINCSRC) -I$(MESASRCDIR)/include \
+-		-I$(XF86OSSRC) -I$(XF86COMSRC) \
++		-I$(XF86OSSRC) -I$(XF86OSSRC)/bus -I$(XF86COMSRC) \
+ 		-I../include -I../glx -I$(LIBSRC)/GL/include \
+ 		-I$(SERVERSRC)/mi -I$(FONTINCSRC) \
+ 		-I$(DRMSRCDIR)/shared
diff --git a/x11/XFree86-4-libraries/files/patch-xpm-sec b/x11/XFree86-4-libraries/files/patch-xpm-sec
deleted file mode 100644
index 347ab0563d6e..000000000000
--- a/x11/XFree86-4-libraries/files/patch-xpm-sec
+++ /dev/null
@@ -1,521 +0,0 @@
-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;
- {
-     XpmColor **colorTable, **color;
-     int a;
- 
-+    if (ncolors >= UINT_MAX / sizeof(XpmColor *)) 
-+	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 @@
-      */
-     header_nlines = 1 + image->ncolors;
-     header_size = sizeof(char *) * header_nlines;
-+    if (header_size >= UINT_MAX / sizeof(char *))
-+	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 @@
-+/* $XdotOrg: pre-CVS proposed fix for CESA-2004-003 alanc 7/25/2004 $ */
- /*
-  * Copyright (C) 1989-95 GROUPE BULL
-  *
-@@ -816,6 +817,9 @@
- 
-     ErrorStatus = XpmSuccess;
- 
-+    if (image->ncolors >= UINT_MAX / sizeof(Pixel)) 
-+	return (XpmNoMemory);
-+
-     /* malloc pixels index tables */
-     image_pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * image->ncolors);
-     if (!image_pixels)
-@@ -988,6 +992,10 @@
- 	return (XpmNoMemory);
- 
- #if !defined(FOR_MSW) && !defined(AMIGA)
-+    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);
-@@ -2055,6 +2063,9 @@
- 	xpmGetCmt(data, &colors_cmt);
- 
-     /* malloc pixels index tables */
-+    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 @@
- 
- 	    /* 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++) {
-@@ -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;
-     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 >= UINT_MAX / sizeof(*atomTable)) 
-+	return (XpmNoMemory);
-     atomTable = (xpmHashAtom *) XpmMalloc(size * sizeof(*atomTable));
-     if (!atomTable)
- 	return (XpmNoMemory);
-@@ -204,6 +206,8 @@
-     table->size = INITIAL_HASH_SIZE;
-     table->limit = table->size / 3;
-     table->used = 0;
-+    if (table->size >= UINT_MAX / sizeof(*atomTable))
-+	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 @@
-+/* $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 @@
-     char **defaults;
-     int ErrorStatus;
- 
-+    if (ncolors >= UINT_MAX / sizeof(XpmColor))
-+	return (XpmNoMemory);
-     colorTable = (XpmColor *) XpmCalloc(ncolors, sizeof(XpmColor));
-     if (!colorTable)
- 	return (XpmNoMemory);
-@@ -197,6 +218,10 @@
- 	    /*
- 	     * read pixel value
- 	     */
-+	    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 @@
- 	    /*
- 	     * read pixel value
- 	     */
-+	    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;
-     unsigned int a, x, y;
- 
-+    if ((height > 0 && width >= SIZE_MAX / height) ||
-+	width * height >= UINT_MAX / sizeof(unsigned int)) 
-+	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 @@
- 
- 	    /* 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++) {
-@@ -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
- 	cpp = 0;
- 
-+    if ((height > 0 && width >= SIZE_MAX / height) ||
-+	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 >= UINT_MAX / sizeof(Pixel)) 
-+	RETURN(XpmNoMemory);
-+
-     pmap.pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * pmap.size);
-     if (!pmap.pixels)
- 	RETURN(XpmNoMemory);
-@@ -301,7 +308,8 @@
-      * get rgb values and a string of char, and possibly a name for each
-      * color
-      */
--
-+    if (pmap.ncolors >= UINT_MAX / sizeof(XpmColor))
-+	RETURN(XpmNoMemory);
-     colorTable = (XpmColor *) XpmCalloc(pmap.ncolors, sizeof(XpmColor));
-     if (!colorTable)
- 	RETURN(XpmNoMemory);
-@@ -360,6 +368,8 @@
- 
-     /* first get a character string */
-     a = 0;
-+    if (cpp >= UINT_MAX - 1)
-+	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 @@
-     }
- 
-     /* first get character strings and rgb values */
-+    if (ncolors >= UINT_MAX / sizeof(XColor) || cpp >= UINT_MAX - 1)
-+	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/XFree86-4-libraries/files/patch-z05 b/x11/XFree86-4-libraries/files/patch-z05
deleted file mode 100644
index bbbd80e455cb..000000000000
--- a/x11/XFree86-4-libraries/files/patch-z05
+++ /dev/null
@@ -1,14 +0,0 @@
---- lib/font/X-TrueType/Imakefile.inc~	Fri Feb 18 02:13:25 2000
-+++ lib/font/X-TrueType/Imakefile.inc	Tue Apr 18 17:13:40 2000
-@@ -12,7 +12,11 @@
-            ARMSCII8 ARABIC MULEENCODING DOSENCODING
- #endif
- 
-+#if !defined(FreeBSDBuildXlib) || !FreeBSDBuildXlib
- SUBDIRS = $(MODULE_SUBDIRS) $(DEFAULT_CCONV_SUBDIR) $(CCONV_SUBDIRS)
-+#else
-+SUBDIRS = $(MODULE_SUBDIRS)
-+#endif
- 
- #if XTrueTypeDebugXTT
-   XTT_DEBUG_SRCS = xttdump.c
diff --git a/x11/XFree86-4-libraries/files/patch-z41 b/x11/XFree86-4-libraries/files/patch-z41
deleted file mode 100644
index 1c03e9b9709e..000000000000
--- a/x11/XFree86-4-libraries/files/patch-z41
+++ /dev/null
@@ -1,18 +0,0 @@
---- config/cf/xttMod.tmpl~	Tue Dec  5 11:59:36 2000
-+++ config/cf/xttMod.tmpl	Wed Dec 20 13:39:42 2000
-@@ -24,11 +24,15 @@
- 
- ModuleObjectRule()
- LibraryModuleTarget($(MODULENAME),$(OBJS))
-+#if (!defined(LibInstall) || LibInstall) || (!defined(ModInstall) || ModInstall)
- InstallLibraryModule($(MODULENAME),$(MODULEDIR),codeconv)
-+#endif
- 
- DependTarget()
- 
-+#if (!defined(LibInstall) || LibInstall) || (!defined(ModInstall) || ModInstall)
- InstallDriverSDKLibraryModule($(MODULENAME),$(DRIVERSDKMODULEDIR),codeconv)
-+#endif
- 
- # else
- /* dlopen based code converter */
diff --git a/x11/XFree86-4-libraries/pkg-plist b/x11/XFree86-4-libraries/pkg-plist
index ba03d4f9a3cf..ade849504555 100644
--- a/x11/XFree86-4-libraries/pkg-plist
+++ b/x11/XFree86-4-libraries/pkg-plist
@@ -1,3 +1,4 @@
+@unexec if cmp -s %D/lib/X11/xserver/SecurityPolicy %D/lib/X11/xserver/SecurityPolicy.default; then rm %D/lib/X11/xserver/SecurityPolicy; fi
 bin/xcursor-config
 include/DPS/ColorSB.h
 include/DPS/ColorSBP.h
@@ -305,6 +306,8 @@ include/X11/extensions/XvMCproto.h
 include/X11/extensions/Xvlib.h
 include/X11/extensions/Xvproto.h
 include/X11/extensions/bigreqstr.h
+include/X11/extensions/dmxext.h
+include/X11/extensions/dmxproto.h
 include/X11/extensions/dpms.h
 include/X11/extensions/dpmsstr.h
 include/X11/extensions/extutil.h
@@ -323,6 +326,7 @@ include/X11/extensions/multibuf.h
 include/X11/extensions/multibufst.h
 include/X11/extensions/panoramiXext.h
 include/X11/extensions/panoramiXproto.h
+include/X11/extensions/panoramiXwrap.h
 include/X11/extensions/randr.h
 include/X11/extensions/randrproto.h
 include/X11/extensions/record.h
@@ -362,12 +366,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
@@ -470,11 +468,17 @@ lib/X11/locale/koi8-r/XLC_LOCALE
 lib/X11/locale/koi8-u/Compose
 lib/X11/locale/koi8-u/XI18N_OBJS
 lib/X11/locale/koi8-u/XLC_LOCALE
+lib/X11/locale/lib/common/ximcp.so
 lib/X11/locale/lib/common/ximcp.so.2
+lib/X11/locale/lib/common/xlcDef.so
 lib/X11/locale/lib/common/xlcDef.so.2
+lib/X11/locale/lib/common/xlcUTF8Load.so
 lib/X11/locale/lib/common/xlcUTF8Load.so.2
+lib/X11/locale/lib/common/xlibi18n.so
 lib/X11/locale/lib/common/xlibi18n.so.2
+lib/X11/locale/lib/common/xlocale.so
 lib/X11/locale/lib/common/xlocale.so.2
+lib/X11/locale/lib/common/xomGeneric.so
 lib/X11/locale/lib/common/xomGeneric.so.2
 lib/X11/locale/locale.alias
 lib/X11/locale/locale.dir
@@ -523,6 +527,7 @@ lib/X11/locale/zh_TW.big5/XLC_LOCALE
 lib/X11/locale/zh_TW/Compose
 lib/X11/locale/zh_TW/XI18N_OBJS
 lib/X11/locale/zh_TW/XLC_LOCALE
+lib/X11/xserver/SecurityPolicy.default
 lib/libFS.a
 lib/libFS.so
 lib/libFS.so.6
@@ -550,8 +555,8 @@ lib/libX11.so.6
 lib/libXRes.a
 lib/libXRes.so
 lib/libXRes.so.1
-%%XTHRSTUB:%%lib/libXThrStub.so
-%%XTHRSTUB:%%lib/libXThrStub.so.6
+lib/libXThrStub.so
+lib/libXThrStub.so.6
 lib/libXTrap.a
 lib/libXTrap.so
 lib/libXTrap.so.6
@@ -623,6 +628,9 @@ lib/libXxf86misc.so.1
 lib/libXxf86vm.a
 lib/libXxf86vm.so
 lib/libXxf86vm.so.1
+lib/libdmx.a
+lib/libdmx.so
+lib/libdmx.so.1
 lib/libdps.a
 lib/libdps.so
 lib/libdps.so.1
@@ -647,4 +655,71 @@ lib/libxkbui.a
 lib/libxkbui.so
 lib/libxkbui.so.1
 libdata/pkgconfig/xcursor.pc
+@dirrm include/DPS
+@dirrm include/GL
+@dirrm include/X11/ICE
+@dirrm include/X11/PM
+@dirrm include/X11/SM
+@dirrm include/X11/Xaw
+@dirrm include/X11/Xcursor
+@dirrm include/X11/Xmu
+@dirrm include/X11/extensions
+@dirrm include/X11/fonts
+@dirrm lib/X11/locale/C
+@dirrm lib/X11/locale/armscii-8
+@dirrm lib/X11/locale/el_GR.UTF-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-10
+@dirrm lib/X11/locale/iso8859-11
+@dirrm lib/X11/locale/iso8859-13
+@dirrm lib/X11/locale/iso8859-14
+@dirrm lib/X11/locale/iso8859-15
+@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-9e
+@dirrm lib/X11/locale/ja
+@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-c
+@dirrm lib/X11/locale/koi8-r
+@dirrm lib/X11/locale/koi8-u
+@dirrm lib/X11/locale/lib/common
+@dirrm lib/X11/locale/lib
+@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/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.UTF-8
+@dirrm lib/X11/locale/zh_CN.gbk
+@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.UTF-8
+@dirrm lib/X11/locale/zh_TW.big5
+@dirrm lib/X11/locale
+@exec if [ ! -f %D/lib/X11/xserver/SecurityPolicy ]; then cp %D/lib/X11/xserver/SecurityPolicy.default %D/lib/X11/xserver/SecurityPolicy; fi
+@unexec rmdir %D/include/X11/bitmaps 2>/dev/null || true
+@unexec rmdir %D/lib/X11/xserver 2>/dev/null || true