At Kris's request, back out the MACHINE_ARCH spelling correction until

after 5.4-RELEASE.

39 files changed, 46 insertions, 46 deletions

diff --git a/games/abuse_sdl/Makefile b/games/abuse_sdl/Makefile
index 2f0728e851a7..118236a99210 100644
--- a/games/abuse_sdl/Makefile
+++ b/games/abuse_sdl/Makefile
@@ -22,7 +22,7 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" \
 		LDFLAGS="-L${X11BASE}/lib"
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN6=		abuse-sdl.6
 
diff --git a/games/adonthell/Makefile b/games/adonthell/Makefile
index 935fc2c66edb..7745fbf24a3b 100644
--- a/games/adonthell/Makefile
+++ b/games/adonthell/Makefile
@@ -25,7 +25,7 @@ USE_PYTHON=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--disable-py-debug
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	LDFLAGS=-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
diff --git a/games/afternoonstalker/Makefile b/games/afternoonstalker/Makefile
index 049d38932739..73f6ec897259 100644
--- a/games/afternoonstalker/Makefile
+++ b/games/afternoonstalker/Makefile
@@ -20,7 +20,7 @@ USE_SDL=	mixer sdl
 USE_GETOPT_LONG=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN6=		afternoonstalker.6
diff --git a/games/amy/Makefile b/games/amy/Makefile
index b71ac3d03fa7..5f9c79542efb 100644
--- a/games/amy/Makefile
+++ b/games/amy/Makefile
@@ -22,7 +22,7 @@ NOT_FOR_ARCHS=	sparc64 alpha
 MAN6=		Amy.6
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 post-extract:
 	${BZCAT} ${DISTDIR}/ClassicGames.pgn.bz2 > \
diff --git a/games/briquolo/Makefile b/games/briquolo/Makefile
index d7382d466f44..5428e45b7423 100644
--- a/games/briquolo/Makefile
+++ b/games/briquolo/Makefile
@@ -21,7 +21,7 @@ USE_GCC=	3.4
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
diff --git a/games/cgoban/Makefile b/games/cgoban/Makefile
index 236bf5f41883..345f2139a048 100644
--- a/games/cgoban/Makefile
+++ b/games/cgoban/Makefile
@@ -19,7 +19,7 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_AUTOCONF_VER=	253
 USE_REINPLACE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
 		AUTOHEADER="${TRUE}"
 
diff --git a/games/crafty/Makefile b/games/crafty/Makefile
index 2662eaedd33c..2cd07e921b51 100644
--- a/games/crafty/Makefile
+++ b/games/crafty/Makefile
@@ -25,11 +25,11 @@ DISTFILES+=	${DOCFILES:S/$/:doc/}
 ALL_TARGET=	crafty
 
 OPT=		-DCOMPACT_ATTACKS -DUSE_ATTACK_FUNCTIONS
-.if ${ARCH} == "i386"
+.if ${MACHINE_ARCH} == "i386"
 MAKE_ENV+=	asm=X86-elf.o
 OPT+=		-DUSE_ASSEMBLY_A -DUSE_ASSEMBLY_B -DFAST
 # XXX Someone with ASM knowledge would have to fix the Sparc.S
-.elif ${ARCH} == "sparc64" && defined(CRAFTY_SPARC_ASM)
+.elif ${MACHINE_ARCH} == "sparc64" && defined(CRAFTY_SPARC_ASM)
 MAKE_ENV+=	asm=Sparc.o
 OPT+=		-DUSE_ASSEMBLY_A
 .else
diff --git a/games/criticalmass/Makefile b/games/criticalmass/Makefile
index e752a9e9c008..164762994003 100644
--- a/games/criticalmass/Makefile
+++ b/games/criticalmass/Makefile
@@ -23,7 +23,7 @@ USE_SDL=	image mixer sdl
 USE_GL=		yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--disable-optimize
 
 MAN6=		critter.6
