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

after 5.4-RELEASE.

53 files changed, 65 insertions, 65 deletions

diff --git a/audio/ample/Makefile b/audio/ample/Makefile
index 20a59e9b7a00..3e60a77237d0 100644
--- a/audio/ample/Makefile
+++ b/audio/ample/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Allows you to listen to your own MP3's away from home
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=		ample.1
 MAN5=		ample.conf.5 ample.html.5
diff --git a/audio/arts/Makefile b/audio/arts/Makefile
index ccb2219ff77a..b8035555f378 100644
--- a/audio/arts/Makefile
+++ b/audio/arts/Makefile
@@ -37,7 +37,7 @@ _NO_KDE_FINAL=	yes
 CFLAGS+=	-DHAVE_VASPRINTF
 CONFIGURE_ENV+=	DO_NOT_COMPILE="${DO_NOT_COMPILE}"
 CONFIGURE_TARGET= # empty
-CONFIGURE_ARGS+=--build=${ARCH}-portbld-freebsd${OSREL} \
+CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \
 		--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
 
 OPTIONS=	ESD "Enable esound support" off \
diff --git a/audio/autocd/Makefile b/audio/autocd/Makefile
index 6188db4ffec6..1d449e1d0468 100644
--- a/audio/autocd/Makefile
+++ b/audio/autocd/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	KOT@MATPOCKuH.Ru
 COMMENT=	Compact disc control utility
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 MAN1=		cdctl.1 acdplay.1
 MAN8=		autocd.8
 MLINKS=		cdctl.1 eject.1 cdctl.1 pause.1
diff --git a/audio/blop/Makefile b/audio/blop/Makefile
index 472c9d4fd8a2..f261cdaf87cc 100644
--- a/audio/blop/Makefile
+++ b/audio/blop/Makefile
@@ -19,7 +19,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}"
 CONFIGURE_ARGS=	--with-ladspa-prefix="${LOCALBASE}"
 
diff --git a/audio/bmp-faad/Makefile b/audio/bmp-faad/Makefile
index 934bafe694d5..8b4bae29748d 100644
--- a/audio/bmp-faad/Makefile
+++ b/audio/bmp-faad/Makefile
@@ -32,7 +32,7 @@ USE_GMAKE=		yes
 USE_GNOME=		gtk20
 USE_REINPLACE=		yes
 
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-xmms --with-mp4v2
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} -DHAVE_GTK" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
diff --git a/audio/boodler/Makefile b/audio/boodler/Makefile
index 553d8c125bb1..8a929521801f 100644
--- a/audio/boodler/Makefile
+++ b/audio/boodler/Makefile
@@ -33,7 +33,7 @@ DRIVER=		FILE
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "amd64" || ${ARCH} == "ia64"
+.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64"
 PIC=	--PIC
 .endif
 
diff --git a/audio/cuetools/Makefile b/audio/cuetools/Makefile
index b4d06acc0bc3..3117ecd4a0d6 100644
--- a/audio/cuetools/Makefile
+++ b/audio/cuetools/Makefile
@@ -17,7 +17,7 @@ USE_REINPLACE=	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}
 
 MAN1=		cuebreakpoints.1 cueconvert.1 cueprint.1
 PORTDOCS=	README
diff --git a/audio/darkice/Makefile b/audio/darkice/Makefile
index 25b5708d80c8..ae7619865c3b 100644
--- a/audio/darkice/Makefile
+++ b/audio/darkice/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	mp3lame.0:${PORTSDIR}/audio/lame \
 
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-lame-prefix=${LOCALBASE} \
 		--with-vorbis-prefix=${LOCALBASE}
 
diff --git a/audio/faac/Makefile b/audio/faac/Makefile
index 38659e3a9116..57677145a433 100644
--- a/audio/faac/Makefile
+++ b/audio/faac/Makefile
@@ -24,7 +24,7 @@ AUTOMAKE_ARGS=	--add-missing
 USE_GMAKE=	yes
 USE_LIBTOOL_VER=13
 USE_REINPLACE=	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" \
 		HAVECXX="yes"
