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

after 5.4-RELEASE.

43 files changed, 45 insertions, 45 deletions

diff --git a/security/barnyard/Makefile b/security/barnyard/Makefile
index 14fbe3e3b36c..b4551b9c4d7e 100644
--- a/security/barnyard/Makefile
+++ b/security/barnyard/Makefile
@@ -28,7 +28,7 @@ RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 DOCS=		AUTHORS COPYING LICENSE.QPL README docs/BUGS docs/ChangeLog \
 		docs/FAQ docs/INSTALL docs/NEWS docs/USAGE
diff --git a/security/beecrypt/Makefile b/security/beecrypt/Makefile
index 57d8bc59f2a3..90371caafa9e 100644
--- a/security/beecrypt/Makefile
+++ b/security/beecrypt/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	krion@FreeBSD.org
 COMMENT=	BeeCrypt is an open source cryptography library
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_LIBTOOL_VER=15
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
diff --git a/security/bro/Makefile b/security/bro/Makefile
index aaae8ca4b920..889d92229ff5 100644
--- a/security/bro/Makefile
+++ b/security/bro/Makefile
@@ -21,7 +21,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-pub-${PORTVERSION}a37
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 MAKE_ENV+=	CC="${CC}"
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--libdir=${PREFIX}/share
 USE_BISON=	yes
 USE_PERL5=	yes
diff --git a/security/bubblegum/Makefile b/security/bubblegum/Makefile
index f92288708f91..5218ea0dd15a 100644
--- a/security/bubblegum/Makefile
+++ b/security/bubblegum/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Watch a file for changes
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=		bubblegum.1
 MANCOMPRESSED=	no
diff --git a/security/checkpassword-pam/Makefile b/security/checkpassword-pam/Makefile
index 6918743af285..d34593850d45 100644
--- a/security/checkpassword-pam/Makefile
+++ b/security/checkpassword-pam/Makefile
@@ -19,6 +19,6 @@ GNU_CONFIGURE=	yes
 MAN8=		checkpassword-pam.8
 PLIST_FILES=	bin/checkpassword-pam
 
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 .include <bsd.port.mk>
diff --git a/security/clamav-devel/Makefile b/security/clamav-devel/Makefile
index 496df9ca852d..ab5cb27b3742 100644
--- a/security/clamav-devel/Makefile
+++ b/security/clamav-devel/Makefile
@@ -27,7 +27,7 @@ OPTIONS=	MILTER "Compile the milter interface" Off \
 		CURL "Support URL downloading" Off
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_AUTOCONF_VER=259
 USE_AUTOMAKE_VER=19
 USE_LIBTOOL_VER=15
diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index 3ac777f5d4f0..a5f35cbb9c49 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -29,7 +29,7 @@ OPTIONS=	MILTER "Compile the milter interface" Off \
 		CURL "Support URL downloading" Off
 USE_REINPLACE=	yes
 USE_LIBTOOL_VER=15
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 USE_RC_SUBR=	yes
 
diff --git a/security/courier-authlib-base/Makefile b/security/courier-authlib-base/Makefile
index 96eb0a2976ab..902b25be6031 100644
--- a/security/courier-authlib-base/Makefile
+++ b/security/courier-authlib-base/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/security/courier-authlib/Makefile b/security/courier-authlib/Makefile
index 96eb0a2976ab..902b25be6031 100644
--- a/security/courier-authlib/Makefile
+++ b/security/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/security/digest/Makefile b/security/digest/Makefile
index e7df4608c390..1d57d3495ad1 100644
--- a/security/digest/Makefile
+++ b/security/digest/Makefile
@@ -24,7 +24,7 @@ MAN1?=		${PORTNAME}.1
 
 PLIST_FILES?=	bin/${PORTNAME}
 
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 .include <bsd.port.pre.mk>
 
