--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/XORG_NV/packages/SUNWxorg-mesa/preremove	Tue Apr 25 12:57:44 2006 +0000
@@ -0,0 +1,21 @@
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#pragma ident	"@(#)preremove	1.1	06/02/22 SMI"
+#
+# SUNWxorg-mesa preremove script.
+
+# If the NVIDIA web installation has been run prior to
+# the integration of the OpenGL switcher, it will have
+# created the directory /usr/include/GL which the package
+# programs will refuse to replace with a symlink. 
+(   # Run in a subshell to isolate any directory changes if we later expand this
+    # script.
+
+    if [ -d $BASEDIR/include/GL ]; then
+        rm -rf $BASEDIR/include/GL
+    fi
+)
+
+exit 0
+

--- a/XORG_NV/packages/SUNWxorg-mesa/prototype	Tue Apr 18 09:21:26 2006 -0700
+++ b/XORG_NV/packages/SUNWxorg-mesa/prototype	Tue Apr 25 12:57:44 2006 +0000
@@ -29,13 +29,14 @@
 #
 ##########################################################################
 #
-# ident	"@(#)prototype	1.9	06/02/03 SMI"
+# ident	"@(#)prototype	1.11	06/04/18 SMI"
 #
 # Mesa - OpenGL Workalike for Solaris
 
 !HOME=../usr/X11
 
 i pkginfo
+i preremove
 i depend
 i copyright
 
@@ -120,7 +121,7 @@
 f none X11/include/mesa/GLwMDrawAP.h 0755 root bin
 d none X11/include/GL 0755 root bin
 s none X11/include/GL/gl.h=../../../../var/run/opengl/include/gl.h 0755 root bin
-s none X11/include/GL/glext.h=../../../var/run/opengl/include/glxext.h  0755 root bin
+s none X11/include/GL/glext.h=../../../../var/run/opengl/include/glext.h  0755 root bin
 s none X11/include/GL/glu.h=../mesa/glu.h 0755 root bin
 s none X11/include/GL/glx.h=../../../../var/run/opengl/include/glx.h 0755 root bin
 s none X11/include/GL/glxext.h=../../../../var/run/opengl/include/glxext.h 0755 root bin