diff --git a/external/mit/xorg/lib/dri/Makefile b/external/mit/xorg/lib/dri/Makefile
index 9524ca190e51..28169c211d86 100644
--- a/external/mit/xorg/lib/dri/Makefile
+++ b/external/mit/xorg/lib/dri/Makefile
@@ -1,17 +1,14 @@
-# $NetBSD: Makefile,v 1.9 2009/02/14 10:48:49 abs Exp $
+# $NetBSD: Makefile,v 1.10 2009/02/14 13:27:47 abs Exp $
 
 SUBDIR=	libmesa .WAIT
 
-.if ${MACHINE} == "alpha"
+.if ${MACHINE_ARCH} == "alpha"
 SUBDIR+=	mach64 mga r128 r200 r300 radeon s3v savage sis tdfx trident
 .elif ${MACHINE} == "macppc"
 SUBDIR+=	mach64 mga r128 r200 r300 radeon tdfx
-.elif ${MACHINE} == "sparc64" || ${MACHINE} == "sparc"
+.elif ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "sparc"
 SUBDIR+=	mach64 mga r128 r200 r300 radeon
-.elif ${MACHINE} == "shark" || ${MACHINE} == "ibmnws" || \
-      ${MACHINE} == "sgimips" || ${MACHINE} == "netwinder"
-SUBDIR=
-+.elif ${MACHINE} == "amd64" || ${MACHINE} == "i386"
+.elif ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 SUBDIR+=	i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v \
 	savage sis tdfx trident unichrome
 .endif