diff --git a/audio/faad/Makefile b/audio/faad/Makefile
index ea141b9136db..9512d29221ea 100644
--- a/audio/faad/Makefile
+++ b/audio/faad/Makefile
@@ -26,7 +26,7 @@ NO_CDROM=	"Restrictive copyright (do not sell for profit)"
 USE_AUTOMAKE_VER=	15
 USE_AUTOHEADER_VER=	259
 AUTOMAKE_ARGS=	--add-missing
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GETOPT_LONG=yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/audio/festival+OGI/Makefile b/audio/festival+OGI/Makefile
index 82fc50b36574..1ad7a924de00 100644
--- a/audio/festival+OGI/Makefile
+++ b/audio/festival+OGI/Makefile
@@ -33,7 +33,7 @@ DIST_SUBDIR=	festival
 RESTRICTED=	no-commercial-use
 
 FESTIVAL=	${WRKSRC}/festival
-FESTIVAL_ARCH=	${ARCH:S/i386/ix86/}
+FESTIVAL_ARCH=	${MACHINE_ARCH:S/i386/ix86/}
 FHOME=		${PREFIX}/share/festival
 MAKE_ENV+=	PKG_EST_HOME=${SPEECHTOOLS} \
 		EST_HOME=${SPEECHTOOLS} \
diff --git a/audio/festival/Makefile b/audio/festival/Makefile
index 48231b6236db..485dbcfd9b79 100644
--- a/audio/festival/Makefile
+++ b/audio/festival/Makefile
@@ -26,7 +26,7 @@ DIST_SUBDIR=	festival
 
 EXTRA_PATCHES=	${PATCHDIR}/extra-patch-aa
 
-FESTIVAL_ARCH=	${ARCH:S/i386/ix86/}
+FESTIVAL_ARCH=	${MACHINE_ARCH:S/i386/ix86/}
 USE_GCC=	2.95
 
 WRKSRC=		${WRKDIR}
diff --git a/audio/flac123/Makefile b/audio/flac123/Makefile
index 5d04effa71f2..7349aec2ddd2 100644
--- a/audio/flac123/Makefile
+++ b/audio/flac123/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	FLAC.7:${PORTSDIR}/audio/flac \
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 PORTDOCS=	README.remote
 PLIST_FILES=	bin/flac123
diff --git a/audio/lame/Makefile b/audio/lame/Makefile
index 28070425a1e8..327d3174c95c 100644
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@@ -29,7 +29,7 @@ DOC_FILES=	API LICENSE README TODO USAGE
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "i386"
+.if ${MACHINE_ARCH} == "i386"
 BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 .endif
 
diff --git a/audio/linux-arts/Makefile b/audio/linux-arts/Makefile
index 993aed970ff8..108d6b92be4d 100644
--- a/audio/linux-arts/Makefile
+++ b/audio/linux-arts/Makefile
@@ -10,9 +10,9 @@ PORTVERSION=		1.0.3
 PORTREVISION=		3
 CATEGORIES=		audio kde linux
 MASTER_SITES=		${MASTER_SITE_REDHAT_LINUX}
-MASTER_SITE_SUBDIR=	8.0/en/os/${ARCH}/RedHat/RPMS
+MASTER_SITE_SUBDIR=	8.0/en/os/${MACHINE_ARCH}/RedHat/RPMS
 PKGNAMEPREFIX=		linux-
-DISTNAME=		${PORTNAME}-${PORTVERSION:S/.1$/-1/}-1.${ARCH}
+DISTNAME=		${PORTNAME}-${PORTVERSION:S/.1$/-1/}-1.${MACHINE_ARCH}
 EXTRACT_SUFX=		.rpm
 EXTRACT_ONLY=
 
@@ -30,8 +30,8 @@ ONLY_FOR_ARCHS=		i386
 DIST_SUBDIR=		rpm
 NO_BUILD=		yes
 NO_FILTER_SHLIBS=	yes
-PLIST=			${MASTERDIR}/pkg-plist.${ARCH}
-MD5_FILE=		${MASTERDIR}/distinfo.${ARCH}
+PLIST=			${MASTERDIR}/pkg-plist.${MACHINE_ARCH}
+MD5_FILE=		${MASTERDIR}/distinfo.${MACHINE_ARCH}
 
 DBPATH=			/var/lib/rpm
 RPMFLAGS=		--ignoreos --root ${PREFIX} --dbpath ${DBPATH} \
