Fix this in another way, hopefully it works better.

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

1 files changed, 21 insertions, 15 deletions

diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile
index c82f925..27d728a 100644
--- a/graphics/dri/Makefile
+++ b/graphics/dri/Makefile
@@ -21,30 +21,36 @@ USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes dri2proto
 BROKEN=		does not install on ia64
 .endif
 
-ALL_DRI_DRIVERS=RADEON SWRAST
-
-.if !defined(WITH_NEW_XORG)
-.if ${ARCH} == i386 || ${ARCH} = amd64
+.if ! defined(WITH_NEW_XORG)
 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
+.else
+ALL_DRI_DRIVERS=I915 I965 R200 RADEON SWRAST
 .endif
-.endif # !defined(WITH_NEW_XORG)
 
 .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
 
-DRI_DRIVERS=
+.if ${ARCH} == "amd64" || ${ARCH} == "i386"
+DRI_DRIVERS=	${ALL_DRI_DRIVERS}
+.endif
+
+.if defined(WITH_NEW_XORG)
+.if ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
+DRI_DRIVERS=	RADEON SWRAST
+.endif
+.else # !defined(WITH_NEW_XORG)
+.if ${ARCH} == "powerpc"
+DRI_DRIVERS=	MACH64 RADEON SWRAST TDFX
+.elif ${ARCH} == "sparc64"
+DRI_DRIVERS=	MACH64 RADEON SWRAST
+.endif
+.endif # defined(WITH_NEW_XORG)
+
 .for _d in ${ALL_DRI_DRIVERS}
-DRI_DRIVERS+=	${_d}
+.if ${DRI_DRIVERS:M${_d}}
 PLIST_SUB+=	${_d}_DRIVER=""
 .else
 PLIST_SUB+=	${_d}_DRIVER="@comment "
+.endif
 .endfor
 
 .if !(${ARCH} == "amd64" || ${ARCH} == "i386")