diff --git a/games/crossfire-server/Makefile b/games/crossfire-server/Makefile
index 187e48367b9c..5e4cac2f0b07 100644
--- a/games/crossfire-server/Makefile
+++ b/games/crossfire-server/Makefile
@@ -28,7 +28,7 @@ USE_OPENSSL=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN6=		crossedit.6 crossfire.6 crossfire-config.6 crossloop.6 \
diff --git a/games/d2x/Makefile b/games/d2x/Makefile
index dc1ec9e6f2ef..322ecf7ae6e2 100644
--- a/games/d2x/Makefile
+++ b/games/d2x/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Unix port of Descent 2 Game
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_SDL=	sdl image
 USE_GMAKE=	yes
 
diff --git a/games/deng/Makefile b/games/deng/Makefile
index 6787195f1c26..58f25b98b390 100644
--- a/games/deng/Makefile
+++ b/games/deng/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS=	${LOCALBASE}/bin/timidity:${PORTSDIR}/audio/timidity
 USE_REINPLACE=	yes
 REINPLACE_ARGS=	-i ""
 USE_LIBTOOL_VER=	15
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include -I${X11BASE}/include" \
 		CPPFLAGS="`${SDL_CONFIG} --cflags` -I${LOCALBASE}/include -I${X11BASE}/include"
 USE_SDL=	sdl mixer net
diff --git a/games/exult/Makefile b/games/exult/Makefile
index f129f5096352..ba86eb66dd5e 100644
--- a/games/exult/Makefile
+++ b/games/exult/Makefile
@@ -22,7 +22,7 @@ USE_SDL=	sdl mixer
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=	expack.1 ipack.1 shp2pcx.1 splitshp.1 textpack.1
 MAN6=	exult.6
diff --git a/games/freecell-solver/Makefile b/games/freecell-solver/Makefile
index 8c0e4e7a3859..d47dbc006f97 100644
--- a/games/freecell-solver/Makefile
+++ b/games/freecell-solver/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A program that automatically solves games of Freecell
 
 USE_REINPLACE=	yes
 USE_LIBTOOL_VER=	15
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 
 MAN6=	fc-solve-board_gen.6 fc-solve.6 \
diff --git a/games/fuhquake/files/Makefile b/games/fuhquake/files/Makefile
index 589bfc987e0f..bb65bf3408c8 100644
--- a/games/fuhquake/files/Makefile
+++ b/games/fuhquake/files/Makefile
@@ -18,7 +18,7 @@ DO_CFLAGS +=	-DNO_WINDOWED_MOUSE
 .undef WITHOUT_X86_ASM
 .endif
 
-.if ${ARCH} == "i386" && !defined(WITHOUT_X86_ASM)
+.if ${MACHINE_ARCH} == "i386" && !defined(WITHOUT_X86_ASM)
 DO_CFLAGS +=	-Did386
 .endif
 
@@ -116,7 +116,7 @@ CL_COMMON_OBJS = \
 		rulesets.o \
 		utils.o
 
-.if ${ARCH} == "i386" && !defined(WITHOUT_X86_ASM)
+.if ${MACHINE_ARCH} == "i386" && !defined(WITHOUT_X86_ASM)
 CL_COMMON_AS_OBJS = \
 		cl_math.o \
 		math.o \
@@ -154,7 +154,7 @@ CL_SOFT_OBJS = \
 		r_surf.o \
 		r_vars.o
 
-.if ${ARCH} == "i386" && !defined(WITHOUT_X86_ASM)
+.if ${MACHINE_ARCH} == "i386" && !defined(WITHOUT_X86_ASM)
 CL_SOFT_AS_OBJS = \
 		d_draw.o \
 		d_draw16.o \
@@ -192,7 +192,7 @@ CL_GLX_OBJS = \
 
 CL_SVGA_OBJS = vid_svgalib.o
 
-.if ${ARCH} == "i386" && !defined(WITHOUT_X86_ASM)
+.if ${MACHINE_ARCH} == "i386" && !defined(WITHOUT_X86_ASM)
 CL_SVGA_AS_OBJS = d_copy.o
 .endif
 
