[pkgsrc/trunk]: pkgsrc/lang/spidermonkey uname -m returns amd64, not x86_86.

[hubertf <hubertf%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3c0459deecde
branches:  trunk
changeset: 522042:3c0459deecde
user:      hubertf <hubertf%pkgsrc.org@localhost>
date:      Fri Dec 01 10:55:24 2006 +0000

description:
uname -m returns amd64, not x86_86.
Reported and tested by Blair Sadewitz (blair.sadewitz at gmail dot com)

diffstat:

 lang/spidermonkey/Makefile        |  4 ++--
 lang/spidermonkey/files/pkgsrc.mk |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (35 lines):

diff -r 9f874c07dc0a -r 3c0459deecde lang/spidermonkey/Makefile
--- a/lang/spidermonkey/Makefile        Fri Dec 01 10:53:15 2006 +0000
+++ b/lang/spidermonkey/Makefile        Fri Dec 01 10:55:24 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2006/09/09 02:43:09 obache Exp $
+# $NetBSD: Makefile,v 1.9 2006/12/01 10:55:24 hubertf Exp $
 
 DISTNAME=      js-1.5
 PKGNAME=       ${DISTNAME:S/js/spidermonkey/}
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    lang
 MASTER_SITES=  http://ftp.mozilla.org/pub/mozilla.org/js/
 
diff -r 9f874c07dc0a -r 3c0459deecde lang/spidermonkey/files/pkgsrc.mk
--- a/lang/spidermonkey/files/pkgsrc.mk Fri Dec 01 10:53:15 2006 +0000
+++ b/lang/spidermonkey/files/pkgsrc.mk Fri Dec 01 10:55:24 2006 +0000
@@ -54,7 +54,7 @@
 
 CPU_ARCH = $(shell uname -m)
 # don't filter in x86-64 architecture
-ifneq (x86_64,$(CPU_ARCH))
+ifneq (amd64,$(CPU_ARCH))
 ifeq (86,$(findstring 86,$(CPU_ARCH)))
 CPU_ARCH = x86
 OS_CFLAGS+= -DX86_LINUX
@@ -90,7 +90,7 @@
 # Use the editline library to provide line-editing support.
 JS_EDITLINE = 1
 
-ifeq ($(CPU_ARCH),x86_64)
+ifeq ($(CPU_ARCH),amd64)
 # Use VA_COPY() standard macro on x86-64
 # FIXME: better use it everywhere
 OS_CFLAGS += -DHAVE_VA_COPY -DVA_COPY=va_copy