4 files changed, 24 insertions, 7 deletions
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 99c105a..4be12bc 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -221,9 +221,9 @@ SUBDIR=	alias \
 	xstr \
 	${_yacc} \
 	yes \
-	ypcat \
-	ypmatch \
-	ypwhich
+	${_ypcat} \
+	${_ypmatch} \
+	${_ypwhich}
 
 .if ${MACHINE_ARCH} != "arm" && \
     ${MACHINE_ARCH} != "powerpc"
@@ -250,6 +250,12 @@ _chkey=		chkey
 _newkey=	newkey
 .endif
 
+.if !defined(NO_NIS) 
+_ypcat=		ypcat
+_ypmatch=	ypmatch
+_ypwhich=	ypwhich
+.endif
+
 .if !defined(NO_SENDMAIL)
 _vacation=	vacation
 .endif
diff --git a/usr.bin/chkey/Makefile b/usr.bin/chkey/Makefile
index 8cf1ef2..f3f5bd6 100644
--- a/usr.bin/chkey/Makefile
+++ b/usr.bin/chkey/Makefile
@@ -4,7 +4,10 @@
 
 PROG=	chkey
 SRCS=	chkey.c generic.c update.c
-CFLAGS+=-DYP -I${.CURDIR}/../newkey
+CFLAGS+= -I${.CURDIR}/../newkey
+.if !defined(NO_NIS)
+CFLAGS+= -DYP
+.endif
 DPADD=	${LIBRPCSVC} ${LIBMP} ${LIBCRYPTO}
 LDADD=	-lrpcsvc -lmp -lcrypto
 
diff --git a/usr.bin/chpass/Makefile b/usr.bin/chpass/Makefile
index 8077152..a012ad8 100644
--- a/usr.bin/chpass/Makefile
+++ b/usr.bin/chpass/Makefile
@@ -8,13 +8,19 @@ SRCS=	chpass.c edit.c field.c pw_scan.c table.c util.c
 BINOWN=	root
 BINMODE=4555
 WARNS?=	5
-CFLAGS+=-DYP
+.if !defined(NO_NIS)
+CFLAGS+= -DYP
+.endif
 #Some people need this, uncomment to activate
 #CFLAGS+=-DRESTRICT_FULLNAME_CHANGE
 CFLAGS+=-I${.CURDIR}/../../usr.sbin/pwd_mkdb -I${.CURDIR}/../../lib/libc/gen -I.
 
-DPADD=	${LIBCRYPT} ${LIBUTIL} ${LIBYPCLNT}
-LDADD=	-lcrypt -lutil -lypclnt
+DPADD=	${LIBCRYPT} ${LIBUTIL}
+LDADD=	-lcrypt -lutil
+.if !defined(NO_NIS)
+DPADD+=	${LIBYPCLNT}
+LDADD+=	-lypclnt
+.endif 
 
 LINKS=	${BINDIR}/chpass ${BINDIR}/chfn
 LINKS+=	${BINDIR}/chpass ${BINDIR}/chsh
diff --git a/usr.bin/newkey/Makefile b/usr.bin/newkey/Makefile
index 6fa5f96..670aa3c 100644
--- a/usr.bin/newkey/Makefile
+++ b/usr.bin/newkey/Makefile
@@ -2,7 +2,9 @@
 
 PROG=	newkey
 SRCS=	newkey.c generic.c update.c
+.if !defined(NO_NIS)
 CFLAGS+= -DYP
+.endif
 MAN=	newkey.8
 DPADD=	${LIBRPCSVC} ${LIBMP} ${LIBCRYPTO}
 LDADD=	-lrpcsvc -lmp -lcrypto