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

after 5.4-RELEASE.

23 files changed, 23 insertions, 23 deletions

diff --git a/editors/MathPlanner/Makefile b/editors/MathPlanner/Makefile
index d7bc6551b23e..4d2b4e6614be 100644
--- a/editors/MathPlanner/Makefile
+++ b/editors/MathPlanner/Makefile
@@ -19,7 +19,7 @@ COMMENT=	A mathematical design and publishing application
 USE_QT_VER=	3
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	QTDIR="${QT_PREFIX}"
 
 QTCPPFLAGS+=	${PTHREAD_CFLAGS}
diff --git a/editors/aewan/Makefile b/editors/aewan/Makefile
index f057172565d2..17a960af8d0c 100644
--- a/editors/aewan/Makefile
+++ b/editors/aewan/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Curses-based program for the creation and editing of ascii art
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=		aecat.1 aewan.1
 MAN5=		aewan.5
diff --git a/editors/cooledit/Makefile b/editors/cooledit/Makefile
index 729eb34cc198..a2bf9908790e 100644
--- a/editors/cooledit/Makefile
+++ b/editors/cooledit/Makefile
@@ -20,7 +20,7 @@ USE_GETTEXT=	yes
 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="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 INSTALLS_SHLIB=	yes
 
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index ba1f17b9ac9f..83d93917cca0 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -34,7 +34,7 @@ PATCH_DIST_STRIP=	-p1
 USE_AUTOCONF_VER=213
 USE_GMAKE=	yes
 
-CONFIGURE_TARGET=	${ARCH}--freebsd
+CONFIGURE_TARGET=	${MACHINE_ARCH}--freebsd
 .if defined(WITHOUT_X11)
 CONFIGURE_ARGS=		--with-x=no
 .endif
diff --git a/editors/emacs19/Makefile b/editors/emacs19/Makefile
index fea7005f4f47..aac853660cc5 100644
--- a/editors/emacs19/Makefile
+++ b/editors/emacs19/Makefile
@@ -19,7 +19,7 @@ ONLY_FOR_ARCHS=	i386
 DEPRECATED=	"editors/emacs is recommended instead for new installations"
 
 EMACS_VERSION=	19.34
-CONFIGURE_TARGET=	${ARCH}--freebsd
+CONFIGURE_TARGET=	${MACHINE_ARCH}--freebsd
 PLIST_SUB=	EMACS_VERSION=${EMACS_VERSION} EMACS_ARCH=${CONFIGURE_TARGET}
 NO_LATEST_LINK=	yes
 WRKSRC=		${WRKDIR}/emacs-19.34
diff --git a/editors/emacs20-dl/Makefile b/editors/emacs20-dl/Makefile
index af2ab9a24ab7..14fadfa3e1da 100644
--- a/editors/emacs20-dl/Makefile
+++ b/editors/emacs20-dl/Makefile
@@ -34,7 +34,7 @@ USE_AUTOCONF_VER=	213
 USE_GMAKE=	yes
 MAKE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 EMACS_VER=	20.7
-CONFIGURE_TARGET=	${ARCH}--freebsd
+CONFIGURE_TARGET=	${MACHINE_ARCH}--freebsd
 .if !defined(WITHOUT_X11)
 CONFIGURE_ARGS=	--with-x-toolkit --with-pop
 USE_XLIB=	yes
diff --git a/editors/emacs20-mule-devel/Makefile b/editors/emacs20-mule-devel/Makefile
index b6328d400252..e1cd200ab06f 100644
--- a/editors/emacs20-mule-devel/Makefile
+++ b/editors/emacs20-mule-devel/Makefile
@@ -35,7 +35,7 @@ USE_AUTOCONF_VER=	213
 USE_GMAKE=	yes
 MAKE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 EMACS_VER=	20.7
-CONFIGURE_TARGET=	${ARCH}--freebsd
+CONFIGURE_TARGET=	${MACHINE_ARCH}--freebsd
 .if !defined(WITHOUT_X11)
 CONFIGURE_ARGS=	--with-x-toolkit --with-pop
 USE_XLIB=	yes
