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

after 5.4-RELEASE.

23 files changed, 26 insertions, 26 deletions

diff --git a/x11-toolkits/Xaw3d/Makefile b/x11-toolkits/Xaw3d/Makefile
index 7205dcaded3f..bac6290453f9 100644
--- a/x11-toolkits/Xaw3d/Makefile
+++ b/x11-toolkits/Xaw3d/Makefile
@@ -33,7 +33,7 @@ post-extract:
 	${SED} 's|%%XAWVER%%|${XAWVER}|g' ${MSG_FILE} > ${PKGMESSAGE}
 
 # Workaround a bug in egcs on FreeBSD/Alpha.
-.if ${ARCH} == "alpha"
+.if ${MACHINE_ARCH} == "alpha"
 post-configure:
 	@(cd ${WRKSRC}; ${MV} Makefile Makefile.orig; ${SED} -e \
 	  's/CDEBUGFLAGS = -O/CDEBUGFLAGS =/g' Makefile.orig > Makefile)
diff --git a/x11-toolkits/fltk/Makefile b/x11-toolkits/fltk/Makefile
index ff621003b182..9c0dd83fd62c 100644
--- a/x11-toolkits/fltk/Makefile
+++ b/x11-toolkits/fltk/Makefile
@@ -36,7 +36,7 @@ VERSION=	1.1.6
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=--enable-shared --enable-xft
 # configure ignores ${CXX} and keeps on linking C++ code with ${CC}
 CONFIGURE_ENV+=	CC="${CXX}" CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
diff --git a/x11-toolkits/flvw/Makefile b/x11-toolkits/flvw/Makefile
index e3496ba27d3d..624a00f01e6c 100644
--- a/x11-toolkits/flvw/Makefile
+++ b/x11-toolkits/flvw/Makefile
@@ -35,7 +35,7 @@ INC_FILES=	Flv_CStyle.H Flv_Data_Source.H Flv_List.H Flv_Style.H \
 
 INSTALLS_SHLIB=	yes
 
-.if ${ARCH:L} == "amd64"
+.if ${MACHINE_ARCH:L} == "amd64"
 CFLAGS+=	-fPIC
 .endif
 
diff --git a/x11-toolkits/fox-devel/Makefile b/x11-toolkits/fox-devel/Makefile
index 30cf13b7f1dd..bba06ef89e41 100644
--- a/x11-toolkits/fox-devel/Makefile
+++ b/x11-toolkits/fox-devel/Makefile
@@ -31,7 +31,7 @@ PLIST_SUB+=	MAJORVER=${MAJORVER} SHVER=${SHVER}
 USE_GL=		yes
 USE_REINPLACE=	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}"
 CONFIGURE_ARGS=	--with-opengl --with-x --enable-threadsafe
 INSTALLS_SHLIB=	yes
diff --git a/x11-toolkits/fox14/Makefile b/x11-toolkits/fox14/Makefile
index 30cf13b7f1dd..bba06ef89e41 100644
--- a/x11-toolkits/fox14/Makefile
+++ b/x11-toolkits/fox14/Makefile
@@ -31,7 +31,7 @@ PLIST_SUB+=	MAJORVER=${MAJORVER} SHVER=${SHVER}
 USE_GL=		yes
 USE_REINPLACE=	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}"
 CONFIGURE_ARGS=	--with-opengl --with-x --enable-threadsafe
 INSTALLS_SHLIB=	yes
diff --git a/x11-toolkits/gai/Makefile b/x11-toolkits/gai/Makefile
index fa7bba4825de..619d6f76e885 100644
--- a/x11-toolkits/gai/Makefile
+++ b/x11-toolkits/gai/Makefile
@@ -31,7 +31,7 @@ PLIST_FILES=	include/gai/gai.h lib/libgai.so.0.5.4 lib/libgai.so.0 \
 PLIST_DIRS=	include/gai
 INSTALLS_SHLIB=	yes
 
-.if ${ARCH:L} == "amd64"
+.if ${MACHINE_ARCH:L} == "amd64"
 CFLAGS+=	-fPIC
 .endif
 
