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

after 5.4-RELEASE.

45 files changed, 45 insertions, 45 deletions

diff --git a/mail/anubis/Makefile b/mail/anubis/Makefile
index e57f8e038fa6..2a7f71e77d8a 100644
--- a/mail/anubis/Makefile
+++ b/mail/anubis/Makefile
@@ -30,7 +30,7 @@ COMMENT=		Outgoing SMTP mail processor
 USE_REINPLACE=		yes
 USE_GETOPT_LONG=	yes
 GNU_CONFIGURE=		yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=		MAKEINFO="makeinfo --no-split" LDFLAGS="${LDFLAGS}" \
 			CFLAGS="${CFLAGS}" CPPFLAGS="${CFLAGS}"
 LDFLAGS+=		-L${LOCALBASE}/lib
diff --git a/mail/bbmail/Makefile b/mail/bbmail/Makefile
index e4fe206ee686..b59e7a320d30 100644
--- a/mail/bbmail/Makefile
+++ b/mail/bbmail/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A tool intended for Blackbox that checks for new mail
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=		bbmail.1
 PLIST_FILES=	bin/bbmail share/bbtools/bbmail.bb
diff --git a/mail/bincimap/Makefile b/mail/bincimap/Makefile
index 92b81541d853..d18fd38822c4 100644
--- a/mail/bincimap/Makefile
+++ b/mail/bincimap/Makefile
@@ -24,7 +24,7 @@ COMMENT=	Light-weight IMAP server for Maildir
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--sysconfdir=${CONFDIR}
 CONFDIR=	${PREFIX}/etc/${PORTNAME}
 
diff --git a/mail/bogofilter-current/Makefile b/mail/bogofilter-current/Makefile
index 45101502b6df..cf2aedea2365 100644
--- a/mail/bogofilter-current/Makefile
+++ b/mail/bogofilter-current/Makefile
@@ -37,7 +37,7 @@ CONFIGURE_ARGS+=	--with-included-gsl
 CONFIGURE_ENV?=	CPPFLAGS="-I${LOCALBASE}/include/db42" \
 		LDFLAGS="-L${LOCALBASE}/lib" LIBS="-ldb-4.2"
 CONFIGURE_ENV+=	PERL="${PERL}"
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALL_TARGET=	install-strip prefix=${PREFIX}
 
 MAN1=		bogofilter.1 bogoutil.1 bogoupgrade.1 bogolexer.1 bogotune.1
diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
index 45101502b6df..cf2aedea2365 100644
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -37,7 +37,7 @@ CONFIGURE_ARGS+=	--with-included-gsl
 CONFIGURE_ENV?=	CPPFLAGS="-I${LOCALBASE}/include/db42" \
 		LDFLAGS="-L${LOCALBASE}/lib" LIBS="-ldb-4.2"
 CONFIGURE_ENV+=	PERL="${PERL}"
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALL_TARGET=	install-strip prefix=${PREFIX}
 
 MAN1=		bogofilter.1 bogoutil.1 bogoupgrade.1 bogolexer.1 bogotune.1
diff --git a/mail/cone/Makefile b/mail/cone/Makefile
index da84a132322a..87f8a715c505 100644
--- a/mail/cone/Makefile
+++ b/mail/cone/Makefile
@@ -34,7 +34,7 @@ CONFIGURE_ARGS=	-C --without-db --prefix=${PREFIX} --exec-prefix=${PREFIX}
 
 CONFIGURE_ENV=	REHASH="${PERL} ${SCRIPTDIR}/c_rehash" LDFLAGS=-L${LOCALBASE}/lib \
 		CPPFLAGS=-I${LOCALBASE}/include
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 MAN1=		cone.1 leaf.1 mailtool.1
 INSTALL_TARGET=	install-strip
 