diff --git a/audio/linux-esound/Makefile b/audio/linux-esound/Makefile
index 469d54630afd..e67027ca85ba 100644
--- a/audio/linux-esound/Makefile
+++ b/audio/linux-esound/Makefile
@@ -15,7 +15,7 @@ COMMENT=	RPM of esound
 
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libaudiofile.so.0:${PORTSDIR}/audio/linux-libaudiofile
 
-RPM_SET=	esound-${PORTVERSION}-1.${ARCH}.rpm
+RPM_SET=	esound-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
 
 .include "../../x11-toolkits/linux-gtk/Makefile"
 
diff --git a/audio/linux-f10-arts/Makefile b/audio/linux-f10-arts/Makefile
index 993aed970ff8..108d6b92be4d 100644
--- a/audio/linux-f10-arts/Makefile
+++ b/audio/linux-f10-arts/Makefile
@@ -10,9 +10,9 @@ PORTVERSION=		1.0.3
 PORTREVISION=		3
 CATEGORIES=		audio kde linux
 MASTER_SITES=		${MASTER_SITE_REDHAT_LINUX}
-MASTER_SITE_SUBDIR=	8.0/en/os/${ARCH}/RedHat/RPMS
+MASTER_SITE_SUBDIR=	8.0/en/os/${MACHINE_ARCH}/RedHat/RPMS
 PKGNAMEPREFIX=		linux-
-DISTNAME=		${PORTNAME}-${PORTVERSION:S/.1$/-1/}-1.${ARCH}
+DISTNAME=		${PORTNAME}-${PORTVERSION:S/.1$/-1/}-1.${MACHINE_ARCH}
 EXTRACT_SUFX=		.rpm
 EXTRACT_ONLY=
 
@@ -30,8 +30,8 @@ ONLY_FOR_ARCHS=		i386
 DIST_SUBDIR=		rpm
 NO_BUILD=		yes
 NO_FILTER_SHLIBS=	yes
-PLIST=			${MASTERDIR}/pkg-plist.${ARCH}
-MD5_FILE=		${MASTERDIR}/distinfo.${ARCH}
+PLIST=			${MASTERDIR}/pkg-plist.${MACHINE_ARCH}
+MD5_FILE=		${MASTERDIR}/distinfo.${MACHINE_ARCH}
 
 DBPATH=			/var/lib/rpm
 RPMFLAGS=		--ignoreos --root ${PREFIX} --dbpath ${DBPATH} \
diff --git a/audio/linux-f10-esound/Makefile b/audio/linux-f10-esound/Makefile
index 469d54630afd..e67027ca85ba 100644
--- a/audio/linux-f10-esound/Makefile
+++ b/audio/linux-f10-esound/Makefile
@@ -15,7 +15,7 @@ COMMENT=	RPM of esound
 
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libaudiofile.so.0:${PORTSDIR}/audio/linux-libaudiofile
 
-RPM_SET=	esound-${PORTVERSION}-1.${ARCH}.rpm
+RPM_SET=	esound-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
 
 .include "../../x11-toolkits/linux-gtk/Makefile"
 
diff --git a/audio/linux-f10-libaudiofile/Makefile b/audio/linux-f10-libaudiofile/Makefile
index 7516d7d0065e..35d35de5cb40 100644
--- a/audio/linux-f10-libaudiofile/Makefile
+++ b/audio/linux-f10-libaudiofile/Makefile
@@ -13,6 +13,6 @@ CATEGORIES=	audio linux
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of audiofile
 
-RPM_SET=	audiofile-${PORTVERSION}-1.${ARCH}.rpm
+RPM_SET=	audiofile-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
 
 .include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/audio/linux-f8-arts/Makefile b/audio/linux-f8-arts/Makefile
index 993aed970ff8..108d6b92be4d 100644
--- a/audio/linux-f8-arts/Makefile
+++ b/audio/linux-f8-arts/Makefile
@@ -10,9 +10,9 @@ PORTVERSION=		1.0.3
 PORTREVISION=		3
 CATEGORIES=		audio kde linux
 MASTER_SITES=		${MASTER_SITE_REDHAT_LINUX}