diff --git a/x11-toolkits/gauche-gtk/Makefile b/x11-toolkits/gauche-gtk/Makefile
index c76f0d392f88..b3092c4d8240 100644
--- a/x11-toolkits/gauche-gtk/Makefile
+++ b/x11-toolkits/gauche-gtk/Makefile
@@ -26,7 +26,7 @@ GNU_CONFIGURE=	yes
 EXAMPLESDIR=	${PREFIX}/share/examples/${PORTNAME}/gtk
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}/gtk
 PLIST_SUB=	VERSION="`gauche-config -V`" \
-		TARGET="${ARCH}-portbld-freebsd${OSREL}"
+		TARGET="${MACHINE_ARCH}-portbld-freebsd${OSREL}"
 
 .if defined(WITH_GTKGLEXT)
 LIB_DEPENDS+=	gtkglext-x11-1.0.2:${PORTSDIR}/x11-toolkits/gtkglext
diff --git a/x11-toolkits/gob/Makefile b/x11-toolkits/gob/Makefile
index 0e8c30835751..7f2b76b30cdf 100644
--- a/x11-toolkits/gob/Makefile
+++ b/x11-toolkits/gob/Makefile
@@ -20,7 +20,7 @@ USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET=	--target=${ARCH}-unknown-freebsd${OSREL}
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 MAN1=		gob.1
 
diff --git a/x11-toolkits/libXaw/Makefile b/x11-toolkits/libXaw/Makefile
index 70b57682769c..048ef7f001d5 100644
--- a/x11-toolkits/libXaw/Makefile
+++ b/x11-toolkits/libXaw/Makefile
@@ -27,7 +27,7 @@ CONFLICTS=	XFree86-libraries-* xorg-libraries-*
 USE_BZIP2=	yes
 PREFIX?=	${X11BASE}
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
 USE_LIBTOOL_VER=13
 CFLAGS+=	-DMALLOC_0_RETURNS_NULL
diff --git a/x11-toolkits/libXmu/Makefile b/x11-toolkits/libXmu/Makefile
index 0d87e915d703..27cb4e497874 100644
--- a/x11-toolkits/libXmu/Makefile
+++ b/x11-toolkits/libXmu/Makefile
@@ -23,7 +23,7 @@ CONFLICTS=	XFree86-libraries-* xorg-libraries-*
 USE_BZIP2=	yes
 PREFIX?=	${X11BASE}
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
 USE_INC_LIBTOOL_VER=13
 CFLAGS+=	-DMALLOC_0_RETURNS_NULL
diff --git a/x11-toolkits/libXt/Makefile b/x11-toolkits/libXt/Makefile
index a9a4853a4946..8fcdf76c9362 100644
--- a/x11-toolkits/libXt/Makefile
+++ b/x11-toolkits/libXt/Makefile
@@ -25,7 +25,7 @@ USE_BZIP2=	yes
 PREFIX?=	${X11BASE}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_LIBTOOL_VER=13
 CFLAGS+=	-DMALLOC_0_RETURNS_NULL
 INSTALLS_SHLIB=	yes
diff --git a/x11-toolkits/libgtkeditor/Makefile b/x11-toolkits/libgtkeditor/Makefile
index edc65e2ecad7..8b2255fbc801 100644
--- a/x11-toolkits/libgtkeditor/Makefile
+++ b/x11-toolkits/libgtkeditor/Makefile
@@ -30,7 +30,7 @@ CFLAGS+=	-fPIC
 
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 pre-configure:
 .for file in install-sh mkinstalldirs
diff --git a/x11-toolkits/linux-f10-openmotif/Makefile b/x11-toolkits/linux-f10-openmotif/Makefile
index 60d6b42d0426..40884e0cc17e 100644
--- a/x11-toolkits/linux-f10-openmotif/Makefile
+++ b/x11-toolkits/linux-f10-openmotif/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	x11-toolkits linux
 MASTER_SITES=	ftp://ftp.ics.com/pub/Products/Motif/%SUBDIR%/
 MASTER_SITE_SUBDIR=	om2.2.4/redhat-7.3
 PKGNAMEPREFIX=	linux-
-EXTRACT_SUFX=	-0.1.${ARCH}.rpm
+EXTRACT_SUFX=	-0.1.${MACHINE_ARCH}.rpm
 DIST_SUBDIR=	rpm
 EXTRACT_ONLY=
 
@@ -25,7 +25,7 @@ ONLY_FOR_ARCHS=	i386
 USE_LINUX_PREFIX=	yes
 NO_BUILD=	yes
 NO_FILTER_SHLIBS=	yes
