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

after 5.4-RELEASE.

56 files changed, 58 insertions, 58 deletions

diff --git a/net/4g8/Makefile b/net/4g8/Makefile
index 80b3f1e3c331..ec4143cc775d 100644
--- a/net/4g8/Makefile
+++ b/net/4g8/Makefile
@@ -17,7 +17,7 @@ COMMENT=	4g8 is a tool that allows you to capture traffic
 BUILD_DEPENDS=	${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet-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"
 
diff --git a/net/amule-devel/Makefile b/net/amule-devel/Makefile
index 6215e3df0dc4..06fa04facbbe 100644
--- a/net/amule-devel/Makefile
+++ b/net/amule-devel/Makefile
@@ -27,7 +27,7 @@ USE_X_PREFIX=	yes
 USE_GNOME=	gnomehier gnomehack gnomeprefix
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--disable-debug \
 		--without-included-gettext \
 		--with-libintl-prefix=${LOCALBASE} \
diff --git a/net/ari-yahoo/Makefile b/net/ari-yahoo/Makefile
index 6d11b761f11a..f07bd6832f8c 100644
--- a/net/ari-yahoo/Makefile
+++ b/net/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/b2bua/Makefile b/net/b2bua/Makefile
index 6efa4bfe3a58..4f53ed977847 100644
--- a/net/b2bua/Makefile
+++ b/net/b2bua/Makefile
@@ -32,7 +32,7 @@ BROKEN=		"Does not compile on sparc64"
 .endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/sip/b2b/bin.nodebug.FreeBSD.${ARCH}/b2bua \
+	${INSTALL_PROGRAM} ${WRKSRC}/sip/b2b/bin.nodebug.FreeBSD.${MACHINE_ARCH}/b2bua \
 		${PREFIX}/bin
 	${MKDIR} ${DOCSDIR}
 .for file in LICENSE HOWTO HOWTO.PROV b2bdesign.pdf
diff --git a/net/beacon/Makefile b/net/beacon/Makefile
index f9401753d208..745185d87f75 100644
--- a/net/beacon/Makefile
+++ b/net/beacon/Makefile
@@ -23,7 +23,7 @@ PLIST_SUB+=	VERSION=${PORTVERSION}
 USE_PERL5=	yes
 USE_AUTOCONF_VER=	259
 CONFIGURE_ARGS=	--bindir=${WWW_DIR}/${PORTNAME}-${PORTVERSION}
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 .ifdef(WITH_IPV6)
 #enable IPv6 name lookup, and sending IPv6 multicast
diff --git a/net/bfilter/Makefile b/net/bfilter/Makefile
index 65503ffb2445..3de68595aa23 100644
--- a/net/bfilter/Makefile
+++ b/net/bfilter/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
 		sigc-1.2.5:${PORTSDIR}/devel/libsigc++12
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 USE_RC_SUBR=	yes
diff --git a/net/c3270/Makefile b/net/c3270/Makefile
index 0940addc7457..aced92ef1ca8 100644
--- a/net/c3270/Makefile
+++ b/net/c3270/Makefile
@@ -21,7 +21,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/([0-9]\.[0-9])(\..*)/\1/}
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 USE_OPENSSL=	yes
 
diff --git a/net/courier-authlib-ldap/Makefile b/net/courier-authlib-ldap/Makefile
index 96eb0a2976ab..902b25be6031 100644
--- a/net/courier-authlib-ldap/Makefile
+++ b/net/courier-authlib-ldap/Makefile
@@ -55,7 +55,7 @@ CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
 		CXXFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
 		LIBS="${LDFLAGS} -L${LOCALBASE}/lib"
 
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--sysconfdir=${CONFDIR} \
 		--without-authshadow \
 		--without-authcustom \
diff --git a/net/dante/Makefile b/net/dante/Makefile
index 47d32583875f..455ca31a0f18 100644
--- a/net/dante/Makefile
+++ b/net/dante/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	anders@FreeBSD.org
 COMMENT=	A circuit-level firewall/proxy
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-socks-conf=${PREFIX}/etc/socks.conf \
 		--with-sockd-conf=${PREFIX}/etc/sockd.conf
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
diff --git a/net/freewais-sf/Makefile b/net/freewais-sf/Makefile
index c77799867085..ae0da05abf91 100644
--- a/net/freewais-sf/Makefile
+++ b/net/freewais-sf/Makefile
@@ -22,7 +22,7 @@ USE_PERL5_BUILD=yes
 CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ENV=	PREFIX="${PREFIX}" CC="${CC}" CFLAGS="${CFLAGS}"
 CONFIGURE_ARGS=	-sde -Dprefix="${PREFIX}" \
