6 files changed, 121 insertions, 116 deletions

diff --git a/emulators/linux_base-6/Makefile b/emulators/linux_base-6/Makefile
index a2ce0843907e..ea2ec96f27c7 100644
--- a/emulators/linux_base-6/Makefile
+++ b/emulators/linux_base-6/Makefile
@@ -10,22 +10,23 @@ PORTVERSION=		6.1
 PORTREVISION=		6
 CATEGORIES=		emulators linux
 MASTER_SITES=		${MASTER_SITE_REDHAT_LINUX}
-MASTER_SITE_SUBDIR=	${PORTVERSION}/en/os/${MACHINE_ARCH}/RedHat/RPMS
+MASTER_SITE_SUBDIR=	${PORTVERSION}/en/os/${ARCH}/RedHat/RPMS
 DISTFILES=		${RPM_SET1} ${RPM_LDCONFIG} ${RPM_SET2} \
 			${RPM_RPM} ${RPM_SET3}
 
 PATCH_SITES=		${MASTER_SITE_REDHAT_LINUX}
-PATCH_SITE_SUBDIR=	updates/6.2/en/os/${MACHINE_ARCH} \
-				updates/6.1/en/os/${MACHINE_ARCH} \
-				6.2/en/os/${MACHINE_ARCH}/RedHat/RPMS
+PATCH_SITE_SUBDIR=	updates/6.2/en/os/${ARCH} \
+				updates/6.1/en/os/${ARCH} \
+				6.2/en/os/${ARCH}/RedHat/RPMS
 PATCHFILES=		${UPDATES}
 
 MAINTAINER=		ports@FreeBSD.org
 COMMENT=	The base set of packages needed in Linux mode
 
+
 DEPRECATED=	"obsolete and has a minor security bug:  see http://www.redhat.com/support/errata/archives/RHSA-2000-117.html"
 
-.if (${MACHINE_ARCH} == "alpha")
+.if (${ARCH} == "alpha")
 FORBIDDEN=	"see <URL:http://rhn.redhat.com/errata/RHSA-2003-089.html> or\
  <URL:http://www.cert.org/advisories/CA-2003-10.html>"
 .endif
@@ -42,17 +43,17 @@ NO_BUILD=		yes
 NO_FILTER_SHLIBS=	yes
 NO_LATEST_LINK=		yes
 NO_MTREE=		yes
-PLIST=			${PKGDIR}/pkg-plist.${MACHINE_ARCH}
-MD5_FILE=		${MASTERDIR}/distinfo.${MACHINE_ARCH}
+PLIST=			${PKGDIR}/pkg-plist.${ARCH}
+MD5_FILE=		${MASTERDIR}/distinfo.${ARCH}
 
 .include <bsd.port.pre.mk>
 
-RPM_GLIBC=		glibc-2.1.3-29.${MACHINE_ARCH}.rpm
+RPM_GLIBC=		glibc-2.1.3-29.${ARCH}.rpm
 UPDATES=		${RPM_GLIBC} \
-			zlib-1.1.3-25.6.${MACHINE_ARCH}.rpm \
-			XFree86-libs-3.3.6-29.${MACHINE_ARCH}.rpm \
-			gtk+-1.2.6-7.${MACHINE_ARCH}.rpm
-.if (${MACHINE_ARCH} == "i386")
+			zlib-1.1.3-25.6.${ARCH}.rpm \
+			XFree86-libs-3.3.6-29.${ARCH}.rpm \
+			gtk+-1.2.6-7.${ARCH}.rpm
+.if (${ARCH} == "i386")
 LIBC5_COMPAT=		ld.so-1.9.5-11.i386.rpm libc-5.3.12-31.i386.rpm
 RPM_BINUTILS=		binutils-2.9.1.0.23-6.i386.rpm
 RPM_GLIB=
@@ -75,27 +76,27 @@ UPDATES+=
 RPM_SET1=		setup-2.0.5-1.noarch.rpm \
 			filesystem-1.3.5-1.noarch.rpm \
 			basesystem-6.0-4.noarch.rpm