diff --git a/mail/courier-authlib-vchkpw/Makefile b/mail/courier-authlib-vchkpw/Makefile
index 96eb0a2976ab..902b25be6031 100644
--- a/mail/courier-authlib-vchkpw/Makefile
+++ b/mail/courier-authlib-vchkpw/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/mail/courier-authlib/Makefile b/mail/courier-authlib/Makefile
index 96eb0a2976ab..902b25be6031 100644
--- a/mail/courier-authlib/Makefile
+++ b/mail/courier-authlib/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/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 7ea384acb78c..b4d80a73214d 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -61,7 +61,7 @@ PLIST_SUB=	CONFDIR=${CONFDIR:S,^${PREFIX}/,,} \
 		USERDB=${USERDB:S,^${PREFIX}/,,} \
 		LIBEXECDIR=${LIBEXECDIR:S,^${PREFIX}/,,}
 
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--sysconfdir=${CONFDIR} \
 		--with-userdb=${USERDB} \
 		--datadir=${DATADIR} \
diff --git a/mail/courier/Makefile b/mail/courier/Makefile
index ee3bd65b9adb..2f9d56842b2e 100644
--- a/mail/courier/Makefile
+++ b/mail/courier/Makefile
@@ -73,7 +73,7 @@ CONFIGURE_ENV=	REHASH=${SCRIPTDIR}/c_rehash \
 		CPPFLAGS='${CPPFLAGS}' \
 		LDFLAGS='${LDFLAGS}'
 MAKE_ENV:=	${CONFIGURE_ENV}
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--disable-root-check --with-db=db \
 		--enable-syslog=1 --enable-use-flock \
 		--program-transform-name=s,^,, \
diff --git a/mail/crashecho/Makefile b/mail/crashecho/Makefile
index 2f9eccf0cb01..6b92678c8fe9 100644
--- a/mail/crashecho/Makefile
+++ b/mail/crashecho/Makefile
@@ -16,7 +16,7 @@ COMMENT=	An FTN JAM and *.MSG tosser
 LIB_DEPENDS=	jam.2:${PORTSDIR}/mail/jamlib
 
 USE_LIBTOOL_VER=	13
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=	crashecho.1 \
 	crashexport.1 \
diff --git a/mail/dovecot-devel/Makefile b/mail/dovecot-devel/Makefile
index 9ed102257819..359f2da2017f 100644
--- a/mail/dovecot-devel/Makefile
+++ b/mail/dovecot-devel/Makefile
@@ -20,7 +20,7 @@ USE_ICONV=	yes
 USE_RC_SUBR=	yes
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--without-shadow --with-pam --localstatedir=/var
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index 9ed102257819..359f2da2017f 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -20,7 +20,7 @@ USE_ICONV=	yes
 USE_RC_SUBR=	yes
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--without-shadow --with-pam --localstatedir=/var
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/mail/dspam-devel/Makefile b/mail/dspam-devel/Makefile
index 5f791ef8e690..7b232f212177 100644
--- a/mail/dspam-devel/Makefile
+++ b/mail/dspam-devel/Makefile
@@ -92,7 +92,7 @@ USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 .ifdef(GDBS)
 CFLAGS+=	-g -DDEBUG
diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index 1dfb3c74d5cb..c7028641dad8 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -89,7 +89,7 @@ USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 .ifdef(GDBS)
 CFLAGS+=	-g -DDEBUG
diff --git a/mail/esmtp/Makefile b/mail/esmtp/Makefile
index 15e2bc3b881e..cfe44bef2422 100644
--- a/mail/esmtp/Makefile
+++ b/mail/esmtp/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	esmtp.6:${PORTSDIR}/mail/libesmtp
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GETOPT_LONG=	yes
 USE_OPENSSL=	yes
 USE_REINPLACE=	yes
