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

after 5.4-RELEASE.

32 files changed, 32 insertions, 32 deletions

diff --git a/databases/courier-authlib-mysql/Makefile b/databases/courier-authlib-mysql/Makefile
index 96eb0a2976ab..902b25be6031 100644
--- a/databases/courier-authlib-mysql/Makefile
+++ b/databases/courier-authlib-mysql/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/databases/courier-authlib-pgsql/Makefile b/databases/courier-authlib-pgsql/Makefile
index 96eb0a2976ab..902b25be6031 100644
--- a/databases/courier-authlib-pgsql/Makefile
+++ b/databases/courier-authlib-pgsql/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/databases/courier-authlib-userdb/Makefile b/databases/courier-authlib-userdb/Makefile
index 96eb0a2976ab..902b25be6031 100644
--- a/databases/courier-authlib-userdb/Makefile
+++ b/databases/courier-authlib-userdb/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/databases/courier-authlib-usergdbm/Makefile b/databases/courier-authlib-usergdbm/Makefile
index 96eb0a2976ab..902b25be6031 100644
--- a/databases/courier-authlib-usergdbm/Makefile
+++ b/databases/courier-authlib-usergdbm/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/databases/db3/Makefile b/databases/db3/Makefile
index 66a63c97e59b..1e189ac6f3f5 100644
--- a/databases/db3/Makefile
+++ b/databases/db3/Makefile
@@ -33,7 +33,7 @@ CONFIGURE_ARGS=		--enable-compat185 \
 			--enable-dynamic \
 			--prefix=${PREFIX} \
 			--includedir=${PREFIX}/include/db3
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALL_TARGET=		install_include install_lib install_utilities
 .if !defined(NOPORTDOCS)
 INSTALL_TARGET+=	install_docs docdir=${DOCSDIR}
diff --git a/databases/db4/Makefile b/databases/db4/Makefile
index 427d069268b4..fed7092819e9 100644
--- a/databases/db4/Makefile
+++ b/databases/db4/Makefile
@@ -22,7 +22,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	../dist/configure
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-compat185 --enable-dump185 \
 		--enable-cxx --enable-dynamic \
 		--includedir=${PREFIX}/include/db4
diff --git a/databases/db41/Makefile b/databases/db41/Makefile
index b0864665bf9a..49767b36f05d 100644
--- a/databases/db41/Makefile
+++ b/databases/db41/Makefile
@@ -26,7 +26,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	../dist/configure
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-compat185 --enable-dump185 \
 		--enable-cxx --enable-dynamic \
 		--includedir=${PREFIX}/include/db41
diff --git a/databases/dbconnect/Makefile b/databases/dbconnect/Makefile
index f89801d2cbe5..ea3d5ac9aeaf 100644
--- a/databases/dbconnect/Makefile
+++ b/databases/dbconnect/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Use C++ object API to allow applications to connect to databases
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_AUTOCONF_VER=	259
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 
 CXXFLAGS+=	${PTHREAD_CFLAGS} -fPIC -DFREEBSD
diff --git a/databases/gdbm/Makefile b/databases/gdbm/Makefile
index 122f10341572..b150bab27b24 100644
--- a/databases/gdbm/Makefile
+++ b/databases/gdbm/Makefile
@@ -17,7 +17,7 @@ COMMENT=	The GNU database manager
 
 USE_GMAKE=	yes
 USE_INC_LIBTOOL_VER=	13
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 
 .if defined(WITH_COMPAT)
diff --git a/databases/gigabase/Makefile b/databases/gigabase/Makefile
index 50ae608c469d..05dd6e2953d0 100644
--- a/databases/gigabase/Makefile
+++ b/databases/gigabase/Makefile
@@ -17,7 +17,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_GMAKE=	yes
 USE_LIBTOOL_VER=	15
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS?=--prefix=${LOCALBASE}
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
 INSTALLS_SHLIB=	yes