-RPM_SET2=		termcap-9.12.6-15.${MACHINE_ARCH}.rpm \
-			libtermcap-2.0.8-18.${MACHINE_ARCH}.rpm \
-			bash-1.14.7-16.${MACHINE_ARCH}.rpm \
-			ncurses-4.2-25.${MACHINE_ARCH}.rpm \
-			info-3.12h-2.${MACHINE_ARCH}.rpm \
-			fileutils-4.0-8.${MACHINE_ARCH}.rpm \
-			grep-2.3-2.${MACHINE_ARCH}.rpm \
+RPM_SET2=		termcap-9.12.6-15.${ARCH}.rpm \
+			libtermcap-2.0.8-18.${ARCH}.rpm \
+			bash-1.14.7-16.${ARCH}.rpm \
+			ncurses-4.2-25.${ARCH}.rpm \
+			info-3.12h-2.${ARCH}.rpm \
+			fileutils-4.0-8.${ARCH}.rpm \
+			grep-2.3-2.${ARCH}.rpm \
 			${RPM_BINUTILS} \
-			gd-1.3-5.${MACHINE_ARCH}.rpm \
-			gdbm-1.8.0-2.${MACHINE_ARCH}.rpm \
+			gd-1.3-5.${ARCH}.rpm \
+			gdbm-1.8.0-2.${ARCH}.rpm \
 			${RPM_GLIB} \
 			${LIBC5_COMPAT} \
-			libstdc++-2.9.0-24.${MACHINE_ARCH}.rpm \
-			sh-utils-2.0-1.${MACHINE_ARCH}.rpm \
-			readline-2.2.1-5.${MACHINE_ARCH}.rpm \
+			libstdc++-2.9.0-24.${ARCH}.rpm \
+			sh-utils-2.0-1.${ARCH}.rpm \
+			readline-2.2.1-5.${ARCH}.rpm \
 			redhat-release-6.1-1.noarch.rpm
-RPM_SET3=		setserial-2.15-2.${MACHINE_ARCH}.rpm \
-			slang-1.2.2-4.${MACHINE_ARCH}.rpm \
-			stat-1.5-11.${MACHINE_ARCH}.rpm \
-			tcsh-6.08.00-6.${MACHINE_ARCH}.rpm \
-			xpm-3.4k-1.${MACHINE_ARCH}.rpm
+RPM_SET3=		setserial-2.15-2.${ARCH}.rpm \
+			slang-1.2.2-4.${ARCH}.rpm \
+			stat-1.5-11.${ARCH}.rpm \
+			tcsh-6.08.00-6.${ARCH}.rpm \
+			xpm-3.4k-1.${ARCH}.rpm
 
 DBPATH=			/var/lib/rpm
 RPM=			LC_ALL=C rpm
@@ -163,9 +164,9 @@ do-install:
 	@${LINUXBASE}/sbin/ldconfig
 	@${TOUCH} ${LINUXBASE}/etc/ld.so.conf
 	@for R in ${RPM_GLIBC} \
-		zlib-1.1.3-25.6.${MACHINE_ARCH}.rpm \
+		zlib-1.1.3-25.6.${ARCH}.rpm \
 		${RPM_SET2} \
-		XFree86-libs-3.3.6-29.${MACHINE_ARCH}.rpm; do \
+		XFree86-libs-3.3.6-29.${ARCH}.rpm; do \
 			${ECHO_MSG} $$R; \
 			${RPM} -U ${RPMFLAGS} ${RPMDIR}/$$R; \
 		done
diff --git a/emulators/linux_base-8/Makefile b/emulators/linux_base-8/Makefile
index de30fb4375d2..6cb045e1b78e 100644
--- a/emulators/linux_base-8/Makefile
+++ b/emulators/linux_base-8/Makefile
@@ -13,41 +13,41 @@ CATEGORIES=		emulators linux
 MASTER_SITES=		${MASTER_SITE_REDHAT_LINUX} \
 			${MASTER_SITE_REDHAT_LINUX:S/$/:new/}
 MASTER_SITE_SUBDIR=    \