diff --git a/mail/faces/Makefile b/mail/faces/Makefile
index dd977de6f578..06cf76db4de4 100644
--- a/mail/faces/Makefile
+++ b/mail/faces/Makefile
@@ -30,7 +30,7 @@ WITH_AUDIO=	# none
 PLIST_SUB+=	X11=""
 USE_GNOME=	gnomehack gtk12
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I../compface -I${LOCALBASE}/include" \
 		LDFLAGS="-L../compface -L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--enable-imap --enable-pop \
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 7ed6a47e838e..3a556e82c09e 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -35,7 +35,7 @@ USE_PYTHON=	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_ARGS=	--enable-opie --enable-RPA --enable-POP2 --enable-SDPS \
 		--with-hesiod=no --enable-fallback=no
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/mail/filtermail/Makefile b/mail/filtermail/Makefile
index 07e51583e400..01f240b4b988 100644
--- a/mail/filtermail/Makefile
+++ b/mail/filtermail/Makefile
@@ -32,7 +32,7 @@ USE_GETOPT_LONG=	yes
 USE_BISON=	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}"
 
 MAN1=		filtermail.1
diff --git a/mail/gensig/Makefile b/mail/gensig/Makefile
index 4402078c9a3f..f3deabca8080 100644
--- a/mail/gensig/Makefile
+++ b/mail/gensig/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	arensb+freebsd-ports@ooblick.com
 COMMENT=	A random .signature generator
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 USE_GETOPT_LONG=	yes
 
diff --git a/mail/gmime/Makefile b/mail/gmime/Makefile
index 20cdf82ccc3a..221c2212625a 100644
--- a/mail/gmime/Makefile
+++ b/mail/gmime/Makefile
@@ -24,7 +24,7 @@ USE_LIBTOOL_VER=13
 CONFIGURE_ARGS+=--with-libiconv-prefix=${LOCALBASE}
 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}
 
 INSTALLS_SHLIB=	YES
 
diff --git a/mail/gnarwl/Makefile b/mail/gnarwl/Makefile
index 6ca4f26cc76c..4afaf3747443 100644
--- a/mail/gnarwl/Makefile
+++ b/mail/gnarwl/Makefile
@@ -23,7 +23,7 @@ USE_ICONV=	yes
 USE_OPENLDAP=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} --with-docdir=${DOCSDIR}
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN8=		damnit.8 gnarwl.8
 MANCOMPRESSED=	yes
diff --git a/mail/ifile/Makefile b/mail/ifile/Makefile
index c7edb792e63b..ab65533bd8ef 100644
--- a/mail/ifile/Makefile
+++ b/mail/ifile/Makefile
@@ -17,7 +17,7 @@ COMMENT=	An application of machine learning to e-mail filtering
 USE_GETOPT_LONG=yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 MAN1=		ifile.1
 
 .include <bsd.port.mk>
diff --git a/mail/isoqlog/Makefile b/mail/isoqlog/Makefile
index c8b1d1fc2071..853884ae6f58 100644
--- a/mail/isoqlog/Makefile
+++ b/mail/isoqlog/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ofsen@enderunix.org
 COMMENT=	A qmail, postfix, sendmail, exim MTA log analysis program
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
 
 post-install:
diff --git a/mail/isync/Makefile b/mail/isync/Makefile
index 5554201bfd4b..1c89d1ac57b8 100644
--- a/mail/isync/Makefile
+++ b/mail/isync/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Maintain local copies of remote IMAP folders w/synchronized flags
 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}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=		isync.1
diff --git a/mail/libesmtp/Makefile b/mail/libesmtp/Makefile
index f1fbdef4c48d..5320e5da3bd0 100644
--- a/mail/libesmtp/Makefile
+++ b/mail/libesmtp/Makefile
@@ -26,7 +26,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 # require-all-recipients (implied by enable-all) is required for Balsa
 CONFIGURE_ARGS=	--enable-all --disable-isoc
diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile
index 7d5ab0662e98..e789090978f3 100644
--- a/mail/libetpan/Makefile
+++ b/mail/libetpan/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A mail library
 USE_ICONV=	yes
 USE_OPENSSL=	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/mail/libspf-alt/Makefile b/mail/libspf-alt/Makefile
index 74d35a9982f2..de324b7ba758 100644
--- a/mail/libspf-alt/Makefile
+++ b/mail/libspf-alt/Makefile
@@ -26,7 +26,7 @@ CPPFLAGS+=		${PTHREAD_CFLAGS} \
 			-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
 
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=		CPPFLAGS="${CPPFLAGS}" \
 			LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=		--program-transform-name=s,^spf,spf_alt,