-MASTER_SITE_SUBDIR=	8.0/en/os/${ARCH}/RedHat/RPMS
+MASTER_SITE_SUBDIR=	8.0/en/os/${MACHINE_ARCH}/RedHat/RPMS
 PKGNAMEPREFIX=		linux-
-DISTNAME=		${PORTNAME}-${PORTVERSION:S/.1$/-1/}-1.${ARCH}
+DISTNAME=		${PORTNAME}-${PORTVERSION:S/.1$/-1/}-1.${MACHINE_ARCH}
 EXTRACT_SUFX=		.rpm
 EXTRACT_ONLY=
 
@@ -30,8 +30,8 @@ ONLY_FOR_ARCHS=		i386
 DIST_SUBDIR=		rpm
 NO_BUILD=		yes
 NO_FILTER_SHLIBS=	yes
-PLIST=			${MASTERDIR}/pkg-plist.${ARCH}
-MD5_FILE=		${MASTERDIR}/distinfo.${ARCH}
+PLIST=			${MASTERDIR}/pkg-plist.${MACHINE_ARCH}
+MD5_FILE=		${MASTERDIR}/distinfo.${MACHINE_ARCH}
 
 DBPATH=			/var/lib/rpm
 RPMFLAGS=		--ignoreos --root ${PREFIX} --dbpath ${DBPATH} \
diff --git a/audio/linux-f8-esound/Makefile b/audio/linux-f8-esound/Makefile
index 469d54630afd..e67027ca85ba 100644
--- a/audio/linux-f8-esound/Makefile
+++ b/audio/linux-f8-esound/Makefile
@@ -15,7 +15,7 @@ COMMENT=	RPM of esound
 
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libaudiofile.so.0:${PORTSDIR}/audio/linux-libaudiofile
 
-RPM_SET=	esound-${PORTVERSION}-1.${ARCH}.rpm
+RPM_SET=	esound-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
 
 .include "../../x11-toolkits/linux-gtk/Makefile"
 
diff --git a/audio/linux-f8-libaudiofile/Makefile b/audio/linux-f8-libaudiofile/Makefile
index 7516d7d0065e..35d35de5cb40 100644
--- a/audio/linux-f8-libaudiofile/Makefile
+++ b/audio/linux-f8-libaudiofile/Makefile
@@ -13,6 +13,6 @@ CATEGORIES=	audio linux
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of audiofile
 
-RPM_SET=	audiofile-${PORTVERSION}-1.${ARCH}.rpm
+RPM_SET=	audiofile-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
 
 .include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/audio/linux-libaudiofile/Makefile b/audio/linux-libaudiofile/Makefile
index 7516d7d0065e..35d35de5cb40 100644
--- a/audio/linux-libaudiofile/Makefile
+++ b/audio/linux-libaudiofile/Makefile
@@ -13,6 +13,6 @@ CATEGORIES=	audio linux
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of audiofile
 
-RPM_SET=	audiofile-${PORTVERSION}-1.${ARCH}.rpm
+RPM_SET=	audiofile-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
 
 .include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/audio/lplayer/Makefile b/audio/lplayer/Makefile
index 53a19bc10490..64e879d88838 100644
--- a/audio/lplayer/Makefile
+++ b/audio/lplayer/Makefile
@@ -26,7 +26,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_ARGS=	--with-xmms-prefix=${X11BASE} --with-xinerama \
 		--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
diff --git a/audio/mbrola/Makefile b/audio/mbrola/Makefile
index 1a884d4463a5..0921b1f2c475 100644
--- a/audio/mbrola/Makefile
+++ b/audio/mbrola/Makefile
@@ -45,13 +45,13 @@ do-patch:
 
 do-install:
 .if defined(USE_LINUX)
-.if (${ARCH} == "alpha")
+.if (${MACHINE_ARCH} == "alpha")
 	@${INSTALL_PROGRAM} ${WRKSRC}/mbrola-linux-alpha ${PREFIX}/bin/mbrola