-			${PORTVERSION}/${LANG}/os/${MACHINE_ARCH}/RedHat/RPMS \
-			updates/${PORTVERSION}/${LANG}/os/${MACHINE_ARCH}/:new
+			${PORTVERSION}/${LANG}/os/${ARCH}/RedHat/RPMS \
+			updates/${PORTVERSION}/${LANG}/os/${ARCH}/:new
 DISTFILES=		redhat-release-8.0-8.noarch.rpm \
-			glibc-common-2.3.2-4.80.8.${MACHINE_ARCH}.rpm:new \
-			glibc-2.3.2-4.80.8.${MACHINE_ARCH}.rpm:new \
+			glibc-common-2.3.2-4.80.8.${ARCH}.rpm:new \
+			glibc-2.3.2-4.80.8.${ARCH}.rpm:new \
 			setup-2.5.20-1.noarch.rpm \
 			filesystem-2.1.6-5.noarch.rpm \
 			basesystem-8.0-1.noarch.rpm \
-			libattr-2.0.8-3.${MACHINE_ARCH}.rpm \
-			libacl-2.0.11-2.${MACHINE_ARCH}.rpm \
-			libelf-0.8.2-2.${MACHINE_ARCH}.rpm \
-			bzip2-libs-1.0.2-5.${MACHINE_ARCH}.rpm \
+			libattr-2.0.8-3.${ARCH}.rpm \
+			libacl-2.0.11-2.${ARCH}.rpm \
+			libelf-0.8.2-2.${ARCH}.rpm \
+			bzip2-libs-1.0.2-5.${ARCH}.rpm \
 			termcap-11.0.1-13.noarch.rpm \
-			compat-db-3.3.11-2.${MACHINE_ARCH}.rpm \
-			db4-4.0.14-14.${MACHINE_ARCH}.rpm \
-			gdbm-1.8.0-18.${MACHINE_ARCH}.rpm \
-			glib-1.2.10-8.${MACHINE_ARCH}.rpm \
-			libtermcap-2.0.8-31.${MACHINE_ARCH}.rpm \
-			bash-2.05b-5.${MACHINE_ARCH}.rpm \
-			bzip2-1.0.2-5.${MACHINE_ARCH}.rpm \
-			compat-libstdc++-7.3-2.96.110.${MACHINE_ARCH}.rpm \
-			ncurses-5.2-28.${MACHINE_ARCH}.rpm \
-			info-4.2-5.${MACHINE_ARCH}.rpm \
-			grep-2.5.1-4.${MACHINE_ARCH}.rpm \
-			fileutils-4.1.9-11.${MACHINE_ARCH}.rpm \
-			popt-1.7-1.06.${MACHINE_ARCH}.rpm \
-			readline-4.3-3.${MACHINE_ARCH}.rpm \
-			setserial-2.17-9.${MACHINE_ARCH}.rpm \
-			libstdc++-3.2-7.${MACHINE_ARCH}.rpm \
-			slang-1.4.5-11.${MACHINE_ARCH}.rpm \
-			sh-utils-2.0.12-3.${MACHINE_ARCH}.rpm \
-			rpm-4.1-1.06.${MACHINE_ARCH}.rpm \
-			libgcc-3.2-7.${MACHINE_ARCH}.rpm \
-			freetype-2.1.2-7.${MACHINE_ARCH}.rpm \
-			zlib-1.1.4-8.8x.${MACHINE_ARCH}.rpm:new
+			compat-db-3.3.11-2.${ARCH}.rpm \
+			db4-4.0.14-14.${ARCH}.rpm \
+			gdbm-1.8.0-18.${ARCH}.rpm \
+			glib-1.2.10-8.${ARCH}.rpm \
+			libtermcap-2.0.8-31.${ARCH}.rpm \
+			bash-2.05b-5.${ARCH}.rpm \
+			bzip2-1.0.2-5.${ARCH}.rpm \
+			compat-libstdc++-7.3-2.96.110.${ARCH}.rpm \
+			ncurses-5.2-28.${ARCH}.rpm \
+			info-4.2-5.${ARCH}.rpm \
+			grep-2.5.1-4.${ARCH}.rpm \
+			fileutils-4.1.9-11.${ARCH}.rpm \
+			popt-1.7-1.06.${ARCH}.rpm \
+			readline-4.3-3.${ARCH}.rpm \
+			setserial-2.17-9.${ARCH}.rpm \
+			libstdc++-3.2-7.${ARCH}.rpm \
+			slang-1.4.5-11.${ARCH}.rpm \
+			sh-utils-2.0.12-3.${ARCH}.rpm \
+			rpm-4.1-1.06.${ARCH}.rpm \
+			libgcc-3.2-7.${ARCH}.rpm \
+			freetype-2.1.2-7.${ARCH}.rpm \
+			zlib-1.1.4-8.8x.${ARCH}.rpm:new
 
 MAINTAINER=		trevor@FreeBSD.org
 COMMENT=	Base set of packages needed in Linux mode (only for i386)