-MD5_FILE=	${MASTERDIR}/distinfo.${ARCH}
+MD5_FILE=	${MASTERDIR}/distinfo.${MACHINE_ARCH}
 
 EXTRACT_FILES=	./usr/X11R6/lib/libMrm.so.3.0.3 \
 		./usr/X11R6/lib/libUil.so.3.0.3 \
diff --git a/x11-toolkits/linux-f8-openmotif/Makefile b/x11-toolkits/linux-f8-openmotif/Makefile
index 60d6b42d0426..40884e0cc17e 100644
--- a/x11-toolkits/linux-f8-openmotif/Makefile
+++ b/x11-toolkits/linux-f8-openmotif/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	x11-toolkits linux
 MASTER_SITES=	ftp://ftp.ics.com/pub/Products/Motif/%SUBDIR%/
 MASTER_SITE_SUBDIR=	om2.2.4/redhat-7.3
 PKGNAMEPREFIX=	linux-
-EXTRACT_SUFX=	-0.1.${ARCH}.rpm
+EXTRACT_SUFX=	-0.1.${MACHINE_ARCH}.rpm
 DIST_SUBDIR=	rpm
 EXTRACT_ONLY=
 
@@ -25,7 +25,7 @@ ONLY_FOR_ARCHS=	i386
 USE_LINUX_PREFIX=	yes
 NO_BUILD=	yes
 NO_FILTER_SHLIBS=	yes
-MD5_FILE=	${MASTERDIR}/distinfo.${ARCH}
+MD5_FILE=	${MASTERDIR}/distinfo.${MACHINE_ARCH}
 
 EXTRACT_FILES=	./usr/X11R6/lib/libMrm.so.3.0.3 \
 		./usr/X11R6/lib/libUil.so.3.0.3 \
diff --git a/x11-toolkits/linux-openmotif/Makefile b/x11-toolkits/linux-openmotif/Makefile
index 60d6b42d0426..40884e0cc17e 100644
--- a/x11-toolkits/linux-openmotif/Makefile
+++ b/x11-toolkits/linux-openmotif/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	x11-toolkits linux
 MASTER_SITES=	ftp://ftp.ics.com/pub/Products/Motif/%SUBDIR%/
 MASTER_SITE_SUBDIR=	om2.2.4/redhat-7.3
 PKGNAMEPREFIX=	linux-
-EXTRACT_SUFX=	-0.1.${ARCH}.rpm
+EXTRACT_SUFX=	-0.1.${MACHINE_ARCH}.rpm
 DIST_SUBDIR=	rpm
 EXTRACT_ONLY=
 
@@ -25,7 +25,7 @@ ONLY_FOR_ARCHS=	i386
 USE_LINUX_PREFIX=	yes
 NO_BUILD=	yes
 NO_FILTER_SHLIBS=	yes
-MD5_FILE=	${MASTERDIR}/distinfo.${ARCH}
+MD5_FILE=	${MASTERDIR}/distinfo.${MACHINE_ARCH}
 
 EXTRACT_FILES=	./usr/X11R6/lib/libMrm.so.3.0.3 \
 		./usr/X11R6/lib/libUil.so.3.0.3 \
diff --git a/x11-toolkits/neXtaw/Makefile b/x11-toolkits/neXtaw/Makefile
index db1181ddcdb0..08c077c41bde 100644
--- a/x11-toolkits/neXtaw/Makefile
+++ b/x11-toolkits/neXtaw/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Athena Widgets with N*XTSTEP appearance
 USE_X_PREFIX=	yes
 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${X11BASE}/include" \
 		LDFLAGS="-L${X11BASE}/lib"
 INSTALLS_SHLIB=	yes
diff --git a/x11-toolkits/py-gtk/Makefile b/x11-toolkits/py-gtk/Makefile
index 467d65054ee9..b5bbd76c7171 100644
--- a/x11-toolkits/py-gtk/Makefile
+++ b/x11-toolkits/py-gtk/Makefile
@@ -29,7 +29,7 @@ USE_GNOME=	gnomelibs gdkpixbuf libglade
 USE_PYTHON=	yes
 USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	PYTHON=${PYTHON_CMD}