-		-Darchname="${ARCH}-freebsd"
+		-Darchname="${MACHINE_ARCH}-freebsd"
 INSTALL_TARGET=	install install.man
 
 PORTDOCS=	fwsf.ps
diff --git a/net/gutenfetch/Makefile b/net/gutenfetch/Makefile
index 38ac25cb5860..b7aff2839b3f 100644
--- a/net/gutenfetch/Makefile
+++ b/net/gutenfetch/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Fetch listings and books from Project Gutenberg
 LIB_DEPENDS=	gutenfetch:${PORTSDIR}/devel/libgutenfetch
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 USE_GMAKE=	yes
diff --git a/net/hidentd/Makefile b/net/hidentd/Makefile
index a6f11f439e22..b06bc0daff32 100644
--- a/net/hidentd/Makefile
+++ b/net/hidentd/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	krion@FreeBSD.org
 COMMENT=	Simple and secure ident (RFC1413) server
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN8=		hidentd.8
 
diff --git a/net/honeyd/Makefile b/net/honeyd/Makefile
index b3a968979b56..8b4b7c2a78cc 100644
--- a/net/honeyd/Makefile
+++ b/net/honeyd/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/libdnet.a:${PORTSDIR}/net/libdnet \
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-libdnet=${LOCALBASE} \
 		--with-libevent=${LOCALBASE} \
 		--with-pcap
diff --git a/net/ickle/Makefile b/net/ickle/Makefile
index 1736306ace20..9feb3441512e 100644
--- a/net/ickle/Makefile
+++ b/net/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/icpld/Makefile b/net/icpld/Makefile
index b909f5dd89e0..688c346c3b5f 100644
--- a/net/icpld/Makefile
+++ b/net/icpld/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Internet connection performance logging daemon
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=		${PORTNAME}.1
 
diff --git a/net/ipsumdump/Makefile b/net/ipsumdump/Makefile
index c763028f543b..6887b1ab10f2 100644
--- a/net/ipsumdump/Makefile
+++ b/net/ipsumdump/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	krion@FreeBSD.org
 COMMENT=	Produce ASCII summary of network traffic or tcpdump(1) file
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_PERL5_BUILD=yes
 USE_GMAKE=	yes
 
diff --git a/net/kf/Makefile b/net/kf/Makefile
index af8221a713fc..b455d51380be 100644
--- a/net/kf/Makefile
+++ b/net/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/latd/Makefile b/net/latd/Makefile
index e78da1f6b4ff..45aa3934bcf7 100644
--- a/net/latd/Makefile
+++ b/net/latd/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	tillman@seekingfire.com
 COMMENT=	The linux-decnet project LAT protocol suite
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=		llogin.1
 MAN5=		latd.conf.5
diff --git a/net/libnet-devel/Makefile b/net/libnet-devel/Makefile
index dd0c1c53985c..e7b1de29727d 100644
--- a/net/libnet-devel/Makefile
+++ b/net/libnet-devel/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A C library for creating IP packets (development version)
 CONFLICTS=	libnet-1.*
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/net/libnetdude/Makefile b/net/libnetdude/Makefile
index 9be1fd4a8f35..ed1b19a3c7ac 100644
--- a/net/libnetdude/Makefile
+++ b/net/libnetdude/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	pcapnav.0:${PORTSDIR}/net/libpcapnav
 
 USE_INC_LIBTOOL_VER=	13
 USE_GNOME=	glib12
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--disable-gtk-doc --with-html-dir=${DOCSDIR}
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
diff --git a/net/librsync/Makefile b/net/librsync/Makefile
index a652b5479ab3..1868e79619e8 100644
--- a/net/librsync/Makefile
+++ b/net/librsync/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/bzip2
 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="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--enable-shared --disable-trace
diff --git a/net/linux-ymessenger/Makefile b/net/linux-ymessenger/Makefile
index 4a3b94116434..2d58e7c4ff0f 100644
--- a/net/linux-ymessenger/Makefile
+++ b/net/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/micq/Makefile b/net/micq/Makefile
index 091fbb1b8f1f..d2b002c8e31b 100644
--- a/net/micq/Makefile
+++ b/net/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/minisapserver/Makefile b/net/minisapserver/Makefile
index 687e4c42b701..d0c1cdffff72 100644
--- a/net/minisapserver/Makefile
+++ b/net/minisapserver/Makefile
@@ -16,7 +16,7 @@ COMMENT=	SAP and SLP announcement for the VLC Media Player
 
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
 MAN1=		sapserver.1
 PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README