@@ -58,13 +58,13 @@ CONFLICTS=	linux_base-6* linux_base-7* linux_base-deb* linux_base-gen* \
 		linux_base-rh* linux_base-suse*
 RESTRICTED=		"binaries under GNU GPL without accompanying source"
 ONLY_FOR_ARCHS=		i386 amd64
-DIST_SUBDIR=		rpm/${MACHINE_ARCH}/${PORTVERSION}
+DIST_SUBDIR=		rpm/${ARCH}/${PORTVERSION}
 PREFIX=			${LINUXBASE}
 NO_BUILD=		yes
 NO_FILTER_SHLIBS=	yes
 NO_MTREE=		yes
 PLIST=			${WRKDIR}/pkg-plist
-MD5_FILE=		${MASTERDIR}/distinfo.${MACHINE_ARCH}
+MD5_FILE=		${MASTERDIR}/distinfo.${ARCH}
 
 # Let's avoid hardcoding 'en' as the language.
 LANG=			en
@@ -88,8 +88,8 @@ REMOVE_FILES=		bin/df bin/su etc/exports etc/group etc/localtime \
 BRAND_FILES=		bin/rpm sbin/ldconfig sbin/sln
 
 .if (${ARCH} == "amd64")
-LATEST_LINK:=	${LATEST_LINK:C/linux/linux32/}
-MACHINE_ARCH=		i386
+LATEST_LINK:=		${LATEST_LINK:C/linux/linux32/}
+ARCH=			i386
 FALLBACK_ELF_MIB=	kern.elf32.fallback_brand
 .else
 FALLBACK_ELF_MIB=	kern.fallback_elf_brand
diff --git a/emulators/linux_base-debian/Makefile b/emulators/linux_base-debian/Makefile
index 6cf1b4193c48..38537262726f 100644
--- a/emulators/linux_base-debian/Makefile
+++ b/emulators/linux_base-debian/Makefile
@@ -34,8 +34,7 @@ PREFIX?=	${LINUXBASE}
 
 .if (${ARCH} == "amd64")
 LATEST_LINK=	${PORTNAME:C/linux_base/linux32_base/}
-MACHINE_ARCH=	i386
-ARCH=		${MACHINE_ARCH}
+ARCH=		i386
 .endif
 
 DIST_SUBDIR=	debian-${PORTVERSION}-${DISTDATE}
diff --git a/emulators/linux_base-gentoo-stage1/Makefile b/emulators/linux_base-gentoo-stage1/Makefile
index d2f38464699e..af3c336da58e 100644
--- a/emulators/linux_base-gentoo-stage1/Makefile
+++ b/emulators/linux_base-gentoo-stage1/Makefile
@@ -16,33 +16,33 @@ COMMENT=	Files from Gentoo distribution, for Linux compatibility
 
 RESTRICTED=	"binaries licensed under GNU GPL without accompanying source"
 
-ONLY_FOR_MACHINE_ARCHS=	alpha amd64 ia64 i386
+ONLY_FOR_ARCHS=	alpha amd64 ia64 i386
 
 USE_BZIP2=	y
 
 .include <bsd.port.pre.mk>
 
-.if (${MACHINE_ARCH} == "amd64")
+.if (${ARCH} == "amd64")
 LATEST_LINK=	${PORTNAME:C/linux_base/linux32_base/}
-MACHINE_ARCH=	i386
+ARCH=	i386
 .endif
 