diff --git a/games/glob2/Makefile b/games/glob2/Makefile
index 9c635668be34..ff17a7fdcc30 100644
--- a/games/glob2/Makefile
+++ b/games/glob2/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=		vorbis.3:${PORTSDIR}/audio/libvorbis	\
 
 USE_SDL=		image net sdl
 GNU_CONFIGURE=		yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=		CFLAGS="${CFLAGS} -I${LOCALBASE}/include"	\
 			LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 USE_GCC=		3.4
diff --git a/games/gltron/Makefile b/games/gltron/Makefile
index ad620bed037a..c7a6ea40fc96 100644
--- a/games/gltron/Makefile
+++ b/games/gltron/Makefile
@@ -24,7 +24,7 @@ USE_SDL=	sdl sound
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--disable-warn
 
diff --git a/games/gnuchess/Makefile b/games/gnuchess/Makefile
index acb7a2d52534..2e9f94d53bea 100644
--- a/games/gnuchess/Makefile
+++ b/games/gnuchess/Makefile
@@ -38,7 +38,7 @@ EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	LIBS="${PTHREAD_LIBS}"
 
 post-patch:
diff --git a/games/gturing/Makefile b/games/gturing/Makefile
index 60e28d9e0301..2c57a7c1b5ed 100644
--- a/games/gturing/Makefile
+++ b/games/gturing/Makefile
@@ -21,7 +21,7 @@ USE_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 INSTALLS_OMF=	yes
-CONFIGURE_TARGET=	--target=${ARCH}-unknown-freebsd${OSREL}
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 DOCS=	AUTHORS COPYING NEWS ChangeLog TODO README INSTALL
 
diff --git a/games/heroes/Makefile b/games/heroes/Makefile
index a5ae265c3044..c9583ab6132e 100644
--- a/games/heroes/Makefile
+++ b/games/heroes/Makefile
@@ -37,7 +37,7 @@ USE_GETOPT_LONG=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
 		MAKEINFO="makeinfo --no-split"
 CONFIGURE_ARGS=	--with-sdl_mixer=${LOCALBASE} --without-gii --without-ggi
diff --git a/games/ifm/Makefile b/games/ifm/Makefile
index 13b1cd94b4cb..bf5163298ab1 100644
--- a/games/ifm/Makefile
+++ b/games/ifm/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
 USE_PERL5=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	WISH=${LOCALBASE}/bin/wish8.4
 
 post-patch:
diff --git a/games/jfk/Makefile b/games/jfk/Makefile
index aa2a6fba448a..6f07fe0ae593 100644
--- a/games/jfk/Makefile
+++ b/games/jfk/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://relax.ath.cx/jfk/
 MAINTAINER=	stefan@fafoe.narf.at
 COMMENT=	A multiplayer 2D shoot'em up game
 
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 GNU_CONFIGURE=	yes
 USE_SDL=	image sdl
 
diff --git a/games/kpicframer/Makefile b/games/kpicframer/Makefile
index f91bfb68f6f0..3f588d1bec67 100644
--- a/games/kpicframer/Makefile
+++ b/games/kpicframer/Makefile
@@ -19,7 +19,7 @@ USE_KDELIBS_VER=	3
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
 CONFIGURE_TARGET=
-CONFIGURE_ARGS+=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 pre-build:
 	${TOUCH} ${WRKSRC}/config.h.in
diff --git a/games/kpictorial/Makefile b/games/kpictorial/Makefile
index f9b2f1253f4e..b540e234f32f 100644
--- a/games/kpictorial/Makefile
+++ b/games/kpictorial/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Little logical game for KDE
 USE_KDELIBS_VER=	3
 GNU_CONFIGURE=		yes
 CONFIGURE_TARGET=
-CONFIGURE_ARGS+=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS+=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=		yes
 USE_REINPLACE=		yes
 
