Sync with ports tree.

This might need more work, but I want to sync it before digging deeper.


git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@637 058c260c-8361-11dd-a0ac-aa2bafec7d09

2 files changed, 105 insertions, 15 deletions

diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile
index da3cea8..146b32f 100644
--- a/graphics/dri/Makefile
+++ b/graphics/dri/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	dri
 PORTVERSION=	${MESAVERSION}
+PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	graphics
 
@@ -25,4 +26,92 @@ do-install:
 BROKEN=		Does not install on ia64
 .endif
 
+.if ${ARCH} != "amd64" || ${ARCH} != "i386"
+CONFIGURE_ARGS+=--disable-gallium-intel
+.endif
+
+.if ${ARCH} == "amd64"
+PLIST_SUB+=	I810_DRIVER="@comment "
+PLIST_SUB+=	I9X5_DRIVER=""
+PLIST_SUB+=	MACH64_DRIVER=""
+PLIST_SUB+=	MGA_DRIVER=""
+PLIST_SUB+=	NOUVEAU_DRIVER=""
+PLIST_SUB+=	RADEON_DRIVERS=""
+PLIST_SUB+=	SAVAGE_DRIVER=""
+PLIST_SUB+=	SIS_DRIVER=""
+PLIST_SUB+=	SWRAST_DRIVER=""
+PLIST_SUB+=	TDFX_DRIVER=""
+PLIST_SUB+=	UNICHROME_DRIVER=""
+.endif
+
+.if ${ARCH} == "arm"
+PLIST_SUB+=	I810_DRIVER="@comment "
+PLIST_SUB+=	I9X5_DRIVER="@comment "
+PLIST_SUB+=	MACH64_DRIVER="@comment "
+PLIST_SUB+=	MGA_DRIVER="@comment "
+PLIST_SUB+=	NOUVEAU_DRIVER="@comment "
+PLIST_SUB+=	RADEON_DRIVERS="@comment "
+PLIST_SUB+=	SAVAGE_DRIVER="@comment "
+PLIST_SUB+=	SIS_DRIVER="@comment "
+PLIST_SUB+=	SWRAST_DRIVER="@comment "
+PLIST_SUB+=	TDFX_DRIVER="@comment "
+PLIST_SUB+=	UNICHROME_DRIVER="@comment "
+.endif
+
+.if ${ARCH} == "i386"
+PLIST_SUB+=	I810_DRIVER=""
+PLIST_SUB+=	I9X5_DRIVER=""
+PLIST_SUB+=	MACH64_DRIVER=""
+PLIST_SUB+=	MGA_DRIVER=""
+PLIST_SUB+=	NOUVEAU_DRIVER=""
+PLIST_SUB+=	RADEON_DRIVERS=""
+PLIST_SUB+=	SAVAGE_DRIVER=""
+PLIST_SUB+=	SIS_DRIVER=""
+PLIST_SUB+=	SWRAST_DRIVER=""
+PLIST_SUB+=	TDFX_DRIVER=""
+PLIST_SUB+=	UNICHROME_DRIVER=""
+.endif
+
+.if ${ARCH} == "mips"
+PLIST_SUB+=	I810_DRIVER="@comment "
+PLIST_SUB+=	I9X5_DRIVER="@comment "
+PLIST_SUB+=	MACH64_DRIVER="@comment "
+PLIST_SUB+=	MGA_DRIVER="@comment "
+PLIST_SUB+=	NOUVEAU_DRIVER="@comment "
+PLIST_SUB+=	RADEON_DRIVERS="@comment "
+PLIST_SUB+=	SAVAGE_DRIVER="@comment "
+PLIST_SUB+=	SIS_DRIVER="@comment "
+PLIST_SUB+=	SWRAST_DRIVER="@comment "
+PLIST_SUB+=	TDFX_DRIVER="@comment "
+PLIST_SUB+=	UNICHROME_DRIVER="@comment "
+.endif
+
+.if ${ARCH} == "powerpc"
+PLIST_SUB+=	I810_DRIVER="@comment "
+PLIST_SUB+=	I9X5_DRIVER="@comment "
+PLIST_SUB+=	MACH64_DRIVER=""
+PLIST_SUB+=	MGA_DRIVER="@comment "
+PLIST_SUB+=	NOUVEAU_DRIVER="@comment "
+PLIST_SUB+=	RADEON_DRIVERS=""
+PLIST_SUB+=	SAVAGE_DRIVER="@comment "
+PLIST_SUB+=	SIS_DRIVER="@comment "
+PLIST_SUB+=	SWRAST_DRIVER=""
+PLIST_SUB+=	TDFX_DRIVER=""
+PLIST_SUB+=	UNICHROME_DRIVER="@comment "
+.endif
+
+.if ${ARCH} == "sparc64"
+PLIST_SUB+=	I810_DRIVER="@comment "
+PLIST_SUB+=	I9X5_DRIVER="@comment "
+PLIST_SUB+=	MACH64_DRIVER=""
+PLIST_SUB+=	MGA_DRIVER="@comment "
+PLIST_SUB+=	NOUVEAU_DRIVER="@comment "
+PLIST_SUB+=	RADEON_DRIVERS=""
+PLIST_SUB+=	SAVAGE_DRIVER="@comment "
+PLIST_SUB+=	SIS_DRIVER="@comment "
+PLIST_SUB+=	SWRAST_DRIVER=""
+PLIST_SUB+=	TDFX_DRIVER="@comment "
+PLIST_SUB+=	UNICHROME_DRIVER="@comment "
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/graphics/dri/pkg-plist b/graphics/dri/pkg-plist
index 3b0b034..364c563 100644
--- a/graphics/dri/pkg-plist
+++ b/graphics/dri/pkg-plist
@@ -1,19 +1,20 @@
 include/GL/internal/dri_interface.h