-CONFIGURE_TARGET=	--target=${ARCH}-unknown-freebsd${OSREL}
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 EG_SRC_DIR=	${WRKSRC}/examples
 EG_DST_DIR=	${PREFIX}/share/examples/py-gtk
diff --git a/x11-toolkits/scx/Makefile b/x11-toolkits/scx/Makefile
index 61cec4dc66a9..7e4735f2663f 100644
--- a/x11-toolkits/scx/Makefile
+++ b/x11-toolkits/scx/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/scsh/scsh-install-pkg:${PORTSDIR}/devel/scsh-insta
 NO_BUILD=	yes
 USE_XLIB=	yes
 
-PLIST_SUB=	TARGET=${ARCH}-portbld-freebsd${OSREL}
+PLIST_SUB=	TARGET=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 do-install:
 	(cd ${WRKSRC}; ${LOCALBASE}/lib/scsh/scsh-install-pkg --prefix=${PREFIX}/lib/scsh)
diff --git a/x11-toolkits/soqt/Makefile b/x11-toolkits/soqt/Makefile
index 164127cdf131..39b666f95a6d 100644
--- a/x11-toolkits/soqt/Makefile
+++ b/x11-toolkits/soqt/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	Coin.43:${PORTSDIR}/graphics/Coin
 USE_QT_VER=	3
 USE_GMAKE=	yes
 USE_LIBTOOL_VER=	15
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	QTDIR="${QT_PREFIX}"
 CONFIGURE_ARGS=	--with-pthread=yes --with-coin=${X11BASE}
 INSTALLS_SHLIB=	yes
diff --git a/x11-toolkits/v/Makefile b/x11-toolkits/v/Makefile
index e37a507b9f71..2342fb4e074f 100644
--- a/x11-toolkits/v/Makefile
+++ b/x11-toolkits/v/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://programming.ccp14.ac.uk/ftp-mirror/programming/objectcentra
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A C++ GUI development framework for X11 and Microsoft Windows
 
-.if ${ARCH} == "alpha"
+.if ${MACHINE_ARCH} == "alpha"
 BROKEN=		compiler error in function fixup_memory_subreg
 .endif
 
diff --git a/x11-toolkits/wxgtk/Makefile b/x11-toolkits/wxgtk/Makefile
index 872dcbb1dc63..9b0fc3d7bfa3 100644
--- a/x11-toolkits/wxgtk/Makefile
+++ b/x11-toolkits/wxgtk/Makefile
@@ -73,7 +73,7 @@ LIB_DEPENDS+=	wx_gtk2u-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2-unicode
 
 .if ${WXGTK_FLAVOR:Mgtk2*} != ""
 USE_GNOME=	gtk20
-CONFIGURE_ARGS+=--enable-gtk2 ${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS+=--enable-gtk2 ${MACHINE_ARCH}-portbld-freebsd${OSREL}
 .else
 USE_GNOME=	gtk12
 CONFIGURE_ARGS+=--host=${CONFIGURE_TARGET} --build=${CONFIGURE_TARGET}
diff --git a/x11-toolkits/wxgtk24/Makefile b/x11-toolkits/wxgtk24/Makefile
index 872dcbb1dc63..9b0fc3d7bfa3 100644
--- a/x11-toolkits/wxgtk24/Makefile
+++ b/x11-toolkits/wxgtk24/Makefile
@@ -73,7 +73,7 @@ LIB_DEPENDS+=	wx_gtk2u-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2-unicode
 
 .if ${WXGTK_FLAVOR:Mgtk2*} != ""
 USE_GNOME=	gtk20
-CONFIGURE_ARGS+=--enable-gtk2 ${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS+=--enable-gtk2 ${MACHINE_ARCH}-portbld-freebsd${OSREL}
 .else
 USE_GNOME=	gtk12
 CONFIGURE_ARGS+=--host=${CONFIGURE_TARGET} --build=${CONFIGURE_TARGET}
diff --git a/x11-toolkits/xbae/Makefile b/x11-toolkits/xbae/Makefile
index 2ba788b40b4d..b012e04caae0 100644
--- a/x11-toolkits/xbae/Makefile
+++ b/x11-toolkits/xbae/Makefile
@@ -19,7 +19,7 @@ COMMENT=	A Motif-based widget which displays a grid of cells as a spreadsheet
 
 USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 USE_MOTIF=	yes
 USE_X_PREFIX=	yes