Fix the WANT_BIND_LIBS knob by correctly spelling it as WITH_BIND_LIBS

to match how similar syntax is used in the ports system. Thanks to kris
for pointing out my mistake here.

Install the lwres library unless the user defines NO_BIND, or the new
knob, NO_BIND_LIBS_LWRES. There is at least one potential customer
for this library in the wings. Thanks to nectar for the reminder.

8 files changed, 18 insertions, 10 deletions

diff --git a/lib/bind/bind/Makefile b/lib/bind/bind/Makefile
index a00a385..72b0083 100644
--- a/lib/bind/bind/Makefile
+++ b/lib/bind/bind/Makefile
@@ -65,7 +65,7 @@ SRCS+=		herror.c res_comp.c res_data.c \
 DPADD=		${PTHREAD_DPADD}
 LDADD=		${PTHREAD_LDADD}
 
-#.if defined(WANT_BIND_LIBS)
+#.if defined(WITH_BIND_LIBS)
 #INCS=		${SRCDIR}/include/isc/assertions.h \
 #		${SRCDIR}/include/isc/ctl.h \
 #		${SRCDIR}/include/isc/dst.h \
diff --git a/lib/bind/bind9/Makefile b/lib/bind/bind9/Makefile
index 7085a93..d470ed6 100644
--- a/lib/bind/bind9/Makefile
+++ b/lib/bind/bind9/Makefile
@@ -17,7 +17,7 @@ CFLAGS+=	-I${SRCDIR}/include
 DPADD=		${PTHREAD_DPADD}
 LDADD=		${PTHREAD_LDADD}
 
-.if defined(WANT_BIND_LIBS)
+.if defined(WITH_BIND_LIBS)
 INCS=		${SRCDIR}/include/bind9/check.h \
 		${SRCDIR}/include/bind9/getaddresses.h \
 		${SRCDIR}/include/bind9/version.h
diff --git a/lib/bind/config.mk b/lib/bind/config.mk
index 7968d90..77dbf36 100644
--- a/lib/bind/config.mk
+++ b/lib/bind/config.mk
@@ -15,7 +15,7 @@ CFLAGS+=	-DHAVE_CONFIG_H
 CFLAGS+=	-DLIBINTERFACE=${LIBINTERFACE}
 CFLAGS+=	-DLIBREVISION=${LIBREVISION}
 CFLAGS+=	-DLIBAGE=${LIBAGE}
-.if defined(WANT_BIND_LIBS)
+.if defined(WITH_BIND_LIBS)
 SHLIB_MAJOR=	${LIBINTERFACE}
 SHLIB_MINOR=	${LIBINTERFACE}
 .else
@@ -61,7 +61,7 @@ CFLAGS+=	-I${LIB_BIND_DIR}
 .endif
 
 # Link against BIND libraries
-.if !defined(WANT_BIND_LIBS)
+.if !defined(WITH_BIND_LIBS)
 LIBBIND9=	${LIB_BIND_REL}/bind9/libbind9.a
 CFLAGS+=	-I${BIND_DIR}/lib/bind9/include
 LIBDNS=		${LIB_BIND_REL}/dns/libdns.a
@@ -84,7 +84,7 @@ CFLAGS+=	-I${BIND_DIR}/lib/lwres/unix/include \
 .endif
 BIND_DPADD=	${LIBBIND9} ${LIBDNS} ${LIBISCCC} ${LIBISCCFG} \
 		${LIBISC} ${LIBLWRES}
-.if defined(WANT_BIND_LIBS)
+.if defined(WITH_BIND_LIBS)
 BIND_LDADD=	-lbind9 -ldns -lisccc -lisccfg -lisc -llwres
 .else
 BIND_LDADD=	${BIND_DPADD}
diff --git a/lib/bind/dns/Makefile b/lib/bind/dns/Makefile
index ea9a230..731f161 100644
--- a/lib/bind/dns/Makefile
+++ b/lib/bind/dns/Makefile
@@ -40,7 +40,7 @@ CFLAGS+=	-I${.CURDIR}
 DPADD=		${CRYPTO_DPADD} ${PTHREAD_DPADD}
 LDADD=		${CRYPTO_LDADD} ${PTHREAD_LDADD}
 
