From 97a7ccf9c1a69c94aae9e28ae86f30133bdc7be3 Mon Sep 17 00:00:00 2001
From: dougb <dougb@FreeBSD.org>
Date: Sun, 9 Jan 2011 23:47:11 +0000
Subject: Revert part of r217071 so that us mere mortals can clearly see what
 this bit of code is intended to do. :)

Approved by:	imp
---
 lib/bind/config.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'lib/bind')

diff --git a/lib/bind/config.mk b/lib/bind/config.mk
index 0fb5f3e..184d017 100644
--- a/lib/bind/config.mk
+++ b/lib/bind/config.mk
@@ -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"
-- 
cgit v1.1