Updated to latest master (change of amd64 tag to x86_64).

diff --git a/lib/libbind9/Makefile b/lib/libbind9/Makefile
index 0027abf..4c94dfe 100644 (file)
--- a/lib/libbind9/Makefile
+++ b/lib/libbind9/Makefile
@@ -11,7 +11,7 @@ CFLAGS+= -I${BIND_DIR}/lib/isc/x86_32/include
 CFLAGS+= -DISC_PLATFORM_USETHREADS
 CFLAGS+= -DISC_PLATFORM_USEGCCASM
 .endif
-.if ${MACHINE_ARCH} == "amd64"
+.if ${MACHINE_ARCH} == "x86_64"
 CFLAGS+= -I${BIND_DIR}/lib/isc/x86_64/include
 CFLAGS+= -DISC_PLATFORM_USETHREADS
 CFLAGS+= -DISC_PLATFORM_USEGCCASM

diff --git a/lib/libisc/Makefile b/lib/libisc/Makefile
index 912bb8a..7d3cc2b 100644 (file)
--- a/lib/libisc/Makefile
+++ b/lib/libisc/Makefile
@@ -84,7 +84,7 @@ CFLAGS+= -I${BIND_DIR}/lib/isc/x86_32/include
 CFLAGS+= -DISC_PLATFORM_USETHREADS
 CFLAGS+= -DISC_PLATFORM_USEGCCASM
 .endif
-.if ${MACHINE_ARCH} == "amd64"
+.if ${MACHINE_ARCH} == "x86_64"
 CFLAGS+= -I${BIND_DIR}/lib/isc/x86_64/include
 CFLAGS+= -DISC_PLATFORM_USETHREADS
 CFLAGS+= -DISC_PLATFORM_USEGCCASM

diff --git a/usr.bin/dig/Makefile b/usr.bin/dig/Makefile
index eb2605f..275c061 100644 (file)
--- a/usr.bin/dig/Makefile
+++ b/usr.bin/dig/Makefile
@@ -22,7 +22,7 @@ CFLAGS+= -I${BIND_DIR}/lib/isc/x86_32/include
 CFLAGS+= -DISC_PLATFORM_USETHREADS
 CFLAGS+= -DISC_PLATFORM_USEGCCASM
 .endif
-.if ${MACHINE_ARCH} == "amd64"
+.if ${MACHINE_ARCH} == "x86_64"
 CFLAGS+= -I${BIND_DIR}/lib/isc/x86_64/include
 CFLAGS+= -DISC_PLATFORM_USETHREADS
 CFLAGS+= -DISC_PLATFORM_USEGCCASM

diff --git a/usr.bin/host/Makefile b/usr.bin/host/Makefile
index ee91813..41306a0 100644 (file)
--- a/usr.bin/host/Makefile
+++ b/usr.bin/host/Makefile
@@ -23,7 +23,7 @@ CFLAGS+= -I${BIND_DIR}/lib/isc/x86_32/include
 CFLAGS+= -DISC_PLATFORM_USETHREADS
 CFLAGS+= -DISC_PLATFORM_USEGCCASM
 .endif
-.if ${MACHINE_ARCH} == "amd64"
+.if ${MACHINE_ARCH} == "x86_64"
 CFLAGS+= -I${BIND_DIR}/lib/isc/x86_64/include
 CFLAGS+= -DISC_PLATFORM_USETHREADS
 CFLAGS+= -DISC_PLATFORM_USEGCCASM

diff --git a/usr.sbin/named/Makefile b/usr.sbin/named/Makefile
index a6613b6..1d25d2e 100644 (file)
--- a/usr.sbin/named/Makefile
+++ b/usr.sbin/named/Makefile
@@ -36,7 +36,7 @@ CFLAGS+= -I${BIND_DIR}/lib/isc/x86_32/include
 CFLAGS+= -DISC_PLATFORM_USETHREADS
 CFLAGS+= -DISC_PLATFORM_USEGCCASM
 .endif
-.if ${MACHINE_ARCH} == "amd64"
+.if ${MACHINE_ARCH} == "x86_64"
 CFLAGS+= -I${BIND_DIR}/lib/isc/x86_64/include
 CFLAGS+= -DISC_PLATFORM_USETHREADS
 CFLAGS+= -DISC_PLATFORM_USEGCCASM

diff --git a/usr.sbin/nslookup/Makefile b/usr.sbin/nslookup/Makefile
index df4f477..62f647b 100644 (file)
--- a/usr.sbin/nslookup/Makefile
+++ b/usr.sbin/nslookup/Makefile
@@ -24,7 +24,7 @@ CFLAGS+= -I${BIND_DIR}/lib/isc/x86_32/include
 CFLAGS+= -DISC_PLATFORM_USETHREADS
 CFLAGS+= -DISC_PLATFORM_USEGCCASM
 .endif
-.if ${MACHINE_ARCH} == "amd64"
+.if ${MACHINE_ARCH} == "x86_64"
 CFLAGS+= -I${BIND_DIR}/lib/isc/x86_64/include
 CFLAGS+= -DISC_PLATFORM_USETHREADS
 CFLAGS+= -DISC_PLATFORM_USEGCCASM

diff --git a/usr.sbin/nsupdate/Makefile b/usr.sbin/nsupdate/Makefile
index 3486639..8c9d710 100644 (file)
--- a/usr.sbin/nsupdate/Makefile
+++ b/usr.sbin/nsupdate/Makefile
@@ -21,7 +21,7 @@ CFLAGS+= -I${BIND_DIR}/lib/isc/x86_32/include
 CFLAGS+= -DISC_PLATFORM_USETHREADS
 CFLAGS+= -DISC_PLATFORM_USEGCCASM
 .endif
-.if ${MACHINE_ARCH} == "amd64"
+.if ${MACHINE_ARCH} == "x86_64"
 CFLAGS+= -I${BIND_DIR}/lib/isc/x86_64/include
 CFLAGS+= -DISC_PLATFORM_USETHREADS
 CFLAGS+= -DISC_PLATFORM_USEGCCASM