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

after 5.4-RELEASE.

34 files changed, 35 insertions, 35 deletions

diff --git a/textproc/aft/Makefile b/textproc/aft/Makefile
index 4e414874313..06dc4df09d8 100644
--- a/textproc/aft/Makefile
+++ b/textproc/aft/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A document preparation system using an Almost Free Text input format
 
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	-build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	-build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 .if defined(NOPORTDOCS)
 INSTALL_TARGET=	install-binSCRIPTS install-pkgdataDATA install-pkgdataSCRIPTS
diff --git a/textproc/dbacl/Makefile b/textproc/dbacl/Makefile
index 554b124ef1b..7d817ef6eb8 100644
--- a/textproc/dbacl/Makefile
+++ b/textproc/dbacl/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Digramic Bayesian classifier
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash2
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_REINPLACE=	yes
 
 PROGRAMS=	bayesol dbacl mailinspect
diff --git a/textproc/dictfmt/Makefile b/textproc/dictfmt/Makefile
index 13c409d3118..11e5e3e3425 100644
--- a/textproc/dictfmt/Makefile
+++ b/textproc/dictfmt/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Formats a DICT protocol dictionary database
 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}"
 CONFIGURE_ARGS=	--with-cflags="${CFLAGS}"
 ALL_TARGET=	dictfmt
diff --git a/textproc/docbook-to-man/Makefile b/textproc/docbook-to-man/Makefile
index b4d35291007..ebb2b73cf8c 100644
--- a/textproc/docbook-to-man/Makefile
+++ b/textproc/docbook-to-man/Makefile
@@ -23,7 +23,7 @@ COMMENT=	A DocBook SGML DTD into nroff/troff -man macros converter
 # Jade is preferred, but it currently doesn't compile on 2.1.x
 # system, so use sp in that case.
 
-.if ${ARCH} == "alpha"
+.if ${MACHINE_ARCH} == "alpha"
 WITH_OPENJADE=	yes
 .endif
 
diff --git a/textproc/filepp/Makefile b/textproc/filepp/Makefile
index 130e82c731f..5bec960b317 100644
--- a/textproc/filepp/Makefile
+++ b/textproc/filepp/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A generic file preprocessor
 
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 NO_BUILD=	yes
 
 MAN1=	filepp.1
diff --git a/textproc/gmetadom/Makefile b/textproc/gmetadom/Makefile
index 8d6ec4ef249..a9cb6c3257c 100644
--- a/textproc/gmetadom/Makefile
+++ b/textproc/gmetadom/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 USE_GNOME=	glib20 gnomehack libxml2
 USE_GMAKE=	yes
 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"
 INSTALLS_SHLIB=	yes
diff --git a/textproc/gsed/Makefile b/textproc/gsed/Makefile
index 998ee7f0d02..0a1f9825641 100644
--- a/textproc/gsed/Makefile
+++ b/textproc/gsed/Makefile
@@ -21,7 +21,7 @@ COMMENT=	The GNU stream editor
 
 USE_REINPLACE=	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"
 CONFIGURE_ARGS=	--disable-nls
 USE_GMAKE=	yes
diff --git a/textproc/gxmlviewer/Makefile b/textproc/gxmlviewer/Makefile
index 3aa50656035..7c6afae66fa 100644
--- a/textproc/gxmlviewer/Makefile
+++ b/textproc/gxmlviewer/Makefile
@@ -27,7 +27,7 @@ USE_GNOME=	gnomelibs bonobo gnomeprefix
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libiconv-prefix="${LOCALBASE}"
 
-.if ${ARCH:L} == "amd64"
+.if ${MACHINE_ARCH:L} == "amd64"
 CFLAGS+=	-fPIC
 .endif
 
diff --git a/textproc/iiimf-client-lib/Makefile b/textproc/iiimf-client-lib/Makefile
index 3dbf6f11016..67408b25a71 100644
--- a/textproc/iiimf-client-lib/Makefile
+++ b/textproc/iiimf-client-lib/Makefile
@@ -29,7 +29,7 @@ USE_AUTOHEADER_VER=	259
 USE_AUTOMAKE_VER=	19
 WANT_LIBTOOL_VER=	15
 
