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

after 5.4-RELEASE.

10 files changed, 10 insertions, 10 deletions

diff --git a/net-im/ari-yahoo/Makefile b/net-im/ari-yahoo/Makefile
index 6d11b761f11..f07bd6832f8 100644
--- a/net-im/ari-yahoo/Makefile
+++ b/net-im/ari-yahoo/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A console Yahoo! messenger client
 PLIST_FILES=	bin/ari-yahoo
 USE_GMAKE=	yes
 USE_AUTOCONF_VER=	253
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 pre-configure:
 	@(cd ${WRKSRC}/libyahoo && ${SETENV} ${AUTOCONF_ENV} ${AUTOCONF} \
diff --git a/net-im/climm/Makefile b/net-im/climm/Makefile
index 091fbb1b8f1..d2b002c8e31 100644
--- a/net-im/climm/Makefile
+++ b/net-im/climm/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Text-based ICQ implementation
 USE_GMAKE=	yes
 USE_OPENSSL=	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}"
 
 MAN1=		micq.1
diff --git a/net-im/ickle/Makefile b/net-im/ickle/Makefile
index 1736306ace2..9feb3441512 100644
--- a/net-im/ickle/Makefile
+++ b/net-im/ickle/Makefile
@@ -27,7 +27,7 @@ USE_LIBTOOL_VER=	13
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
-CONFIGURE_TARGET=	--target=${ARCH}-unknown-freebsd${OSREL}
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-sigc-prefix=${LOCALBASE} \
 		--with-gtkmm-prefix=${X11BASE}
 CONFIGURE_ENV=	CPPFLAGS="`${LOCALBASE}/bin/sigc-config --cflags`"
diff --git a/net-im/kf/Makefile b/net-im/kf/Makefile
index af8221a713f..b455d51380b 100644
--- a/net-im/kf/Makefile
+++ b/net-im/kf/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	loudmouth-1.0:${PORTSDIR}/net/loudmouth
 USE_X_PREFIX=	yes
 USE_GNOME=	libglade2
 USE_GETOPT_LONG=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_LIBTOOL_VER=	15
 
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/net-im/linux-ymessenger/Makefile b/net-im/linux-ymessenger/Makefile
index 4a3b9411643..2d58e7c4ff0 100644
--- a/net-im/linux-ymessenger/Makefile
+++ b/net-im/linux-ymessenger/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.0.4.1
 CATEGORIES=	net
 MASTER_SITES=	http://download.yahoo.com/dl/unix/
 PKGNAMEPREFIX=	linux-
-DISTNAME=	rh${BASEVERSION:C/([^\.])\..*/\1/}.${PORTNAME}-${PORTVERSION:C/\.([^\.]+)$/-\1/}.${ARCH}
+DISTNAME=	rh${BASEVERSION:C/([^\.])\..*/\1/}.${PORTNAME}-${PORTVERSION:C/\.([^\.]+)$/-\1/}.${MACHINE_ARCH}
 EXTRACT_SUFX=	.rpm
 
 MAINTAINER=	sethk@meowfishies.com
diff --git a/net-im/micq/Makefile b/net-im/micq/Makefile
index 091fbb1b8f1..d2b002c8e31 100644
--- a/net-im/micq/Makefile
+++ b/net-im/micq/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Text-based ICQ implementation
 USE_GMAKE=	yes
 USE_OPENSSL=	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}"
 
 MAN1=		micq.1
diff --git a/net-im/naim/Makefile b/net-im/naim/Makefile
index a251f94d4d1..7ceda940605 100644
--- a/net-im/naim/Makefile
+++ b/net-im/naim/Makefile
@@ -17,7 +17,7 @@ USE_BZIP2=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--with-pkgdocdir=${DOCSDIR} \
 			--mandir=${MANPREFIX}/man
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=		naim.1
 MLINKS=		naim.1 nirc.1 naim.1 nicq.1 naim.1 nlily.1
diff --git a/net-im/pork/Makefile b/net-im/pork/Makefile
index 5ba0ce7da7e..5fd6657cbd4 100644
--- a/net-im/pork/Makefile
+++ b/net-im/pork/Makefile
@@ -19,6 +19,6 @@ USE_GETOPT_LONG=	yes
 USE_OPENSSL=		yes
 
 GNU_CONFIGURE=		yes
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 .include <bsd.port.mk>
diff --git a/net-im/sim-im/Makefile b/net-im/sim-im/Makefile
index 5ac24844134..588d8466f5a 100644
--- a/net-im/sim-im/Makefile
+++ b/net-im/sim-im/Makefile
@@ -25,7 +25,7 @@ GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 .if !defined(WITHOUT_SSL)
 USE_OPENSSL=	yes
diff --git a/net-im/simicq/Makefile b/net-im/simicq/Makefile
index 5ac24844134..588d8466f5a 100644
--- a/net-im/simicq/Makefile
+++ b/net-im/simicq/Makefile
@@ -25,7 +25,7 @@ GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 .if !defined(WITHOUT_SSL)
 USE_OPENSSL=	yes