-.if defined(WANT_BIND_LIBS)
+.if defined(WITH_BIND_LIBS)
 DNSINCS=	${SRCDIR}/include/dns/acl.h \
 		${SRCDIR}/include/dns/adb.h \
 		${SRCDIR}/include/dns/bit.h \
diff --git a/lib/bind/isc/Makefile b/lib/bind/isc/Makefile
index 5128769..6114bd0 100644
--- a/lib/bind/isc/Makefile
+++ b/lib/bind/isc/Makefile
@@ -41,7 +41,7 @@ CFLAGS+=	-I${SRCDIR}/include -I${.CURDIR}
 DPADD=		${PTHREAD_DPADD}
 LDADD=		${PTHREAD_LDADD}
 
-.if defined(WANT_BIND_LIBS)
+.if defined(WITH_BIND_LIBS)
 INCS=		${SRCDIR}/include/isc/app.h \
 		${SRCDIR}/include/isc/assertions.h \
 		${SRCDIR}/include/isc/base64.h \
diff --git a/lib/bind/isccc/Makefile b/lib/bind/isccc/Makefile
index d3b0d4f..18e9c14 100644
--- a/lib/bind/isccc/Makefile
+++ b/lib/bind/isccc/Makefile
@@ -19,7 +19,7 @@ CFLAGS+=	-I${SRCDIR}/include
 DPADD=		${PTHREAD_DPADD}
 LDADD=		${PTHREAD_LDADD}
 
-.if defined(WANT_BIND_LIBS)
+.if defined(WITH_BIND_LIBS)
 INCS=		${SRCDIR}/include/isccc/alist.h \
 		${SRCDIR}/include/isccc/base64.h \
 		${SRCDIR}/include/isccc/cc.h \
diff --git a/lib/bind/isccfg/Makefile b/lib/bind/isccfg/Makefile
index 86adb54..609da2c 100644
--- a/lib/bind/isccfg/Makefile
+++ b/lib/bind/isccfg/Makefile
@@ -17,7 +17,7 @@ CFLAGS+=	-I${SRCDIR}/include -I${.CURDIR}
 DPADD=		${PTHREAD_DPADD}
 LDADD=		${PTHREAD_LDADD}
 
-.if defined(WANT_BIND_LIBS)
+.if defined(WITH_BIND_LIBS)
 INCS=		${SRCDIR}/include/isccfg/cfg.h \
 		${SRCDIR}/include/isccfg/grammar.h \
 		${SRCDIR}/include/isccfg/log.h \
diff --git a/lib/bind/lwres/Makefile b/lib/bind/lwres/Makefile
index 2d3dccf..f8dafdf 100644
--- a/lib/bind/lwres/Makefile
+++ b/lib/bind/lwres/Makefile
@@ -22,7 +22,14 @@ CFLAGS+=	-I${.CURDIR}
 DPADD=		${PTHREAD_DPADD}
 LDADD=		${PTHREAD_LDADD}
 
-.if defined(WANT_BIND_LIBS)
+# Unlike other BIND libs, this should be installed unless the user says NO.
+.if !defined(NO_BIND)
+.if !defined(NO_BIND_LIBS_LWRES)
+.undef INTERNALLIB
+
+SHLIB_MAJOR=	${LIBINTERFACE}
+SHLIB_MINOR=	${LIBINTERFACE}
+
 INCS=		${SRCDIR}/include/lwres/context.h \
 		${SRCDIR}/include/lwres/int.h \
 		${SRCDIR}/include/lwres/ipv6.h \
@@ -39,5 +46,6 @@ INCS=		${SRCDIR}/include/lwres/context.h \
 
 INCSDIR=	${INCLUDEDIR}/lwres
 .endif
+.endif
 
 .include <bsd.lib.mk>