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

after 5.4-RELEASE.

12 files changed, 13 insertions, 13 deletions

diff --git a/irc/bitchx/Makefile b/irc/bitchx/Makefile
index a5879a5a5da..566a6d1b6f4 100644
--- a/irc/bitchx/Makefile
+++ b/irc/bitchx/Makefile
@@ -28,7 +28,7 @@ CONFIGURE_ARGS+=--exec-prefix="${PREFIX}/share" \
 		--bindir="${PREFIX}/bin" \
 		--datadir="${PREFIX}/share" \
 		--libdir="${PREFIX}/share" \
-		--build=${ARCH}-portbld-freebsd${OSREL}
+		--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
diff --git a/irc/bopm/Makefile b/irc/bopm/Makefile
index 7c58a62f544..d94f8818011 100644
--- a/irc/bopm/Makefile
+++ b/irc/bopm/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Open proxy monitor and blocker, designed for use with ircds
 
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc
 
 INSTALLS_SHLIB=	yes
diff --git a/irc/eggdrop/Makefile b/irc/eggdrop/Makefile
index 384a5ff31f3..863f75301b9 100644
--- a/irc/eggdrop/Makefile
+++ b/irc/eggdrop/Makefile
@@ -19,7 +19,7 @@ MAINTAINER=	q@uni.de
 COMMENT=	The most popular open source Internet Relay Chat bot
 
 USE_BZIP2=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 .if !defined(WITHOUT_TCL)
 LIB_DEPENDS+=		tcl84.1:${PORTSDIR}/lang/tcl84
diff --git a/irc/irc/Makefile b/irc/irc/Makefile
index 1138cb51e90..2f00bb1b763 100644
--- a/irc/irc/Makefile
+++ b/irc/irc/Makefile
@@ -47,10 +47,10 @@ pre-build:
 	@${SED} -e "s;%%PREFIX%%;${PREFIX};g" ${FILESDIR}/ircd.sh > ${WRKDIR}/ircd.sh
 
 do-build:
-	@(cd ${WRKSRC}/${ARCH}-unknown-freebsd${OSREL}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
+	@(cd ${WRKSRC}/${MACHINE_ARCH}-unknown-freebsd${OSREL}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
 
 do-install:
-	@(cd ${WRKSRC}/${ARCH}-unknown-freebsd${OSREL} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
+	@(cd ${WRKSRC}/${MACHINE_ARCH}-unknown-freebsd${OSREL} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
 
 post-install:
 	@if [ ! -f ${STARTUP_SCRIPT} ]; then				\
diff --git a/irc/irssi-devel/Makefile b/irc/irssi-devel/Makefile
index 0903c0044de..710cabadd76 100644
--- a/irc/irssi-devel/Makefile
+++ b/irc/irssi-devel/Makefile
@@ -18,7 +18,7 @@ USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 
 WANT_GNOME=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=		irssi.1
 
diff --git a/irc/irssi/Makefile b/irc/irssi/Makefile
index 0903c0044de..710cabadd76 100644
--- a/irc/irssi/Makefile
+++ b/irc/irssi/Makefile
@@ -18,7 +18,7 @@ USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 
 WANT_GNOME=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=		irssi.1
 
diff --git a/irc/miau/Makefile b/irc/miau/Makefile
index ad9bbe4f0fa..2540f51a5b2 100644
--- a/irc/miau/Makefile
+++ b/irc/miau/Makefile
@@ -33,7 +33,7 @@ CONFIGURE_ARGS=		--enable-dccbounce \
 			--enable-empty-awaymsg \
 			--enable-dumpstatus \
 			--disable-dependency-tracking
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=		CPPFLAGS="${CPPFLAGS}" \
 			LDFLAGS="${LDFLAGS}" \
 			LIBS="${LIBS}"
diff --git a/irc/ngircd/Makefile b/irc/ngircd/Makefile
index c4c3a65b587..244b14caa21 100644
--- a/irc/ngircd/Makefile
+++ b/irc/ngircd/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	krion@FreeBSD.org
 COMMENT=	Free open source daemon for Internet Relay Chat (IRC)
 
 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"
 
diff --git a/irc/quirc/Makefile b/irc/quirc/Makefile
index bb67585e496..9a3def06806 100644
--- a/irc/quirc/Makefile
+++ b/irc/quirc/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	tk84.1:${PORTSDIR}/x11-toolkits/tk84
 
 USE_XLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-wish=${LOCALBASE}/bin/wish8.4 \
 		--with-tcl-include-dir=${LOCALBASE}/include/tcl8.4 \
 		--with-tk-include-dir=${LOCALBASE}/include/tk8.4 \
diff --git a/irc/srvx/Makefile b/irc/srvx/Makefile
index 4f3782c56d1..3293b97fcc6 100644
--- a/irc/srvx/Makefile
+++ b/irc/srvx/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	weaseal@users.sourceforge.net
 COMMENT=	Srvx IRC services
 
 GNU_CONFIGURE=		yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug
diff --git a/irc/undernet-ircu/Makefile b/irc/undernet-ircu/Makefile
index 8d10283447b..73d4e02baf1 100644
--- a/irc/undernet-ircu/Makefile
+++ b/irc/undernet-ircu/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Undernet IRCU irc daemon
 CONFLICTS=	ircd-hybrid*
 
 GNU_CONFIGURE=		yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=		--with-dpath=${PREFIX}/etc --with-symlink=no
 
 PLIST_FILES=	bin/chkconf bin/ircd etc/ircd.conf.example
diff --git a/irc/xaric/Makefile b/irc/xaric/Makefile
index 4dcd126ef53..757470172e4 100644
--- a/irc/xaric/Makefile
+++ b/irc/xaric/Makefile
@@ -16,7 +16,7 @@ COMMENT=	IRC Client similer to BitchX or ircII
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=		xaric.1