-.elseif (${ARCH} == "i386")
+.elseif (${MACHINE_ARCH} == "i386")
 	@${INSTALL_PROGRAM} ${WRKSRC}/mbrola-linux-i386 ${PREFIX}/bin/mbrola
-.elseif (${ARCH} == "ppc")
+.elseif (${MACHINE_ARCH} == "ppc")
 	@${INSTALL_PROGRAM} ${WRKSRC}/mbrola206a-linux-ppc ${PREFIX}/bin/mbrola
-.elseif (${ARCH} == "sparc64")
+.elseif (${MACHINE_ARCH} == "sparc64")
 	@${INSTALL_PROGRAM} ${WRKSRC}/mbrola-SuSElinux-ultra1.dat \
 		${PREFIX}/bin/mbrola
 .endif
diff --git a/audio/mp3splt/Makefile b/audio/mp3splt/Makefile
index c8b17d56ef73..7869fe2021eb 100644
--- a/audio/mp3splt/Makefile
+++ b/audio/mp3splt/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS=	mad.2:${PORTSDIR}/audio/libmad \
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
 		CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GETOPT_LONG=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/audio/mp3wrap/Makefile b/audio/mp3wrap/Makefile
index 5c2b0f187303..0a05d24f857c 100644
--- a/audio/mp3wrap/Makefile
+++ b/audio/mp3wrap/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	q@uni.de
 COMMENT=	Utility to merge mp3 files (and other formats)
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/audio/mpc/Makefile b/audio/mpc/Makefile
index 114e015a245e..abda9cc3ac7f 100644
--- a/audio/mpc/Makefile
+++ b/audio/mpc/Makefile
@@ -22,7 +22,7 @@ MAN1=		mpc.1
 
 .include <bsd.port.pre.mk>
 
-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/audio/mpeg4ip-faad/Makefile b/audio/mpeg4ip-faad/Makefile
index 0b59430f7314..f2f3dea23174 100644
--- a/audio/mpeg4ip-faad/Makefile
+++ b/audio/mpeg4ip-faad/Makefile
@@ -25,7 +25,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_AUTOMAKE_VER=	15
 USE_AUTOHEADER_VER=	253
 AUTOMAKE_ARGS=	--add-missing
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GETOPT_LONG=yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/audio/mpg321/Makefile b/audio/mpg321/Makefile
index 2521f732e21c..86dd7eabefca 100644
--- a/audio/mpg321/Makefile
+++ b/audio/mpg321/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	ao.3:${PORTSDIR}/audio/libao \
 		mad.2:${PORTSDIR}/audio/libmad
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--disable-mpg123-symlink
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/normalize/Makefile b/audio/normalize/Makefile
index 7af40bb03fbb..c7c3f6dcd358 100644
--- a/audio/normalize/Makefile
+++ b/audio/normalize/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS+=	xmms.4:${PORTSDIR}/multimedia/xmms
 
 USE_GETOPT_LONG=	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}"
 .if defined(WITH_XMMS)
 PLIST_SUB+=	XMMS=""
diff --git a/audio/openal/Makefile b/audio/openal/Makefile
index 93f3985dff9e..edfe882d83b8 100644
--- a/audio/openal/Makefile
+++ b/audio/openal/Makefile
@@ -18,7 +18,7 @@ INFO=		openal
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/linux
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
 USE_GNOME=	pkgconfig
 INSTALLS_SHLIB=	yes
diff --git a/audio/osalp/Makefile b/audio/osalp/Makefile
index 26f1e9b0c854..221e959511f8 100644
--- a/audio/osalp/Makefile
+++ b/audio/osalp/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_GETOPT_LONG=yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CFLAGS+=	-fPIC -DPIC
 CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
diff --git a/audio/resid/Makefile b/audio/resid/Makefile
index f4f6870b9fe0..e075ce1d685c 100644
--- a/audio/resid/Makefile
+++ b/audio/resid/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Cycle-based SID emulator engine
 
 USE_INC_LIBTOOL_VER=	13
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-shared
 INSTALLS_SHLIB=	yes
 
diff --git a/audio/rioutil/Makefile b/audio/rioutil/Makefile
index 0e1799cd11be..606bcf7fe9da 100644
--- a/audio/rioutil/Makefile
+++ b/audio/rioutil/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	usb-0.1.7:${PORTSDIR}/devel/libusb
 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}"
 INSTALLS_SHLIB=	yes
 