diff --git a/mail/libspf2-10/Makefile b/mail/libspf2-10/Makefile
index 7d9339a6a79c..81419234af42 100644
--- a/mail/libspf2-10/Makefile
+++ b/mail/libspf2-10/Makefile
@@ -18,6 +18,6 @@ INSTALLS_SHLIB=		yes
 GNU_CONFIGURE=		yes
 USE_LIBTOOL_VER=	15
 
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 .include <bsd.port.mk>
diff --git a/mail/libspf2/Makefile b/mail/libspf2/Makefile
index 7d9339a6a79c..81419234af42 100644
--- a/mail/libspf2/Makefile
+++ b/mail/libspf2/Makefile
@@ -18,6 +18,6 @@ INSTALLS_SHLIB=		yes
 GNU_CONFIGURE=		yes
 USE_LIBTOOL_VER=	15
 
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 .include <bsd.port.mk>
diff --git a/mail/libsrs2/Makefile b/mail/libsrs2/Makefile
index f6c554da9e32..bb65c3151185 100644
--- a/mail/libsrs2/Makefile
+++ b/mail/libsrs2/Makefile
@@ -18,6 +18,6 @@ INSTALLS_SHLIB=		yes
 GNU_CONFIGURE=		yes
 USE_LIBTOOL_VER=	15
 
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 .include <bsd.port.mk>
diff --git a/mail/lmtpd/Makefile b/mail/lmtpd/Makefile
index bfa0f35110b2..788d7d7531a8 100644
--- a/mail/lmtpd/Makefile
+++ b/mail/lmtpd/Makefile
@@ -68,7 +68,7 @@ CONFIGURE_ARGS+=	--without-db4
 GNU_CONFIGURE=	YES
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
 CONFIGURE_ARGS+=	--without-perl
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN8=		lmtpd.8
 DOCS=		NEWS README TODO
diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index fa4b270a97a9..e9bb820b88dd 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -33,7 +33,7 @@ CONFIGURE_ARGS=	--enable-syslog=1 \
 		--enable-use-flock=1 \
 		--with-etcdir="${PREFIX}/etc" \
 		--enable-maildirquota
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
diff --git a/mail/masqmail-devel/Makefile b/mail/masqmail-devel/Makefile
index 64bbd481d2db..45daf45260db 100644
--- a/mail/masqmail-devel/Makefile
+++ b/mail/masqmail-devel/Makefile
@@ -22,7 +22,7 @@ GNU_CONFIGURE=	yes
 CFLAGS+=	-Wno-trigraphs
 CONFIGURE_ARGS+=	--mandir=${PREFIX}/man --with-user=mailnull --with-group=mail \
 		--with-confdir=${PREFIX}/etc/masqmail --with-logdir=/var/log/masqmail
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 .if defined(WITH_LIBCRYPTO)
 CONFIGURE_ARGS+=	--with-libcrypto
diff --git a/mail/milter-greylist-devel/Makefile b/mail/milter-greylist-devel/Makefile
index f79a35755e63..c123517e15ce 100644
--- a/mail/milter-greylist-devel/Makefile
+++ b/mail/milter-greylist-devel/Makefile
@@ -22,7 +22,7 @@ CFLAGS+=	${PTHREAD_CFLAGS}
 LIBS+=		${PTHREAD_LIBS}
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=	--with-user=smmsp
 CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LIBS="${LIBS}"
 
diff --git a/mail/milter-greylist/Makefile b/mail/milter-greylist/Makefile
index 2db5976de312..7860bd8a8d55 100644
--- a/mail/milter-greylist/Makefile
+++ b/mail/milter-greylist/Makefile
@@ -19,7 +19,7 @@ MAN5=		greylist.conf.5
 MAN8=		milter-greylist.8
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=	--with-user=smmsp
 CFLAGS+=	${PTHREAD_CFLAGS}
 LIBS+=		${PTHREAD_LIBS}