-CONFIGURE_TARGET=       --build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=       --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}/lib/iiimcf
 PATCH_WRKSRC=	${WRKDIR}/${DISTNAME:S/src-//}
diff --git a/textproc/iiimf-csconv/Makefile b/textproc/iiimf-csconv/Makefile
index 1344361d31a..8313328bbdd 100644
--- a/textproc/iiimf-csconv/Makefile
+++ b/textproc/iiimf-csconv/Makefile
@@ -28,7 +28,7 @@ USE_AUTOCONF_VER=	259
 WANT_AUTOMAKE_VER=	19
 WANT_LIBTOOL_VER=	15
 
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}/lib/CSConv
 PATCH_WRKSRC=	${WRKDIR}/${DISTNAME:S/src-//}
diff --git a/textproc/iiimf-gnome-im-switcher/Makefile b/textproc/iiimf-gnome-im-switcher/Makefile
index fc128471ce3..7eb9393f5e3 100644
--- a/textproc/iiimf-gnome-im-switcher/Makefile
+++ b/textproc/iiimf-gnome-im-switcher/Makefile
@@ -34,7 +34,7 @@ USE_AUTOMAKE_VER=	19
 WANT_LIBTOOL_VER=	15
 
 AUTOMAKE_ARGS+=		--add-missing
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 WRKSRC=         ${WRKDIR}/${DISTNAME:S/src-//}/gnome-im-switcher
 PATCH_WRKSRC=   ${WRKDIR}/${DISTNAME:S/src-//}
diff --git a/textproc/iiimf-gtk/Makefile b/textproc/iiimf-gtk/Makefile
index 854db3c0819..148bfd8183e 100644
--- a/textproc/iiimf-gtk/Makefile
+++ b/textproc/iiimf-gtk/Makefile
@@ -34,7 +34,7 @@ USE_AUTOMAKE_VER=	19
 WANT_LIBTOOL_VER=	15
 
 AUTOMAKE_ARGS+=		--add-missing
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 WRKSRC=         ${WRKDIR}/${DISTNAME:S/src-//}/iiimgcf
 PATCH_WRKSRC=   ${WRKDIR}/${DISTNAME:S/src-//}
diff --git a/textproc/iiimf-le-unit/Makefile b/textproc/iiimf-le-unit/Makefile
index b4ae3f417d2..6ecae1ae756 100644
--- a/textproc/iiimf-le-unit/Makefile
+++ b/textproc/iiimf-le-unit/Makefile
@@ -31,7 +31,7 @@ USE_AUTOMAKE_VER=	19
 WANT_LIBTOOL_VER=	15
 
 AUTOMAKE_ARGS+=		--add-missing
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 WRKSRC=         ${WRKDIR}/${DISTNAME:S/src-//}/leif
 PATCH_WRKSRC=   ${WRKDIR}/${DISTNAME:S/src-//}
diff --git a/textproc/iiimf-protocol-lib/Makefile b/textproc/iiimf-protocol-lib/Makefile
index a587b03885f..a5654937944 100644
--- a/textproc/iiimf-protocol-lib/Makefile
+++ b/textproc/iiimf-protocol-lib/Makefile
@@ -27,7 +27,7 @@ USE_AUTOHEADER_VER=	259
 USE_AUTOMAKE_VER=	19
 WANT_LIBTOOL_VER=	15
 
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 WRKSRC=         ${WRKDIR}/${DISTNAME:S/src-//}/lib/iiimp
 PATCH_WRKSRC=   ${WRKDIR}/${DISTNAME:S/src-//}
diff --git a/textproc/iiimf-server/Makefile b/textproc/iiimf-server/Makefile
index 3f66ee126e2..4c372a952c0 100644
--- a/textproc/iiimf-server/Makefile
+++ b/textproc/iiimf-server/Makefile
@@ -31,7 +31,7 @@ USE_AUTOHEADER_VER=	259
 USE_AUTOMAKE_VER=	19
 WANT_LIBTOOL_VER=	15
 
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 WRKSRC=         ${WRKDIR}/${DISTNAME:S/src-//}/iiimsf
 PATCH_WRKSRC=   ${WRKDIR}/${DISTNAME:S/src-//}
diff --git a/textproc/iiimf-x-lib/Makefile b/textproc/iiimf-x-lib/Makefile
index f43475ccd3b..2363398e7ba 100644
--- a/textproc/iiimf-x-lib/Makefile
+++ b/textproc/iiimf-x-lib/Makefile
@@ -33,7 +33,7 @@ USE_AUTOHEADER_VER=	259
 USE_AUTOMAKE_VER=	19
 WANT_LIBTOOL_VER=	15
 
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 WRKSRC=         ${WRKDIR}/${DISTNAME:S/src-//}/iiimxcf/xiiimp.so
 PATCH_WRKSRC=   ${WRKDIR}/${DISTNAME:S/src-//}
diff --git a/textproc/iiimf-x/Makefile b/textproc/iiimf-x/Makefile
index afac1c19867..7a82a8f54d8 100644
--- a/textproc/iiimf-x/Makefile
+++ b/textproc/iiimf-x/Makefile
@@ -31,7 +31,7 @@ USE_AUTOHEADER_VER=	259
 USE_AUTOMAKE_VER=	19
 WANT_LIBTOOL_VER=	15
 
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 WRKSRC=         ${WRKDIR}/${DISTNAME:S/src-//}/iiimxcf/htt_xbe
 PATCH_WRKSRC=   ${WRKDIR}/${DISTNAME:S/src-//}
diff --git a/textproc/ipdf/Makefile b/textproc/ipdf/Makefile
index 02734b9fbbc..ba237e298fd 100644
--- a/textproc/ipdf/Makefile
+++ b/textproc/ipdf/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	pdf.7:${PORTSDIR}/print/pdflib \
 		tiff.4:${PORTSDIR}/graphics/tiff
 
 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/textproc/libhtmlparse/Makefile b/textproc/libhtmlparse/Makefile
index a428544f09c..d9b8ceee825 100644
--- a/textproc/libhtmlparse/Makefile
+++ b/textproc/libhtmlparse/Makefile
@@ -17,6 +17,6 @@ USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 
 CONFIGURE_TARGET=
-CONFIGURE_ARGS+=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 .include <bsd.port.mk>
diff --git a/textproc/libparsifal/Makefile b/textproc/libparsifal/Makefile
index 881b604e8a3..10f91668f74 100644
--- a/textproc/libparsifal/Makefile
+++ b/textproc/libparsifal/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Lightweight XML Parser
 
 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
 
 PLIST_SUB=	VERSION=${PORTVERSION}
diff --git a/textproc/libpathan/Makefile b/textproc/libpathan/Makefile
index b7f9137dbdd..b6117496112 100644
--- a/textproc/libpathan/Makefile
+++ b/textproc/libpathan/Makefile
@@ -25,7 +25,7 @@ USE_LIBTOOL_VER=13
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 INSTALLS_SHLIB=	yes
 XERCESCROOT=	`cd ${PORTSDIR}/textproc/xerces-c2; ${MAKE} -V WRKSRC`
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV+=	XERCESCROOT=${XERCESCROOT}
 CONFIGURE_SCRIPT=	runConfigure
 CONFIGURE_ARGS+=	--disable-static
diff --git a/textproc/linux-f10-libxml/Makefile b/textproc/linux-f10-libxml/Makefile
index fd4a49b02db..c9590a2f6ff 100644
--- a/textproc/linux-f10-libxml/Makefile
+++ b/textproc/linux-f10-libxml/Makefile
@@ -13,6 +13,6 @@ CATEGORIES=	textproc linux
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of libxml
 
-RPM_SET=	libxml-${PORTVERSION}-1.${ARCH}.rpm
+RPM_SET=	libxml-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
 
 .include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/textproc/linux-f10-libxml2/Makefile b/textproc/linux-f10-libxml2/Makefile
index fd4a49b02db..c9590a2f6ff 100644
--- a/textproc/linux-f10-libxml2/Makefile
+++ b/textproc/linux-f10-libxml2/Makefile
@@ -13,6 +13,6 @@ CATEGORIES=	textproc linux
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of libxml
 
-RPM_SET=	libxml-${PORTVERSION}-1.${ARCH}.rpm
+RPM_SET=	libxml-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
 
 .include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/textproc/linux-f8-libxml/Makefile b/textproc/linux-f8-libxml/Makefile
index fd4a49b02db..c9590a2f6ff 100644
--- a/textproc/linux-f8-libxml/Makefile
+++ b/textproc/linux-f8-libxml/Makefile
@@ -13,6 +13,6 @@ CATEGORIES=	textproc linux
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of libxml
 
-RPM_SET=	libxml-${PORTVERSION}-1.${ARCH}.rpm
+RPM_SET=	libxml-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
 
 .include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/textproc/linux-f8-libxml2/Makefile b/textproc/linux-f8-libxml2/Makefile
index fd4a49b02db..c9590a2f6ff 100644
--- a/textproc/linux-f8-libxml2/Makefile
+++ b/textproc/linux-f8-libxml2/Makefile
@@ -13,6 +13,6 @@ CATEGORIES=	textproc linux
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of libxml
 
-RPM_SET=	libxml-${PORTVERSION}-1.${ARCH}.rpm
+RPM_SET=	libxml-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
 
 .include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/textproc/linux-libxml/Makefile b/textproc/linux-libxml/Makefile
index fd4a49b02db..c9590a2f6ff 100644
--- a/textproc/linux-libxml/Makefile
+++ b/textproc/linux-libxml/Makefile
@@ -13,6 +13,6 @@ CATEGORIES=	textproc linux
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of libxml
 
-RPM_SET=	libxml-${PORTVERSION}-1.${ARCH}.rpm
+RPM_SET=	libxml-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
 
 .include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/textproc/linux-libxml2/Makefile b/textproc/linux-libxml2/Makefile
index fd4a49b02db..c9590a2f6ff 100644
--- a/textproc/linux-libxml2/Makefile
+++ b/textproc/linux-libxml2/Makefile
@@ -13,6 +13,6 @@ CATEGORIES=	textproc linux
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of libxml
 
-RPM_SET=	libxml-${PORTVERSION}-1.${ARCH}.rpm
+RPM_SET=	libxml-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
 
 .include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/textproc/sgmlformat/Makefile b/textproc/sgmlformat/Makefile
index bade1d3bfd9..87785e234fe 100644
--- a/textproc/sgmlformat/Makefile
+++ b/textproc/sgmlformat/Makefile
@@ -20,7 +20,7 @@ COMMENT=	Generates groff and HTML from linuxdoc and docbook SGML documents
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} != "i386"
+.if ${MACHINE_ARCH} != "i386"
 WITH_OPENJADE=	yes
 .endif
 
diff --git a/textproc/source-highlight/Makefile b/textproc/source-highlight/Makefile
index f7aa9293374..fa7aba631b0 100644
--- a/textproc/source-highlight/Makefile
+++ b/textproc/source-highlight/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	kevlo@FreeBSD.org
 COMMENT=	C/C++ and Java sources to HTML converter
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 .if defined(NOPORTDOCS)
 MAKE_ENV+=	NOPORTDOCS="${NOPORTDOCS}"
 .endif
diff --git a/textproc/sp/Makefile b/textproc/sp/Makefile
index 7c010d33e34..82635e05eac 100644
--- a/textproc/sp/Makefile
+++ b/textproc/sp/Makefile
@@ -13,8 +13,8 @@ MASTER_SITES=	ftp://ftp.jclark.com/pub/sp/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An object-oriented toolkit for SGML parsing and entity management
 
-.if ${ARCH} == sparc64
-BROKEN=		does not compile on ${ARCH}
+.if ${MACHINE_ARCH} == sparc64
+BROKEN=		does not compile on ${MACHINE_ARCH}
 .endif
 
 USE_SUBMAKE=	yes
diff --git a/textproc/webcpp/Makefile b/textproc/webcpp/Makefile
index 5d6526a9297..4a2998e0829 100644
--- a/textproc/webcpp/Makefile
+++ b/textproc/webcpp/Makefile
@@ -21,7 +21,7 @@ COMMENT=	Convert your source code to syntax highlighted HTML
 USE_GCC=	3.2
 .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"
 USE_REINPLACE=	yes
 
diff --git a/textproc/wv/Makefile b/textproc/wv/Makefile
index 9c0119f1587..66ba9bb93ed 100644
--- a/textproc/wv/Makefile
+++ b/textproc/wv/Makefile
@@ -38,7 +38,7 @@ MLINKS=	wvWare.1 wvConvert.1
 CPPFLAGS=	-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
 
-.if ${ARCH:L} == "amd64"
+.if ${MACHINE_ARCH:L} == "amd64"
 USE_GNOME+=	glib20
 CONFIGURE_ARGS+=	--with-glib
 .else
diff --git a/textproc/xlhtml/Makefile b/textproc/xlhtml/Makefile
index 95cd88f5adc..b32cb57a13e 100644
--- a/textproc/xlhtml/Makefile
+++ b/textproc/xlhtml/Makefile
@@ -20,7 +20,7 @@ COMMENT=	Convert Excel and PowerPoint files to HTML and text
 USE_GMAKE=	yes
 USE_AUTOMAKE_VER=	14
 USE_AUTOCONF_VER=	213
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=		ppthtml.1 xlhtml.1
 
diff --git a/textproc/xmlto/Makefile b/textproc/xmlto/Makefile
index 757b277fde4..aa336cfc109 100644
--- a/textproc/xmlto/Makefile
+++ b/textproc/xmlto/Makefile
@@ -35,7 +35,7 @@ USE_BZIP2=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-bash=${BASH_CMD} --with-getopt=${GETOPT_CMD}
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 BASH_CMD=	${LOCALBASE}/bin/bash
 GETOPT_CMD=	${LOCALBASE}/bin/getopt