diff --git a/games/lincity/Makefile b/games/lincity/Makefile
index 8da7b9c265a0..a25a6c304d0c 100644
--- a/games/lincity/Makefile
+++ b/games/lincity/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Rich city simulation game for X
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/games/maelstrom/Makefile b/games/maelstrom/Makefile
index cc545d01a190..7764a58e25a0 100644
--- a/games/maelstrom/Makefile
+++ b/games/maelstrom/Makefile
@@ -19,7 +19,7 @@ USE_X_PREFIX=	yes
 USE_SDL=	sdl net
 USE_XPM=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 .if !defined(NOPORTDOCS)
 INSTALL_TARGET=	install install_gamedocs
diff --git a/games/mvdsv/Makefile b/games/mvdsv/Makefile
index 0cbbfadce3e8..5420ff07131d 100644
--- a/games/mvdsv/Makefile
+++ b/games/mvdsv/Makefile
@@ -45,7 +45,7 @@ pre-everything::
 .if !defined(WITH_OPTIMIZED_CFLAGS)
 	@${ECHO_MSG} "Define WITH_OPTIMIZED_CFLAGS to enable extra optimization options"
 .endif
-.if ${ARCH} == "i386" && !defined(WITHOUT_X86_ASM)
+.if ${MACHINE_ARCH} == "i386" && !defined(WITHOUT_X86_ASM)
 	@${ECHO_MSG} "Define WITHOUT_X86_ASM to disable x86 assembly code"
 .endif
 
diff --git a/games/mvdsv/files/Makefile b/games/mvdsv/files/Makefile
index 74b6d442bbef..bc1f37e86d85 100644
--- a/games/mvdsv/files/Makefile
+++ b/games/mvdsv/files/Makefile
@@ -13,7 +13,7 @@
 
 DO_CFLAGS =	${CFLAGS} -funsigned-char -I${LOCALBASE}/include -DSERVERONLY -Dstricmp=strcasecmp
 
-.if ${ARCH} == "i386" && !defined(WITHOUT_X86_ASM)
+.if ${MACHINE_ARCH} == "i386" && !defined(WITHOUT_X86_ASM)
 DO_CFLAGS +=	-Did386
 .endif
 
@@ -64,7 +64,7 @@ SV_OBJS = \
 		world.o \
 		zone.o
 
-.if ${ARCH} == "i386" && !defined(WITHOUT_X86_ASM)
+.if ${MACHINE_ARCH} == "i386" && !defined(WITHOUT_X86_ASM)
 SV_AS_OBJS = \
 		math.o \
 		sys_x86.o \
diff --git a/games/openmortal/Makefile b/games/openmortal/Makefile
index 8b17bc2032ba..1f3d05106636 100644
--- a/games/openmortal/Makefile
+++ b/games/openmortal/Makefile
@@ -22,7 +22,7 @@ USE_REINPLACE=	yes
 USE_SDL=	mixer image sdl net
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 post-patch:
diff --git a/games/pinball/Makefile b/games/pinball/Makefile
index da1ec465e188..01e4383f852c 100644
--- a/games/pinball/Makefile
+++ b/games/pinball/Makefile
@@ -30,7 +30,7 @@ USE_GL=	yes
 USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 
-CONFIGURE_TARGET=	--target=${ARCH}-unknown-freebsd${OSREL}
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 CONFIGURE_ARGS=	--prefix=${PREFIX} --without-debug
 .if defined(WITH_ALLEGRO)
 CONFIGURE_ARGS+=	--with-allegro
@@ -45,9 +45,9 @@ DOCS=		README
 .include <bsd.port.pre.mk>
 
 post-install:
-	@${MV} ${PREFIX}/bin/${ARCH}-unknown-freebsd${OSREL}-pinball \
+	@${MV} ${PREFIX}/bin/${MACHINE_ARCH}-unknown-freebsd${OSREL}-pinball \
 		${PREFIX}/bin/pinball
-	@${MV} ${PREFIX}/bin/${ARCH}-unknown-freebsd${OSREL}-pinball-config \
+	@${MV} ${PREFIX}/bin/${MACHINE_ARCH}-unknown-freebsd${OSREL}-pinball-config \
 		${PREFIX}/bin/pinball-config
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/games/qgo/Makefile b/games/qgo/Makefile
index 79fcbe363658..e594a6d9ef44 100644
--- a/games/qgo/Makefile
+++ b/games/qgo/Makefile
@@ -19,7 +19,7 @@ USE_QT_VER=	3
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	QTDIR="${QT_PREFIX}"
 CONFIGURE_ARGS=	--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
 