-.if (${MACHINE_ARCH} == "alpha")
+.if (${ARCH} == "alpha")
 MASTER_SITES+=	ftp://ftp.uos.ac.kr/pub/Linux/gentoo/gentoo/experimental/alpha/stages/
 MASTER_SITE_SUBDIR=	experimental/alpha/stages
 DISTNAME=	stage1-alpha-20030729
-.elif (${MACHINE_ARCH} == "i386")
+.elif (${ARCH} == "i386")
 MASTER_SITE_SUBDIR=	releases/x86/${PORTVERSION}/stages/x86 \
 			releases/historical/x86/${PORTVERSION}/stages/x86
 DISTNAME=	stage1-x86-20030910
-.elif (${MACHINE_ARCH} == "ia64")
+.elif (${ARCH} == "ia64")
 MASTER_SITE_SUBDIR=	releases/x86/${PORTVERSION}/stages/x86 \
 			releases/historical/x86/${PORTVERSION}/stages/x86
 DISTNAME=	stage1-x86-20030910
 .endif
 
 DIST_SUBDIR=	gentoo-linux
-MD5_FILE=	${MASTERDIR}/distinfo.${MACHINE_ARCH}
+MD5_FILE=	${MASTERDIR}/distinfo.${ARCH}
 PLIST=		${WRKDIR}/pkg-plist
 PREFIX=		${LINUXBASE}
 NO_FILTER_SHLIBS=y
diff --git a/emulators/linux_base/Makefile b/emulators/linux_base/Makefile
index 2550d39f522c..47b449efd2f9 100644
--- a/emulators/linux_base/Makefile
+++ b/emulators/linux_base/Makefile
@@ -11,36 +11,36 @@ PORTREVISION=		6
 CATEGORIES=		emulators linux
 MASTER_SITES=		${MASTER_SITE_REDHAT_LINUX} \
 			${MASTER_SITE_REDHAT_LINUX:S/$/:i386/}
-MASTER_SITE_SUBDIR=	${PORTVERSION}/${LANG}/os/${MACHINE_ARCH}/RedHat/RPMS \
+MASTER_SITE_SUBDIR=	${PORTVERSION}/${LANG}/os/${ARCH}/RedHat/RPMS \
 			${PORTVERSION}/${LANG}/os/i386/RedHat/RPMS/:i386
 DISTFILES=		redhat-release-7.1-1.noarch.rpm:i386 \
 			${RPM_SETUP} \
 			filesystem-2.0.7-1.noarch.rpm \
 			basesystem-7.0-2.noarch.rpm \
 			termcap-11.0.1-8.noarch.rpm \
-			db1-1.85-5.${MACHINE_ARCH}.rpm \
-			db3-3.1.17-7.${MACHINE_ARCH}.rpm \
+			db1-1.85-5.${ARCH}.rpm \
+			db3-3.1.17-7.${ARCH}.rpm \
 			${RPM_GDBM} \
-			glib-1.2.9-1.${MACHINE_ARCH}.rpm \
-			libtermcap-2.0.8-26.${MACHINE_ARCH}.rpm \
-			bash-2.04-21.${MACHINE_ARCH}.rpm \
+			glib-1.2.9-1.${ARCH}.rpm \
+			libtermcap-2.0.8-26.${ARCH}.rpm \
+			bash-2.04-21.${ARCH}.rpm \
 			${RPM_BZIP2} \
 			${RPM_LIBSTDCXX} \
 			${RPM_COMPAT_LIBSTDCXX} \
-			ncurses-5.2-8.${MACHINE_ARCH}.rpm \
-			info-4.0-20.${MACHINE_ARCH}.rpm \
-			fileutils-4.0.36-4.${MACHINE_ARCH}.rpm \
-			grep-2.4.2-5.${MACHINE_ARCH}.rpm \
-			popt-1.6.2-8.${MACHINE_ARCH}.rpm \
-			readline-4.1-9.${MACHINE_ARCH}.rpm \
+			ncurses-5.2-8.${ARCH}.rpm \
+			info-4.0-20.${ARCH}.rpm \
+			fileutils-4.0.36-4.${ARCH}.rpm \
+			grep-2.4.2-5.${ARCH}.rpm \
+			popt-1.6.2-8.${ARCH}.rpm \
+			readline-4.1-9.${ARCH}.rpm \
 			${RPM_SETSERIAL} \