diff --git a/net/mutella/Makefile b/net/mutella/Makefile
index 5dc3a2c159d6..ff2762f26c3e 100644
--- a/net/mutella/Makefile
+++ b/net/mutella/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A command line Gnutella client
 MAN1=		mutella.1
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
diff --git a/net/naim/Makefile b/net/naim/Makefile
index a251f94d4d1b..7ceda9406059 100644
--- a/net/naim/Makefile
+++ b/net/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/nast/Makefile b/net/nast/Makefile
index 52e926a9ef29..ee0889a0cdaf 100644
--- a/net/nast/Makefile
+++ b/net/nast/Makefile
@@ -23,7 +23,7 @@ LIBNET_CONFIG?=	${LOCALBASE}/bin/libnet-config
 MAN8=		nast.8
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	LIBS="${PTHREAD_LIBS}"
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
diff --git a/net/nc6/Makefile b/net/nc6/Makefile
index a62c48fdd449..dd30331ddd81 100644
--- a/net/nc6/Makefile
+++ b/net/nc6/Makefile
@@ -20,7 +20,7 @@ USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET=	--target=${ARCH}-unknown-freebsd${OSREL}
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index d19052d56565..d91cf38761c1 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -46,7 +46,7 @@ PLIST_SUB+=		TIMELORD=""
 PLIST_SUB+=		TIMELORD="@comment "
 .endif
 USE_LIBTOOL_VER=15
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
 USE_PERL5=	yes
 FILES=		AppleVolumes.default AppleVolumes.system afpd.conf \
diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index d528eda1ed5f..382f174a3a32 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -32,7 +32,7 @@ USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 PLIST_SUB+=	DBDIR=${DBDIR} \
 		SHLIB=${PORTVERSION:S/.p/pre/}
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--localstatedir=${DBDIR} \
 		--with-ossl-root=${OPENSSLBASE} \
 		--with-gdbm-root=${LOCALBASE} \
diff --git a/net/nylon/Makefile b/net/nylon/Makefile
index ba14ee9d1244..4bb76b057dba 100644
--- a/net/nylon/Makefile
+++ b/net/nylon/Makefile
@@ -21,7 +21,7 @@ RC_SCRIPTS_SUB=PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
 
 GNU_CONFIGURE=	yes
 # Necessary for $PREFIX to work:
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-libevent=${LOCALBASE}
 
 MAN1=		nylon.1
diff --git a/net/opendchub/Makefile b/net/opendchub/Makefile
index 4f8bf841038c..418101c52d92 100644
--- a/net/opendchub/Makefile
+++ b/net/opendchub/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Unofficial Unix version of the Direct Connect Hub software
 USE_PERL5=	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="-I${LOCALBASE}/include"
 
 post-install:
diff --git a/net/openldap21-server/Makefile b/net/openldap21-server/Makefile
index 5e3b57287a47..d87faeb89978 100644
--- a/net/openldap21-server/Makefile
+++ b/net/openldap21-server/Makefile
@@ -232,7 +232,7 @@ CPPFLAGS+=		${PTHREAD_CFLAGS} \
 LDFLAGS+=		-L${LOCALBASE}/lib
 #LIBS+=			${PTHREAD_LIBS}
 
-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/net/openldap22-server/Makefile b/net/openldap22-server/Makefile
index 7ce479d6c627..9fb728906ee4 100644
--- a/net/openldap22-server/Makefile
+++ b/net/openldap22-server/Makefile
@@ -304,7 +304,7 @@ CPPFLAGS+=		${PTHREAD_CFLAGS} \
 LDFLAGS+=		-L${LOCALBASE}/lib
 #LIBS+=			${PTHREAD_LIBS}
 
-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/net/openslp/Makefile b/net/openslp/Makefile
index 2dee603b7a09..46374cf75436 100644
--- a/net/openslp/Makefile
+++ b/net/openslp/Makefile
@@ -22,7 +22,7 @@ USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/openslp \
 		--localstatedir=/var
