Remove references to amd64, MACHINE_ARCH x86_64 cover all variants of

this architecture in pkgsrc now.

Reviewed by wiz@

5 files changed, 12 insertions, 13 deletions

diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index 3ce11551b65..3666dfffec4 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2015/09/07 12:02:05 jperkin Exp $
+# $NetBSD: Makefile,v 1.51 2015/11/08 15:08:00 sevan Exp $
 
 .include "dist.mk"
 
@@ -82,9 +82,9 @@ PY_PLATNAME=	${LOWER_OPSYS}${OS_VERSION:C/\..*//}
 .endif
 PLIST_SUBST+=	PY_PLATNAME=${PY_PLATNAME:Q}
 
-.if (${MACHINE_ARCH} == "alpha") || (${MACHINE_ARCH} == "amd64") || \
-    (${MACHINE_ARCH} == "sparc64") || (${MACHINE_ARCH} == "x86_64") || \
-    (${MACHINE_ARCH} == "powerpc64") || (defined(ABI) && ${ABI} == "64")
+.if (${MACHINE_ARCH} == "alpha") || (${MACHINE_ARCH} == "sparc64") || \
+    (${MACHINE_ARCH} == "x86_64") || (${MACHINE_ARCH} == "powerpc64") || \
+    (defined(ABI) && ${ABI} == "64")
 IS_64BIT_PLATFORM?=	yes
 .else
 IS_64BIT_PLATFORM?=	no
diff --git a/math/lp_solve/Makefile b/math/lp_solve/Makefile
index 75082297094..61e247bd0fe 100644
--- a/math/lp_solve/Makefile
+++ b/math/lp_solve/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2015/03/17 14:24:43 jperkin Exp $
+# $NetBSD: Makefile,v 1.7 2015/11/08 15:08:00 sevan Exp $
 #
 
 DISTNAME=	lp_solve_5.5.2.0_source
@@ -27,7 +27,7 @@ SUBST_FILES.dl+=	demo/ccc
 .include "../../mk/bsd.fast.prefs.mk"
 
 .if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64" || \
-	${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "amd64"
+	${MACHINE_ARCH} == "x86_64"
 LPSOLVE_ARCH=	ux64
 .else
 LPSOLVE_ARCH=	ux32
diff --git a/multimedia/libvpx/Makefile b/multimedia/libvpx/Makefile
index f8f9585cab8..7d8529358b4 100644
--- a/multimedia/libvpx/Makefile
+++ b/multimedia/libvpx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2015/07/11 23:40:49 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2015/11/08 15:08:00 sevan Exp $
 
 DISTNAME=	libvpx-1.4.0
 CATEGORIES=	multimedia
@@ -25,8 +25,7 @@ CONFIGURE_ARGS+=	--disable-unit-tests
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
-	${MACHINE_ARCH} == "amd64"
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 .  if ${PKGSRC_COMPILER} == "gcc" && (${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS")
 # PR pkg/48508: GCC 4.4 or later is required to compile ssse3 code on NetBSD & Solaris.
 GCC_REQD+=	4.4
diff --git a/x11/modular-xorg-server/Makefile.common b/x11/modular-xorg-server/Makefile.common
index a37503b09c0..22657a3f576 100644
--- a/x11/modular-xorg-server/Makefile.common
+++ b/x11/modular-xorg-server/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2015/11/01 22:58:52 tnn Exp $
+# $NetBSD: Makefile.common,v 1.4 2015/11/08 15:08:00 sevan Exp $
 # used by x11/modular-xorg-server/Makefile
 # used by x11/modular-xorg-xephyr/Makefile
 
@@ -82,7 +82,7 @@ PLIST_SUBST+=		SUNOS_ARCH=${SUNOS_ARCH}
 PLIST.sunos=		yes
 .  if ${MACHINE_ARCH} == "i386"
 SUNOS_ARCH=		ia32
-.  elif ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "x86_64"
+.  elif ${MACHINE_ARCH} == "x86_64"
 SUNOS_ARCH=		amd64
 .  elif ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
 SUNOS_ARCH=		sparcv8plus
diff --git a/x11/modular-xorg-server112/Makefile b/x11/modular-xorg-server112/Makefile
index 90070b98391..ee469f045d1 100644
--- a/x11/modular-xorg-server112/Makefile
+++ b/x11/modular-xorg-server112/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2015/10/11 17:51:47 tnn Exp $
+# $NetBSD: Makefile,v 1.8 2015/11/08 15:08:00 sevan Exp $
 
 DISTNAME=	xorg-server-1.12.4
 PKGNAME=	modular-${DISTNAME}
@@ -92,7 +92,7 @@ PLIST_SUBST+=		SUNOS_ARCH=${SUNOS_ARCH}
 PLIST.sunos=		yes
 .  if ${MACHINE_ARCH} == "i386"
 SUNOS_ARCH=		ia32
-.  elif ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "x86_64"
+.  elif ${MACHINE_ARCH} == "x86_64"
 SUNOS_ARCH=		amd64
 .  elif ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
 SUNOS_ARCH=		sparcv8plus