--- a/open-src/Makefile	Mon Sep 13 14:09:43 2010 -0700
+++ b/open-src/Makefile	Mon Sep 13 14:16:54 2010 -0700
@@ -48,9 +48,11 @@
 lib: proto util
 util: proto
 app: lib data/xbitmaps
-xserver/xorg xserver/xvnc: proto doc lib
+xserver/xorg xserver/xvnc: proto doc/docbook-utils lib
 driver: xserver/xorg
 app/rgb: xserver/xorg
+doc/docbook-utils: doc/xorg-sgml-doctools
+doc/xorg-docs: doc/docbook-utils doc/xorg-sgml-doctools
 data: app
 FONTAPPS = app/bdftopcf app/mkfontscale app/mkfontdir
 font: $(FONTAPPS)
@@ -63,7 +65,9 @@
 	proto \
 	data/xbitmaps \
 	util \
-	doc \
+	doc/xorg-sgml-doctools \
+	doc/docbook-utils \
+	doc/xorg-docs \
 	lib \
 	app \
 	$(FONTAPPS) \

--- a/open-src/lib/Makefile	Mon Sep 13 14:09:43 2010 -0700
+++ b/open-src/lib/Makefile	Mon Sep 13 14:16:54 2010 -0700
@@ -70,7 +70,7 @@
 libXrender: libX11 libXext
 libXres: libX11 libXext
 libXScrnSaver: libX11 libXext
-libXt: libX11 libSM
+libXt: libX11 libSM libICE
 libXtsol: libX11 libXext
 libXtst: libX11 libXext
 libXv: libX11 libXext

--- a/open-src/lib/mesa/Makefile	Mon Sep 13 14:09:43 2010 -0700
+++ b/open-src/lib/mesa/Makefile	Mon Sep 13 14:16:54 2010 -0700
@@ -66,6 +66,7 @@
 	install-pc-dir.patch,-p1 \
 	glu-no-mangled-exports.patch \
 	solaris-port.patch \
+	make-race.patch \
 	6872597.patch 6866668.patch
 
 # File created by running configure script

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/mesa/make-race.patch	Mon Sep 13 14:16:54 2010 -0700
@@ -0,0 +1,11 @@
+--- src/mesa/drivers/dri/Makefile.template	2010-07-02 19:59:36.605863132 -0700
++++ src/mesa/drivers/dri/Makefile.template	2010-07-03 14:00:38.222593253 -0700
+@@ -73,7 +73,7 @@ $(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME)
+ 	$(INSTALL) $(LIBNAME) $(TOP)/$(LIB_DIR) 
+ 
+ 
+-depend: $(C_SOURCES) $(ASM_SOURCES) $(SYMLINKS)
++depend: $(C_SOURCES) $(ASM_SOURCES) $(SYMLINKS) $(COMMON_SYMLINKS)
+ 	touch depend
+ 	$(MKDEP) $(MKDEP_OPTIONS) $(DRIVER_DEFINES) $(INCLUDES) $(C_SOURCES) \
+ 		$(ASM_SOURCES)