-%%OLD%%lib/dri/i810_dri.so
-lib/dri/i915_dri.so
-lib/dri/i965_dri.so
-%%OLD%%lib/dri/mach64_dri.so
-%%OLD%%lib/dri/mga_dri.so
-%%OLD%%lib/dri/r128_dri.so
-lib/dri/r200_dri.so
-%%OLD%%lib/dri/r300_dri.so
-%%OLD%%lib/dri/r600_dri.so
-lib/dri/radeon_dri.so
-%%OLD%%lib/dri/savage_dri.so
-%%OLD%%lib/dri/sis_dri.so
-lib/dri/swrast_dri.so
-%%OLD%%lib/dri/tdfx_dri.so
-%%OLD%%lib/dri/unichrome_dri.so
+%%I810_DRIVER%%lib/dri/i810_dri.so
+%%I9X5_DRIVER%%lib/dri/i915_dri.so
+%%I9X5_DRIVER%%lib/dri/i965_dri.so
+%%MACH64_DRIVER%%lib/dri/mach64_dri.so
+%%MGA_DRIVER%%lib/dri/mga_dri.so
+%%NEW%%%%NOUVEAU_DRIVER%%lib/dri/nouveau_vieux_dri.so
+%%RADEON_DRIVERS%%lib/dri/r128_dri.so
+%%RADEON_DRIVERS%%lib/dri/r200_dri.so
+%%RADEON_DRIVERS%%lib/dri/r300_dri.so
+%%RADEON_DRIVERS%%lib/dri/r600_dri.so
+%%RADEON_DRIVERS%%lib/dri/radeon_dri.so
+%%SAVAGE_DRIVER%%lib/dri/savage_dri.so
+%%SIS_DRIVER%%lib/dri/sis_dri.so
+%%SWRAST_DRIVER%%lib/dri/swrast_dri.so
+%%TDFX_DRIVER%%lib/dri/tdfx_dri.so
+%%UNICHROME_DRIVER%%lib/dri/unichrome_dri.so
 libdata/pkgconfig/dri.pc
 @dirrm lib/dri
 @dirrmtry include/GL/internal