diff --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile
index 0d100e55ded8..03c3f0fa35ec 100644
--- a/editors/emacs20/Makefile
+++ b/editors/emacs20/Makefile
@@ -27,7 +27,7 @@ USE_AUTOCONF_VER=213
 USE_GMAKE=	yes
 EMACS_VER=	20.7
 LATEST_LINK?=	${PKGNAMEPREFIX}emacs20
-CONFIGURE_TARGET=	${ARCH}--freebsd
+CONFIGURE_TARGET=	${MACHINE_ARCH}--freebsd
 .if defined(WITHOUT_X11)
 CONFIGURE_ARGS=	--with-x=no --with-pop
 .else
diff --git a/editors/emacs22/Makefile b/editors/emacs22/Makefile
index ba1f17b9ac9f..83d93917cca0 100644
--- a/editors/emacs22/Makefile
+++ b/editors/emacs22/Makefile
@@ -34,7 +34,7 @@ PATCH_DIST_STRIP=	-p1
 USE_AUTOCONF_VER=213
 USE_GMAKE=	yes
 
-CONFIGURE_TARGET=	${ARCH}--freebsd
+CONFIGURE_TARGET=	${MACHINE_ARCH}--freebsd
 .if defined(WITHOUT_X11)
 CONFIGURE_ARGS=		--with-x=no
 .endif
diff --git a/editors/emacs23/Makefile b/editors/emacs23/Makefile
index ba1f17b9ac9f..83d93917cca0 100644
--- a/editors/emacs23/Makefile
+++ b/editors/emacs23/Makefile
@@ -34,7 +34,7 @@ PATCH_DIST_STRIP=	-p1
 USE_AUTOCONF_VER=213
 USE_GMAKE=	yes
 
-CONFIGURE_TARGET=	${ARCH}--freebsd
+CONFIGURE_TARGET=	${MACHINE_ARCH}--freebsd
 .if defined(WITHOUT_X11)
 CONFIGURE_ARGS=		--with-x=no
 .endif
diff --git a/editors/hexcurse/Makefile b/editors/hexcurse/Makefile
index af6e0486ce53..c8884e186bbd 100644
--- a/editors/hexcurse/Makefile
+++ b/editors/hexcurse/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A versatile ncurses-based hex editor
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=		hexcurse.1
 PLIST_FILES=	bin/hexcurse
diff --git a/editors/hte/Makefile b/editors/hte/Makefile
index 5118883579e4..f2305f7f4709 100644
--- a/editors/hte/Makefile
+++ b/editors/hte/Makefile
@@ -19,7 +19,7 @@ COMMENT=	A file editor/viewer/analyzer for executables
 USE_BZIP2=	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}"
 CONFIGURE_ARGS=	--enable-release
 
diff --git a/editors/joe-devel/Makefile b/editors/joe-devel/Makefile
index dbc8dc4d391c..59da314df948 100644
--- a/editors/joe-devel/Makefile
+++ b/editors/joe-devel/Makefile
@@ -21,7 +21,7 @@ CONFLICTS=	joe-2.*
 LATEST_LINK=	joe-devel
 
 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 -liconv"
 
diff --git a/editors/lfhex/Makefile b/editors/lfhex/Makefile
index cf5117bdb30f..647f859056bb 100644
--- a/editors/lfhex/Makefile
+++ b/editors/lfhex/Makefile
@@ -19,7 +19,7 @@ USE_BISON=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	QTDIR="${QT_PREFIX}"
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-qt-moc=${MOC}
 
 MAKE_ARGS=	CXXFLAGS="${CXXFLAGS}" \
diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile
index f31f07e3a90e..9d89139c2c7d 100644
--- a/editors/poedit/Makefile
+++ b/editors/poedit/Makefile
@@ -25,7 +25,7 @@ USE_GETTEXT=	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-wx-config=${X11BASE}/bin/wxgtk2-2.4-config
 
