From owner-svn-src-head@FreeBSD.ORG  Sun Jan  9 23:47:12 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 057D5106564A;
	Sun,  9 Jan 2011 23:47:12 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E93698FC1A;
	Sun,  9 Jan 2011 23:47:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p09NlBlL060804;
	Sun, 9 Jan 2011 23:47:11 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p09NlB4M060802;
	Sun, 9 Jan 2011 23:47:11 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201101092347.p09NlB4M060802@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sun, 9 Jan 2011 23:47:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r217213 - head/lib/bind
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 09 Jan 2011 23:47:12 -0000

Author: dougb
Date: Sun Jan  9 23:47:11 2011
New Revision: 217213
URL: http://svn.freebsd.org/changeset/base/217213

Log:
  Revert part of r217071 so that us mere mortals can clearly see
  what this bit of code is intended to do. :)
  
  Approved by:	imp

Modified:
  head/lib/bind/config.mk

Modified: head/lib/bind/config.mk
==============================================================================
--- head/lib/bind/config.mk	Sun Jan  9 23:46:24 2011	(r217212)
+++ head/lib/bind/config.mk	Sun Jan  9 23:47:11 2011	(r217213)
@@ -65,7 +65,11 @@ CFLAGS+=	-I${LIB_BIND_DIR}
 .endif
 
 # Use the right version of the atomic.h file from lib/isc
-ISC_ATOMIC_ARCH=${MACHINE_CPUARCH:S/i386/x86_32/:S/amd64/x86_32/}
+.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
+ISC_ATOMIC_ARCH=	x86_32
+.else
+ISC_ATOMIC_ARCH=	${MACHINE_CPUARCH}
+.endif
 
 # Optional features
 .if ${MK_BIND_LARGE_FILE} == "yes"