Reimplementation of world/kernel build options. For details, see:

http://lists.freebsd.org/pipermail/freebsd-current/2006-March/061725.html

The src.conf(5) manpage is to follow in a few days.

Brought to you by:	imp, jhb, kris, phk, ru (all bugs are mine)

8 files changed, 32 insertions, 16 deletions

diff --git a/lib/bind/bind/Makefile b/lib/bind/bind/Makefile
index 452223b..c10025c 100644
--- a/lib/bind/bind/Makefile
+++ b/lib/bind/bind/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+#.include <bsd.own.mk>
+
 BIND_DIR=	${.CURDIR}/../../../contrib/bind9
 LIB_BIND_REL=	..
 LIB_BIND_DIR=	${.CURDIR}/${LIB_BIND_REL}
@@ -62,7 +64,7 @@ SRCS+=		herror.c res_comp.c res_data.c \
 		res_mkquery.c res_mkupdate.c res_query.c \
 		res_send.c res_sendsigned.c res_update.c
 
-#.if defined(WITH_BIND_LIBS)
+#.if ${MK_BIND_LIBS} != "no"
 #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 3943bb8..68f72d7 100644
--- a/lib/bind/bind9/Makefile
+++ b/lib/bind/bind9/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 BIND_DIR=	${.CURDIR}/../../../contrib/bind9
 LIB_BIND_REL=	..
 LIB_BIND_DIR=	${.CURDIR}/${LIB_BIND_REL}
@@ -14,7 +16,7 @@ SRCS=		check.c getaddresses.c version.c
 
 CFLAGS+=	-I${SRCDIR}/include
 
-.if defined(WITH_BIND_LIBS)
+.if ${MK_BIND_LIBS} != "no"
 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 15d8122..d89207b 100644
--- a/lib/bind/config.mk
+++ b/lib/bind/config.mk
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 # BIND version number
 .if defined(BIND_DIR) && exists(${BIND_DIR}/version)
 .include	"${BIND_DIR}/version"
@@ -15,7 +17,7 @@ CFLAGS+=	-DHAVE_CONFIG_H
 CFLAGS+=	-DLIBINTERFACE=${LIBINTERFACE}
 CFLAGS+=	-DLIBREVISION=${LIBREVISION}
 CFLAGS+=	-DLIBAGE=${LIBAGE}
-.if defined(WITH_BIND_LIBS)
+.if ${MK_BIND_LIBS} != "no"
 SHLIB_MAJOR=	${LIBINTERFACE}
 SHLIB_MINOR=	${LIBINTERFACE}
 .else
@@ -24,17 +26,17 @@ INTERNALLIB=
 .endif
 
 # GSSAPI support is incomplete in 9.3.0
-#.if !defined(NO_KERBEROS)
+#.if ${MK_KERBEROS} != "no"
 #CFLAGS+=	-DGSSAPI
 #.endif
 
 # Enable IPv6 support if available
-.if !defined(NO_INET6)
+.if ${MK_INET6_SUPPORT} != "no"
 CFLAGS+=	-DWANT_IPV6
 .endif
 
 # Enable crypto if available
-.if !defined(NO_CRYPT)
+.if ${MK_OPENSSL} != "no"
 CFLAGS+=	-DOPENSSL
 .endif
 
@@ -61,7 +63,7 @@ CFLAGS+=	-I${LIB_BIND_DIR}
 .endif
 
 # Link against BIND libraries
-.if !defined(WITH_BIND_LIBS)
+.if ${MK_BIND_LIBS} == "no"
 LIBBIND9=	${LIB_BIND_REL}/bind9/libbind9.a
 CFLAGS+=	-I${BIND_DIR}/lib/bind9/include
 LIBDNS=		${LIB_BIND_REL}/dns/libdns.a
@@ -84,14 +86,14 @@ CFLAGS+=	-I${BIND_DIR}/lib/lwres/unix/include \
 .endif
 BIND_DPADD=	${LIBBIND9} ${LIBDNS} ${LIBISCCC} ${LIBISCCFG} \
 		${LIBISC} ${LIBLWRES}
-.if defined(WITH_BIND_LIBS)
+.if ${MK_BIND_LIBS} != "no"
 BIND_LDADD=	-lbind9 -ldns -lisccc -lisccfg -lisc -llwres
 .else
 BIND_LDADD=	${BIND_DPADD}
 .endif
 
 # Link against crypto library