diff --git a/audio/sdl_mixer/Makefile b/audio/sdl_mixer/Makefile
index d50ff1c026ac..6e46e3c0fcb0 100644
--- a/audio/sdl_mixer/Makefile
+++ b/audio/sdl_mixer/Makefile
@@ -21,7 +21,7 @@ USE_SDL=	sdl
 USE_REINPLACE=	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="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 INSTALLS_SHLIB=	yes
diff --git a/audio/sdl_sound/Makefile b/audio/sdl_sound/Makefile
index ca12184cfe9b..96506d499e17 100644
--- a/audio/sdl_sound/Makefile
+++ b/audio/sdl_sound/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A SDL audio library and player for some popular sound file formats
 USE_SDL=	sdl
 USE_REINPLACE=	yes
 USE_INC_LIBTOOL_VER=	13
-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"
 INSTALLS_SHLIB=	yes
diff --git a/audio/snack/Makefile b/audio/snack/Makefile
index 4861e014061c..8c75e9881458 100644
--- a/audio/snack/Makefile
+++ b/audio/snack/Makefile
@@ -23,7 +23,7 @@ OPTIONS=	VORBIS "Support for OGG/Vorbis Audio" off
 
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-tcl=${LOCALBASE}/lib/tcl8.4 \
 		--with-tk=${LOCALBASE}/lib/tk8.4
 MAKE_ENV=	prefix=${PREFIX} exec_prefix=${PREFIX}
diff --git a/audio/speex-devel/Makefile b/audio/speex-devel/Makefile
index a5f4f1aaa968..e50b6b5e170e 100644
--- a/audio/speex-devel/Makefile
+++ b/audio/speex-devel/Makefile
@@ -25,7 +25,7 @@ USE_GETOPT_LONG=	yes
 USE_REINPLACE=	yes
 USE_LIBTOOL_VER=	15
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 INSTALLS_SHLIB=	yes
 
diff --git a/audio/speex/Makefile b/audio/speex/Makefile
index 3c12e5a7ae52..098dba1bca08 100644
--- a/audio/speex/Makefile
+++ b/audio/speex/Makefile
@@ -26,7 +26,7 @@ USE_GETOPT_LONG=	yes
 USE_REINPLACE=	yes
 USE_INC_LIBTOOL_VER=	13
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 INSTALLS_SHLIB=	yes
 
diff --git a/audio/swhplugins/Makefile b/audio/swhplugins/Makefile
index ca9e59c7a9b9..58b4d9db089a 100644
--- a/audio/swhplugins/Makefile
+++ b/audio/swhplugins/Makefile
@@ -24,7 +24,7 @@ ONLY_FOR_ARCHS=	i386 amd64
 USE_REINPLACE=	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="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 INSTALLS_SHLIB=	yes
diff --git a/audio/taglib/Makefile b/audio/taglib/Makefile
index e8b19deb8981..5d25929c7312 100644
--- a/audio/taglib/Makefile
+++ b/audio/taglib/Makefile
@@ -19,6 +19,6 @@ USE_INC_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 
 CONFIGURE_TARGET=
-CONFIGURE_ARGS+=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS+=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 .include <bsd.port.mk>
diff --git a/audio/tclmidi/Makefile b/audio/tclmidi/Makefile
index aadc1fe9f756..91f182e4656f 100644
--- a/audio/tclmidi/Makefile
+++ b/audio/tclmidi/Makefile
@@ -31,7 +31,7 @@ MANN=		midiconf.n midievnt.n midifree.n midiget.n midigrep.n \
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "ia64" || ${ARCH} == "sparc64"
+.if ${MACHINE_ARCH} == "ia64" || ${MACHINE_ARCH} == "sparc64"
 IGNORE=		"ignored due to cast from pointer to integer of different size"
 .endif
 
diff --git a/audio/umix/Makefile b/audio/umix/Makefile
index 6c05da703985..ee0269bd7da1 100644
--- a/audio/umix/Makefile
+++ b/audio/umix/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Advanced tool for adjusting soundcard mixers, replacement for aumix
 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}
 
 MAN1=		umix.1
 PLIST_FILES=	bin/umix