diff --git a/editors/ssed/Makefile b/editors/ssed/Makefile
index cc211d1848dc..230e413f77c7 100644
--- a/editors/ssed/Makefile
+++ b/editors/ssed/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Super-sed - a heavily enhanced version of sed
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/a//}
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--program-prefix=s
 
 MAN1=		ssed.1
diff --git a/editors/ted/Makefile b/editors/ted/Makefile
index bd44d5a43089..b39283c41eef 100644
--- a/editors/ted/Makefile
+++ b/editors/ted/Makefile
@@ -26,7 +26,7 @@ USE_MOTIF=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX}
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CC="${CC}" CFLAGS="${CFLAGS}"
 MAKE_ENV=	DEF_AFMDIR="-DAFMDIR=\"\\\"${AFMDIR}\\\"\"" \
 		DEF_INDDIR="-DINDDIR=\"\\\"${INDDIR}\\\"\"" \
diff --git a/editors/tetradraw/Makefile b/editors/tetradraw/Makefile
index 9b50afeccbe1..d4e444f5c2b2 100644
--- a/editors/tetradraw/Makefile
+++ b/editors/tetradraw/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Fully featured ANSI art editor/viewer with TCP/IP multidraw support
 
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git a/editors/xemacs-devel-mule/Makefile b/editors/xemacs-devel-mule/Makefile
index 6a9813595ed1..8d57d1cb92e4 100644
--- a/editors/xemacs-devel-mule/Makefile
+++ b/editors/xemacs-devel-mule/Makefile
@@ -45,7 +45,7 @@ USE_XPM=	yes
 
 XEMACS_REL=	21.5
 XEMACS_VER=	${XEMACS_REL}-b20
-XEMACS_ARCH=	${ARCH}--freebsd
+XEMACS_ARCH=	${MACHINE_ARCH}--freebsd
 
 WRKSRC=		${WRKDIR}/xemacs-${XEMACS_VER:S/-b/./}
 STRIP=
diff --git a/editors/xemacs-devel/Makefile b/editors/xemacs-devel/Makefile
index d8e786353a90..770b52cd39e8 100644
--- a/editors/xemacs-devel/Makefile
+++ b/editors/xemacs-devel/Makefile
@@ -38,7 +38,7 @@ XEMACS_ARCH=		${CONFIGURE_TARGET}
 WRKSRC=		${WRKDIR}/xemacs-${XEMACS_VER:S/-b/./}
 STRIP=
 USE_AUTOCONF_VER=213
-CONFIGURE_TARGET=${ARCH}--freebsd
+CONFIGURE_TARGET=${MACHINE_ARCH}--freebsd
 
 CONFIGURE_ARGS?=--with-clash-detection \
 		--with-sound=native,nonas,noesd \
diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index 0d48bcd4672f..c53cb5105469 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS+=	${LOCALBASE}/lib/xemacs/xemacs-packages/etc/enriched.doc:${PORTSDI
 USE_BZIP2=	yes
 STRIP=
 USE_AUTOCONF_VER=213
-CONFIGURE_TARGET=${ARCH}--freebsd
+CONFIGURE_TARGET=${MACHINE_ARCH}--freebsd
 
 CONFIGURE_ARGS?=--with-clash-detection \
 		--with-sound=native,nonas,noesd \
diff --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile
index dab6547c2a89..98cae6376807 100644
--- a/editors/xemacs21-mule/Makefile
+++ b/editors/xemacs21-mule/Makefile
@@ -48,7 +48,7 @@ USE_XLIB=	yes
 USE_XPM=	yes
 STRIP=
 USE_AUTOCONF_VER=	213
-CONFIGURE_TARGET=${ARCH}--freebsd
+CONFIGURE_TARGET=${MACHINE_ARCH}--freebsd
 
 CONFIGURE_ARGS=	--with-x11 \
 		--with-mule \
diff --git a/editors/zile/Makefile b/editors/zile/Makefile
index 98da9c20de9c..dfac99fe4e73 100644
--- a/editors/zile/Makefile
+++ b/editors/zile/Makefile
@@ -19,7 +19,7 @@ USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_AUTOMAKE_VER=	19
 USE_AUTOCONF_VER=	259
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=		zile.1
 INFO=		zile