--- build.sh.orig
+++ build.sh
@@ -10,7 +10,7 @@
 global environment variables you may set to replace default functionality:
   ACLOCAL:  alternate invocation for 'aclocal' (default: aclocal)
   MAKE:     program to use instead of 'make' (default: make)
-  FONTPATH: font path to use (defaults under: \$PREFIX/\$LIBDIR...)
+  FONTPATH_DEPRECATED: font path to use (defaults under: \$PREFIX/\$LIBDIR...)
   LIBDIR:   path under \$PREFIX for libraries (e.g., lib64) (default: lib)
   GITROOT:  path to freedesktop.org git root, only needed for --clone
             (default: git://anongit.freedesktop.org/git)
@@ -53,8 +53,8 @@
     MAKE=${MAKE:="make"}
 
     # Set the default font path for xserver/xorg unless it's already set
-    if [ X"$FONTPATH" = X ]; then
-	export FONTPATH="${PREFIX}/${LIBDIR}/X11/fonts/misc/,${PREFIX}/${LIBDIR}/X11/fonts/Type1/,${PREFIX}/${LIBDIR}/X11/fonts/75dpi/,${PREFIX}/${LIBDIR}/X11/fonts/100dpi/,${PREFIX}/${LIBDIR}/X11/fonts/cyrillic/,${PREFIX}/${LIBDIR}/X11/fonts/TTF/"
+    if [ X"$FONTPATH_DEPRECATED" = X ]; then
+	export FONTPATH_DEPRECATED="${PREFIX}/${LIBDIR}/X11/fonts/misc/,${PREFIX}/${LIBDIR}/X11/fonts/Type1/,${PREFIX}/${LIBDIR}/X11/fonts/75dpi/,${PREFIX}/${LIBDIR}/X11/fonts/100dpi/,${PREFIX}/${LIBDIR}/X11/fonts/cyrillic/,${PREFIX}/${LIBDIR}/X11/fonts/TTF/"
     fi
 
     # Create the log file directory
@@ -131,11 +131,39 @@
             ;;
         "xcb")
             case $C in
-                "proto") C="xcb-proto" ;;
-                "pthread-stubs") M="lib"; C="libpthread-stubs" ;;
-                "util") C="xcb-util" ;;
+                "proto")
+                    M="xcb/proto"
+                    C="xcb-proto"
+                ;;
+                "pthread-stubs")
+                    M="xcb/pthread-stubs"
+                    C="libpthread-stubs"
+                ;;
+                "libxcb")
+                    M="xcb/libxcb"
+                    C="libxcb"
+                ;;
+                "util")
+                    M="xcb/util"
+                    C="xcb-util"
+                ;;
             esac
             ;;
+        "mesa")
+            case $C in
+                "drm")
+                    M="mesa/drm"
+                    C="libdrm"
+                ;;
+                "mesa")
+                    M="mesa/mesa"
+                    C="MesaLib"
+                ;;
+            esac
+            ;;
+        "xkeyboard-config")
+            C="xkeyboard-config"
+            ;;
         "xserver")
             C="xorg-server"
             ;;
@@ -145,6 +173,7 @@
             TARFILE=`ls -1rt $ii/$C-*.tar.$jj 2> /dev/null | tail -n 1`
             if [ X"$TARFILE" != X ]; then
                 SRCDIR=`echo $TARFILE | sed "s,.tar.$jj,,"`
+                SRCDIR=`echo $SRCDIR | sed "s,MesaLib,Mesa,"` 
                 if [ ! -d $SRCDIR ]; then
                     TAROPTS=xjf
                     if [ X"$jj" = X"gz" ]; then
@@ -319,6 +348,11 @@
     # Special configure flags for certain modules
     MOD_SPECIFIC=
 
+    if [ X"$1" = X"mesa" ] && [ X"$2" = X"mesa" ]; then
+        MOD_SPECIFIC=" --disable-gallium
+                       --disable-gallium-swrast"
+    fi
+
     if [ X"$1" = X"lib" ] && [ X"$2" = X"libX11" ] && [ X"${USE_XCB}" = X"NO" ]; then
 	MOD_SPECIFIC="--with-xcb=no"
     fi