From cedb8c677d8ecfe00138ad97e79f5c72d1c771ee Mon Sep 17 00:00:00 2001
From: ngie <ngie@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Fri, 13 Feb 2015 21:21:51 +0000
Subject: [PATCH] MFstable/10 r278710:

r278710:

  MFC r277676:

  r277676:

    Add MK_TALK knob for building the talk and talkd

    Sponsored by: EMC / Isilon Storage Division


git-svn-id: svn://svn.freebsd.org/base/stable/9@278712 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 libexec/Makefile                         | 5 ++++-
 share/mk/bsd.own.mk                      | 1 +
 tools/build/mk/OptionalObsoleteFiles.inc | 7 +++++++
 tools/build/options/WITHOUT_TALK         | 5 +++++
 usr.bin/Makefile                         | 5 ++++-
 5 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 tools/build/options/WITHOUT_TALK

diff --git a/libexec/Makefile b/libexec/Makefile
index 78953b4e2..052a23dfb 100644
--- a/libexec/Makefile
+++ b/libexec/Makefile
@@ -24,7 +24,6 @@ SUBDIR=	${_atrun} \
 	${_rtld-elf} \
 	save-entropy \
 	${_smrsh} \
-	talkd \
 	tcpd \
 	${_telnetd} \
 	tftpd \
@@ -67,6 +66,10 @@ _mail.local=	mail.local
 _smrsh=		smrsh
 .endif
 
+.if ${MK_TALK} != "no"
+SUBDIR+=	talkd
+.endif
+
 .if ${MK_TELNET} != "no"
 _telnetd=	telnetd
 .endif
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 3f6c6e8f0..800e86251 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -427,6 +427,7 @@ __DEFAULT_YES_OPTIONS = \
     SYSINSTALL \
     SYMVER \
     SYSCONS \
+    TALK \
     TCSH \
     TELNET \
     TEXTPROC \
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 78796421f..971042482 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -3827,6 +3827,13 @@ OLD_FILES+=usr/share/sendmail/cf/siteconfig/uucp.ucbvax.m4
 # to be filled in
 #.endif
 
+.if ${MK_TALK} == no
+OLD_FILES+=usr/bin/talk
+OLD_FILES+=usr/libexec/ntalkd
+OLD_FILES+=usr/share/man/man1/talk.1.gz
+OLD_FILES+=usr/share/man/man8/talkd.8.gz
+.endif
+
 .if ${MK_TCSH} == no
 OLD_FILES+=bin/csh
 OLD_FILES+=bin/tcsh
diff --git a/tools/build/options/WITHOUT_TALK b/tools/build/options/WITHOUT_TALK
new file mode 100644
index 000000000..33d416750
--- /dev/null
+++ b/tools/build/options/WITHOUT_TALK
@@ -0,0 +1,5 @@
+.\" $FreeBSD$
+Set to not build or install
+.Xr talk 1
+and
+.Xr talkd 8 .
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 4081fce4e..41dbc6ede 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -150,7 +150,6 @@ SUBDIR=	alias \
 	systat \
 	tabs \
 	tail \
-	talk \
 	tar \
 	tcopy \
 	tee \
@@ -311,6 +310,10 @@ SUBDIR+=	rwho
 SUBDIR+=	vacation
 .endif
 
+.if ${MK_TALK} != "no"
+SUBDIR+=	talk
+.endif
+
 .if ${MK_TELNET} != "no"
 SUBDIR+=	telnet
 .endif
-- 
2.45.0