diff --git a/security/fakeroot/Makefile b/security/fakeroot/Makefile
index 8d13958969ee..2a9f9d490cc9 100644
--- a/security/fakeroot/Makefile
+++ b/security/fakeroot/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Simulate the root user behaviour
 
 USE_LIBTOOL_VER=15
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 MANLANG=	"" es sv
diff --git a/security/fcrackzip/Makefile b/security/fcrackzip/Makefile
index 5f8650278b0f..8f7d8a747435 100644
--- a/security/fcrackzip/Makefile
+++ b/security/fcrackzip/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	sw@gegenunendlich.de
 COMMENT=	Portable, fast and featureful ZIP password cracker
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GETOPT_LONG=yes
 USE_PERL5_BUILD=yes
 USE_REINPLACE=	yes
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index fc801095ae97..1d15b2da2af8 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -20,9 +20,9 @@ COMMENT=	The GNU Privacy Guard
 USE_BZIP2=	YES
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
-CONFIGURE_TARGET=	--build ${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build ${MACHINE_ARCH}-portbld-freebsd${OSREL}
 .if ${MACHINE_CPU:Mi586}
-ARCH=	i586
+MACHINE_ARCH=	i586
 .endif
 CFLAGS:=	${CFLAGS:S/-pipe//g}
 .if !defined(WITHOUT_NLS)
diff --git a/security/gnupg1/Makefile b/security/gnupg1/Makefile
index fc801095ae97..1d15b2da2af8 100644
--- a/security/gnupg1/Makefile
+++ b/security/gnupg1/Makefile
@@ -20,9 +20,9 @@ COMMENT=	The GNU Privacy Guard
 USE_BZIP2=	YES
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
-CONFIGURE_TARGET=	--build ${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build ${MACHINE_ARCH}-portbld-freebsd${OSREL}
 .if ${MACHINE_CPU:Mi586}
-ARCH=	i586
+MACHINE_ARCH=	i586
 .endif
 CFLAGS:=	${CFLAGS:S/-pipe//g}
 .if !defined(WITHOUT_NLS)
diff --git a/security/gnutls-devel/Makefile b/security/gnutls-devel/Makefile
index 80b5d02ee1b7..ab902bddca0b 100644
--- a/security/gnutls-devel/Makefile
+++ b/security/gnutls-devel/Makefile
@@ -33,7 +33,7 @@ INSTALLS_SHLIB=	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}
 CONFIGURE_ARGS=	--with-included-lzo
 
 MAN1=		certtool.1 gnutls-cli.1 gnutls-cli-debug.1 \
diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index 5afa81d63fee..90009b1249c8 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -42,7 +42,7 @@ INSTALLS_SHLIB=	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}
 CONFIGURE_ARGS=	--with-included-lzo
 
 MAN1=		certtool.1 gnutls-cli.1 gnutls-cli-debug.1 \
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index 142c3d7fa6cd..4be43f2dff32 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -22,7 +22,7 @@ USE_LIBTOOL_VER=15
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-gpg=${LOCALBASE}/bin/gpg \
 		--with-gpgsm=${LOCALBASE}/bin/gpgsm \
 		--includedir=${PREFIX}/include/gpgme
diff --git a/security/hashish/Makefile b/security/hashish/Makefile
index 5be705d816ea..04169d08199d 100644
--- a/security/hashish/Makefile
+++ b/security/hashish/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2
 .endif
 
 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"
 .if !defined(WITH_GTK1)
diff --git a/security/libbf/Makefile b/security/libbf/Makefile
index 3c78d28ad4a7..1c27cae2602f 100644
--- a/security/libbf/Makefile
+++ b/security/libbf/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES=	ftp://ftp.funet.fi/pub/mirrors/ftp.psy.uq.oz.au/libeay/ \
 MAINTAINER=	jim@corebsd.or.id
 COMMENT=	The Blowfish block cipher Library
 
-.if ${ARCH} == "i386"
+.if ${MACHINE_ARCH} == "i386"
 MAKEFLAGS+=	BF_ENC=asm/bx86-elf.o
 .else
 MAKEFLAGS+=	BF_ENC=bf_enc.o
diff --git a/security/libgpg-error/Makefile b/security/libgpg-error/Makefile
index e71fd21be72e..1605da36ab87 100644
--- a/security/libgpg-error/Makefile
+++ b/security/libgpg-error/Makefile
@@ -20,7 +20,7 @@ SIG_SUFFIX=		.sig
 USE_INC_LIBTOOL_VER=	15
 INSTALLS_SHLIB=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS=	--without-nls
diff --git a/security/libksba/Makefile b/security/libksba/Makefile
index f98bab7d18f8..6c3708e344bc 100644
--- a/security/libksba/Makefile
+++ b/security/libksba/Makefile
@@ -21,7 +21,7 @@ GNU_CONFIGURE=	yes
 USE_INC_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=
-CONFIGURE_ARGS+=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_PERL5_BUILD=yes
 
 INFO=	ksba
diff --git a/security/libmcrypt/Makefile b/security/libmcrypt/Makefile
index bd591f573abc..4e6dedb83e33 100644
--- a/security/libmcrypt/Makefile
+++ b/security/libmcrypt/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Multi-cipher cryptographic library (used in PHP)
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-static
 INSTALLS_SHLIB=	yes
 
diff --git a/security/libprelude/Makefile b/security/libprelude/Makefile
index 054862a8541f..48a5e55cbe43 100644
--- a/security/libprelude/Makefile
+++ b/security/libprelude/Makefile
@@ -16,7 +16,7 @@ USE_REINPLACE=		yes
 USE_GMAKE=		yes
 USE_LIBTOOL_VER=	13
 INSTALLS_SHLIB=		yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=		--with-html-dir=${PREFIX}/share/doc --localstatedir=/var
 
 .if defined(WITHOUT_SSL)
diff --git a/security/libtasn1/Makefile b/security/libtasn1/Makefile
index d5ad6a7639d8..b4e62aeaa0e2 100644
--- a/security/libtasn1/Makefile
+++ b/security/libtasn1/Makefile
@@ -22,7 +22,7 @@ SIG_SUFFIX=	.sig
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL_VER=	15
 USE_GETOPT_LONG=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 DOCS=		AUTHORS NEWS README THANKS doc/TODO \
 		doc/libtasn1.html doc/libtasn1.pdf doc/libtasn1.ps
diff --git a/security/mcrypt/Makefile b/security/mcrypt/Makefile
index 36fd5e19bef1..d9d479c92f86 100644
--- a/security/mcrypt/Makefile
+++ b/security/mcrypt/Makefile
@@ -29,7 +29,7 @@ CONFIGURE_ARGS+=	${CONFIGURE_SHARED}
 CONFIGURE_ARGS+=	--enable-static --with-catgets
 CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib -lintl"
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 GNU_CONFIGURE=		yes
 DOCS=			FORMAT magic
 MAN1=			mcrypt.1
diff --git a/security/mhash/Makefile b/security/mhash/Makefile
index 16129d909ca7..900686aa70eb 100644
--- a/security/mhash/Makefile
+++ b/security/mhash/Makefile
@@ -16,7 +16,7 @@ COMMENT=	An easy-to-use library for strong hashes such as MD5 and SHA1
 
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL_VER=13
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=	--with-LDFLAGS="${PTHREAD_LIBS}" --enable-static \
 			--with-gnu-ld
 
diff --git a/security/nmap/Makefile b/security/nmap/Makefile
index b5b35de4e3dd..e46747324a2d 100644
--- a/security/nmap/Makefile
+++ b/security/nmap/Makefile
@@ -25,7 +25,7 @@ USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-localdirs
 
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 .ifndef BUILD_NMAPFE
 
diff --git a/security/oidentd/Makefile b/security/oidentd/Makefile
index f3ee703388ed..7672b3c26882 100644
--- a/security/oidentd/Makefile
+++ b/security/oidentd/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Ident server that supports user-defined ident strings
 USE_RC_SUBR=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN5=		oidentd.conf.5 oidentd_masq.conf.5
 MAN8=		oidentd.8
diff --git a/security/opencdk/Makefile b/security/opencdk/Makefile
index 4e27a385e53b..b8a5249c8805 100644
--- a/security/opencdk/Makefile
+++ b/security/opencdk/Makefile
@@ -26,7 +26,7 @@ SIG_SUFFIX=	.sig.asc
 USE_BZIP2=	yes
 USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-libgcrypt-prefix=${LOCALBASE}
 USE_REINPLACE=	yes
 
diff --git a/security/osiris/Makefile b/security/osiris/Makefile
index 1bb812aa964f..e348cd95b712 100644
--- a/security/osiris/Makefile
+++ b/security/osiris/Makefile
@@ -19,7 +19,7 @@ OPTIONS=	OSIRISMD "Enable to build the management daemon" off \
 		CLI "Enable to build the management CLI" off
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL} \
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \
 			--enable-fancy-cli
 USE_LIBTOOL_VER=	15
 USE_RC_SUBR=	yes
diff --git a/security/pam_ldap/Makefile b/security/pam_ldap/Makefile
index 20a81023b0b9..a620f2d2ad96 100644
--- a/security/pam_ldap/Makefile
+++ b/security/pam_ldap/Makefile
@@ -23,7 +23,7 @@ CONFIGURE_ARGS=	--with-ldap-lib=openldap \
 		--with-ldap-dir=${LOCALBASE} \
 		--with-ldap-conf-file=${PREFIX}/etc/ldap.conf \
 		--with-ldap-secret-file=${PREFIX}/etc/ldap.secret
-CONFIGURE_TARGET=--build=${ARCH}-unknown-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
diff --git a/security/pgp/Makefile b/security/pgp/Makefile
index e4adda2d1835..28afa6d34027 100644
--- a/security/pgp/Makefile
+++ b/security/pgp/Makefile
@@ -19,7 +19,7 @@ COMMENT=	PGP International version - Public-Key encryption for the masses
 WRKSRC=		${WRKDIR}/src
 
 MAKEFILE=	makefile
-ALL_TARGET=	freebsd-${ARCH}
+ALL_TARGET=	freebsd-${MACHINE_ARCH}
 MAKE_ENV=	PREFIX="${PREFIX}" OS_CFLAGS="${CFLAGS}"
 PGPLIB=		${PREFIX}/share/pgp
 MAN1=		pgp.1 pgp2.1
diff --git a/security/pgpin/Makefile b/security/pgpin/Makefile
index dba05071a666..41add2b2748e 100644
--- a/security/pgpin/Makefile
+++ b/security/pgpin/Makefile
@@ -18,7 +18,7 @@ COMMENT=	PGP International version - improved for use in IN-CA
 WRKSRC=		${WRKDIR}/pgp263in/src
 
 MAKEFILE=	makefile
-ALL_TARGET=	freebsd-${ARCH} OS_CFLAGS="${CFLAGS}"
+ALL_TARGET=	freebsd-${MACHINE_ARCH} OS_CFLAGS="${CFLAGS}"
 PGPLIB=		${PREFIX}/lib/pgpin
 MAN1=		pgpin.1
 
diff --git a/security/prelude-lml/Makefile b/security/prelude-lml/Makefile
index a9cd6de93c3a..49955e32692a 100644
--- a/security/prelude-lml/Makefile
+++ b/security/prelude-lml/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS+=	prelude.1:${PORTSDIR}/security/libprelude \
 
 USE_GMAKE=		yes
 USE_LIBTOOL_VER=	13
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 
 .include <bsd.port.mk>
diff --git a/security/prelude-manager/Makefile b/security/prelude-manager/Makefile
index a2bc47677bb9..4e89bd7a8d76 100644
--- a/security/prelude-manager/Makefile
+++ b/security/prelude-manager/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS+=	prelude.1:${PORTSDIR}/security/libprelude \
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=		--with-html-dir=${PREFIX}/share/doc \
 			--localstatedir=/var
 
diff --git a/security/prelude-nids/Makefile b/security/prelude-nids/Makefile
index d06b814502fd..b905a2dd689f 100644
--- a/security/prelude-nids/Makefile
+++ b/security/prelude-nids/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	prelude.1:${PORTSDIR}/security/libprelude
 
 USE_GMAKE=		yes
 USE_LIBTOOL_VER=	13
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=	--prefix=${PREFIX} \
 			--with-html-dir=${PREFIX}/share/doc
 
diff --git a/security/snort/Makefile b/security/snort/Makefile
index 7f195edbcd4d..18034c289e6f 100644
--- a/security/snort/Makefile
+++ b/security/snort/Makefile
@@ -29,7 +29,7 @@ USE_RC_SUBR=	yes
 RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN8=		snort.8
 DOCS=		ChangeLog doc/AUTHORS doc/BUGS doc/CREDITS doc/NEWS \
diff --git a/security/steghide/Makefile b/security/steghide/Makefile
index 74dc64afb5a9..177711344081 100644
--- a/security/steghide/Makefile
+++ b/security/steghide/Makefile
@@ -25,7 +25,7 @@ USE_LIBTOOL_VER=13
 GNU_CONFIGURE=	yes
 USE_GCC=	3.4
 CONFIGURE_TARGET=
-CONFIGURE_ARGS=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lintl -lmcrypt"
diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index cc8576911902..7330326347b9 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -21,7 +21,7 @@ USE_LIBTOOL_VER=	15
 USE_RC_SUBR=	YES
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--target=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--localstatedir=/var/tmp --with-pem-dir=${PEM_DIR} \
 		--enable-static
 
diff --git a/security/tor-devel/Makefile b/security/tor-devel/Makefile
index f30b70571e64..dc79814d0fd6 100644
--- a/security/tor-devel/Makefile
+++ b/security/tor-devel/Makefile
@@ -17,7 +17,7 @@ COMMENT=	An anonymizing overlay network for TCP
 RUN_DEPENDS=	tsocks:${PORTSDIR}/net/tsocks
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_OPENSSL=	yes
 USE_REINPLACE=	yes
 
diff --git a/security/tor/Makefile b/security/tor/Makefile
index f30b70571e64..dc79814d0fd6 100644
--- a/security/tor/Makefile
+++ b/security/tor/Makefile
@@ -17,7 +17,7 @@ COMMENT=	An anonymizing overlay network for TCP
 RUN_DEPENDS=	tsocks:${PORTSDIR}/net/tsocks
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_OPENSSL=	yes
 USE_REINPLACE=	yes
 
diff --git a/security/xmlsec/Makefile b/security/xmlsec/Makefile
index 2ed6cad26d96..06f868d773a6 100644
--- a/security/xmlsec/Makefile
+++ b/security/xmlsec/Makefile
@@ -24,7 +24,7 @@ BUILD_DEPENDS=	${RUN_DEPENDS}
 USE_OPENSSL=	yes
 USE_GNOME=	gnomehack libxslt
 USE_INC_LIBTOOL_VER=13
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 
 MAN1=	xmlsec.1 xmlsec-config.1
diff --git a/security/yafic/Makefile b/security/yafic/Makefile
index 6d7a45fbb9dd..8879fbd6363c 100644
--- a/security/yafic/Makefile
+++ b/security/yafic/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	allan@saddi.com
 COMMENT=	Yet Another File Integrity Checker, similar to Tripwire
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
 CONFIGURE_ENV=	LDFLAGS="-static"