-CONFIGURE_TARGET=	--target=${ARCH}-unknown-freebsd${OSREL}
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 .if defined(WITH_SLP_SECURITY)
 CONFIGURE_ARGS+=	--enable-slpv2-security
diff --git a/net/poink/Makefile b/net/poink/Makefile
index 5692fea1a38e..792dcf722b1c 100644
--- a/net/poink/Makefile
+++ b/net/poink/Makefile
@@ -16,8 +16,8 @@ COMMENT=	Nosuid, secure ping like utility
 
 USE_ZIP=	yes
 
-.if ${ARCH} == "sparc64"
-BROKEN=		"Hostname resolution broken on ${ARCH}"
+.if ${MACHINE_ARCH} == "sparc64"
+BROKEN=		"Hostname resolution broken on ${MACHINE_ARCH}"
 .endif
 
 MAN1=		poink.1
diff --git a/net/pork/Makefile b/net/pork/Makefile
index 5ba0ce7da7ee..5fd6657cbd43 100644
--- a/net/pork/Makefile
+++ b/net/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/portfwd/Makefile b/net/portfwd/Makefile
index 0a8e01768ef1..1b6104cf3d55 100644
--- a/net/portfwd/Makefile
+++ b/net/portfwd/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ale@FreeBSD.org
 COMMENT=	A Port Forwarding Daemon
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 
diff --git a/net/rrdtool/Makefile b/net/rrdtool/Makefile
index fda0e1a848d8..501cf6d0ebba 100644
--- a/net/rrdtool/Makefile
+++ b/net/rrdtool/Makefile
@@ -23,7 +23,7 @@ INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-shared --enable-local-zlib \
 		--program-transform-name=''
 CONFIGURE_ENV=	PERL=${PERL}
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib -fPIC
 LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS:=	${CFLAGS:N-ffast-math}
diff --git a/net/rrdtool10/Makefile b/net/rrdtool10/Makefile
index fda0e1a848d8..501cf6d0ebba 100644
--- a/net/rrdtool10/Makefile
+++ b/net/rrdtool10/Makefile
@@ -23,7 +23,7 @@ INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-shared --enable-local-zlib \
 		--program-transform-name=''
 CONFIGURE_ENV=	PERL=${PERL}
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib -fPIC
 LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS:=	${CFLAGS:N-ffast-math}
diff --git a/net/rsync/Makefile b/net/rsync/Makefile
index 12ef8aca05f4..7ac45e1893cc 100644
--- a/net/rsync/Makefile
+++ b/net/rsync/Makefile
@@ -31,7 +31,7 @@ GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--disable-debug \
 		--with-rsyncd-conf=${PREFIX}/etc/rsyncd.conf
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 .if defined(WITH_POPT_PORT)
 CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include" \
diff --git a/net/samba3/Makefile b/net/samba3/Makefile
index 19d031dbc982..56b950c24abf 100644
--- a/net/samba3/Makefile
+++ b/net/samba3/Makefile
@@ -43,7 +43,7 @@ SAMBA_CONFIG=		${SAMBA_CONFDIR}/smb.conf
 CONFIGURE_ENV+=		CPPFLAGS=-I${LOCALBASE}/include \
 			LDFLAGS=-L${LOCALBASE}/lib
 
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 CONFIGURE_ARGS+=	--exec-prefix=${PREFIX} \
 			--localstatedir=${VARDIR} \
diff --git a/net/serveez/Makefile b/net/serveez/Makefile
index dab760e236c3..cbf71296e66b 100644
--- a/net/serveez/Makefile
+++ b/net/serveez/Makefile
@@ -27,7 +27,7 @@ USE_GETOPT_LONG=	yes
 USE_GMAKE=	yes
 USE_INC_LIBTOOL_VER=13
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
-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/net/silc-client/Makefile b/net/silc-client/Makefile
index fcad1dde7571..3b43de970939 100644
--- a/net/silc-client/Makefile
+++ b/net/silc-client/Makefile
@@ -31,7 +31,7 @@ COMMENT=	Secure Internet Live Conferencing (SILC) network client
 USE_BZIP2=	yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GNOME=	glib12
 #USE_LIBTOOL=	yes
 USE_GMAKE=	yes
diff --git a/net/silky/Makefile b/net/silky/Makefile
index 4171258c3de4..df38e3fc9b77 100644
--- a/net/silky/Makefile
+++ b/net/silky/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	silcclient-1.0.3:${PORTSDIR}/devel/silc-toolkit
 RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-silc-include=${LOCALBASE}/include/silc \
 		--with-silc-libs=${LOCALBASE}/lib \
 		--with-docdir=${DOCSDIR} \
