Index: Makefile
===================================================================
--- Makefile	(revision 792)
+++ Makefile	(working copy)
@@ -23,25 +23,17 @@
 
 .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
 
-.if ${ARCH} == "ia64"
-BROKEN=		does not install on ia64
+OPTIONS_DEFINE_i386=	${ALL_DRI_DRIVERS}
+OPTIONS_DEFINE_amd64=	${OPTIONS_DEFINE_i386}
+
+.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
 .endif
 
-.if ${ARCH} == "amd64" || ${ARCH} == "i386"
-OPTIONS_DEFINE=	${ALL_DRI_DRIVERS}
-.elif ${ARCH} == "powerpc"
-. if defined(WITH_NEW_XORG)
-OPTIONS_DEFINE=	RADEON SWRAST
-. else
-OPTIONS_DEFINE=	MACH64 RADEON SWRAST TDFX
-. endif
-.elif ${ARCH} == "sparc64"
-. if defined(WITH_NEW_XORG)
-OPTIONS_DEIFNE=	RADEON SWRAST
-. else
-OPTIONS_DEFINE=	MACH64 RADEON SWRAST
-. endif
-.endif
 OPTIONS_DEFAULT=${OPTIONS_DEFINE}
 
 I810_DESC=	Include DRI support for Intel i810
@@ -74,6 +66,10 @@
 
 .include <bsd.port.pre.mk>
 
+.if ${ARCH} == "ia64"
+BROKEN=		does not install on ia64
+.endif
+
 .if !(${ARCH} == "amd64" || ${ARCH} == "i386")
 CONFIGURE_ARGS+=--disable-gallium-intel
 .endif