--- a/open-src/xserver/Makefile.inc	Wed Jul 08 10:42:00 2009 -0700
+++ b/open-src/xserver/Makefile.inc	Wed Jul 08 17:52:32 2009 -0700
@@ -1,7 +1,7 @@
 # -*- Makefile -*- rules common to both Xorg & Xvnc builds
 #
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use subject to license terms.
+# Use is subject to license terms.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
@@ -28,7 +28,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile.inc	1.12	09/05/15
+# @(#)Makefile.inc	1.13	09/07/07
 #
 
 PWD:sh=pwd
@@ -40,13 +40,13 @@
 include $(TOP)/common/Makefile.init
 
 # Xorg server source tarball to use sources from
-XORGSERVER_VERS=1.6.1.901
+XORGSERVER_VERS=1.6.2
 
 # Patches shared between Xorg & Xvnc builds
 XORG_SOURCE_PATCHES:sh=cat -s ../xorg/patch-list ../xorg/closed-src/patch-list | sed '/^\#/ d'
 
 XSERVER_FONTDIR=$(X11_DIR)/lib/X11/fonts
-MESA_SRC_DIR=$(TOP)/lib/mesa/$(BUILD_DIR)/Mesa-7.2
+MESA_SRC_DIR=$(TOP)/lib/mesa/$(BUILD_DIR)/Mesa-7.4.2
 
 SERVER_MODULES_DIR='$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir)'
 DRI_MODULES_DIR='$(X11_SERVERMODS_DIR)/dri$(SERVERMOD_subdir)'
@@ -60,7 +60,7 @@
 	--disable-install-setuid \
 	--with-vendor-name="Sun Microsystems, Inc." \
 	--with-vendor-web="http://sunsolve.sun.com/" \
-	--with-os-name="`uname -srmv`" \
+	--with-os-name="`uname -srm`" \
 	--with-log-dir=/var/log --with-xkb-output=/var/run/xkb \
 	--with-module-dir=$(SERVER_MODULES_DIR) \
 	--with-dri-driver-path=$(DRI_MODULES_DIR) \