--- a/open-src/app/Makefile	Tue May 13 17:07:06 2008 -0700
+++ b/open-src/app/Makefile	Tue May 13 17:54:47 2008 -0700
@@ -28,7 +28,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.41	08/05/05
+# @(#)Makefile	1.42	08/05/13
 #
 ###############################################################################
 
@@ -57,6 +57,7 @@
 	xconsole \
 	xcursorgen \
 	xdpyinfo \
+	xdriinfo \
 	xev \
 	xfd \
 	xfwp \
@@ -88,8 +89,7 @@
 
 OS_SUBDIRS_sparc = $(OS_SUBDIRS_common)
 
-OS_SUBDIRS_i386 = $(OS_SUBDIRS_common) \
-		  xdriinfo
+OS_SUBDIRS_i386 = $(OS_SUBDIRS_common)
 
 MACH:sh=uname -p
 OS_SUBDIRS=$(OS_SUBDIRS_$(MACH))

--- a/open-src/app/xdriinfo/Makefile	Tue May 13 17:07:06 2008 -0700
+++ b/open-src/app/xdriinfo/Makefile	Tue May 13 17:54:47 2008 -0700
@@ -30,7 +30,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.1 08/05/05
+# @(#)Makefile	1.2 08/05/13
 #
 
 # Package name used in tarballs
@@ -40,7 +40,7 @@
 APP_VERS=1.0.2
 
 # Patches to apply to source after unpacking, in order
-SOURCE_PATCHES = 
+SOURCE_PATCHES = compile-on-sparc.patch
 
 # Man pages to apply Sun footer to & attributes to list
 SUNTOUCHED_MANPAGES=*.man

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/xdriinfo/compile-on-sparc.patch	Tue May 13 17:54:47 2008 -0700
@@ -0,0 +1,10 @@
+--- xdriinfo.c	Tue May 13 12:10:12 2008
++++ xdriinfo.c	Tue May 13 12:10:19 2008
+@@ -24,7 +24,6 @@
+ 
+ #define GLX_GLXEXT_PROTOTYPES
+ #include <GL/glx.h>
+-#include <GL/glxext.h>
+ #include <X11/Xlib.h>
+ #include <stdio.h>
+ #include <unistd.h>

--- a/open-src/proto/Makefile	Tue May 13 17:07:06 2008 -0700
+++ b/open-src/proto/Makefile	Tue May 13 17:54:47 2008 -0700
@@ -28,13 +28,13 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.9	08/03/25
+# @(#)Makefile	1.10	08/05/13
 #
 ###############################################################################
 
 OS_SUBDIRS_common = \
 	x11proto bigreqsproto compositeproto damageproto evieproto \
-	fixesproto fontcacheproto fontsproto inputproto kbproto pmproto \
+	fixesproto fontcacheproto fontsproto glproto inputproto kbproto pmproto \
 	randrproto recordproto renderproto resourceproto scrnsaverproto \
 	trapproto videoproto xcmiscproto xextproto xf86bigfontproto \
 	xf86dgaproto xf86miscproto xf86vidmodeproto xineramaproto \
@@ -43,7 +43,7 @@
 OS_SUBDIRS_sparc = $(OS_SUBDIRS_common)
 
 OS_SUBDIRS_i386 = $(OS_SUBDIRS_common)       \
-	glproto xf86driproto
+	xf86driproto
 
 MACH:sh=uname -p
 OS_SUBDIRS=$(OS_SUBDIRS_$(MACH))

--- a/packages/SUNWxorg-mesa/prototype	Tue May 13 17:07:06 2008 -0700
+++ b/packages/SUNWxorg-mesa/prototype	Tue May 13 17:54:47 2008 -0700
@@ -29,7 +29,7 @@
 #
 ##########################################################################
 #
-# ident	"@(#)prototype	1.19	08/04/29 SMI"
+# ident	"@(#)prototype	1.20	08/05/13 SMI"
 #
 # Mesa - OpenGL Workalike for Solaris
 
@@ -230,3 +230,14 @@
 d none openwin/share 0755 root bin
 d none openwin/share/include 0755 root bin
 s none openwin/share/include/GL=../../../X11/include/GL
+
+!search $HOME/../lib/pkgconfig
+d none lib                                      0755 root bin
+d none lib/pkgconfig                            0755 root other
+f none lib/pkgconfig/glproto.pc                 0444 root bin
+
+d none lib/$plat_64                             0755 root bin
+d none lib/$plat_64/pkgconfig                   0755 root other
+s none lib/$plat_64/pkgconfig/glproto.pc=../../pkgconfig/glproto.pc
+
+