diff --git a/games/quake2forge/Makefile b/games/quake2forge/Makefile
index 02c815a90881..06466a1c63be 100644
--- a/games/quake2forge/Makefile
+++ b/games/quake2forge/Makefile
@@ -26,7 +26,7 @@ WANT_SDL=	yes
 .include <bsd.port.pre.mk>
 
 CONFIGURE_ARGS=	--program-transform-name='s/^quake2$$/q2f/'
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 .if ${HAVE_SDL:Msdl}!=""
 WITH_SDL=	yes
diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile
index 8eb77d7eb2ba..c25828a2c3b6 100644
--- a/games/quakeforge/Makefile
+++ b/games/quakeforge/Makefile
@@ -43,7 +43,7 @@ WANT_SDL=	yes
 BROKEN=		"Does not compile on sparc64"
 .endif
 
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=--with-global-cfg=${PREFIX}/etc/quakeforge.conf \
 		--with-sharepath=${PREFIX}/share/quakeforge \
 		--disable-optimize
diff --git a/games/ssc/Makefile b/games/ssc/Makefile
index 9aa84637f7bb..6614361476c0 100644
--- a/games/ssc/Makefile
+++ b/games/ssc/Makefile
@@ -24,7 +24,7 @@ USE_GL=		yes
 USE_SDL=	mixer sdl
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${X11BASE}/include" \
 		LDFLAGS=-L${X11BASE}/lib
 ONLY_FOR_ARCHS=	i386
diff --git a/games/supertux/Makefile b/games/supertux/Makefile
index 1464f158c64e..6b37291a7359 100644
--- a/games/supertux/Makefile
+++ b/games/supertux/Makefile
@@ -20,7 +20,7 @@ USE_SDL=	image mixer
 USE_GL=		yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=		--disable-debug
 USE_REINPLACE=	yes
 
diff --git a/games/torcs/Makefile b/games/torcs/Makefile
index 0f3898c3f3e9..72e6175cbd46 100644
--- a/games/torcs/Makefile
+++ b/games/torcs/Makefile
@@ -30,7 +30,7 @@ USE_REINPLACE=	yes
 USE_GETOPT_LONG=yes
 REINPLACE_ARGS=	-i ""
 CONFIGURE_ARGS=	--x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 ALL_TARGET=	default
 
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/games/trackballs/Makefile b/games/trackballs/Makefile
index 3969e94dc64c..47620fd43478 100644
--- a/games/trackballs/Makefile
+++ b/games/trackballs/Makefile
@@ -23,7 +23,7 @@ USE_GETOPT_LONG=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN6=		${PORTNAME}.6
diff --git a/games/vamos/Makefile b/games/vamos/Makefile
index bb5e7a06f6e3..24873eec6855 100644
--- a/games/vamos/Makefile
+++ b/games/vamos/Makefile
@@ -25,7 +25,7 @@ USE_GL=		yes
 USE_GETOPT_LONG=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL_VER=	15
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
 		MAKEINFO="makeinfo --no-split"
 CONFIGURE_ARGS=	--x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib
diff --git a/games/wmpuzzle/Makefile b/games/wmpuzzle/Makefile
index f97b3cc8bf81..607a9b8e244e 100644
--- a/games/wmpuzzle/Makefile
+++ b/games/wmpuzzle/Makefile
@@ -21,7 +21,7 @@ USE_XPM=	yes
 USE_GETOPT_LONG=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN6=		wmpuzzle.6
diff --git a/games/xabacus/Makefile b/games/xabacus/Makefile
index 4c534c795d38..630b7ba13ba2 100644
--- a/games/xabacus/Makefile
+++ b/games/xabacus/Makefile
@@ -20,7 +20,7 @@ USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN6=		xabacus.6