From c71158d45355ad344b90b42af22dc619f06114b0 Mon Sep 17 00:00:00 2001
From: Tom Rhodes <trhodes@FreeBSD.org>
Date: Wed, 2 Mar 2005 11:53:22 +0000
Subject: [PATCH] Wrap BSD r* commands in NO_RCMDS. Change NO_RCMDNS to
 NO_RCMDS and do the switch in bsd.compat.mk.

Discussed with: ru, nectar
---
 bin/Makefile           |  2 +-
 libexec/Makefile       | 12 +++++++++---
 rescue/rescue/Makefile |  2 +-
 share/mk/bsd.compat.mk |  1 +
 usr.bin/Makefile       |  9 +++++++--
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/bin/Makefile b/bin/Makefile
index 86998bd4ff7b..a56de99821b1 100644
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -37,7 +37,7 @@ SUBDIR= cat \
 	sync \
 	test
 
-.if !defined(NO_RCMNDS)
+.if !defined(NO_RCMDS)
 _rcp=	rcp
 .endif
 
diff --git a/libexec/Makefile b/libexec/Makefile
index 56919cfde43a..defc296f48d7 100644
--- a/libexec/Makefile
+++ b/libexec/Makefile
@@ -16,14 +16,14 @@ SUBDIR=	atrun \
 	pt_chown \
 	rbootd \
 	revnetgroup \
-	rexecd \
-	rlogind \
+	${_rexecd} \
+	${_rlogind} \
 	rpc.rquotad \
 	rpc.rstatd \
 	rpc.rusersd \
 	rpc.rwalld \
 	rpc.sprayd \
-	rshd \
+	${_rshd} \
 	${_rtld-elf} \
 	save-entropy \
 	${_smrsh} \
@@ -46,6 +46,12 @@ _ftp-proxy=	ftp-proxy
 _rtld-elf=	rtld-elf
 .endif
 
+.if !defined(NO_RCMDS)
+_rexecd=	rexecd
+_logind=	rlogind
+_rshd=		rshd
+.endif
+
 .if !defined(NO_SENDMAIL)
 _mail.local=	mail.local
 _smrsh=	smrsh
diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile
index ee43a38795d1..24278d34ed50 100644
--- a/rescue/rescue/Makefile
+++ b/rescue/rescue/Makefile
@@ -81,7 +81,7 @@ CRUNCH_ALIAS_ln= link
 CRUNCH_ALIAS_rm= unlink
 CRUNCH_ALIAS_ed= red
 
-.if !defined(NO_RCMNDS)
+.if !defined(NO_RCMDS)
 CRUNCH_PROGS_bin+= rcp
 .endif
 
diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk
index 91d46c2717af..d7eada6743cb 100644
--- a/share/mk/bsd.compat.mk
+++ b/share/mk/bsd.compat.mk
@@ -26,6 +26,7 @@
 	NOPAM:NO_PAM \
 	NOPIC:NO_PIC \
 	NOPROFILE:NO_PROFILE \
+	NO_RCMNDS:NO_RCMDS \
 	NOSHARE:NO_SHARE \
 	NOSHARED:NO_SHARED \
 	NOTAGS:NO_TAGS
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index fbe4e4574c91..824260e20c23 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -147,11 +147,11 @@ SUBDIR=	alias \
 	quota \
 	renice \
 	rev \
-	rlogin \
+	${_rlogin} \
 	rpcgen \
 	rpcinfo \
 	rs \
-	rsh \
+	${_rsh} \
 	rup \
 	ruptime \
 	rusers \
@@ -261,6 +261,11 @@ _ypmatch=	ypmatch
 _ypwhich=	ypwhich
 .endif
 
+.if !defined(NO_RCMDS)
+_rlogin=	rlogin
+_rsh=		rsh
+.endif
+
 .if !defined(NO_SENDMAIL)
 _vacation=	vacation
 .endif