Index: graphics/dri/Makefile
===================================================================
--- graphics/dri/Makefile
+++ graphics/dri/Makefile
@@ -61,7 +61,7 @@
 . if ${ARCH} == powerpc || ${ARCH} == powerpc64
 DRI_DRIVERS=	RADEON SWRAST
 . endif
-. if ${ARCH} == sparc64
+. if ${ARCH} == sparc64 || ${ARCH} == armv6
 DRI_DRIVERS=	SWRAST
 . endif
 .else # !defined(WITH_NEW_XORG)
@@ -83,9 +83,6 @@
 .endif
 .endfor
 
-.if !(${ARCH} == amd64 || ${ARCH} == i386)
-CONFIGURE_ARGS+=--disable-gallium-intel
-.endif
 CONFIGURE_ARGS+=--with-dri-drivers="${DRI_DRIVERS:tl}"
 
 .if defined(WITH_NEW_XORG) && !defined(WITH_GALLIUM) \
@@ -98,16 +95,4 @@
 	@${ECHO_MSG} ""
 .endif
 
-post-install:
-.if defined(WITH_NEW_XORG)
-	@${RM} -f ${STAGEDIR}${PREFIX}/include/GL/*.h
-	@${RM} ${STAGEDIR}${PREFIX}/lib/libGL.*
-	@${RM} ${STAGEDIR}${PREFIX}/lib/libglapi.*
-	@${RM} -f ${STAGEDIR}${PREFIX}/libdata/pkgconfig/gl.pc	
-.else
-	@${RM} -f ${STAGEDIR}${PREFIX}/include/GL/*.h
-	@${RM} -rf ${STAGEDIR}${PREFIX}/lib/.libGL
-	@${RM} -f ${STAGEDIR}${PREFIX}/libdata/pkgconfig/gl.pc	
-.endif
-
 .include <bsd.port.mk>
Index: graphics/dri/pkg-plist
===================================================================
--- graphics/dri/pkg-plist
+++ graphics/dri/pkg-plist
@@ -38,3 +38,21 @@
 @dirrm lib/dri
 @dirrmtry include/GL/internal
 @dirrmtry include/GL
+@comment include/GL/gl.h
+@comment include/GL/glext.h
+@comment include/GL/glx_mangle.h
+@comment include/GL/osmesa.h
+@comment include/GL/wmesa.h
+@comment include/GL/gl_mangle.h
+@comment include/GL/glx.h
+@comment include/GL/glxext.h
+@comment include/GL/wglext.h
+@comment lib/libGL.a
+@comment lib/libGL.so
+@comment lib/libGL.so.1
+@comment lib/libGL.so.1.2.0
+@comment lib/libglapi.a
+@comment lib/libglapi.so
+@comment lib/libglapi.so.0
+@comment lib/libglapi.so.0.0.0
+@comment libdata/pkgconfig/gl.pc