14 files changed, 16 insertions, 16 deletions

diff --git a/archivers/advancecomp/Makefile b/archivers/advancecomp/Makefile
index 1909974d02e9..c36be5ca0bdd 100644
--- a/archivers/advancecomp/Makefile
+++ b/archivers/advancecomp/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Recompression utilities for .ZIP, .PNG, .MNG and .GZ files
 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}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=		advdef.1 advmng.1 advpng.1 advzip.1
diff --git a/archivers/arj/Makefile b/archivers/arj/Makefile
index 0d5508b28d3e..62d0b01476af 100644
--- a/archivers/arj/Makefile
+++ b/archivers/arj/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Open-source ARJ
 USE_REINPLACE=	yes
 USE_AUTOCONF_VER=	259
 USE_GMAKE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_WRKSRC=	${WRKSRC}/gnu
 CONFIGURE_ENV=	CFLAGS="-fPIC"
 MAKEFILE=	GNUmakefile
diff --git a/archivers/cabextract/Makefile b/archivers/cabextract/Makefile
index 556e5b466312..924398d82a0c 100644
--- a/archivers/cabextract/Makefile
+++ b/archivers/cabextract/Makefile
@@ -15,7 +15,7 @@ COMMENT=	A program to extract Microsoft cabinet (.CAB) files
 
 USE_GETOPT_LONG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MANLANG=	"" ja
 MAN1=		cabextract.1
diff --git a/archivers/dact/Makefile b/archivers/dact/Makefile
index a269b477c3ae..a4952a819095 100644
--- a/archivers/dact/Makefile
+++ b/archivers/dact/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/bzip2
 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} \
 			--libdir=${PREFIX}/lib
 CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/archivers/dynamite/Makefile b/archivers/dynamite/Makefile
index ac9991b8eea7..514958e39a85 100644
--- a/archivers/dynamite/Makefile
+++ b/archivers/dynamite/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	boris@brooknet.com.au
 COMMENT=	Decompress data compressed with PKWARE Data Compression Library
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/archivers/gzip/Makefile b/archivers/gzip/Makefile
index 44dcf9a1e7a2..9ada5d066558 100644
--- a/archivers/gzip/Makefile
+++ b/archivers/gzip/Makefile
@@ -21,7 +21,7 @@ COMMENT=	A compression utility designed to be a replacement for compress
 
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=	gunzip.1 gzexe.1 gzip.1 zcat.1 zcmp.1 zdiff.1 zforce.1 \
 	zgrep.1 zless.1 zmore.1 znew.1
diff --git a/archivers/libdynamite/Makefile b/archivers/libdynamite/Makefile
index ac9991b8eea7..514958e39a85 100644
--- a/archivers/libdynamite/Makefile
+++ b/archivers/libdynamite/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	boris@brooknet.com.au
 COMMENT=	Decompress data compressed with PKWARE Data Compression Library
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/archivers/liborange/Makefile b/archivers/liborange/Makefile
index 04173fbedfc5..c5f93e0e2453 100644
--- a/archivers/liborange/Makefile
+++ b/archivers/liborange/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	synce.0:${PORTSDIR}/palm/synce-libsynce \
 		unshield.0:${PORTSDIR}/archivers/unshield
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-libsynce=${LOCALBASE}
 USE_ICONV=	yes
 USE_LIBTOOL_VER=15
diff --git a/archivers/lzop/Makefile b/archivers/lzop/Makefile
index f1fcc8d4d4b3..bd11f6006d60 100644
--- a/archivers/lzop/Makefile
+++ b/archivers/lzop/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Fast file compressor similar to gzip, using the LZO library
 LIB_DEPENDS=	lzo.1:${PORTSDIR}/archivers/lzo
 
 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/archivers/orange/Makefile b/archivers/orange/Makefile
index 04173fbedfc5..c5f93e0e2453 100644
--- a/archivers/orange/Makefile
+++ b/archivers/orange/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	synce.0:${PORTSDIR}/palm/synce-libsynce \
 		unshield.0:${PORTSDIR}/archivers/unshield
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-libsynce=${LOCALBASE}
 USE_ICONV=	yes
 USE_LIBTOOL_VER=15
diff --git a/archivers/par2cmdline/Makefile b/archivers/par2cmdline/Makefile
index fa061d98083a..03ca56e8bab6 100644
--- a/archivers/par2cmdline/Makefile
+++ b/archivers/par2cmdline/Makefile
@@ -19,7 +19,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}
 
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 PORTDOCS=	README
 PLIST_FILES=	bin/par2 bin/par2create bin/par2repair bin/par2verify
diff --git a/archivers/star/Makefile b/archivers/star/Makefile
index a7d4d31195f5..545b2d0e479c 100644
--- a/archivers/star/Makefile
+++ b/archivers/star/Makefile
@@ -26,14 +26,14 @@ MLINKS=		star.1 ustar.1
 .include <bsd.port.pre.mk>
 
 post-extract:
-.if ${ARCH} != "i386" || ${CC} != "cc"
+.if ${MACHINE_ARCH} != "i386" || ${CC} != "cc"
 	@${LN} -sf i386-freebsd-cc.rul \
-		${WRKSRC}/RULES/${ARCH}-freebsd-${CC}.rul
+		${WRKSRC}/RULES/${MACHINE_ARCH}-freebsd-${CC}.rul
 .endif
 
 do-install:
 	@${INSTALL_PROGRAM} \
-		${WRKSRC}/star/OBJ/${ARCH}-freebsd-${CC}/star \
+		${WRKSRC}/star/OBJ/${MACHINE_ARCH}-freebsd-${CC}/star \
 		${PREFIX}/bin
 	@cd ${PREFIX}/bin ; ${LN} -f star ustar
 	@${INSTALL_MAN} ${WRKSRC}/star/star.1 ${MANPREFIX}/man/man1
diff --git a/archivers/tardy/Makefile b/archivers/tardy/Makefile
index 50d701cd2633..73e74370980d 100644
--- a/archivers/tardy/Makefile
+++ b/archivers/tardy/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Manipulate the file headers in tar archive files in various ways
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=	tardy.1
 PLIST_FILES=	bin/tardy
diff --git a/archivers/ucl/Makefile b/archivers/ucl/Makefile
index a1a3710a69ae..f3f1e07c73a5 100644
--- a/archivers/ucl/Makefile
+++ b/archivers/ucl/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A data compression library with low memory usage
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL_VER=	15
 CONFIGURE_ARGS=	--enable-shared
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 PORTDOCS=	AUTHORS NEWS README THANKS TODO