diff --git a/audio/vorbisgain/Makefile b/audio/vorbisgain/Makefile
index c242ef9182e9..8711abceecbc 100644
--- a/audio/vorbisgain/Makefile
+++ b/audio/vorbisgain/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis
 
 USE_ZIP=	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/audio/xhippo/Makefile b/audio/xhippo/Makefile
index 059954b6448f..018b3ff2174d 100644
--- a/audio/xhippo/Makefile
+++ b/audio/xhippo/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
 USE_GNOME=	gtk12
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 DOCS=		ChangeLog gnu-xhippo.html screenshot.jpeg xhippo.html.gz \
 		xhippo.info.gz xhippo.ps.gz xhippo.sgml xhippo.txt.gz
diff --git a/audio/xmms-arts_output/Makefile b/audio/xmms-arts_output/Makefile
index 38befb46d08b..334632e0fcd0 100644
--- a/audio/xmms-arts_output/Makefile
+++ b/audio/xmms-arts_output/Makefile
@@ -22,7 +22,7 @@ USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 PLIST_FILES=	lib/xmms/Output/libarts.so \
 		bin/xmms-arts-helper
 
diff --git a/audio/xmms-faad/Makefile b/audio/xmms-faad/Makefile
index 5dbf8a798340..297d05207cb4 100644
--- a/audio/xmms-faad/Makefile
+++ b/audio/xmms-faad/Makefile
@@ -33,7 +33,7 @@ USE_GNOME=		gtk12
 USE_GMAKE=		yes
 USE_REINPLACE=		yes
 
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-xmms --with-mp4v2
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} -DHAVE_GTK" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
diff --git a/audio/xmms-kde/Makefile b/audio/xmms-kde/Makefile
index 67f89c4d25da..758ad05318f1 100644
--- a/audio/xmms-kde/Makefile
+++ b/audio/xmms-kde/Makefile
@@ -23,7 +23,7 @@ USE_INC_LIBTOOL_VER=	13
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=
-CONFIGURE_ARGS+=--build=${ARCH}-portbld-freebsd${OSREL} \
+CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \
 		--with-xmms-prefix=${X11BASE}
 USE_GNOME=	gtk12
 
diff --git a/audio/xmms-real-random/Makefile b/audio/xmms-real-random/Makefile
index 9adac5a1533f..d878ad8b50b7 100644
--- a/audio/xmms-real-random/Makefile
+++ b/audio/xmms-real-random/Makefile
@@ -23,7 +23,7 @@ USE_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 USE_X_PREFIX=	yes
 
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CFLAGS='${CFLAGS}'
 
 post-patch:
diff --git a/audio/xmms-volnorm/Makefile b/audio/xmms-volnorm/Makefile
index 3ec1448993ec..eedf8f7f25b4 100644
--- a/audio/xmms-volnorm/Makefile
+++ b/audio/xmms-volnorm/Makefile
@@ -21,7 +21,7 @@ PLIST_FILES=	lib/xmms/Effect/libnormvol.so
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--target=${ARCH}-unknown-freebsd${OSREL}
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/audio/xmp/Makefile b/audio/xmp/Makefile
index 2a610973404f..362d0c06fd71 100644
--- a/audio/xmp/Makefile
+++ b/audio/xmp/Makefile
@@ -29,7 +29,7 @@ CFLAGS+=	-fPIC
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} > 500013 || ${ARCH} == "alpha"
+.if ${OSVERSION} > 500013 || ${MACHINE_ARCH} == "alpha"
 USE_GNOME+=	esound
 CONFIGURE_ARGS+=	--disable-oss --enable-esd
 PKGNAMESUFFIX=	-esound
diff --git a/audio/xsidplay/Makefile b/audio/xsidplay/Makefile
index 3ad52f96d012..5d40ad9021b1 100644
--- a/audio/xsidplay/Makefile
+++ b/audio/xsidplay/Makefile
@@ -38,7 +38,7 @@ MAN1=		xsidplay.1
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "alpha"
+.if ${MACHINE_ARCH} == "alpha"
 CFLAGS+=	-O0
 .endif