-			slang-1.4.2-2.${MACHINE_ARCH}.rpm \
-			sh-utils-2.0-13.${MACHINE_ARCH}.rpm \
-			rpm-4.0.2-8.${MACHINE_ARCH}.rpm \
+			slang-1.4.2-2.${ARCH}.rpm \
+			sh-utils-2.0-13.${ARCH}.rpm \
+			rpm-4.0.2-8.${ARCH}.rpm \
 			${RPM_FREETYPE}
 
 PATCH_SITES=		${MASTER_SITE_REDHAT_LINUX}
-PATCH_SITE_SUBDIR=	updates/${PORTVERSION}/${LANG}/os/${MACHINE_ARCH}
+PATCH_SITE_SUBDIR=	updates/${PORTVERSION}/${LANG}/os/${ARCH}
 PATCHFILES=		${UPDATES}
 
 MAINTAINER=		ports@FreeBSD.org
@@ -50,43 +50,46 @@ BUILD_DEPENDS=		rpm:${PORTSDIR}/archivers/rpm
 
 FORBIDDEN=	"X Pixmap parsing bugs--see <URL:https://rhn.redhat.com/errata/RHSA-2004-478.html> and <URL:https://rhn.redhat.com/errata/RHSA-2004-612.html>"
 
-CONFLICTS=	linux_base-6* linux_base-8* linux_base-deb* linux_base-gen* \
-		linux_base-rh* linux_base-suse*
-ONLY_FOR_ARCHS=		alpha i386
+ONLY_FOR_ARCHS=		alpha amd64 i386
+
+CONFLICTS=		linux_base-6* linux_base-8* linux_base-rh* \
+			linux_base-suse* linux_base-debian* linux_base-gentoo*
+
 DIST_SUBDIR=		rpm
 PREFIX=			${LINUXBASE}
 EXTRACT_ONLY=
 NO_BUILD=		yes
 NO_FILTER_SHLIBS=	yes
 NO_MTREE=		yes
-PLIST=			${PKGDIR}/pkg-plist.${MACHINE_ARCH}
-MD5_FILE=		${MASTERDIR}/distinfo.${MACHINE_ARCH}
+PLIST=			${PKGDIR}/pkg-plist.${ARCH}
+MD5_FILE=		${MASTERDIR}/distinfo.${ARCH}
 
 # Let's avoid hardcoding 'en' as the language.
 LANG=			en
 