diff --git a/mail/milter-spamc/Makefile b/mail/milter-spamc/Makefile
index f634dd3ecad0..beb67376c51e 100644
--- a/mail/milter-spamc/Makefile
+++ b/mail/milter-spamc/Makefile
@@ -50,7 +50,7 @@ LDFLAGS+=	${PTHREAD_LIBS}
 DOCS=		CHANGES.TXT index.shtml style.css mailto.js \
 		LICENSE.TXT
 
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS+=--localstatedir=/var/spool
 .if !defined(WITH_DEBUG)
diff --git a/mail/msmtp/Makefile b/mail/msmtp/Makefile
index dfeda6877f0a..1f0c93adde0b 100644
--- a/mail/msmtp/Makefile
+++ b/mail/msmtp/Makefile
@@ -20,7 +20,7 @@ USE_GETOPT_LONG=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}
 MAN1=		msmtp.1
 PLIST_FILES=	bin/msmtp
 
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 6fa634f1e60c..a5555c38f88f 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -36,7 +36,7 @@ BUILD_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell
 RUN_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell \
 		urlview:${PORTSDIR}/textproc/urlview
 .endif
-.if ${ARCH} != "alpha"
+.if ${MACHINE_ARCH} != "alpha"
 #  coredump in sgmls
 WITH_SGML_DOCS?=yes
 .endif
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile
index 6fa634f1e60c..a5555c38f88f 100644
--- a/mail/mutt14/Makefile
+++ b/mail/mutt14/Makefile
@@ -36,7 +36,7 @@ BUILD_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell
 RUN_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell \
 		urlview:${PORTSDIR}/textproc/urlview
 .endif
-.if ${ARCH} != "alpha"
+.if ${MACHINE_ARCH} != "alpha"
 #  coredump in sgmls
 WITH_SGML_DOCS?=yes
 .endif
diff --git a/mail/renattach/Makefile b/mail/renattach/Makefile
index 5bd32f254c71..0881b434fd47 100644
--- a/mail/renattach/Makefile
+++ b/mail/renattach/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Rename or remove certain attachments or kill entire messages
 
 USE_GETOPT_LONG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=		renattach.1
 PORTDOCS=	INSTALL
diff --git a/mail/spamguard/Makefile b/mail/spamguard/Makefile
index 2452dc315e0e..40f5977b3b63 100644
--- a/mail/spamguard/Makefile
+++ b/mail/spamguard/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	ofsen@enderunix.org
 COMMENT=	MTA spam prevention program for qmail/postfix/sendmail
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index 93138ca194e1..38cce6912064 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -72,7 +72,7 @@ CACHEOWNER?=	bin
 
 # End of user variables
 
-CONFIGURE_TARGET=	--build=${ARCH}-unknown-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 USE_PERL5=	YES
 HAS_CONFIGURE=	YES
 USE_BZIP2=	YES
diff --git a/mail/tpop3d/Makefile b/mail/tpop3d/Makefile
index 8de480128b6c..3b536a71b86a 100644
--- a/mail/tpop3d/Makefile
+++ b/mail/tpop3d/Makefile
@@ -21,7 +21,7 @@ CONFIGURE_ARGS=	--enable-auth-other \
 		--enable-tcp-wrappers \
 		--enable-tls \
 		--with-mailspool-directory=/var/mail
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 OPTIONS=	MYSQL		"Use MySQL authentication"			off \
 		PGSQL		"Use PgSQL authentication"			off \
diff --git a/mail/vqadmin/Makefile b/mail/vqadmin/Makefile
index 85d70b0a7fae..e62e89914029 100644
--- a/mail/vqadmin/Makefile
+++ b/mail/vqadmin/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	${LOCALBASE}/vpopmail/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail
 RUN_DEPENDS=	${LOCALBASE}/vpopmail/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail
 
 GNU_CONFIGURE=	YES
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_REINPLACE=	YES
 
 CGIBINDIR?=	www/cgi-bin-dist