diff --git a/net/simicq/Makefile b/net/simicq/Makefile
index 5ac248441341..588d8466f5a8 100644
--- a/net/simicq/Makefile
+++ b/net/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
diff --git a/net/socat/Makefile b/net/socat/Makefile
index 2643320916ed..b6a7236dcb1f 100644
--- a/net/socat/Makefile
+++ b/net/socat/Makefile
@@ -18,7 +18,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R:R}
 USE_BZIP2=	yes
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 MAKE_ARGS=	CCOPT="${CFLAGS}"
 
 .if defined(WITHOUT_SSL)
diff --git a/net/tac_plus4/Makefile b/net/tac_plus4/Makefile
index 7acfd86a9a97..352bac6b6bae 100644
--- a/net/tac_plus4/Makefile
+++ b/net/tac_plus4/Makefile
@@ -18,7 +18,7 @@ USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
 USE_RC_SUBR=	yes
 USE_REINPLACE=	yes
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN5=		tac_plus.conf.5
 MAN8=		tac_plus.8 tac_pwd.8
diff --git a/net/tacshell/Makefile b/net/tacshell/Makefile
index bd7cbd83b4cc..ba81792ea217 100644
--- a/net/tacshell/Makefile
+++ b/net/tacshell/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	krion@FreeBSD.org
 COMMENT=	Shell authentication for TACACS+ protocol
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 PORTDOCS=	README WHATSNEW ChangeLog
 PLIST_FILES=	bin/tacshell etc/tacshell.conf.sample
diff --git a/net/tcpstat/Makefile b/net/tcpstat/Makefile
index d2a52ad0e633..8ecacda0db8e 100644
--- a/net/tcpstat/Makefile
+++ b/net/tcpstat/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A program to report various network statistics
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=		tcpstat.1 tcpprof.1
 DOCS=		AUTHORS ChangeLog LICENSE README doc/Tips_and_Tricks.txt 
diff --git a/net/trickle/Makefile b/net/trickle/Makefile
index ebefd6adfcfb..19c4e2e21835 100644
--- a/net/trickle/Makefile
+++ b/net/trickle/Makefile
@@ -21,7 +21,7 @@ INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS+=--with-libevent=${LOCALBASE}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=		trickle.1
 MAN5=		trickled.conf.5
diff --git a/net/tridiavnc/Makefile b/net/tridiavnc/Makefile
index c471121065e8..8e94735471ca 100644
--- a/net/tridiavnc/Makefile
+++ b/net/tridiavnc/Makefile
@@ -26,8 +26,8 @@ XFREE86_HTML_MAN=	no
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} != i386
-BROKEN=		"Does not compile on ${ARCH}"
+.if ${MACHINE_ARCH} != i386
+BROKEN=		"Does not compile on ${MACHINE_ARCH}"
 .endif
 
 post-patch:
diff --git a/net/uplog/Makefile b/net/uplog/Makefile
index 127fb282dba5..b0cb79ed3bf2 100644
--- a/net/uplog/Makefile
+++ b/net/uplog/Makefile
@@ -18,7 +18,7 @@ USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 PORTDOCS=	README
 PLIST_FILES=	bin/uplog
diff --git a/net/valknut/Makefile b/net/valknut/Makefile
index 3d96942f59c6..a40deb89bd2a 100644
--- a/net/valknut/Makefile
+++ b/net/valknut/Makefile
@@ -26,7 +26,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libdc=${LOCALBASE} \
 		--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
 
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/-O2//g; s/-lpthread/${PTHREAD_LIBS}/g' \
diff --git a/net/vomit/Makefile b/net/vomit/Makefile
index 7c5e55ff0c0f..22d5c90da7e1 100644
--- a/net/vomit/Makefile
+++ b/net/vomit/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent \
 
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/net/wol/Makefile b/net/wol/Makefile
index 7ab36af7dcef..7c30845bc4de 100644
--- a/net/wol/Makefile
+++ b/net/wol/Makefile
@@ -23,7 +23,7 @@ USE_ICONV=		yes
 CPPFLAGS=		-I${LOCALBASE}/include
 LDFLAGS=		-L${LOCALBASE}/lib
 CONFIGURE_ENV=		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 INFO=		wol
 DOCS=		AUTHORS NEWS README TODO