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

after 5.4-RELEASE.

9 files changed, 10 insertions, 10 deletions

diff --git a/science/2dhf/Makefile b/science/2dhf/Makefile
index cd62ca647f77..c7ae2dba31a5 100644
--- a/science/2dhf/Makefile
+++ b/science/2dhf/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS=	lapack:${PORTSDIR}/math/lapack \
 
 .if defined(WITH_OPTIMIZED_FLAGS)
 FFLAGS+=	-O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -malign-double
-.if (${ARCH} == "i386")
+.if (${MACHINE_ARCH} == "i386")
 FFLAGS+=	-mfancy-math-387
 .endif # i386
 .endif
diff --git a/science/buddy/Makefile b/science/buddy/Makefile
index 4d71df88f79b..64e0e9f0ee02 100644
--- a/science/buddy/Makefile
+++ b/science/buddy/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	llwang@infor.org
 COMMENT=	A Binary Decision Diagram library
 
 USE_LIBTOOL_VER=15
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/science/chemtool/Makefile b/science/chemtool/Makefile
index 291b511a1542..4356204d86da 100644
--- a/science/chemtool/Makefile
+++ b/science/chemtool/Makefile
@@ -21,7 +21,7 @@ USE_GMAKE=	yes
 USE_AUTOCONF_VER=	259
 GNU_CONFIGURE=	yes
 CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libEMF
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CFLAGS+="${CFLAGS}" LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--enable-emf=yes --with-localedir=${PREFIX}
 
diff --git a/science/dft++/Makefile b/science/dft++/Makefile
index 145136a5eae8..547fc92ceca1 100644
--- a/science/dft++/Makefile
+++ b/science/dft++/Makefile
@@ -31,7 +31,7 @@ FFTW=		-lfftw
 
 .if defined(WITH_OPTIMIZED_FLAGS)
 OPTIMIZED_FLAGS+=	-O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -malign-double
-.if (${ARCH} == "i386")
+.if (${MACHINE_ARCH} == "i386")
 OPTIMIZED_FLAGS+=	-mcpu=i686 -march=i686 -mfancy-math-387 -mpreferred-stack-boundary=3
 .endif # i386
 .endif
diff --git a/science/getdp/Makefile b/science/getdp/Makefile
index 50aadc7e09ed..5eb15b67b45f 100644
--- a/science/getdp/Makefile
+++ b/science/getdp/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	fftw.2:${PORTSDIR}/math/fftw	\
 		lapack.3:${PORTSDIR}/math/lapack
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-fftw-prefix=${LOCALBASE}	\
 		--with-gsl-prefix=${LOCALBASE}
 
diff --git a/science/gromacs/Makefile b/science/gromacs/Makefile
index acad6dc1f13b..7397bc370bc5 100644
--- a/science/gromacs/Makefile
+++ b/science/gromacs/Makefile
@@ -25,11 +25,11 @@ RUN_DEPENDS=	${LOCALBASE}/mpich/bin/mpicc:${PORTSDIR}/net/mpich
 USE_GMAKE=	yes
 USE_LIBTOOL_VER=	15
 INSTALLS_SHLIB=	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=	--exec-prefix=${PREFIX}
 
-PLIST_SUB=	BUILD=${ARCH}-portbld-freebsd${OSREL}
+PLIST_SUB=	BUILD=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 .ifndef WITHOUT_FFTW
 .ifdef WITH_FLOAT
diff --git a/science/kmovisto/Makefile b/science/kmovisto/Makefile
index 1b2695cba89d..37ee5b9ae34a 100644
--- a/science/kmovisto/Makefile
+++ b/science/kmovisto/Makefile
@@ -20,7 +20,7 @@ USE_GL=		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}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/science/netcdf/Makefile b/science/netcdf/Makefile
index 3631bcf086b0..b907ef08a76a 100644
--- a/science/netcdf/Makefile
+++ b/science/netcdf/Makefile
@@ -20,7 +20,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/src
 CONFLICTS=	hdf-4.*
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-fPIC -DPIC -Df2cFortran"
 INSTALLS_SHLIB=	yes
 
diff --git a/science/netcdf4/Makefile b/science/netcdf4/Makefile
index 3631bcf086b0..b907ef08a76a 100644
--- a/science/netcdf4/Makefile
+++ b/science/netcdf4/Makefile
@@ -20,7 +20,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/src
 CONFLICTS=	hdf-4.*
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-fPIC -DPIC -Df2cFortran"
 INSTALLS_SHLIB=	yes