Kill off options and only choose dri drivers depending on arch and xorg

version.  I hope this works.


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

1 files changed, 16 insertions, 37 deletions

diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile
index 2de9da3..7309c24 100644
--- a/graphics/dri/Makefile
+++ b/graphics/dri/Makefile
@@ -15,59 +15,38 @@ LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm \
 USES=		pkgconfig
 USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes dri2proto
 
-ALL_DRI_DRIVERS=I915 I965 R200 RADEON SWRAST
-
 .include <bsd.port.options.mk>
 
-.if ! defined(WITH_NEW_XORG)
-ALL_DRI_DRIVERS+=I810 MACH64 MGA R128 R300 R600 SAVAGE SIS TDFX UNICHROME
+.if ${ARCH} == "ia64"
+BROKEN=		does not install on ia64
 .endif
 
-.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
-
-OPTIONS_DEFINE_i386=	${ALL_DRI_DRIVERS}
-OPTIONS_DEFINE_amd64=	${OPTIONS_DEFINE_i386}
+ALL_DRI_DRIVERS=RADEON SWRAST
 
-.if defined(WITH_NEW_XORG)
-OPTIONS_DEFINE_powerpc=	RADEON SWRAST
-OPTIONS_DEFINE_sparc64=	RADEON SWRAST
-.else
-OPTIONS_DEFINE_powerpc=	MACH64 RADEON SWRAST TDFX
-OPTIONS_DEFINE_sparc64=	MACH64 RADEON SWRAST
+.if !defined(WITH_NEW_XORG)
+.if ${ARCH} == i386 || ${ARCH} = amd64
+ALL_DRI_DRIVERS+=I810 MACH64 MGA R128 R300 R600 SAVAGE SIS TDFX UNICHROME
+.else if ${ARCH} == powerpc
+ALL_DRI_DRIVERS+=MACH64 TDFX
+.else if ${ARCH} == sparc64
+ALL_DRI_DRIVERS=MACH64
 .endif
+.else # defined(WITH_NEW_XORG)
+.if ${ARCH} == i386 || ${ARCH} == amd64
+ALL_DRI_DRIVERS+=I915 I965 R200
+.endif
+.endif # !defined(WITH_NEW_XORG)
 
-OPTIONS_DEFAULT=${OPTIONS_DEFINE}
-
-I810_DESC=	Include DRI support for Intel i810
-I915_DESC=	Include DRI support for Intel i915
-I965_DESC=	Include DRI support for Intel i965
-MACH64_DESC=	Include DRI support for AMD/ATI Mach64
-MGA_DESC=	Include DRI support for Matrox
-R128_DESC=	Include DRI support for AMD/ATI R128
-R200_DESC=	Include DRI support for AMD/ATI R200
-R300_DESC=	Include DRI support for AMD/ATI R300
-R600_DESC=	Include DRI support for AMD/ATI R600
-RADEON_DESC=	Include DRI support for AMD/ATI RADEON
-SAVAGE_DESC=	Include DRI support for S3/Via Savage
-SIS_DESC=	Include DRI support for SiS 300 and 6326
-SWRAST_DESC=	Include generic software DRI support
-TDFX_DESC=	Include DRI support for 3dfx Voodoo
-UNICHROME_DESC=	Include DRI support for S3/Via Unichrome
+.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
 
 DRI_DRIVERS=
-.for _d in ${ALL_DRI_DRIVERS}
 .if ${PORT_OPTIONS:M${_d}}
 DRI_DRIVERS+=	${_d}
 PLIST_SUB+=	${_d}_DRIVER=""
 .else
 PLIST_SUB+=	${_d}_DRIVER="@comment "
-.endif
 .endfor
 
-.if ${ARCH} == "ia64"
-BROKEN=		does not install on ia64
-.endif
-
 .if !(${ARCH} == "amd64" || ${ARCH} == "i386")
 CONFIGURE_ARGS+=--disable-gallium-intel
 .endif