-.if (${MACHINE_ARCH} == "alpha")
-UPD_SET1=		glibc-common-2.2.4-32.1.${MACHINE_ARCH}.rpm \
-			glibc-2.2.4-32.1.${MACHINE_ARCH}.rpm
-.else
-UPD_SET1=		glibc-common-2.2.4-33.${MACHINE_ARCH}.rpm \
-			glibc-2.2.4-33.${MACHINE_ARCH}.rpm
-.endif
-UPD_SET2=		${RPM_XFREE86_LIBS} zlib-1.1.4-8.7x.${MACHINE_ARCH}.rpm
-UPDATES=		${UPD_SET1} ${UPD_SET2}
-
 .ifdef USE_LINUX
 .error You have `USE_LINUX' variable defined either in environment or in make(1) arguments. Please undefine and try again.
 .endif
 
 .include <bsd.port.pre.mk>
 
+
+.if (${ARCH} == "alpha")
+UPD_SET1=		glibc-common-2.2.4-32.1.${ARCH}.rpm \
+			glibc-2.2.4-32.1.${ARCH}.rpm
+.else
+UPD_SET1=		glibc-common-2.2.4-33.${ARCH}.rpm \
+			glibc-2.2.4-33.${ARCH}.rpm
+.endif
+UPD_SET2=		${RPM_XFREE86_LIBS} zlib-1.1.4-8.7x.${ARCH}.rpm
+UPDATES=		${UPD_SET1} ${UPD_SET2}
+
 .if (${ARCH} == "amd64")
-LATEST_LINK=		linux32_base
-MACHINE_ARCH=		i386
+LATEST_LINK=		${PORTNAME:C/linux_base/linux32_base/}
+ARCH=			i386
 .endif
 
-.if (${MACHINE_ARCH} == "i386")
+.if (${ARCH} == "i386")
 PORTREVISION=		7
 RPM_BZIP2=		bzip2-1.0.1-3.i386.rpm
 RPM_FREETYPE=		freetype-2.0.1-4.i386.rpm
@@ -97,7 +100,7 @@ RPM_SETSERIAL=		setserial-2.17-2.i386.rpm
 RPM_SETUP=		setup-2.4.7-1.noarch.rpm
 RPM_XFREE86_LIBS=	XFree86-libs-4.1.0-50.i386.rpm
 UPD_SET2+=		libstdc++-2.96-112.7.1.i386.rpm
-.else
+.elif (${ARCH} == "alpha")
 RPM_BZIP2=		bzip2-1.0.1-4.alpha.rpm
 RPM_FREETYPE=		freetype-2.0.1-5.alpha.rpm
 RPM_GDBM=		gdbm-1.8.0-6.alpha.rpm
@@ -107,6 +110,8 @@ RPM_SETSERIAL=		setserial-2.17-3.alpha.rpm
 RPM_SETUP=		setup-2.4.7-2.noarch.rpm
 RPM_XFREE86_LIBS=	XFree86-libs-4.1.0-29.4hp.alpha.rpm
 UPD_SET2+=
+.else
+.error			Unsupported architecture ${ARCH}.
 .endif
 
 DBPATH=			/var/lib/rpm
diff --git a/emulators/linux_dist-gentoo-stage1/Makefile b/emulators/linux_dist-gentoo-stage1/Makefile
index d2f38464699e..af3c336da58e 100644
--- a/emulators/linux_dist-gentoo-stage1/Makefile
+++ b/emulators/linux_dist-gentoo-stage1/Makefile
@@ -16,33 +16,33 @@ COMMENT=	Files from Gentoo distribution, for Linux compatibility
 
 RESTRICTED=	"binaries licensed under GNU GPL without accompanying source"
 
-ONLY_FOR_MACHINE_ARCHS=	alpha amd64 ia64 i386
+ONLY_FOR_ARCHS=	alpha amd64 ia64 i386
 
 USE_BZIP2=	y
 
 .include <bsd.port.pre.mk>
 
-.if (${MACHINE_ARCH} == "amd64")
+.if (${ARCH} == "amd64")
 LATEST_LINK=	${PORTNAME:C/linux_base/linux32_base/}
-MACHINE_ARCH=	i386
+ARCH=	i386
 .endif
 
-.if (${MACHINE_ARCH} == "alpha")
+.if (${ARCH} == "alpha")
 MASTER_SITES+=	ftp://ftp.uos.ac.kr/pub/Linux/gentoo/gentoo/experimental/alpha/stages/
 MASTER_SITE_SUBDIR=	experimental/alpha/stages
 DISTNAME=	stage1-alpha-20030729
-.elif (${MACHINE_ARCH} == "i386")
+.elif (${ARCH} == "i386")
 MASTER_SITE_SUBDIR=	releases/x86/${PORTVERSION}/stages/x86 \
 			releases/historical/x86/${PORTVERSION}/stages/x86
 DISTNAME=	stage1-x86-20030910
-.elif (${MACHINE_ARCH} == "ia64")
+.elif (${ARCH} == "ia64")
 MASTER_SITE_SUBDIR=	releases/x86/${PORTVERSION}/stages/x86 \
 			releases/historical/x86/${PORTVERSION}/stages/x86
 DISTNAME=	stage1-x86-20030910
 .endif
 
 DIST_SUBDIR=	gentoo-linux
-MD5_FILE=	${MASTERDIR}/distinfo.${MACHINE_ARCH}
+MD5_FILE=	${MASTERDIR}/distinfo.${ARCH}
 PLIST=		${WRKDIR}/pkg-plist
 PREFIX=		${LINUXBASE}
 NO_FILTER_SHLIBS=y