diff --git a/databases/gnome-db/Makefile b/databases/gnome-db/Makefile
index cb0522d38b06..385a1d093608 100644
--- a/databases/gnome-db/Makefile
+++ b/databases/gnome-db/Makefile
@@ -25,7 +25,7 @@ USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -lintl"
-CONFIGURE_TARGET=	--target=${ARCH}-unknown-freebsd${OSREL}
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 PLIST_SUB=	VERSION=${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/databases/gnomedb/Makefile b/databases/gnomedb/Makefile
index cb0522d38b06..385a1d093608 100644
--- a/databases/gnomedb/Makefile
+++ b/databases/gnomedb/Makefile
@@ -25,7 +25,7 @@ USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -lintl"
-CONFIGURE_TARGET=	--target=${ARCH}-unknown-freebsd${OSREL}
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 PLIST_SUB=	VERSION=${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/databases/hk_classes/Makefile b/databases/hk_classes/Makefile
index 5efae94e6656..e854530f2efa 100644
--- a/databases/hk_classes/Makefile
+++ b/databases/hk_classes/Makefile
@@ -23,7 +23,7 @@ USE_PYTHON=	yes
 CXXFLAGS+=	${PTHREAD_CFLAGS}
 CONFIGURE_ENV+=	LIBPYTHON="-l${PYTHON_VERSION} ${PTHREAD_LIBS}" \
 		LDFLAGS="${PTHREAD_LIBS} -largp -L${LOCALBASE}/lib"
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL_VER=	15
diff --git a/databases/knoda/Makefile b/databases/knoda/Makefile
index 619ff12bc63b..18da2b219634 100644
--- a/databases/knoda/Makefile
+++ b/databases/knoda/Makefile
@@ -25,7 +25,7 @@ INSTALLS_SHLIB=		yes
 USE_INC_LIBTOOL_VER=	13
 USE_REINPLACE=		yes
 CONFIGURE_TARGET=
-CONFIGURE_ARGS+=	--build=${ARCH}-portbld-freebsd${OSREL} \
+CONFIGURE_ARGS+=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \
 		--with-hk_classes-dir=${LOCALBASE}/lib/hk_classes \
 		--with-hk_classes-incdir=${LOCALBASE}/include/hk_classes
 
diff --git a/databases/libgda/Makefile b/databases/libgda/Makefile
index 967a41795679..2d79d522a229 100644
--- a/databases/libgda/Makefile
+++ b/databases/libgda/Makefile
@@ -28,7 +28,7 @@ USE_INC_LIBTOOL_VER=	13
 CONFIGURE_ARGS=	--disable-gtk-doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lintl -lgdbm"
-CONFIGURE_TARGET=	--target=${ARCH}-unknown-freebsd${OSREL}
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 PLIST_SUB=	VERSION=${PORTVERSION}
 
 post-patch:
diff --git a/databases/mysql-navigator/Makefile b/databases/mysql-navigator/Makefile
index 39eb4034207d..2e1df2a8777d 100644
--- a/databases/mysql-navigator/Makefile
+++ b/databases/mysql-navigator/Makefile
@@ -25,7 +25,7 @@ GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ARGS+=--with-mysql-includes=${LOCALBASE}/include/mysql \
 		--with-mysql-libraries=${LOCALBASE}/lib/mysql
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV+=	MOC="${MOC}" QTDIR="${X11BASE}"
 MAKE_ENV+=	MOC="${MOC}" QTDIR="${X11BASE}"
 
diff --git a/databases/mysql323-server/Makefile b/databases/mysql323-server/Makefile
index d0b3e1ab4be5..d771a83565b5 100644
--- a/databases/mysql323-server/Makefile
+++ b/databases/mysql323-server/Makefile
@@ -24,7 +24,7 @@ USE_REINPLACE=	yes
 USE_RC_SUBR=	mysql-server.sh
 .endif
 
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
 		--without-debug \
 		--without-readline \
diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile
index fb869a14bacb..7c97b75a86a9 100644
--- a/databases/mysql40-server/Makefile
+++ b/databases/mysql40-server/Makefile
@@ -24,7 +24,7 @@ USE_REINPLACE=	yes
 USE_RC_SUBR=	mysql-server.sh
 .endif
 
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
 		--without-debug \
 		--without-readline \
diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile
index 66a269cefc83..f3be1a14418d 100644
--- a/databases/mysql41-server/Makefile
+++ b/databases/mysql41-server/Makefile
@@ -24,7 +24,7 @@ USE_REINPLACE=	yes
 USE_RC_SUBR=	mysql-server.sh
 .endif
 
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
 		--without-debug \
 		--without-readline \
diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile
index 60ffb43d3df0..3f19a191c06d 100644
--- a/databases/mysql50-server/Makefile
+++ b/databases/mysql50-server/Makefile
@@ -26,7 +26,7 @@ USE_REINPLACE=	yes
 USE_RC_SUBR=	mysql-server.sh
 .endif
 
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
 		--without-debug \
 		--without-readline \
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index 60ffb43d3df0..3f19a191c06d 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -26,7 +26,7 @@ USE_REINPLACE=	yes
 USE_RC_SUBR=	mysql-server.sh
 .endif
 
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
 		--without-debug \
 		--without-readline \
diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile
index 60ffb43d3df0..3f19a191c06d 100644
--- a/databases/mysql54-server/Makefile
+++ b/databases/mysql54-server/Makefile
@@ -26,7 +26,7 @@ USE_REINPLACE=	yes
 USE_RC_SUBR=	mysql-server.sh
 .endif
 
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
 		--without-debug \
 		--without-readline \
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 60ffb43d3df0..3f19a191c06d 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -26,7 +26,7 @@ USE_REINPLACE=	yes
 USE_RC_SUBR=	mysql-server.sh
 .endif
 
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
 		--without-debug \
 		--without-readline \
diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile
index 60ffb43d3df0..3f19a191c06d 100644
--- a/databases/mysql60-server/Makefile
+++ b/databases/mysql60-server/Makefile
@@ -26,7 +26,7 @@ USE_REINPLACE=	yes
 USE_RC_SUBR=	mysql-server.sh
 .endif
 
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
 		--without-debug \
 		--without-readline \
diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index 60ffb43d3df0..3f19a191c06d 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -26,7 +26,7 @@ USE_REINPLACE=	yes
 USE_RC_SUBR=	mysql-server.sh
 .endif
 
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
 		--without-debug \
 		--without-readline \
diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index fda0e1a848d8..501cf6d0ebba 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/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/databases/rrdtool10/Makefile b/databases/rrdtool10/Makefile
index fda0e1a848d8..501cf6d0ebba 100644
--- a/databases/rrdtool10/Makefile
+++ b/databases/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/databases/sqlite2/Makefile b/databases/sqlite2/Makefile
index 659acd84cb8c..41e56068643e 100644
--- a/databases/sqlite2/Makefile
+++ b/databases/sqlite2/Makefile
@@ -60,7 +60,7 @@ USE_LIBTOOL_VER=	13
 GNU_CONFIGURE=	YES
 USE_REINPLACE=	YES
 CONFIGURE_ARGS=	--prefix=${PREFIX} --with-hints=freebsd.hints
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 ALL_TARGET=	all
 #.if defined(WITH_TCL)
 #ALL_TARGET+=	libtclsqlite.la
diff --git a/databases/sqlite3/Makefile b/databases/sqlite3/Makefile
index a0ba5c2e77a5..5e887bc8ddba 100644
--- a/databases/sqlite3/Makefile
+++ b/databases/sqlite3/Makefile
@@ -54,7 +54,7 @@ USE_LIBTOOL_VER=	13
 GNU_CONFIGURE=	YES
 USE_REINPLACE=	YES
 CONFIGURE_ARGS=	--prefix=${PREFIX} --with-hints=freebsd.hints
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 ALL_TARGET=	all
 
 INSTALLS_SHLIB=	YES
diff --git a/databases/sqlite34/Makefile b/databases/sqlite34/Makefile
index a0ba5c2e77a5..5e887bc8ddba 100644
--- a/databases/sqlite34/Makefile
+++ b/databases/sqlite34/Makefile
@@ -54,7 +54,7 @@ USE_LIBTOOL_VER=	13
 GNU_CONFIGURE=	YES
 USE_REINPLACE=	YES
 CONFIGURE_ARGS=	--prefix=${PREFIX} --with-hints=freebsd.hints
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 ALL_TARGET=	all
 
 INSTALLS_SHLIB=	YES
diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile
index ff425cf410b5..06b061d978d5 100644
--- a/databases/sqlrelay/Makefile
+++ b/databases/sqlrelay/Makefile
@@ -31,7 +31,7 @@ CONFIGURE_ARGS=		${SQLRELAY_CONFIGURE_ARGS} \
 			--disable-python \
 			--disable-ruby \
 			--disable-zope
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 
 .include "${.CURDIR}/Makefile.common"
diff --git a/databases/xbsql/Makefile b/databases/xbsql/Makefile
index 23fd9f9e11a6..d4eef2874089 100644
--- a/databases/xbsql/Makefile
+++ b/databases/xbsql/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	xbase-2.0.0:${PORTSDIR}/databases/xbase
 
 USE_BISON=	yes
 USE_INC_LIBTOOL_VER=	13
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes