--- Mesa-8.0.1/configs/darwin.orig	2012-03-16 17:35:29.000000000 -0700
+++ Mesa-8.0.1/configs/darwin	2012-03-16 17:36:21.000000000 -0700
@@ -13,8 +13,7 @@ CC = $(shell xcrun -find cc)
 CXX = $(shell xcrun -find c++)
 PIC_FLAGS = -fPIC
 DEFINES =  -D_DARWIN_C_SOURCE -DPTHREADS -D_GNU_SOURCE \
-	   -DGLX_ALIAS_UNSUPPORTED \
-	   -DGLX_DIRECT_RENDERING -DGLX_USE_APPLEGL
+	   -DGLX_ALIAS_UNSUPPORTED -DGLX_INDIRECT_RENDERING
 
 # -DGLX_INDIRECT_RENDERING \
 
@@ -52,7 +51,7 @@ OSMESA_LIB_DEPS = $(EXTRA_LDFLAGS)
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LDFLAGS)
 GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXt $(EXTRA_LDFLAGS)
 
-SRC_DIRS = glsl mapi/glapi mapi/vgapi glx/apple mesa gallium glu
+SRC_DIRS = glsl mapi/glapi mapi/vgapi glx mesa gallium glu
 GLU_DIRS = sgi
 DRIVER_DIRS = osmesa
 #DRIVER_DIRS = dri
