diff --git a/packages/x11/xserver/xorg-server/patches/01_cache-xkbcomp-output-for-fast-start-up-v5.3.diff b/packages/x11/xserver/xorg-server/patches/01_cache-xkbcomp-output-for-fast-start-up-v5.3.diff
deleted file mode 100644
index 27503ae51f..0000000000
--- a/packages/x11/xserver/xorg-server/patches/01_cache-xkbcomp-output-for-fast-start-up-v5.3.diff
+++ /dev/null
@@ -1,370 +0,0 @@
-diff -Naur xorg-server-20091215/config.log xorg-server-20091215.patch/config.log
-diff -Naur xorg-server-20091215/configure xorg-server-20091215.patch/configure
---- xorg-server-20091215/configure	2009-12-15 20:09:57.000000000 +0100
-+++ xorg-server-20091215.patch/configure	2009-12-15 20:16:28.266446508 +0100
-@@ -2220,7 +2220,7 @@
-                           Comma separated list of font dirs
-   --with-xkb-path=PATH    Path to XKB base dir (default: ${datadir}/X11/xkb)
-   --with-xkb-output=PATH  Path to XKB output dir (default:
--                          ${datadir}/X11/xkb/compiled)
-+                          ${localstatedir}/cache/xkb)
-   --with-default-xkb-rules=RULES
-                           Keyboard ruleset (default: base/evdev)
-   --with-default-xkb-model=MODEL
-@@ -21165,7 +21165,7 @@
- if test "${with_xkb_output+set}" = set; then
-   withval=$with_xkb_output;  XKBOUTPUT="$withval"
- else
--   XKBOUTPUT="compiled"
-+   XKBOUTPUT="${localstatedir}/cache/xkb"
- fi
- 
- 
-@@ -25279,7 +25279,9 @@
- 
- XKBOUTPUT_FIRSTCHAR=`echo $XKBOUTPUT | cut -b 1`
- if [ x$XKBOUTPUT_FIRSTCHAR != x/ -a x$XKBOUTPUT_FIRSTCHAR != 'x$' ] ; then
--   XKBOUTPUT="$XKB_BASE_DIRECTORY/$XKBOUTPUT"
-+   { { $as_echo "$as_me:$LINENO: error: xkb-output must be an absolute path." >&5
-+$as_echo "$as_me: error: xkb-output must be an absolute path." >&2;}
-+   { (exit 1); exit 1; }; }
- fi
- 
- 
-diff -Naur xorg-server-20091215/configure.ac xorg-server-20091215.patch/configure.ac
---- xorg-server-20091215/configure.ac	2009-12-14 23:34:15.000000000 +0100
-+++ xorg-server-20091215.patch/configure.ac	2009-12-15 20:15:56.495321458 +0100
-@@ -519,9 +519,9 @@
- AC_ARG_WITH(xkb-path,         AS_HELP_STRING([--with-xkb-path=PATH], [Path to XKB base dir (default: ${datadir}/X11/xkb)]),
- 				[ XKBPATH="$withval" ],
- 				[ XKBPATH="${datadir}/X11/xkb" ])
--AC_ARG_WITH(xkb-output,       AS_HELP_STRING([--with-xkb-output=PATH], [Path to XKB output dir (default: ${datadir}/X11/xkb/compiled)]),
-+AC_ARG_WITH(xkb-output,       AS_HELP_STRING([--with-xkb-output=PATH], [Path to XKB output dir (default: ${localstatedir}/cache/xkb)]),
- 				[ XKBOUTPUT="$withval" ],
--				[ XKBOUTPUT="compiled" ])
-+				[ XKBOUTPUT="${localstatedir}/cache/xkb" ])
- AC_ARG_WITH(default-xkb-rules, AS_HELP_STRING([--with-default-xkb-rules=RULES],
-                                    [Keyboard ruleset (default: base/evdev)]),
-                                 [ XKB_DFLT_RULES="$withval" ],
-@@ -1117,7 +1117,7 @@
- dnl Make sure XKM_OUTPUT_DIR is an absolute path
- XKBOUTPUT_FIRSTCHAR=`echo $XKBOUTPUT | cut -b 1`
- if [[ x$XKBOUTPUT_FIRSTCHAR != x/ -a x$XKBOUTPUT_FIRSTCHAR != 'x$' ]] ; then
--   XKBOUTPUT="$XKB_BASE_DIRECTORY/$XKBOUTPUT"
-+   AC_MSG_ERROR([xkb-output must be an absolute path.])
- fi
- 
- dnl XKM_OUTPUT_DIR (used in code) must end in / or file names get hosed
-diff -Naur xorg-server-20091215/configure.ac.orig xorg-server-20091215.patch/configure.ac.orig
-diff -Naur xorg-server-20091215/include/do-not-use-config.h.in~ xorg-server-20091215.patch/include/do-not-use-config.h.in~
-diff -Naur xorg-server-20091215/xkb/ddxLoad.c xorg-server-20091215.patch/xkb/ddxLoad.c
---- xorg-server-20091215/xkb/ddxLoad.c	2009-12-14 23:34:15.000000000 +0100
-+++ xorg-server-20091215.patch/xkb/ddxLoad.c	2009-12-15 20:15:56.496321229 +0100
-@@ -30,6 +30,13 @@
- 
- #include <xkb-config.h>
- 
-+#ifdef HAVE_SHA1_IN_LIBMD /* Use libmd for SHA1 */
-+# include <sha1.h>
-+#else /* Use OpenSSL's libcrypto */
-+# include <stddef.h>  /* buggy openssl/sha.h wants size_t */
-+# include <openssl/sha.h>
-+#endif
-+
- #include <stdio.h>
- #include <ctype.h>
- #include <X11/X.h>
-@@ -43,24 +50,13 @@
- #define	XKBSRV_NEED_FILE_FUNCS
- #include <xkbsrv.h>
- #include <X11/extensions/XI.h>
-+#include <errno.h>
- #include "xkb.h"
- 
- #if defined(CSRG_BASED) || defined(linux) || defined(__GNU__)
- #include <paths.h>
- #endif
- 
--	/*
--	 * If XKM_OUTPUT_DIR specifies a path without a leading slash, it is
--	 * relative to the top-level XKB configuration directory.
--	 * Making the server write to a subdirectory of that directory
--	 * requires some work in the general case (install procedure
--	 * has to create links to /var or somesuch on many machines),
--	 * so we just compile into /usr/tmp for now.
--	 */
--#ifndef XKM_OUTPUT_DIR
--#define	XKM_OUTPUT_DIR	"compiled/"
--#endif
--
- #define	PRE_ERROR_MSG "\"The XKEYBOARD keymap compiler (xkbcomp) reports:\""
- #define	ERROR_PREFIX	"\"> \""
- #define	POST_ERROR_MSG1 "\"Errors from xkbcomp are not fatal to the X server\""
-@@ -175,6 +171,45 @@
- }
- 
- static Bool
-+Sha1Asc(char sha1Asc[SHA_DIGEST_LENGTH*2+1], const char * input)
-+{
-+    int i;
-+    unsigned char sha1[SHA_DIGEST_LENGTH];
-+
-+#ifdef HAVE_SHA1_IN_LIBMD /* Use libmd for SHA1 */
-+    SHA1_CTX ctx;
-+
-+    SHA1Init (&ctx);
-+    SHA1Update (&ctx, input, strlen(input));
-+    SHA1Final (sha1, &ctx);
-+#else /* Use OpenSSL's libcrypto */
-+    SHA_CTX ctx;
-+    int success;
-+
-+    success = SHA1_Init (&ctx);
-+    if (! success)
-+	return BadAlloc;
-+
-+    success = SHA1_Update (&ctx, input, strlen(input));
-+    if (! success)
-+	return BadAlloc;
-+
-+    success = SHA1_Final (sha1, &ctx);
-+    if (! success)
-+	return BadAlloc;
-+#endif
-+
-+    /* convert sha1 to sha1_asc */
-+    for(i=0; i<SHA_DIGEST_LENGTH; ++i) {
-+        sprintf(sha1Asc+i*2, "%02X", sha1[i]);
-+    }
-+
-+    return Success;
-+}
-+
-+/* call xkbcomp and compile XKB keymap, return xkm file name in
-+   nameRtrn */
-+static Bool
- XkbDDXCompileKeymapByNames(	XkbDescPtr		xkb,
- 				XkbComponentNamesPtr	names,
- 				unsigned		want,
-@@ -183,7 +218,11 @@
- 				int			nameRtrnLen)
- {
-     FILE *	out;
--    char	*buf = NULL, keymap[PATH_MAX], xkm_output_dir[PATH_MAX];
-+    char *	buf = NULL, xkmfile[PATH_MAX], xkm_output_dir[PATH_MAX];
-+    char *	tmpXkmFile = NULL;
-+    char *	canonicalXkmFileName = NULL;
-+    char	sha1Asc[SHA_DIGEST_LENGTH*2+1], xkbKeyMapBuf[100*1024];
-+    int	ret, result;
- 
-     const char	*emptystring = "";
-     const char	*xkbbasedirflag = emptystring;
-@@ -194,15 +233,69 @@
-     /* WIN32 has no popen. The input must be stored in a file which is
-        used as input for xkbcomp. xkbcomp does not read from stdin. */
-     char tmpname[PATH_MAX];
--    const char *xkmfile = tmpname;
-+    const char *xkbfile = tmpname;
- #else
--    const char *xkmfile = "-";
-+    const char *xkbfile = "-";
-+#endif
-+
-+    /* Write keymap source (xkbfile) to memory buffer `xkbKeyMapBuf',
-+       of which SHA1 is generated and used as result xkm file name  */
-+    memset(xkbKeyMapBuf, 0, sizeof(xkbKeyMapBuf));
-+    out = fmemopen(xkbKeyMapBuf, sizeof(xkbKeyMapBuf), "w");
-+    if (NULL == out) {
-+        ErrorF("[xkb] Open xkbKeyMapBuf for writing failed\n");
-+        return False;
-+    }
-+    ret = XkbWriteXKBKeymapForNames(out, names, xkb, want, need);
-+    if (fclose(out) !=0)
-+    {
-+        ErrorF("[xkb] XkbWriteXKBKeymapForNames error, perhaps xkbKeyMapBuf is too small\n");
-+        return False;
-+    }
-+#ifdef DEBUG
-+    if (xkbDebugFlags) {
-+       ErrorF("[xkb] XkbDDXCompileKeymapByNames compiling keymap:\n");
-+       fputs(xkbKeyMapBuf, stderr);
-+    }
- #endif
-+    if (!ret) {
-+        ErrorF("[xkb] Generating XKB Keymap failed, giving up compiling keymap\n");
-+        return False;
-+    }
- 
--    snprintf(keymap, sizeof(keymap), "server-%s", display);
-+    DebugF("[xkb] computing SHA1 of keymap\n");
-+    if (Success == Sha1Asc(sha1Asc, xkbKeyMapBuf)) {
-+        snprintf(xkmfile, sizeof(xkmfile), "server-%s", sha1Asc);
-+    }
-+    else {
-+        ErrorF("[xkb] Computing SHA1 of keymap failed, "
-+               "using display name instead as xkm file name\n");
-+        snprintf(xkmfile, sizeof(xkmfile), "server-%s", display);
-+    }
- 
-     OutputDirectory(xkm_output_dir, sizeof(xkm_output_dir));
- 
-+    /* set nameRtrn, fail if it's too small */
-+    if ((strlen(xkmfile)+1 > nameRtrnLen) && nameRtrn) {
-+        ErrorF("[xkb] nameRtrn too small to hold xkmfile name\n");
-+        return False;
-+    }
-+    strncpy(nameRtrn, xkmfile, nameRtrnLen);
-+
-+    /* if the xkm file already exists, reuse it */
-+    canonicalXkmFileName = Xprintf("%s%s.xkm", xkm_output_dir, xkmfile);
-+    if (access(canonicalXkmFileName, R_OK) == 0) {
-+        /* yes, we can reuse the old xkm file */
-+        LogMessage(X_INFO, "XKB: reuse xkmfile %s\n", canonicalXkmFileName);
-+        result = True;
-+        goto _ret;
-+    }
-+    LogMessage(X_INFO, "XKB: generating xkmfile %s\n", canonicalXkmFileName);
-+
-+    /* continue to call xkbcomp to compile the keymap. to avoid race
-+       condition, we compile it to a tmpfile then rename it to
-+       xkmfile */
-+
- #ifdef WIN32
-     strcpy(tmpname, Win32TempDir());
-     strcat(tmpname, "\\xkb_XXXXXX");
-@@ -225,19 +318,30 @@
- 	}
-     }
- 
-+    if ( (tmpXkmFile = tempnam(xkm_output_dir, NULL)) == NULL ) {
-+        ErrorF("[xkb] Can't generate temp xkm file name");
-+        result = False;
-+        goto _ret;
-+    }
-+
-     buf = Xprintf("\"%s%sxkbcomp\" -w %d %s -xkm \"%s\" "
--		  "-em1 %s -emp %s -eml %s \"%s%s.xkm\"",
-+		  "-em1 %s -emp %s -eml %s \"%s\"",
- 		  xkbbindir, xkbbindirsep,
- 		  ( (xkbDebugFlags < 2) ? 1 :
- 		    ((xkbDebugFlags > 10) ? 10 : (int)xkbDebugFlags) ),
--		  xkbbasedirflag, xkmfile,
-+		  xkbbasedirflag, xkbfile,
- 		  PRE_ERROR_MSG, ERROR_PREFIX, POST_ERROR_MSG1,
--		  xkm_output_dir, keymap);
-+		  tmpXkmFile);
- 
-     if (xkbbasedirflag != emptystring) {
- 	xfree(xkbbasedirflag);
-     }
-     
-+    /* there's a potential race condition between calling tempnam()
-+       and invoking xkbcomp to write the result file (potential temp
-+       file name conflicts), but since xkbcomp is a standalone
-+       program, we have to live with this */
-+
- #ifndef WIN32
-     out= Popen(buf,"w");
- #else
-@@ -245,31 +349,43 @@
- #endif
-     
-     if (out!=NULL) {
--#ifdef DEBUG
--    if (xkbDebugFlags) {
--       ErrorF("[xkb] XkbDDXCompileKeymapByNames compiling keymap:\n");
--       XkbWriteXKBKeymapForNames(stderr,names,xkb,want,need);
-+        /* write XKBKeyMapBuf to xkbcomp */
-+        if (EOF==fputs(xkbKeyMapBuf, out))
-+        {
-+            ErrorF("[xkb] Sending keymap to xkbcomp failed\n");
-+            result = False;
-+            goto _ret;
-     }
--#endif
--	XkbWriteXKBKeymapForNames(out,names,xkb,want,need);
- #ifndef WIN32
- 	if (Pclose(out)==0)
- #else
- 	if (fclose(out)==0 && System(buf) >= 0)
- #endif
- 	{
-+        /* xkbcomp success */
-             if (xkbDebugFlags)
-                 DebugF("[xkb] xkb executes: %s\n",buf);
--	    if (nameRtrn) {
--		strncpy(nameRtrn,keymap,nameRtrnLen);
--		nameRtrn[nameRtrnLen-1]= '\0';
-+
-+            /* if canonicalXkmFileName already exists now, we simply
-+               overwrite it, this is OK */
-+            ret = rename(tmpXkmFile, canonicalXkmFileName);
-+            if (0 != ret) {
-+                ErrorF("[xkb] Can't rename %s to %s, error: %s\n",
-+                       tmpXkmFile, canonicalXkmFileName,
-+                       strerror(errno));
-+
-+                /* in case of error, don't unlink tmpXkmFile, leave it
-+                   for debugging */
-+
-+                result = False;
-+                goto _ret;
- 	    }
--            if (buf != NULL)
--                xfree (buf);
--	    return True;
-+
-+            result = True;
-+            goto _ret;
- 	}
- 	else
--	    LogMessage(X_ERROR, "Error compiling keymap (%s)\n", keymap);
-+	    LogMessage(X_ERROR, "Error compiling keymap (%s)\n", xkbfile);
- #ifdef WIN32
-         /* remove the temporary file */
-         unlink(tmpname);
-@@ -284,9 +400,17 @@
-     }
-     if (nameRtrn)
- 	nameRtrn[0]= '\0';
-+    result = False;
-+
-+_ret:
-+    if (tmpXkmFile)
-+        free(tmpXkmFile);
-+    if (canonicalXkmFileName)
-+        xfree(canonicalXkmFileName);
-     if (buf != NULL)
-         xfree (buf);
--    return False;
-+
-+    return result;
- }
- 
- static FILE *
-@@ -370,7 +494,6 @@
- 	DebugF("Loaded XKB keymap %s, defined=0x%x\n",fileName,(*xkbRtrn)->defined);
-     }
-     fclose(file);
--    (void) unlink (fileName);
-     return (need|want)&(~missing);
- }
- 
-diff -Naur xorg-server-20091215/xkb/README.compiled xorg-server-20091215.patch/xkb/README.compiled
---- xorg-server-20091215/xkb/README.compiled	2009-12-14 23:34:15.000000000 +0100
-+++ xorg-server-20091215.patch/xkb/README.compiled	2009-12-15 20:15:56.496321229 +0100
-@@ -4,10 +4,10 @@
- or some other tool might destroy or replace the files in this directory,
- so it is not a safe place to store compiled keymaps for long periods of
- time.  The default keymap for any server is usually stored in:
--     X<num>-default.xkm
--where <num> is the display number of the server in question, which makes
--it possible for several servers *on the same host* to share the same 
--directory.
-+     server-<SHA1>.xkm
-+
-+where <SHA1> is the SHA1 hash of keymap source, so that compiled
-+keymap of different keymap sources are stored in different files.
- 
- Unless the X server is modified, sharing this directory between servers on
- different hosts could cause problems.
diff --git a/packages/x11/xserver/xorg-server/patches/20_extra_modelines_fromxorg.diff b/packages/x11/xserver/xorg-server/patches/20_extra_modelines_fromxorg.diff
deleted file mode 100644
index 30743b8b05..0000000000
--- a/packages/x11/xserver/xorg-server/patches/20_extra_modelines_fromxorg.diff
+++ /dev/null
@@ -1,85 +0,0 @@
-From: Adam Jackson <ajax@redhat.com>
-Date: Sun, 28 Oct 2007 09:37:52 +0100
-Subject: [PATCH] Fedora extra modes list
-
----
-Index: xorg-server/hw/xfree86/common/extramodes
-===================================================================
---- xorg-server.orig/hw/xfree86/common/extramodes
-+++ xorg-server/hw/xfree86/common/extramodes
-@@ -3,16 +3,75 @@
- //
- // $XFree86: xc/programs/Xserver/hw/xfree86/etc/extramodes,v 1.5 2002/06/05 19:43:05 dawes Exp $
- //
-+// NOTE:  Please keep all video modes sorted in order of X res, then Y res for
-+//        ease of maintenance and readability.
- 
- # 832x624 @ 75Hz (74.55Hz) (fix if the official/Apple spec is different) hsync: 49.725kHz
- ModeLine "832x624" 57.284 832  864  928 1152  624  625  628  667 -Hsync -Vsync
- 
-+# 1152x864 @ 60.00 Hz (GTF) hsync: 53.70 kHz; pclk: 81.62 MHz
-+Modeline "1152x864"  81.62  1152 1216 1336 1520  864 865 868 895  -HSync +Vsync
-+
-+# 1152x864 @ 70.00 Hz (GTF) hsync: 63.00 kHz; pclk: 96.77 MHz
-+Modeline "1152x864"  96.77  1152 1224 1344 1536  864 865 868 900  -HSync +Vsync
-+
-+# 1152x864 @ 75.00 Hz (GTF) hsync: 67.65 kHz; pclk: 104.99 MHz
-+Modeline "1152x864"  104.99  1152 1224 1352 1552  864 865 868 902  -HSync +Vsync
-+
-+# 1152x864 @ 85.00 Hz (GTF) hsync: 77.10 kHz; pclk: 119.65 MHz
-+Modeline "1152x864"  119.65  1152 1224 1352 1552  864 865 868 907  -HSync +Vsync
-+
-+# 1152x864 @ 85Hz (Red Hat custom modeline)
-+ModeLine "1152x864"  121.5 1152 1216 1344 1568    864  865  868  911 +hsync -vsync
-+
-+# 1152x864 @ 100.00 Hz (GTF) hsync: 91.50 kHz; pclk: 143.47 MHz
-+Modeline "1152x864"  143.47  1152 1232 1360 1568  864 865 868 915  -HSync +Vsync
-+
-+# 1360x768 59.96 Hz (CVT) hsync: 47.37 kHz; pclk: 72.00 MHz
-+Modeline "1360x768"   72.00  1360 1408 1440 1520  768 771 781 790 +hsync -vsync
-+
-+# 1360x768 59.80 Hz (CVT) hsync: 47.72 kHz; pclk: 84.75 MHz
-+Modeline "1360x768"   84.75  1360 1432 1568 1776  768 771 781 798 -hsync +vsync
-+
- # 1400x1050 @ 60Hz (VESA GTF) hsync: 65.5kHz
- ModeLine "1400x1050" 122.0 1400 1488 1640 1880   1050 1052 1064 1082 +hsync +vsync
- 
-+# 1400x1050 @ 70.00 Hz (GTF) hsync: 76.51 kHz; pclk: 145.06 MHz
-+Modeline "1400x1050"  145.06  1400 1496 1648 1896  1050 1051 1054 1093  -HSync +Vsync
-+
- # 1400x1050 @ 75Hz (VESA GTF) hsync: 82.2kHz
- ModeLine "1400x1050" 155.8 1400 1464 1784 1912   1050 1052 1064 1090 +hsync +vsync
- 
-+# 1400x1050 @ 85.00 Hz (GTF) hsync: 93.76 kHz; pclk: 179.26 MHz
-+Modeline "1400x1050"  179.26  1400 1504 1656 1912  1050 1051 1054 1103  -HSync +Vsync
-+
-+# 1440x900 @ 60.00 Hz (CVT) field rate 59.89 Hz; hsync: 55.93 kHz; pclk: 106.50 MHz
-+Modeline "1440x900"  106.50  1440 1520 1672 1904  900 903 909 934  -HSync +Vsync
-+
-+# 1600x1024 for SGI 1600 SW
-+ModeLine "1600x1024" 103.125 1600 1600 1656 1664 1024 1024 1029 1030 +Hsync +Vsync
-+
-+# 1680x1050 59.88 Hz (CVT 1.76MA-R) hsync: 64.67 kHz; pclk: 119.00 MHz
-+Modeline "1680x1050"  119.00  1680 1728 1760 1840  1050 1053 1059 1080 +hsync -vsync
-+
-+# 1680x1050 59.95 Hz (CVT 1.76MA) hsync: 65.29 kHz; pclk: 146.25 MHz
-+Modeline "1680x1050"  146.25  1680 1784 1960 2240  1050 1053 1059 1089 -hsync +vsync
-+
-+# 1680x1050 69.88 Hz (CVT) hsync: 76.58 kHz; pclk: 174.00 MHz
-+Modeline "1680x1050"  174.00  1680 1800 1976 2272  1050 1053 1059 1096 -hsync +vsync
-+
-+# 1680x1050 74.89 Hz (CVT 1.76MA) hsync: 82.31 kHz; pclk: 187.00 MHz
-+Modeline "1680x1050"  187.00  1680 1800 1976 2272  1050 1053 1059 1099 -hsync +vsync
-+
-+# 1680x1050 84.94 Hz (CVT 1.76MA) hsync: 93.86 kHz; pclk: 214.75 MHz
-+Modeline "1680x1050"  214.75  1680 1808 1984 2288  1050 1053 1059 1105 -hsync +vsync
-+
-+# 1920x1080 59.93 Hz (CVT 2.07M9-R) hsync: 66.59 kHz; pclk: 138.50 MHz
-+Modeline "1920x1080"  138.50  1920 1968 2000 2080  1080 1083 1088 1111 +hsync -vsync
-+
-+# 1920x1200 59.95 Hz (CVT 2.30MA-R) hsync: 74.04 kHz; pclk: 154.00 MHz
-+Modeline "1920x1200"  154.00  1920 1968 2000 2080  1200 1203 1209 1235 +hsync -vsync
-+
- # 1920x1440 @ 85Hz (VESA GTF) hsync: 128.5kHz
- Modeline "1920x1440" 341.35  1920 2072 2288 2656  1440 1441 1444 1512 -hsync +vsync
- 
diff --git a/packages/x11/xserver/xorg-server/patches/30_typedef-apm-2.6.24.diff b/packages/x11/xserver/xorg-server/patches/30_typedef-apm-2.6.24.diff
deleted file mode 100644
index 96adefd18b..0000000000
--- a/packages/x11/xserver/xorg-server/patches/30_typedef-apm-2.6.24.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur xorg-server-1.4.0.90/hw/xfree86/os-support/linux/lnx_apm.c xorg-server-1.4.0.90.edit/hw/xfree86/os-support/linux/lnx_apm.c
---- xorg-server-1.4.0.90/hw/xfree86/os-support/linux/lnx_apm.c	2007-12-14 00:38:23.000000000 +0100
-+++ xorg-server-1.4.0.90.edit/hw/xfree86/os-support/linux/lnx_apm.c	2007-12-14 00:38:18.000000000 +0100
-@@ -35,6 +35,8 @@
- # define APM_SUSPEND_FAILED 0xf001
- #endif
- 
-+typedef unsigned short  apm_event_t;
-+
- static PMClose lnxAPMOpen(void);
- static void lnxCloseAPM(void);
- static pointer APMihPtr = NULL;
diff --git a/packages/x11/xserver/xorg-server/patches/xorg-server-crosscompiling.diff b/packages/x11/xserver/xorg-server/patches/xorg-server-crosscompiling.diff
deleted file mode 100644
index 29dfc2623b..0000000000
--- a/packages/x11/xserver/xorg-server/patches/xorg-server-crosscompiling.diff
+++ /dev/null
@@ -1,2244 +0,0 @@
-diff -Naur xorg-server-1.7.99.2/configure xorg-server-1.7.99.2.patch/configure
---- xorg-server-1.7.99.2/configure	2009-12-20 14:25:52.292986199 +0100
-+++ xorg-server-1.7.99.2.patch/configure	2009-12-20 21:16:07.077986090 +0100
-@@ -2132,7 +2132,7 @@
-                           (default: auto)
-   --enable-unix-transport Enable UNIX domain socket transport
-   --enable-tcp-transport  Enable TCP socket transport
--  --enable-IPv6           Enable IPv6 support
-+  --enable-ipv6           Enable IPv6 support
-   --enable-local-transport
-                           Enable os-specific local transport
-   --enable-secure-rpc     Enable Secure RPC
-@@ -16129,7 +16129,9 @@
- $as_echo "${FONT100DPIDIR}" >&6; }
- 
- 
--as_ac_File=`$as_echo "ac_cv_file_${sysconfdir}/X11/fontpath.d" | $as_tr_sh`
-+DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/"
-+if test "$cross_compiling" != yes; then
-+	as_ac_File=`$as_echo "ac_cv_file_${sysconfdir}/X11/fontpath.d" | $as_tr_sh`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${sysconfdir}/X11/fontpath.d" >&5
- $as_echo_n "checking for ${sysconfdir}/X11/fontpath.d... " >&6; }
- if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
-@@ -16148,16 +16150,14 @@
- $as_echo "$ac_res" >&6; }
- eval as_val=\$$as_ac_File
-    if test "x$as_val" = x""yes; then :
--  DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'
-+  DEFAULT_FONT_PATH='catalogue:$(sysconfdir)/X11/fontpath.d'
- else
--
--		DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/"
--		case $host_os in
--			darwin*)    DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
-+  case $host_os in
-+			darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
- 		esac
--
- fi
- 
-+fi
- 
- # Check whether --with-default-font-path was given.
- if test "${with_default_font_path+set}" = set; then :
-@@ -16166,6 +16166,10 @@
-    FONTPATH="${DEFAULT_FONT_PATH}"
- fi
- 
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for default font path" >&5
-+$as_echo_n "checking for default font path... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $FONTPATH" >&5
-+$as_echo "$FONTPATH" >&6; }
- 
- 
- # Check whether --with-xkb-path was given.
-@@ -16862,6 +16866,46 @@
- 
- fi
- 
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lws2_32" >&5
-+$as_echo_n "checking for main in -lws2_32... " >&6; }
-+if test "${ac_cv_lib_ws2_32_main+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lws2_32  $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+
-+int
-+main ()
-+{
-+return main ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_ws2_32_main=yes
-+else
-+  ac_cv_lib_ws2_32_main=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ws2_32_main" >&5
-+$as_echo "$ac_cv_lib_ws2_32_main" >&6; }
-+if test "x$ac_cv_lib_ws2_32_main" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBWS2_32 1
-+_ACEOF
-+
-+  LIBS="-lws2_32 $LIBS"
-+
-+fi
-+ac_cv_lib_ws2_32=ac_cv_lib_ws2_32_main
-+
- 
-  # Needs to come after above checks for libsocket & libnsl for SVR4 systems
-  # Check whether --enable-ipv6 was given.
-@@ -17372,10 +17416,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for UDEV" >&5
- $as_echo_n "checking for UDEV... " >&6; }
- 
--if test -n "$UDEV_CFLAGS"; then
--    pkg_cv_UDEV_CFLAGS="$UDEV_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$UDEV_CFLAGS"; then
-+        pkg_cv_UDEV_CFLAGS="$UDEV_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBUDEV\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$LIBUDEV") 2>&5
-   ac_status=$?
-@@ -17385,13 +17430,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$UDEV_LIBS"; then
--    pkg_cv_UDEV_LIBS="$UDEV_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$UDEV_LIBS"; then
-+        pkg_cv_UDEV_LIBS="$UDEV_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBUDEV\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$LIBUDEV") 2>&5
-   ac_status=$?
-@@ -17401,8 +17448,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -17415,9 +17463,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        UDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBUDEV" 2>&1`
-+	        UDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBUDEV"`
-         else
--	        UDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBUDEV" 2>&1`
-+	        UDEV_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBUDEV"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$UDEV_PKG_ERRORS" >&5
-@@ -17461,10 +17509,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5
- $as_echo_n "checking for DBUS... " >&6; }
- 
--if test -n "$DBUS_CFLAGS"; then
--    pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$DBUS_CFLAGS"; then
-+        pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "dbus-1") 2>&5
-   ac_status=$?
-@@ -17474,13 +17523,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$DBUS_LIBS"; then
--    pkg_cv_DBUS_LIBS="$DBUS_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$DBUS_LIBS"; then
-+        pkg_cv_DBUS_LIBS="$DBUS_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "dbus-1") 2>&5
-   ac_status=$?
-@@ -17490,8 +17541,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -17504,9 +17556,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-1" 2>&1`
-+	        DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-1"`
-         else
--	        DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-1" 2>&1`
-+	        DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-1"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$DBUS_PKG_ERRORS" >&5
-@@ -17564,10 +17616,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for HAL" >&5
- $as_echo_n "checking for HAL... " >&6; }
- 
--if test -n "$HAL_CFLAGS"; then
--    pkg_cv_HAL_CFLAGS="$HAL_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$HAL_CFLAGS"; then
-+        pkg_cv_HAL_CFLAGS="$HAL_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hal\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "hal") 2>&5
-   ac_status=$?
-@@ -17577,13 +17630,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$HAL_LIBS"; then
--    pkg_cv_HAL_LIBS="$HAL_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$HAL_LIBS"; then
-+        pkg_cv_HAL_LIBS="$HAL_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hal\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "hal") 2>&5
-   ac_status=$?
-@@ -17593,8 +17648,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -17607,9 +17663,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "hal" 2>&1`
-+	        HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "hal"`
-         else
--	        HAL_PKG_ERRORS=`$PKG_CONFIG --print-errors "hal" 2>&1`
-+	        HAL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "hal"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$HAL_PKG_ERRORS" >&5
-@@ -17945,10 +18001,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XLIB" >&5
- $as_echo_n "checking for XLIB... " >&6; }
- 
--if test -n "$XLIB_CFLAGS"; then
--    pkg_cv_XLIB_CFLAGS="$XLIB_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XLIB_CFLAGS"; then
-+        pkg_cv_XLIB_CFLAGS="$XLIB_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "x11") 2>&5
-   ac_status=$?
-@@ -17958,13 +18015,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$XLIB_LIBS"; then
--    pkg_cv_XLIB_LIBS="$XLIB_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XLIB_LIBS"; then
-+        pkg_cv_XLIB_LIBS="$XLIB_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "x11") 2>&5
-   ac_status=$?
-@@ -17974,8 +18033,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -17988,9 +18048,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        XLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11" 2>&1`
-+	        XLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11"`
-         else
--	        XLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11" 2>&1`
-+	        XLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$XLIB_PKG_ERRORS" >&5
-@@ -18031,10 +18091,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GL" >&5
- $as_echo_n "checking for GL... " >&6; }
- 
--if test -n "$GL_CFLAGS"; then
--    pkg_cv_GL_CFLAGS="$GL_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$GL_CFLAGS"; then
-+        pkg_cv_GL_CFLAGS="$GL_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GLPROTO \$LIBGL\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$GLPROTO $LIBGL") 2>&5
-   ac_status=$?
-@@ -18044,13 +18105,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$GL_LIBS"; then
--    pkg_cv_GL_LIBS="$GL_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$GL_LIBS"; then
-+        pkg_cv_GL_LIBS="$GL_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GLPROTO \$LIBGL\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$GLPROTO $LIBGL") 2>&5
-   ac_status=$?
-@@ -18060,8 +18123,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -18074,9 +18138,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        GL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$GLPROTO $LIBGL" 2>&1`
-+	        GL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$GLPROTO $LIBGL"`
-         else
--	        GL_PKG_ERRORS=`$PKG_CONFIG --print-errors "$GLPROTO $LIBGL" 2>&1`
-+	        GL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$GLPROTO $LIBGL"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$GL_PKG_ERRORS" >&5
-@@ -18169,10 +18233,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DRIPROTO" >&5
- $as_echo_n "checking for DRIPROTO... " >&6; }
- 
--if test -n "$DRIPROTO_CFLAGS"; then
--    pkg_cv_DRIPROTO_CFLAGS="$DRIPROTO_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$DRIPROTO_CFLAGS"; then
-+        pkg_cv_DRIPROTO_CFLAGS="$DRIPROTO_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DRIPROTO\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$DRIPROTO") 2>&5
-   ac_status=$?
-@@ -18182,13 +18247,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$DRIPROTO_LIBS"; then
--    pkg_cv_DRIPROTO_LIBS="$DRIPROTO_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$DRIPROTO_LIBS"; then
-+        pkg_cv_DRIPROTO_LIBS="$DRIPROTO_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DRIPROTO\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$DRIPROTO") 2>&5
-   ac_status=$?
-@@ -18198,8 +18265,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -18212,9 +18280,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        DRIPROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$DRIPROTO" 2>&1`
-+	        DRIPROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$DRIPROTO"`
-         else
--	        DRIPROTO_PKG_ERRORS=`$PKG_CONFIG --print-errors "$DRIPROTO" 2>&1`
-+	        DRIPROTO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$DRIPROTO"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$DRIPROTO_PKG_ERRORS" >&5
-@@ -18255,10 +18323,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DRI" >&5
- $as_echo_n "checking for DRI... " >&6; }
- 
--if test -n "$DRI_CFLAGS"; then
--    pkg_cv_DRI_CFLAGS="$DRI_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$DRI_CFLAGS"; then
-+        pkg_cv_DRI_CFLAGS="$DRI_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GLPROTO \$LIBDRI\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$GLPROTO $LIBDRI") 2>&5
-   ac_status=$?
-@@ -18268,13 +18337,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$DRI_LIBS"; then
--    pkg_cv_DRI_LIBS="$DRI_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$DRI_LIBS"; then
-+        pkg_cv_DRI_LIBS="$DRI_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GLPROTO \$LIBDRI\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$GLPROTO $LIBDRI") 2>&5
-   ac_status=$?
-@@ -18284,8 +18355,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -18298,9 +18370,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        DRI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$GLPROTO $LIBDRI" 2>&1`
-+	        DRI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$GLPROTO $LIBDRI"`
-         else
--	        DRI_PKG_ERRORS=`$PKG_CONFIG --print-errors "$GLPROTO $LIBDRI" 2>&1`
-+	        DRI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$GLPROTO $LIBDRI"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$DRI_PKG_ERRORS" >&5
-@@ -18344,10 +18416,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DRI2PROTO" >&5
- $as_echo_n "checking for DRI2PROTO... " >&6; }
- 
--if test -n "$DRI2PROTO_CFLAGS"; then
--    pkg_cv_DRI2PROTO_CFLAGS="$DRI2PROTO_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$DRI2PROTO_CFLAGS"; then
-+        pkg_cv_DRI2PROTO_CFLAGS="$DRI2PROTO_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DRI2PROTO\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$DRI2PROTO") 2>&5
-   ac_status=$?
-@@ -18357,13 +18430,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$DRI2PROTO_LIBS"; then
--    pkg_cv_DRI2PROTO_LIBS="$DRI2PROTO_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$DRI2PROTO_LIBS"; then
-+        pkg_cv_DRI2PROTO_LIBS="$DRI2PROTO_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DRI2PROTO\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$DRI2PROTO") 2>&5
-   ac_status=$?
-@@ -18373,8 +18448,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -18387,9 +18463,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        DRI2PROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$DRI2PROTO" 2>&1`
-+	        DRI2PROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$DRI2PROTO"`
-         else
--	        DRI2PROTO_PKG_ERRORS=`$PKG_CONFIG --print-errors "$DRI2PROTO" 2>&1`
-+	        DRI2PROTO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$DRI2PROTO"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$DRI2PROTO_PKG_ERRORS" >&5
-@@ -18432,10 +18508,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBDRM" >&5
- $as_echo_n "checking for LIBDRM... " >&6; }
- 
--if test -n "$LIBDRM_CFLAGS"; then
--    pkg_cv_LIBDRM_CFLAGS="$LIBDRM_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$LIBDRM_CFLAGS"; then
-+        pkg_cv_LIBDRM_CFLAGS="$LIBDRM_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBDRM\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$LIBDRM") 2>&5
-   ac_status=$?
-@@ -18445,13 +18522,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$LIBDRM_LIBS"; then
--    pkg_cv_LIBDRM_LIBS="$LIBDRM_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$LIBDRM_LIBS"; then
-+        pkg_cv_LIBDRM_LIBS="$LIBDRM_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBDRM\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$LIBDRM") 2>&5
-   ac_status=$?
-@@ -18461,8 +18540,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -18475,9 +18555,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        LIBDRM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBDRM" 2>&1`
-+	        LIBDRM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBDRM"`
-         else
--	        LIBDRM_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBDRM" 2>&1`
-+	        LIBDRM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBDRM"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$LIBDRM_PKG_ERRORS" >&5
-@@ -19060,10 +19140,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XDMCP" >&5
- $as_echo_n "checking for XDMCP... " >&6; }
- 
--if test -n "$XDMCP_CFLAGS"; then
--    pkg_cv_XDMCP_CFLAGS="$XDMCP_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XDMCP_CFLAGS"; then
-+        pkg_cv_XDMCP_CFLAGS="$XDMCP_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xdmcp\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "xdmcp") 2>&5
-   ac_status=$?
-@@ -19073,13 +19154,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$XDMCP_LIBS"; then
--    pkg_cv_XDMCP_LIBS="$XDMCP_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XDMCP_LIBS"; then
-+        pkg_cv_XDMCP_LIBS="$XDMCP_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xdmcp\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "xdmcp") 2>&5
-   ac_status=$?
-@@ -19089,8 +19172,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -19103,9 +19187,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        XDMCP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xdmcp" 2>&1`
-+	        XDMCP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xdmcp"`
-         else
--	        XDMCP_PKG_ERRORS=`$PKG_CONFIG --print-errors "xdmcp" 2>&1`
-+	        XDMCP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xdmcp"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$XDMCP_PKG_ERRORS" >&5
-@@ -19393,10 +19477,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5
- $as_echo_n "checking for GLIB... " >&6; }
- 
--if test -n "$GLIB_CFLAGS"; then
--    pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$GLIB_CFLAGS"; then
-+        pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBGLIB\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$LIBGLIB") 2>&5
-   ac_status=$?
-@@ -19406,13 +19491,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$GLIB_LIBS"; then
--    pkg_cv_GLIB_LIBS="$GLIB_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$GLIB_LIBS"; then
-+        pkg_cv_GLIB_LIBS="$GLIB_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBGLIB\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$LIBGLIB") 2>&5
-   ac_status=$?
-@@ -19422,8 +19509,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -19436,9 +19524,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBGLIB" 2>&1`
-+	        GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBGLIB"`
-         else
--	        GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBGLIB" 2>&1`
-+	        GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBGLIB"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$GLIB_PKG_ERRORS" >&5
-@@ -19796,10 +19884,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPENSSL" >&5
- $as_echo_n "checking for OPENSSL... " >&6; }
- 
--if test -n "$OPENSSL_CFLAGS"; then
--    pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$OPENSSL_CFLAGS"; then
-+        pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "openssl") 2>&5
-   ac_status=$?
-@@ -19809,13 +19898,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$OPENSSL_LIBS"; then
--    pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$OPENSSL_LIBS"; then
-+        pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "openssl") 2>&5
-   ac_status=$?
-@@ -19825,8 +19916,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -19839,9 +19931,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "openssl" 2>&1`
-+	        OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "openssl"`
-         else
--	        OPENSSL_PKG_ERRORS=`$PKG_CONFIG --print-errors "openssl" 2>&1`
-+	        OPENSSL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "openssl"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$OPENSSL_PKG_ERRORS" >&5
-@@ -19890,10 +19982,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XSERVERCFLAGS" >&5
- $as_echo_n "checking for XSERVERCFLAGS... " >&6; }
- 
--if test -n "$XSERVERCFLAGS_CFLAGS"; then
--    pkg_cv_XSERVERCFLAGS_CFLAGS="$XSERVERCFLAGS_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XSERVERCFLAGS_CFLAGS"; then
-+        pkg_cv_XSERVERCFLAGS_CFLAGS="$XSERVERCFLAGS_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_MODULES \$REQUIRED_LIBS\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS") 2>&5
-   ac_status=$?
-@@ -19903,13 +19996,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$XSERVERCFLAGS_LIBS"; then
--    pkg_cv_XSERVERCFLAGS_LIBS="$XSERVERCFLAGS_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XSERVERCFLAGS_LIBS"; then
-+        pkg_cv_XSERVERCFLAGS_LIBS="$XSERVERCFLAGS_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_MODULES \$REQUIRED_LIBS\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS") 2>&5
-   ac_status=$?
-@@ -19919,8 +20014,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -19933,9 +20029,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        XSERVERCFLAGS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS" 2>&1`
-+	        XSERVERCFLAGS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS"`
-         else
--	        XSERVERCFLAGS_PKG_ERRORS=`$PKG_CONFIG --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS" 2>&1`
-+	        XSERVERCFLAGS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$XSERVERCFLAGS_PKG_ERRORS" >&5
-@@ -19976,10 +20072,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XSERVERLIBS" >&5
- $as_echo_n "checking for XSERVERLIBS... " >&6; }
- 
--if test -n "$XSERVERLIBS_CFLAGS"; then
--    pkg_cv_XSERVERLIBS_CFLAGS="$XSERVERLIBS_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XSERVERLIBS_CFLAGS"; then
-+        pkg_cv_XSERVERLIBS_CFLAGS="$XSERVERLIBS_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_LIBS\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$REQUIRED_LIBS") 2>&5
-   ac_status=$?
-@@ -19989,13 +20086,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$XSERVERLIBS_LIBS"; then
--    pkg_cv_XSERVERLIBS_LIBS="$XSERVERLIBS_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XSERVERLIBS_LIBS"; then
-+        pkg_cv_XSERVERLIBS_LIBS="$XSERVERLIBS_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_LIBS\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$REQUIRED_LIBS") 2>&5
-   ac_status=$?
-@@ -20005,8 +20104,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -20019,9 +20119,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        XSERVERLIBS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$REQUIRED_LIBS" 2>&1`
-+	        XSERVERLIBS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$REQUIRED_LIBS"`
-         else
--	        XSERVERLIBS_PKG_ERRORS=`$PKG_CONFIG --print-errors "$REQUIRED_LIBS" 2>&1`
-+	        XSERVERLIBS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$REQUIRED_LIBS"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$XSERVERLIBS_PKG_ERRORS" >&5
-@@ -20152,10 +20252,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XNESTMODULES" >&5
- $as_echo_n "checking for XNESTMODULES... " >&6; }
- 
--if test -n "$XNESTMODULES_CFLAGS"; then
--    pkg_cv_XNESTMODULES_CFLAGS="$XNESTMODULES_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XNESTMODULES_CFLAGS"; then
-+        pkg_cv_XNESTMODULES_CFLAGS="$XNESTMODULES_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xfont \$LIBXEXT x11 xau \$XDMCP_MODULES\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "xfont $LIBXEXT x11 xau $XDMCP_MODULES") 2>&5
-   ac_status=$?
-@@ -20165,13 +20266,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$XNESTMODULES_LIBS"; then
--    pkg_cv_XNESTMODULES_LIBS="$XNESTMODULES_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XNESTMODULES_LIBS"; then
-+        pkg_cv_XNESTMODULES_LIBS="$XNESTMODULES_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xfont \$LIBXEXT x11 xau \$XDMCP_MODULES\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "xfont $LIBXEXT x11 xau $XDMCP_MODULES") 2>&5
-   ac_status=$?
-@@ -20181,8 +20284,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -20195,9 +20299,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        XNESTMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xfont $LIBXEXT x11 xau $XDMCP_MODULES" 2>&1`
-+	        XNESTMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xfont $LIBXEXT x11 xau $XDMCP_MODULES"`
-         else
--	        XNESTMODULES_PKG_ERRORS=`$PKG_CONFIG --print-errors "xfont $LIBXEXT x11 xau $XDMCP_MODULES" 2>&1`
-+	        XNESTMODULES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xfont $LIBXEXT x11 xau $XDMCP_MODULES"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$XNESTMODULES_PKG_ERRORS" >&5
-@@ -20327,10 +20431,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PCIACCESS" >&5
- $as_echo_n "checking for PCIACCESS... " >&6; }
- 
--if test -n "$PCIACCESS_CFLAGS"; then
--    pkg_cv_PCIACCESS_CFLAGS="$PCIACCESS_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$PCIACCESS_CFLAGS"; then
-+        pkg_cv_PCIACCESS_CFLAGS="$PCIACCESS_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBPCIACCESS\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$LIBPCIACCESS") 2>&5
-   ac_status=$?
-@@ -20340,13 +20445,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$PCIACCESS_LIBS"; then
--    pkg_cv_PCIACCESS_LIBS="$PCIACCESS_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$PCIACCESS_LIBS"; then
-+        pkg_cv_PCIACCESS_LIBS="$PCIACCESS_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBPCIACCESS\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$LIBPCIACCESS") 2>&5
-   ac_status=$?
-@@ -20356,8 +20463,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -20370,9 +20478,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBPCIACCESS" 2>&1`
-+	        PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBPCIACCESS"`
-         else
--	        PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBPCIACCESS" 2>&1`
-+	        PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBPCIACCESS"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$PCIACCESS_PKG_ERRORS" >&5
-@@ -20640,10 +20748,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DGA" >&5
- $as_echo_n "checking for DGA... " >&6; }
- 
--if test -n "$DGA_CFLAGS"; then
--    pkg_cv_DGA_CFLAGS="$DGA_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$DGA_CFLAGS"; then
-+        pkg_cv_DGA_CFLAGS="$DGA_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DGAPROTO\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$DGAPROTO") 2>&5
-   ac_status=$?
-@@ -20653,13 +20762,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$DGA_LIBS"; then
--    pkg_cv_DGA_LIBS="$DGA_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$DGA_LIBS"; then
-+        pkg_cv_DGA_LIBS="$DGA_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DGAPROTO\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$DGAPROTO") 2>&5
-   ac_status=$?
-@@ -20669,8 +20780,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -20683,9 +20795,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        DGA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$DGAPROTO" 2>&1`
-+	        DGA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$DGAPROTO"`
-         else
--	        DGA_PKG_ERRORS=`$PKG_CONFIG --print-errors "$DGAPROTO" 2>&1`
-+	        DGA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$DGAPROTO"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$DGA_PKG_ERRORS" >&5
-@@ -20710,10 +20822,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DGA" >&5
- $as_echo_n "checking for DGA... " >&6; }
- 
--if test -n "$DGA_CFLAGS"; then
--    pkg_cv_DGA_CFLAGS="$DGA_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$DGA_CFLAGS"; then
-+        pkg_cv_DGA_CFLAGS="$DGA_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DGAPROTO\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$DGAPROTO") 2>&5
-   ac_status=$?
-@@ -20723,13 +20836,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$DGA_LIBS"; then
--    pkg_cv_DGA_LIBS="$DGA_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$DGA_LIBS"; then
-+        pkg_cv_DGA_LIBS="$DGA_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DGAPROTO\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$DGAPROTO") 2>&5
-   ac_status=$?
-@@ -20739,8 +20854,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -20753,9 +20869,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        DGA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$DGAPROTO" 2>&1`
-+	        DGA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$DGAPROTO"`
-         else
--	        DGA_PKG_ERRORS=`$PKG_CONFIG --print-errors "$DGAPROTO" 2>&1`
-+	        DGA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$DGAPROTO"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$DGA_PKG_ERRORS" >&5
-@@ -20805,10 +20921,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XF86VIDMODE" >&5
- $as_echo_n "checking for XF86VIDMODE... " >&6; }
- 
--if test -n "$XF86VIDMODE_CFLAGS"; then
--    pkg_cv_XF86VIDMODE_CFLAGS="$XF86VIDMODE_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XF86VIDMODE_CFLAGS"; then
-+        pkg_cv_XF86VIDMODE_CFLAGS="$XF86VIDMODE_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$VIDMODEPROTO\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$VIDMODEPROTO") 2>&5
-   ac_status=$?
-@@ -20818,13 +20935,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$XF86VIDMODE_LIBS"; then
--    pkg_cv_XF86VIDMODE_LIBS="$XF86VIDMODE_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XF86VIDMODE_LIBS"; then
-+        pkg_cv_XF86VIDMODE_LIBS="$XF86VIDMODE_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$VIDMODEPROTO\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$VIDMODEPROTO") 2>&5
-   ac_status=$?
-@@ -20834,8 +20953,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -20848,9 +20968,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$VIDMODEPROTO" 2>&1`
-+	        XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$VIDMODEPROTO"`
-         else
--	        XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --print-errors "$VIDMODEPROTO" 2>&1`
-+	        XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$VIDMODEPROTO"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$XF86VIDMODE_PKG_ERRORS" >&5
-@@ -20875,10 +20995,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XF86VIDMODE" >&5
- $as_echo_n "checking for XF86VIDMODE... " >&6; }
- 
--if test -n "$XF86VIDMODE_CFLAGS"; then
--    pkg_cv_XF86VIDMODE_CFLAGS="$XF86VIDMODE_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XF86VIDMODE_CFLAGS"; then
-+        pkg_cv_XF86VIDMODE_CFLAGS="$XF86VIDMODE_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$VIDMODEPROTO\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$VIDMODEPROTO") 2>&5
-   ac_status=$?
-@@ -20888,13 +21009,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$XF86VIDMODE_LIBS"; then
--    pkg_cv_XF86VIDMODE_LIBS="$XF86VIDMODE_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XF86VIDMODE_LIBS"; then
-+        pkg_cv_XF86VIDMODE_LIBS="$XF86VIDMODE_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$VIDMODEPROTO\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$VIDMODEPROTO") 2>&5
-   ac_status=$?
-@@ -20904,8 +21027,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -20918,9 +21042,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$VIDMODEPROTO" 2>&1`
-+	        XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$VIDMODEPROTO"`
-         else
--	        XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --print-errors "$VIDMODEPROTO" 2>&1`
-+	        XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$VIDMODEPROTO"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$XF86VIDMODE_PKG_ERRORS" >&5
-@@ -20967,10 +21091,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XORG_MODULES" >&5
- $as_echo_n "checking for XORG_MODULES... " >&6; }
- 
--if test -n "$XORG_MODULES_CFLAGS"; then
--    pkg_cv_XORG_MODULES_CFLAGS="$XORG_MODULES_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XORG_MODULES_CFLAGS"; then
-+        pkg_cv_XORG_MODULES_CFLAGS="$XORG_MODULES_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$XORG_MODULES\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$XORG_MODULES") 2>&5
-   ac_status=$?
-@@ -20980,13 +21105,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$XORG_MODULES_LIBS"; then
--    pkg_cv_XORG_MODULES_LIBS="$XORG_MODULES_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XORG_MODULES_LIBS"; then
-+        pkg_cv_XORG_MODULES_LIBS="$XORG_MODULES_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$XORG_MODULES\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$XORG_MODULES") 2>&5
-   ac_status=$?
-@@ -20996,8 +21123,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -21010,9 +21138,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        XORG_MODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$XORG_MODULES" 2>&1`
-+	        XORG_MODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$XORG_MODULES"`
-         else
--	        XORG_MODULES_PKG_ERRORS=`$PKG_CONFIG --print-errors "$XORG_MODULES" 2>&1`
-+	        XORG_MODULES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$XORG_MODULES"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$XORG_MODULES_PKG_ERRORS" >&5
-@@ -21474,10 +21602,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XWINMODULES" >&5
- $as_echo_n "checking for XWINMODULES... " >&6; }
- 
--if test -n "$XWINMODULES_CFLAGS"; then
--    pkg_cv_XWINMODULES_CFLAGS="$XWINMODULES_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XWINMODULES_CFLAGS"; then
-+        pkg_cv_XWINMODULES_CFLAGS="$XWINMODULES_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xdmcp xau xfont\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "x11 xdmcp xau xfont") 2>&5
-   ac_status=$?
-@@ -21487,13 +21616,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$XWINMODULES_LIBS"; then
--    pkg_cv_XWINMODULES_LIBS="$XWINMODULES_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XWINMODULES_LIBS"; then
-+        pkg_cv_XWINMODULES_LIBS="$XWINMODULES_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xdmcp xau xfont\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "x11 xdmcp xau xfont") 2>&5
-   ac_status=$?
-@@ -21503,8 +21634,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -21517,9 +21649,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11 xdmcp xau xfont" 2>&1`
-+	        XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11 xdmcp xau xfont"`
-         else
--	        XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11 xdmcp xau xfont" 2>&1`
-+	        XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11 xdmcp xau xfont"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$XWINMODULES_PKG_ERRORS" >&5
-@@ -21575,10 +21707,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XWINMODULES" >&5
- $as_echo_n "checking for XWINMODULES... " >&6; }
- 
--if test -n "$XWINMODULES_CFLAGS"; then
--    pkg_cv_XWINMODULES_CFLAGS="$XWINMODULES_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XWINMODULES_CFLAGS"; then
-+        pkg_cv_XWINMODULES_CFLAGS="$XWINMODULES_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xdmcp xau xfont\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "x11 xdmcp xau xfont") 2>&5
-   ac_status=$?
-@@ -21588,13 +21721,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$XWINMODULES_LIBS"; then
--    pkg_cv_XWINMODULES_LIBS="$XWINMODULES_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XWINMODULES_LIBS"; then
-+        pkg_cv_XWINMODULES_LIBS="$XWINMODULES_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xdmcp xau xfont\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "x11 xdmcp xau xfont") 2>&5
-   ac_status=$?
-@@ -21604,8 +21739,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -21618,9 +21754,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11 xdmcp xau xfont" 2>&1`
-+	        XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11 xdmcp xau xfont"`
-         else
--	        XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11 xdmcp xau xfont" 2>&1`
-+	        XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11 xdmcp xau xfont"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$XWINMODULES_PKG_ERRORS" >&5
-@@ -21827,10 +21963,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XPBPROXY" >&5
- $as_echo_n "checking for XPBPROXY... " >&6; }
- 
--if test -n "$XPBPROXY_CFLAGS"; then
--    pkg_cv_XPBPROXY_CFLAGS="$XPBPROXY_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XPBPROXY_CFLAGS"; then
-+        pkg_cv_XPBPROXY_CFLAGS="$XPBPROXY_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$APPLEWMPROTO \$LIBAPPLEWM xfixes x11\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$APPLEWMPROTO $LIBAPPLEWM xfixes x11") 2>&5
-   ac_status=$?
-@@ -21840,13 +21977,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$XPBPROXY_LIBS"; then
--    pkg_cv_XPBPROXY_LIBS="$XPBPROXY_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XPBPROXY_LIBS"; then
-+        pkg_cv_XPBPROXY_LIBS="$XPBPROXY_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$APPLEWMPROTO \$LIBAPPLEWM xfixes x11\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$APPLEWMPROTO $LIBAPPLEWM xfixes x11") 2>&5
-   ac_status=$?
-@@ -21856,8 +21995,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -21870,9 +22010,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        XPBPROXY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$APPLEWMPROTO $LIBAPPLEWM xfixes x11" 2>&1`
-+	        XPBPROXY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$APPLEWMPROTO $LIBAPPLEWM xfixes x11"`
-         else
--	        XPBPROXY_PKG_ERRORS=`$PKG_CONFIG --print-errors "$APPLEWMPROTO $LIBAPPLEWM xfixes x11" 2>&1`
-+	        XPBPROXY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$APPLEWMPROTO $LIBAPPLEWM xfixes x11"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$XPBPROXY_PKG_ERRORS" >&5
-@@ -22088,10 +22228,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DMXMODULES" >&5
- $as_echo_n "checking for DMXMODULES... " >&6; }
- 
--if test -n "$DMXMODULES_CFLAGS"; then
--    pkg_cv_DMXMODULES_CFLAGS="$DMXMODULES_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$DMXMODULES_CFLAGS"; then
-+        pkg_cv_DMXMODULES_CFLAGS="$DMXMODULES_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xmuu \$LIBXEXT x11 xrender xfixes xfont \$LIBXI \$DMXPROTO xau \$XDMCP_MODULES\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES") 2>&5
-   ac_status=$?
-@@ -22101,13 +22242,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$DMXMODULES_LIBS"; then
--    pkg_cv_DMXMODULES_LIBS="$DMXMODULES_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$DMXMODULES_LIBS"; then
-+        pkg_cv_DMXMODULES_LIBS="$DMXMODULES_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xmuu \$LIBXEXT x11 xrender xfixes xfont \$LIBXI \$DMXPROTO xau \$XDMCP_MODULES\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES") 2>&5
-   ac_status=$?
-@@ -22117,8 +22260,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -22131,9 +22275,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        DMXMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES" 2>&1`
-+	        DMXMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES"`
-         else
--	        DMXMODULES_PKG_ERRORS=`$PKG_CONFIG --print-errors "xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES" 2>&1`
-+	        DMXMODULES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$DMXMODULES_PKG_ERRORS" >&5
-@@ -22153,10 +22297,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XDMXCONFIG_DEP" >&5
- $as_echo_n "checking for XDMXCONFIG_DEP... " >&6; }
- 
--if test -n "$XDMXCONFIG_DEP_CFLAGS"; then
--    pkg_cv_XDMXCONFIG_DEP_CFLAGS="$XDMXCONFIG_DEP_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XDMXCONFIG_DEP_CFLAGS"; then
-+        pkg_cv_XDMXCONFIG_DEP_CFLAGS="$XDMXCONFIG_DEP_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xaw7 xmu xt xpm x11\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "xaw7 xmu xt xpm x11") 2>&5
-   ac_status=$?
-@@ -22166,13 +22311,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$XDMXCONFIG_DEP_LIBS"; then
--    pkg_cv_XDMXCONFIG_DEP_LIBS="$XDMXCONFIG_DEP_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XDMXCONFIG_DEP_LIBS"; then
-+        pkg_cv_XDMXCONFIG_DEP_LIBS="$XDMXCONFIG_DEP_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xaw7 xmu xt xpm x11\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "xaw7 xmu xt xpm x11") 2>&5
-   ac_status=$?
-@@ -22182,8 +22329,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -22196,9 +22344,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        XDMXCONFIG_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xaw7 xmu xt xpm x11" 2>&1`
-+	        XDMXCONFIG_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xaw7 xmu xt xpm x11"`
-         else
--	        XDMXCONFIG_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "xaw7 xmu xt xpm x11" 2>&1`
-+	        XDMXCONFIG_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xaw7 xmu xt xpm x11"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$XDMXCONFIG_DEP_PKG_ERRORS" >&5
-@@ -22274,10 +22422,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DMXEXAMPLES_DEP" >&5
- $as_echo_n "checking for DMXEXAMPLES_DEP... " >&6; }
- 
--if test -n "$DMXEXAMPLES_DEP_CFLAGS"; then
--    pkg_cv_DMXEXAMPLES_DEP_CFLAGS="$DMXEXAMPLES_DEP_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$DMXEXAMPLES_DEP_CFLAGS"; then
-+        pkg_cv_DMXEXAMPLES_DEP_CFLAGS="$DMXEXAMPLES_DEP_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX \$LIBXEXT x11\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$LIBDMX $LIBXEXT x11") 2>&5
-   ac_status=$?
-@@ -22287,13 +22436,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$DMXEXAMPLES_DEP_LIBS"; then
--    pkg_cv_DMXEXAMPLES_DEP_LIBS="$DMXEXAMPLES_DEP_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$DMXEXAMPLES_DEP_LIBS"; then
-+        pkg_cv_DMXEXAMPLES_DEP_LIBS="$DMXEXAMPLES_DEP_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX \$LIBXEXT x11\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$LIBDMX $LIBXEXT x11") 2>&5
-   ac_status=$?
-@@ -22303,8 +22454,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -22317,9 +22469,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        DMXEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBDMX $LIBXEXT x11" 2>&1`
-+	        DMXEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBDMX $LIBXEXT x11"`
-         else
--	        DMXEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBDMX $LIBXEXT x11" 2>&1`
-+	        DMXEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBDMX $LIBXEXT x11"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$DMXEXAMPLES_DEP_PKG_ERRORS" >&5
-@@ -22361,10 +22513,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DMXXMUEXAMPLES_DEP" >&5
- $as_echo_n "checking for DMXXMUEXAMPLES_DEP... " >&6; }
- 
--if test -n "$DMXXMUEXAMPLES_DEP_CFLAGS"; then
--    pkg_cv_DMXXMUEXAMPLES_DEP_CFLAGS="$DMXXMUEXAMPLES_DEP_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$DMXXMUEXAMPLES_DEP_CFLAGS"; then
-+        pkg_cv_DMXXMUEXAMPLES_DEP_CFLAGS="$DMXXMUEXAMPLES_DEP_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX xmu \$LIBXEXT x11\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$LIBDMX xmu $LIBXEXT x11") 2>&5
-   ac_status=$?
-@@ -22374,13 +22527,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$DMXXMUEXAMPLES_DEP_LIBS"; then
--    pkg_cv_DMXXMUEXAMPLES_DEP_LIBS="$DMXXMUEXAMPLES_DEP_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$DMXXMUEXAMPLES_DEP_LIBS"; then
-+        pkg_cv_DMXXMUEXAMPLES_DEP_LIBS="$DMXXMUEXAMPLES_DEP_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX xmu \$LIBXEXT x11\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$LIBDMX xmu $LIBXEXT x11") 2>&5
-   ac_status=$?
-@@ -22390,8 +22545,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -22404,9 +22560,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        DMXXMUEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBDMX xmu $LIBXEXT x11" 2>&1`
-+	        DMXXMUEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBDMX xmu $LIBXEXT x11"`
-         else
--	        DMXXMUEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBDMX xmu $LIBXEXT x11" 2>&1`
-+	        DMXXMUEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBDMX xmu $LIBXEXT x11"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$DMXXMUEXAMPLES_DEP_PKG_ERRORS" >&5
-@@ -22448,10 +22604,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DMXXIEXAMPLES_DEP" >&5
- $as_echo_n "checking for DMXXIEXAMPLES_DEP... " >&6; }
- 
--if test -n "$DMXXIEXAMPLES_DEP_CFLAGS"; then
--    pkg_cv_DMXXIEXAMPLES_DEP_CFLAGS="$DMXXIEXAMPLES_DEP_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$DMXXIEXAMPLES_DEP_CFLAGS"; then
-+        pkg_cv_DMXXIEXAMPLES_DEP_CFLAGS="$DMXXIEXAMPLES_DEP_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX \$LIBXI \$LIBXEXT x11\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$LIBDMX $LIBXI $LIBXEXT x11") 2>&5
-   ac_status=$?
-@@ -22461,13 +22618,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$DMXXIEXAMPLES_DEP_LIBS"; then
--    pkg_cv_DMXXIEXAMPLES_DEP_LIBS="$DMXXIEXAMPLES_DEP_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$DMXXIEXAMPLES_DEP_LIBS"; then
-+        pkg_cv_DMXXIEXAMPLES_DEP_LIBS="$DMXXIEXAMPLES_DEP_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX \$LIBXI \$LIBXEXT x11\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$LIBDMX $LIBXI $LIBXEXT x11") 2>&5
-   ac_status=$?
-@@ -22477,8 +22636,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -22491,9 +22651,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        DMXXIEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBDMX $LIBXI $LIBXEXT x11" 2>&1`
-+	        DMXXIEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBDMX $LIBXI $LIBXEXT x11"`
-         else
--	        DMXXIEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBDMX $LIBXI $LIBXEXT x11" 2>&1`
-+	        DMXXIEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBDMX $LIBXI $LIBXEXT x11"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$DMXXIEXAMPLES_DEP_PKG_ERRORS" >&5
-@@ -22535,10 +22695,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XTSTEXAMPLES_DEP" >&5
- $as_echo_n "checking for XTSTEXAMPLES_DEP... " >&6; }
- 
--if test -n "$XTSTEXAMPLES_DEP_CFLAGS"; then
--    pkg_cv_XTSTEXAMPLES_DEP_CFLAGS="$XTSTEXAMPLES_DEP_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XTSTEXAMPLES_DEP_CFLAGS"; then
-+        pkg_cv_XTSTEXAMPLES_DEP_CFLAGS="$XTSTEXAMPLES_DEP_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBXTST \$LIBXEXT x11\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$LIBXTST $LIBXEXT x11") 2>&5
-   ac_status=$?
-@@ -22548,13 +22709,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$XTSTEXAMPLES_DEP_LIBS"; then
--    pkg_cv_XTSTEXAMPLES_DEP_LIBS="$XTSTEXAMPLES_DEP_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XTSTEXAMPLES_DEP_LIBS"; then
-+        pkg_cv_XTSTEXAMPLES_DEP_LIBS="$XTSTEXAMPLES_DEP_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBXTST \$LIBXEXT x11\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$LIBXTST $LIBXEXT x11") 2>&5
-   ac_status=$?
-@@ -22564,8 +22727,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -22578,9 +22742,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        XTSTEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBXTST $LIBXEXT x11" 2>&1`
-+	        XTSTEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBXTST $LIBXEXT x11"`
-         else
--	        XTSTEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBXTST $LIBXEXT x11" 2>&1`
-+	        XTSTEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBXTST $LIBXEXT x11"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$XTSTEXAMPLES_DEP_PKG_ERRORS" >&5
-@@ -22622,10 +22786,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XRESEXAMPLES_DEP" >&5
- $as_echo_n "checking for XRESEXAMPLES_DEP... " >&6; }
- 
--if test -n "$XRESEXAMPLES_DEP_CFLAGS"; then
--    pkg_cv_XRESEXAMPLES_DEP_CFLAGS="$XRESEXAMPLES_DEP_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XRESEXAMPLES_DEP_CFLAGS"; then
-+        pkg_cv_XRESEXAMPLES_DEP_CFLAGS="$XRESEXAMPLES_DEP_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xres \$LIBXEXT x11\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "xres $LIBXEXT x11") 2>&5
-   ac_status=$?
-@@ -22635,13 +22800,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$XRESEXAMPLES_DEP_LIBS"; then
--    pkg_cv_XRESEXAMPLES_DEP_LIBS="$XRESEXAMPLES_DEP_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XRESEXAMPLES_DEP_LIBS"; then
-+        pkg_cv_XRESEXAMPLES_DEP_LIBS="$XRESEXAMPLES_DEP_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xres \$LIBXEXT x11\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "xres $LIBXEXT x11") 2>&5
-   ac_status=$?
-@@ -22651,8 +22818,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -22665,9 +22833,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        XRESEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xres $LIBXEXT x11" 2>&1`
-+	        XRESEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xres $LIBXEXT x11"`
-         else
--	        XRESEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "xres $LIBXEXT x11" 2>&1`
-+	        XRESEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xres $LIBXEXT x11"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$XRESEXAMPLES_DEP_PKG_ERRORS" >&5
-@@ -22709,10 +22877,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11EXAMPLES_DEP" >&5
- $as_echo_n "checking for X11EXAMPLES_DEP... " >&6; }
- 
--if test -n "$X11EXAMPLES_DEP_CFLAGS"; then
--    pkg_cv_X11EXAMPLES_DEP_CFLAGS="$X11EXAMPLES_DEP_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$X11EXAMPLES_DEP_CFLAGS"; then
-+        pkg_cv_X11EXAMPLES_DEP_CFLAGS="$X11EXAMPLES_DEP_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBXEXT x11\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$LIBXEXT x11") 2>&5
-   ac_status=$?
-@@ -22722,13 +22891,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$X11EXAMPLES_DEP_LIBS"; then
--    pkg_cv_X11EXAMPLES_DEP_LIBS="$X11EXAMPLES_DEP_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$X11EXAMPLES_DEP_LIBS"; then
-+        pkg_cv_X11EXAMPLES_DEP_LIBS="$X11EXAMPLES_DEP_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBXEXT x11\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$LIBXEXT x11") 2>&5
-   ac_status=$?
-@@ -22738,8 +22909,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -22752,9 +22924,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        X11EXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBXEXT x11" 2>&1`
-+	        X11EXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBXEXT x11"`
-         else
--	        X11EXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBXEXT x11" 2>&1`
-+	        X11EXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBXEXT x11"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$X11EXAMPLES_DEP_PKG_ERRORS" >&5
-@@ -22913,10 +23085,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TSLIB" >&5
- $as_echo_n "checking for TSLIB... " >&6; }
- 
--if test -n "$TSLIB_CFLAGS"; then
--    pkg_cv_TSLIB_CFLAGS="$TSLIB_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$TSLIB_CFLAGS"; then
-+        pkg_cv_TSLIB_CFLAGS="$TSLIB_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tslib-0.0\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "tslib-0.0") 2>&5
-   ac_status=$?
-@@ -22926,13 +23099,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$TSLIB_LIBS"; then
--    pkg_cv_TSLIB_LIBS="$TSLIB_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$TSLIB_LIBS"; then
-+        pkg_cv_TSLIB_LIBS="$TSLIB_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tslib-0.0\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "tslib-0.0") 2>&5
-   ac_status=$?
-@@ -22942,8 +23117,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -22956,9 +23132,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        TSLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "tslib-0.0" 2>&1`
-+	        TSLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "tslib-0.0"`
-         else
--	        TSLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "tslib-0.0" 2>&1`
-+	        TSLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "tslib-0.0"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$TSLIB_PKG_ERRORS" >&5
-@@ -23045,10 +23221,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XEPHYR" >&5
- $as_echo_n "checking for XEPHYR... " >&6; }
- 
--if test -n "$XEPHYR_CFLAGS"; then
--    pkg_cv_XEPHYR_CFLAGS="$XEPHYR_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XEPHYR_CFLAGS"; then
-+        pkg_cv_XEPHYR_CFLAGS="$XEPHYR_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$XEPHYR_REQUIRED_LIBS\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$XEPHYR_REQUIRED_LIBS") 2>&5
-   ac_status=$?
-@@ -23058,13 +23235,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$XEPHYR_LIBS"; then
--    pkg_cv_XEPHYR_LIBS="$XEPHYR_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XEPHYR_LIBS"; then
-+        pkg_cv_XEPHYR_LIBS="$XEPHYR_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$XEPHYR_REQUIRED_LIBS\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$XEPHYR_REQUIRED_LIBS") 2>&5
-   ac_status=$?
-@@ -23074,8 +23253,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -23088,9 +23268,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        XEPHYR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$XEPHYR_REQUIRED_LIBS" 2>&1`
-+	        XEPHYR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$XEPHYR_REQUIRED_LIBS"`
-         else
--	        XEPHYR_PKG_ERRORS=`$PKG_CONFIG --print-errors "$XEPHYR_REQUIRED_LIBS" 2>&1`
-+	        XEPHYR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$XEPHYR_REQUIRED_LIBS"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$XEPHYR_PKG_ERRORS" >&5
-diff -Naur xorg-server-1.7.99.2/configure.ac xorg-server-1.7.99.2.patch/configure.ac
---- xorg-server-1.7.99.2/configure.ac	2009-12-20 14:25:52.294986508 +0100
-+++ xorg-server-1.7.99.2.patch/configure.ac	2009-12-20 21:15:55.331862561 +0100
-@@ -503,18 +503,21 @@
- XORG_FONTSUBDIR(FONT100DPIDIR, font100dpidir, 100dpi)
- 
- dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d,
--dnl otherwise uses standard subdirectories of FONTROOTDIR
--AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d],
--	[DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'],
--	[
--		DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/"
--		case $host_os in
--			darwin*)    DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
--		esac
--	])
-+dnl otherwise uses standard subdirectories of FONTROOTDIR. When cross
-+dnl compiling, assume default font path uses standard FONTROOTDIR directories.
-+DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/"
-+if test "$cross_compiling" != yes; then
-+	AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d],
-+		[DEFAULT_FONT_PATH='catalogue:$(sysconfdir)/X11/fontpath.d'],
-+		[case $host_os in
-+			darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
-+		esac])
-+fi
- AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]),
- 				[ FONTPATH="$withval" ],
- 				[ FONTPATH="${DEFAULT_FONT_PATH}" ])
-+AC_MSG_CHECKING([for default font path])
-+AC_MSG_RESULT([$FONTPATH])
- 
- AC_ARG_WITH(xkb-path,         AS_HELP_STRING([--with-xkb-path=PATH], [Path to XKB base dir (default: ${datadir}/X11/xkb)]),
- 				[ XKBPATH="$withval" ],
diff --git a/packages/x11/xserver/xorg-server/patches/xorg-x11-nonroot-vesa.diff b/packages/x11/xserver/xorg-server/patches/xorg-x11-nonroot-vesa.diff
new file mode 100644
index 0000000000..76c0a38aa4
--- /dev/null
+++ b/packages/x11/xserver/xorg-server/patches/xorg-x11-nonroot-vesa.diff
@@ -0,0 +1,12 @@
+--- xorg-server-1.6.1.901/hw/xfree86/common/xf86AutoConfig.c~	2009-07-03 11:59:30.000000000 -0700
++++ xorg-server-1.6.1.901/hw/xfree86/common/xf86AutoConfig.c	2009-07-03 11:59:30.000000000 -0700
+@@ -516,7 +516,8 @@
+     /* Fallback to platform default hardware */
+     if (i < (nmatches - 1)) {
+ #if defined(__i386__) || defined(__amd64__) || defined(__hurd__)
+-	matches[i++] = xnfstrdup("vesa");
++	if (geteuid() == 0)
++		matches[i++] = xnfstrdup("vesa");
+ #elif defined(__sparc__) && !defined(sun)
+ 	matches[i++] = xnfstrdup("sunffb");
+ #endif
diff --git a/packages/x11/xserver/xorg-server/patches/xorg.conf-newlines.diff b/packages/x11/xserver/xorg-server/patches/xorg.conf-newlines.diff
deleted file mode 100644
index 11b60aae61..0000000000
--- a/packages/x11/xserver/xorg-server/patches/xorg.conf-newlines.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/hw/xfree86/parser/scan.c b/hw/xfree86/parser/scan.c
-index b80fbfb..8e37aef 100644
---- a/hw/xfree86/parser/scan.c
-+++ b/hw/xfree86/parser/scan.c
-@@ -227,13 +227,15 @@ xf86getNextLine(void)
- 			    configFiles[curFileIndex].file);
- 
- 		if (!ret) {
--			/* stop if there are no more files */
--			if (++curFileIndex >= numFiles) {
--				curFileIndex = 0;
-+			/*
-+			 * if the file doesn't end in a newline, add one
-+			 * and trigger another read
-+			 */
-+			if (pos != 0) {
-+				strcpy(&configBuf[pos], "\n");
-+				ret = configBuf;
-+			} else
- 				break;
--			}
--			configLineNo = 0;
--			continue;
- 		}
- 
- 		/* search for EOL in the new block of chars */
-@@ -338,7 +340,14 @@ again:
- 			}
- 			if (ret == NULL)
- 			{
--				return (pushToken = EOF_TOKEN);
-+				/* move to the next file if necessary */
-+				if (curFileIndex + 1 < numFiles) {
-+					curFileIndex++;
-+					configLineNo = 0;
-+					goto again;
-+				}
-+				else
-+					return (pushToken = EOF_TOKEN);
- 			}
- 			configLineNo++;
- 			configPos = 0;
diff --git a/packages/x11/xserver/xorg-server/patches/xserver-boottime.diff b/packages/x11/xserver/xorg-server/patches/xserver-boottime.diff
deleted file mode 100644
index 4029260d14..0000000000
--- a/packages/x11/xserver/xorg-server/patches/xserver-boottime.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -Nurb xorg-server-1.7.3.orig/os/log.c xorg-server-1.7.3/os/log.c
---- xorg-server-1.7.3.orig/os/log.c	2009-10-27 23:56:24.000000000 -0700
-+++ xorg-server-1.7.3/os/log.c	2010-01-26 11:26:25.683679988 -0800
-@@ -259,6 +259,36 @@
-     static char tmpBuffer[1024];
-     int len = 0;
- 
-+    struct timeval time;
-+    time_t tv_sec;
-+    suseconds_t tv_usec;
-+    static Bool first = TRUE;
-+    static Bool newline = TRUE;
-+    static time_t start_tv_sec;
-+    static suseconds_t start_usec;
-+    int diff_sec, diff_usec;
-+
-+    gettimeofday(&time, NULL);
-+    tv_sec = time.tv_sec;
-+    tv_usec = time.tv_usec;
-+    if (first == TRUE) {
-+	start_tv_sec = tv_sec;
-+	start_usec = tv_usec;
-+	first = FALSE;
-+    }
-+    diff_sec = (int)difftime(tv_sec, start_tv_sec);
-+    diff_usec = (tv_usec - start_usec);
-+    if (diff_usec < 0) {
-+	diff_sec--;
-+	diff_usec += 1000000;
-+    }
-+    if (newline) {
-+	sprintf(tmpBuffer, "[%d.%03d] ", diff_sec , diff_usec / 1000);
-+	len = strlen(tmpBuffer);
-+	if (logFile)
-+	    fwrite(tmpBuffer, len, 1, logFile);
-+    }
-+
-     /*
-      * Since a va_list can only be processed once, write the string to a
-      * buffer, and then write the buffer out to the appropriate output
-@@ -268,6 +298,7 @@
- 	vsnprintf(tmpBuffer, sizeof(tmpBuffer), f, args);
- 	len = strlen(tmpBuffer);
-     }
-+    newline = (tmpBuffer[len-1] == '\n');
-     if ((verb < 0 || logVerbosity >= verb) && len > 0)
- 	fwrite(tmpBuffer, len, 1, stderr);
-     if ((verb < 0 || logFileVerbosity >= verb) && len > 0) {
diff --git a/packages/x11/xserver/xorg-server/patches/xserver-no-root-2.diff b/packages/x11/xserver/xorg-server/patches/xserver-no-root-2.diff
new file mode 100644
index 0000000000..69af3f37c5
--- /dev/null
+++ b/packages/x11/xserver/xorg-server/patches/xserver-no-root-2.diff
@@ -0,0 +1,53 @@
+diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c
+index 297e7a6..8671231 100644
+--- a/hw/xfree86/os-support/linux/lnx_init.c
++++ b/hw/xfree86/os-support/linux/lnx_init.c
+@@ -42,6 +42,7 @@ static Bool KeepTty = FALSE;
+ static int VTnum = -1;
+ static Bool VTSwitch = TRUE;
+ static Bool ShareVTs = FALSE;
++Bool NoHwAccess = FALSE;
+ static int activeVT = -1;
+ 
+ static int vtPermSave[4];
+@@ -377,6 +378,11 @@ xf86ProcessArgument(int argc, char *argv[], int i)
+                 ShareVTs = TRUE;
+                 return(1);
+         }
++        if (!strcmp(argv[i], "-nohwaccess"))
++        {
++                NoHwAccess = TRUE;
++                return(1);
++        }
+ 	if ((argv[i][0] == 'v') && (argv[i][1] == 't'))
+ 	{
+ 		if (sscanf(argv[i], "vt%2d", &VTnum) == 0)
+@@ -397,5 +403,6 @@ xf86UseMsg(void)
+ 	ErrorF("-keeptty               ");
+ 	ErrorF("don't detach controlling tty (for debugging only)\n");
+ 	ErrorF("-novtswitch            don't immediately switch to new VT\n");
++	ErrorF("-nohwaccess            don't access hardware ports directly\n");
+ 	ErrorF("-sharevts              share VTs with another X server\n");
+ }
+diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c
+index 26a1742..c34bb85 100644
+--- a/hw/xfree86/os-support/linux/lnx_video.c
++++ b/hw/xfree86/os-support/linux/lnx_video.c
+@@ -50,6 +50,7 @@
+ #define MAP_FAILED ((void *)-1)
+ #endif
+ 
++extern Bool NoHwAccess;
+ static Bool ExtendedEnabled = FALSE;
+ 
+ #ifdef __ia64__
+@@ -496,6 +497,9 @@ xf86EnableIO(void)
+ 	int fd;
+ 	unsigned int ioBase_phys;
+ #endif
++	/* Fake it... */
++	if (NoHwAccess)
++		return TRUE;
+ 
+ 	if (ExtendedEnabled)
+ 		return TRUE;
diff --git a/packages/x11/xserver/xorg-server/url b/packages/x11/xserver/xorg-server/url
index 0dd081733e..5bec425465 100644
--- a/packages/x11/xserver/xorg-server/url
+++ b/packages/x11/xserver/xorg-server/url
@@ -1 +1 @@
-http://sources.openelec.tv/svn/xorg-server-20100108.tar.bz2
+http://xorg.freedesktop.org/archive/individual/xserver/xorg-server-1.7.99.901.tar.bz2