[Midnightbsd-cvs] src: Makefile: Update for bind 9.4.2

[laffer1 at midnightbsd.org]

Log Message:
-----------
Update for bind 9.4.2

Modified Files:
--------------
    src/lib/bind/isc:
        Makefile (r1.1.1.1 -> r1.2)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/src/lib/bind/isc/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/bind/isc/Makefile -L lib/bind/isc/Makefile -u -r1.1.1.1 -r1.2
--- lib/bind/isc/Makefile
+++ lib/bind/isc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/bind/isc/Makefile,v 1.4.4.2 2005/11/16 07:59:49 ru Exp $
+# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/lib/bind/isc/Makefile,v 1.8 2007/06/02 23:19:56 dougb Exp $
 
 BIND_DIR=	${.CURDIR}/../../../contrib/bind9
 LIB_BIND_REL=	..
@@ -19,7 +19,7 @@
 .PATH:		${SRCDIR}/nls
 SRCS+=		msgcat.c \
 
-.PATH:		${SRCDIR}/nothreads
+.PATH:		${SRCDIR}/pthreads
 SRCS+=		condition.c mutex.c \
 		thread.c
 
@@ -27,16 +27,20 @@
 SRCS+=		inet_pton.c \
 		assertions.c base64.c bitstring.c buffer.c \
 		bufferlist.c commandline.c error.c event.c \
-		hash.c heap.c hex.c hmacmd5.c \
+		hash.c heap.c hex.c hmacmd5.c hmacsha.c \
 		lex.c lfsr.c lib.c log.c md5.c \
 		mem.c mutexblock.c netaddr.c netscope.c ondestroy.c \
 		parseint.c print.c quota.c random.c \
-		ratelimiter.c region.c result.c rwlock.c \
-		serial.c sha1.c  sockaddr.c string.c strtoul.c \
+		ratelimiter.c refcount.c region.c result.c rwlock.c \
+		serial.c sha1.c sha2.c sockaddr.c string.c strtoul.c \
 		symtab.c task.c taskpool.c timer.c version.c
 
-CFLAGS+=	-I${SRCDIR}/unix/include -I${SRCDIR}/nothreads/include
+CFLAGS+=	-I${SRCDIR}/unix/include -I${SRCDIR}/pthreads/include
 CFLAGS+=	-I${SRCDIR}/include -I${.CURDIR}
+CFLAGS+=	-I${SRCDIR}/${ISC_ATOMIC_ARCH}/include
+
+DPADD=		${PTHREAD_DPADD}
+LDADD=		${PTHREAD_LDADD}
 
 .if defined(WITH_BIND_LIBS)
 INCS=		${SRCDIR}/include/isc/app.h \
@@ -58,6 +62,7 @@
 		${SRCDIR}/include/isc/heap.h \
 		${SRCDIR}/include/isc/hex.h \
 		${SRCDIR}/include/isc/hmacmd5.h \
+		${SRCDIR}/include/isc/hmacsha.h \
 		${SRCDIR}/include/isc/interfaceiter.h \
 		${SRCDIR}/include/isc/ipv6.h \
 		${SRCDIR}/include/isc/lang.h \
@@ -89,6 +94,7 @@
 		${SRCDIR}/include/isc/rwlock.h \
 		${SRCDIR}/include/isc/serial.h \
 		${SRCDIR}/include/isc/sha1.h \
+		${SRCDIR}/include/isc/sha2.h \
 		${SRCDIR}/include/isc/sockaddr.h \
 		${SRCDIR}/include/isc/socket.h \
 		${SRCDIR}/include/isc/stdio.h \
@@ -101,10 +107,10 @@
 		${SRCDIR}/include/isc/types.h \
 		${SRCDIR}/include/isc/util.h \
 		${SRCDIR}/include/isc/version.h \
-		${SRCDIR}/nothreads/include/isc/condition.h \
-		${SRCDIR}/nothreads/include/isc/mutex.h \
-		${SRCDIR}/nothreads/include/isc/once.h \
-		${SRCDIR}/nothreads/include/isc/thread.h \
+		${SRCDIR}/pthreads/include/isc/condition.h \
+		${SRCDIR}/pthreads/include/isc/mutex.h \
+		${SRCDIR}/pthreads/include/isc/once.h \
+		${SRCDIR}/pthreads/include/isc/thread.h \
 		${SRCDIR}/unix/include/isc/dir.h \
 		${SRCDIR}/unix/include/isc/int.h \
 		${SRCDIR}/unix/include/isc/keyboard.h \
@@ -116,6 +122,7 @@
 		${SRCDIR}/unix/include/isc/strerror.h \
 		${SRCDIR}/unix/include/isc/syslog.h \
 		${SRCDIR}/unix/include/isc/time.h \
+		${SRCDIR}/${ISC_ATOMIC_ARCH}/include/isc/atomic.h \
 		isc/platform.h
 
 INCSDIR=	${INCLUDEDIR}/isc