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

after 5.4-RELEASE.

10 files changed, 11 insertions, 11 deletions

diff --git a/multimedia/camserv/Makefile b/multimedia/camserv/Makefile
index d0d62a7065ae..ca7c5d40da4e 100644
--- a/multimedia/camserv/Makefile
+++ b/multimedia/camserv/Makefile
@@ -28,7 +28,7 @@ USE_LIBTOOL_VER=15
 USE_REINPLACE=	yes
 USE_AUTOCONF_VER=259
 
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
 		-I${X11BASE}/include/gtk12 -I${X11BASE}/include/gdk-pixbuf-1.0 \
 		-I${LOCALBASE}/include/glib12" \
diff --git a/multimedia/emovix/Makefile b/multimedia/emovix/Makefile
index 7fc5ef01329e..e065e2731d7c 100644
--- a/multimedia/emovix/Makefile
+++ b/multimedia/emovix/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	h.eichmann@gmx.de
 COMMENT=	A mini linux distro to create bootable video CDs
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_PERL5_BUILD=yes
diff --git a/multimedia/kaffeine/Makefile b/multimedia/kaffeine/Makefile
index 3b628c82b8ff..1aac2bad8b33 100644
--- a/multimedia/kaffeine/Makefile
+++ b/multimedia/kaffeine/Makefile
@@ -21,7 +21,7 @@ USE_GMAKE=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV=		CXXFLAGS="${CFLAGS}"
 CONFIGURE_TARGET=
-CONFIGURE_ARGS+=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS+=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=		kaffeine.1
 MANLANG=	"" de
diff --git a/multimedia/kmplayer-kde4/Makefile b/multimedia/kmplayer-kde4/Makefile
index f7333a033ba8..4dfc675bec66 100644
--- a/multimedia/kmplayer-kde4/Makefile
+++ b/multimedia/kmplayer-kde4/Makefile
@@ -23,7 +23,7 @@ USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_TARGET=
 CONFIGURE_ARGS+=--with-x=${X11BASE} --disable-debug
 
diff --git a/multimedia/kmplayer/Makefile b/multimedia/kmplayer/Makefile
index f7333a033ba8..4dfc675bec66 100644
--- a/multimedia/kmplayer/Makefile
+++ b/multimedia/kmplayer/Makefile
@@ -23,7 +23,7 @@ USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_TARGET=
 CONFIGURE_ARGS+=--with-x=${X11BASE} --disable-debug
 
diff --git a/multimedia/libdvbpsi/Makefile b/multimedia/libdvbpsi/Makefile
index 63fd47c3d920..9b088c549db4 100644
--- a/multimedia/libdvbpsi/Makefile
+++ b/multimedia/libdvbpsi/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A library for MPEG TS and DVB PSI tables decoding and generation
 
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-release
 INSTALLS_SHLIB=	yes
 
diff --git a/multimedia/libfame/Makefile b/multimedia/libfame/Makefile
index 944c9defad0f..2f5828e6a93f 100644
--- a/multimedia/libfame/Makefile
+++ b/multimedia/libfame/Makefile
@@ -19,7 +19,7 @@ COMMENT=	A video encoding library
 USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN3=	fame_close.3 fame_encode_frame.3 fame_get_object.3 fame_init.3 \
 	fame_open.3 fame_register.3 fame_unregister.3 fame_encode_slice.3 \
diff --git a/multimedia/libmpeg3/Makefile b/multimedia/libmpeg3/Makefile
index 9666de64e5f3..1fbe2da3cc97 100644
--- a/multimedia/libmpeg3/Makefile
+++ b/multimedia/libmpeg3/Makefile
@@ -31,9 +31,9 @@ post-patch:
 
 do-install:
 .for i in mpeg3cat mpeg3dump mpeg3toc
-	${INSTALL_PROGRAM} ${WRKSRC}/${ARCH}/${i} ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/${MACHINE_ARCH}/${i} ${PREFIX}/bin
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/${ARCH}/libmpeg3.a ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/${MACHINE_ARCH}/libmpeg3.a ${PREFIX}/lib
 .for i in libmpeg3.h mpeg3private.h
 	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/include
 .endfor
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index d6257d455e5c..1662a3afef31 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -30,7 +30,7 @@ LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib
 CPPFLAGS=	-I${X11BASE}/include -I${LOCALBASE}/include
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
 		SDL_CONFIG="${LOCALBASE}/bin/sdl11-config"
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=	--with-ffmpeg_libs-prefix=${LOCALBASE} \
 					--with-libdvdread-prefix=${LOCALBASE} \
 					--with-libiconv-prefix=${LOCALBASE}
diff --git a/multimedia/xmms/Makefile b/multimedia/xmms/Makefile
index 2ae3c326969c..0186b5dac992 100644
--- a/multimedia/xmms/Makefile
+++ b/multimedia/xmms/Makefile
@@ -89,7 +89,7 @@ CONFIGURE_ARGS+=	--disable-esd
 PLIST_SUB+=	ESDPLUGIN:="@comment "
 .endif
 
-.if ${ARCH} != "i386"
+.if ${MACHINE_ARCH} != "i386"
 WITHOUT_SIMD=	yes
 .endif