[pkgsrc/trunk]: pkgsrc/mk Revert last change. It doesn't work properly becaus...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c5a1efed784b
branches:  trunk
changeset: 565365:c5a1efed784b
user:      tron <tron%pkgsrc.org@localhost>
date:      Mon Sep 21 15:28:03 2009 +0000

description:
Revert last change. It doesn't work properly because the "ABI" setting
is not defined that early as we have included neither "bsd.own.mk"
nor "mk.conf" yet.

We unfortunately cannot make these adjustments later because "bsd.own.mk"
and "mk.conf" would be processed with an incorrect value for
"MACHINE_ARCH".

diffstat:

 mk/bsd.prefs.mk |  20 +-------------------
 1 files changed, 1 insertions(+), 19 deletions(-)

diffs (35 lines):

diff -r 44602fc8cbc5 -r c5a1efed784b mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk   Mon Sep 21 13:06:43 2009 +0000
+++ b/mk/bsd.prefs.mk   Mon Sep 21 15:28:03 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.296 2009/09/21 10:56:08 tron Exp $
+# $NetBSD: bsd.prefs.mk,v 1.297 2009/09/21 15:28:03 tron Exp $
 #
 # This file includes the mk.conf file, which contains the user settings.
 #
@@ -123,25 +123,7 @@
 
 .elif ${OPSYS} == "Darwin"
 LOWER_OPSYS?=          darwin
-.if empty(OS_VERSION:M[1-9].*.*)
-# Determine the ABI under Mac OS X Snow Leopard and adjust
-# the machine archicture accordingly.
-.  if !defined(ABI)
-_SYSCTL_HW_OPTIONAL_X86_64!=   /usr/sbin/sysctl -n hw.optional.x86_64
-.    if ${_SYSCTL_HW_OPTIONAL_X86_64} == "1"
-ABI=   64
-.else
-ABI=   32
-.    endif
-.  endif
-.if ${ABI} == "32"
-LOWER_ARCH=    i386
-.else
-LOWER_ARCH=    x86_64
-.endif
-.else
 LOWER_ARCH!=           ${UNAME} -p
-.endif
 MACHINE_ARCH=          ${LOWER_ARCH}
 MAKEFLAGS+=            LOWER_ARCH=${LOWER_ARCH:Q}
 LOWER_OPSYS_VERSUFFIX= ${LOWER_OS_VERSION:C/([0-9]*).*/\1/}