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)

3 files changed, 12 insertions, 6 deletions

diff --git a/usr.sbin/amd/Makefile.inc b/usr.sbin/amd/Makefile.inc
index d4d21f7..afb287f 100644
--- a/usr.sbin/amd/Makefile.inc
+++ b/usr.sbin/amd/Makefile.inc
@@ -9,6 +9,8 @@
 #	Portions derived from amd/libamu/Makefile
 #	$NetBSD: Makefile,v 1.8 1998/08/08 22:33:37 christos Exp $
 
+.include <bsd.own.mk>
+
 CFLAGS+= -I. -I${.CURDIR} 
 CFLAGS+= -I${.CURDIR}/../include
 .if exists(${.OBJDIR}/../include)
@@ -17,11 +19,11 @@ CFLAGS+= -I${.OBJDIR}/../include
 CFLAGS+= -I${.CURDIR}/../../../contrib/amd/include
 CFLAGS+= -I${.CURDIR}/../../../contrib/amd
 CFLAGS+= -DHAVE_CONFIG_H
-.if defined(NO_NIS)
+.if ${MK_NIS} == "no"
 CFLAGS+= -DHAVE_LOCALCONFIG_H
 .endif
 
-.if defined(YES_HESIOD)
+.if ${MK_HESIOD_SUPPORT} != "no"
 CFLAGS+= -DYES_HESIOD
 .endif
 
diff --git a/usr.sbin/amd/amd/Makefile b/usr.sbin/amd/amd/Makefile
index 3509d66..3cc8657 100644
--- a/usr.sbin/amd/amd/Makefile
+++ b/usr.sbin/amd/amd/Makefile
@@ -6,6 +6,8 @@
 # $FreeBSD$
 #
 
+.include <bsd.own.mk>
+
 .PATH: ${.CURDIR}/../../../contrib/amd/amd
 
 PROG=	amd
@@ -39,11 +41,11 @@ CLEANFILES+=	mount_xdr.c
 mount_xdr.c: ${MOUNT_X}
 	${RPCCOM} -c -DWANT_NFS3 ${MOUNT_X} -o ${.TARGET}
 
-.if defined(YES_HESIOD)
+.if ${MK_HESIOD_SUPPORT} != "no"
 SRCS+=	info_hesiod.c
 .endif
 
-.if !defined(NO_NIS)
+.if ${MK_NIS} != "no"
 SRCS+=	info_nis.c
 .endif
 
diff --git a/usr.sbin/amd/include/Makefile b/usr.sbin/amd/include/Makefile
index 7fa54ae..df770d1 100644
--- a/usr.sbin/amd/include/Makefile
+++ b/usr.sbin/amd/include/Makefile
@@ -7,8 +7,10 @@
 #	Portions derived from amd/libamu/Makefile
 #	$NetBSD: Makefile,v 1.8 1998/08/08 22:33:37 christos Exp $
 
+.include <bsd.own.mk>
+
 SRCS=	config_local.h
-.if defined(NO_NIS)
+.if ${MK_NIS} == "no"
 SRCS+=	localconfig.h
 .endif
 CLEANFILES=	${SRCS}
@@ -21,7 +23,7 @@ config_local.h: newvers.sh
 
 localconfig.h:
 	@rm -f ${.TARGET}
-	@echo "/* NIS disabled by NO_NIS make.conf option */" >> ${.TARGET}
+	@echo "/* NIS disabled by WITHOUT_NIS src.conf option */" >> ${.TARGET}
 	@echo "#undef HAVE_MAP_NIS" >> ${.TARGET}
 
 .include <bsd.prog.mk>