-.if !defined(NO_CRYPT)
+.if ${MK_OPENSSL} != "no"
 CRYPTO_DPADD=	${LIBCRYPTO}
 CRYPTO_LDADD=	-lcrypto
 .endif
diff --git a/lib/bind/dns/Makefile b/lib/bind/dns/Makefile
index 463dba7..04be449 100644
--- a/lib/bind/dns/Makefile
+++ b/lib/bind/dns/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 BIND_DIR=	${.CURDIR}/../../../contrib/bind9
 LIB_BIND_REL=	..
 LIB_BIND_DIR=	${.CURDIR}/${LIB_BIND_REL}
@@ -40,7 +42,7 @@ CFLAGS+=	-I${.CURDIR}
 DPADD=		${CRYPTO_DPADD}
 LDADD=		${CRYPTO_LDADD}
 
-.if defined(WITH_BIND_LIBS)
+.if ${MK_BIND_LIBS} != "no"
 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 f34f808..0fd8342 100644
--- a/lib/bind/isc/Makefile
+++ b/lib/bind/isc/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 BIND_DIR=	${.CURDIR}/../../../contrib/bind9
 LIB_BIND_REL=	..
 LIB_BIND_DIR=	${.CURDIR}/${LIB_BIND_REL}
@@ -38,7 +40,7 @@ SRCS+=		inet_pton.c \
 CFLAGS+=	-I${SRCDIR}/unix/include -I${SRCDIR}/nothreads/include
 CFLAGS+=	-I${SRCDIR}/include -I${.CURDIR}
 
-.if defined(WITH_BIND_LIBS)
+.if ${MK_BIND_LIBS} != "no"
 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 549afe3..84e1ba8 100644
--- a/lib/bind/isccc/Makefile
+++ b/lib/bind/isccc/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 BIND_DIR=	${.CURDIR}/../../../contrib/bind9
 LIB_BIND_REL=	..
 LIB_BIND_DIR=	${.CURDIR}/${LIB_BIND_REL}
@@ -16,7 +18,7 @@ SRCS=		alist.c base64.c cc.c ccmsg.c \
 
 CFLAGS+=	-I${SRCDIR}/include
 
-.if defined(WITH_BIND_LIBS)
+.if ${MK_BIND_LIBS} != "no"
 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 36ccf8b..6c2309c 100644
--- a/lib/bind/isccfg/Makefile
+++ b/lib/bind/isccfg/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 BIND_DIR=	${.CURDIR}/../../../contrib/bind9
 LIB_BIND_REL=	..
 LIB_BIND_DIR=	${.CURDIR}/${LIB_BIND_REL}
@@ -14,7 +16,7 @@ SRCS=		log.c namedconf.c parser.c version.c
 
 CFLAGS+=	-I${SRCDIR}/include -I${.CURDIR}
 
-.if defined(WITH_BIND_LIBS)
+.if ${MK_BIND_LIBS} != "no"
 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 ec06a27..eef4589 100644
--- a/lib/bind/lwres/Makefile
+++ b/lib/bind/lwres/Makefile
@@ -1,13 +1,15 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 BIND_DIR=	${.CURDIR}/../../../contrib/bind9
 LIB_BIND_REL=	..
 LIB_BIND_DIR=	${.CURDIR}/${LIB_BIND_REL}
 SRCDIR=		${BIND_DIR}/lib/lwres
 
 # Unlike other BIND libs, this should be installed unless the user says NO.
-.if !defined(NO_BIND_LIBS_LWRES)
-WITH_BIND_LIBS=
+.if ${MK_BIND_LIBS_LWRES} != "no"
+MK_BIND_LIBS=	yes
 .endif
 
 .include	"${LIB_BIND_DIR}/config.mk"
@@ -24,7 +26,7 @@ SRCS+=		context.c gai_strerror.c getaddrinfo.c gethost.c \
 CFLAGS+=	-I${SRCDIR}/unix/include -I${SRCDIR}/include
 CFLAGS+=	-I${.CURDIR}
 
-.if defined(WITH_BIND_LIBS)
+.if ${MK_BIND_LIBS} != "no"
 MAN=		lwres.3 lwres_buffer.3 lwres_config.3 lwres_context.3 \
 		lwres_gabn.3 lwres_gai_strerror.3 lwres_getaddrinfo.3 \
 		lwres_gethostent.3 lwres_getipnode.3 lwres_getnameinfo.3 \