--- a/open-src/driver/xf86-video-ati/Makefile	Fri Apr 25 16:32:36 2008 -0700
+++ b/open-src/driver/xf86-video-ati/Makefile	Mon Apr 28 23:36:32 2008 -0700
@@ -30,7 +30,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.14	08/03/18
+# @(#)Makefile	1.15	08/04/29
 #
 
 # Package name used in tarballs
@@ -40,7 +40,8 @@
 DRIVER_VERS=6.8.0
 
 # Patches to apply to source after unpacking, in order
-SOURCE_PATCHES = 6205248.patch 6675166.patch 6675188.patch
+SOURCE_PATCHES = 6205248.patch 6675166.patch 6675188.patch \
+	build-dri.patch solaris-dri-drv-port.patch
 
 # Man pages to apply Sun footer to & attributes to list
 SUNTOUCHED_MANPAGES=man/*.man
@@ -54,11 +55,13 @@
 # in src/Makefile.am since ATI has so many submodules with different needs
 DRIVER_ADD_LIBS= \
 	-L$(PROTODIR)$(X11_SERVERMODS_DIR)$(ARCHLIBSUBDIR) \
+	-L$(PROTODIR)$(X11_SERVERMODS_DIR)$(ARCHLIBSUBDIR)/extensions \
 	-L$(PROTODIR)$(X11_SERVERMODS_DIR)$(ARCHLIBSUBDIR)/linux \
 	-L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
 	-lexa -lint10 -lfb -lshadowfb -lvbe -lxaa -lfbdevhw \
-	-lvgahw -lm -lshadow \
+	-lvgahw -lm -lshadow  -ldrm -ldri -lglx \
 	-R$(X11_SERVERMODS_DIR)$(ARCHLIBSUBDIR) \
+	-R$(X11_SERVERMODS_DIR)/extensions$(ARCHLIBSUBDIR) \
 	-R$(X11_SERVERMODS_DIR)/linux$(ARCHLIBSUBDIR) \
 	-R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR)