Author: ngie
Date: Fri Feb 13 21:19:54 2015
New Revision: 278710
URL: https://svnweb.freebsd.org/changeset/base/278710
Log:
MFC r277676:
r277676:
Add MK_TALK knob for building the talk and talkd
Sponsored by: EMC / Isilon Storage Division
Added:
stable/10/tools/build/options/WITHOUT_TALK
- copied unchanged from r277676, head/tools/build/options/WITHOUT_TALK
Modified:
stable/10/libexec/Makefile
stable/10/share/mk/bsd.own.mk
stable/10/tools/build/mk/OptionalObsoleteFiles.inc
stable/10/usr.bin/Makefile
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/libexec/Makefile
==============================================================================
--- stable/10/libexec/Makefile Fri Feb 13 21:19:02 2015 (r278709)
+++ stable/10/libexec/Makefile Fri Feb 13 21:19:54 2015 (r278710)
@@ -26,7 +26,6 @@ SUBDIR= ${_atf} \
${_rtld-elf} \
save-entropy \
${_smrsh} \
- talkd \
tcpd \
${_telnetd} \
${_tests} \
@@ -74,6 +73,10 @@ _mail.local= mail.local
_smrsh= smrsh
.endif
+.if ${MK_TALK} != "no"
+SUBDIR+= talkd
+.endif
+
.if ${MK_TELNET} != "no"
_telnetd= telnetd
.endif
Modified: stable/10/share/mk/bsd.own.mk
==============================================================================
--- stable/10/share/mk/bsd.own.mk Fri Feb 13 21:19:02 2015
(r278709)
+++ stable/10/share/mk/bsd.own.mk Fri Feb 13 21:19:54 2015
(r278710)
@@ -357,6 +357,7 @@ __DEFAULT_YES_OPTIONS = \
SYMVER \
SYSCONS \
SYSINSTALL \
+ TALK \
TCSH \
TELNET \
TEXTPROC \
Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/10/tools/build/mk/OptionalObsoleteFiles.inc Fri Feb 13 21:19:02
2015 (r278709)
+++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc Fri Feb 13 21:19:54
2015 (r278710)
@@ -4221,6 +4221,13 @@ OLD_DIRS+=usr/share/doc/pjdfstest
# 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
Copied: stable/10/tools/build/options/WITHOUT_TALK (from r277676,
head/tools/build/options/WITHOUT_TALK)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/10/tools/build/options/WITHOUT_TALK Fri Feb 13 21:19:54 2015
(r278710, copy of r277676, head/tools/build/options/WITHOUT_TALK)
@@ -0,0 +1,5 @@
+.\" $FreeBSD$
+Set to not build or install
+.Xr talk 1
+and
+.Xr talkd 8 .
Modified: stable/10/usr.bin/Makefile
==============================================================================
--- stable/10/usr.bin/Makefile Fri Feb 13 21:19:02 2015 (r278709)
+++ stable/10/usr.bin/Makefile Fri Feb 13 21:19:54 2015 (r278710)
@@ -155,7 +155,6 @@ SUBDIR= alias \
systat \
tabs \
tail \
- talk \
tar \
tcopy \
tee \
@@ -336,6 +335,10 @@ SUBDIR+= rwho
SUBDIR+= vacation
.endif
+.if ${MK_TALK} != "no"
+SUBDIR+= talk
+.endif
+
.if ${MK_TELNET} != "no"
SUBDIR+= telnet
.endif
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
