Author: ngie
Date: Sun Jan 25 04:37:44 2015
New Revision: 277676
URL: https://svnweb.freebsd.org/changeset/base/277676
Log:
Add MK_TALK knob for building the talk and talkd
MFC after: 2 weeks
Sponsored by: EMC / Isilon Storage Division
Added:
head/tools/build/options/WITHOUT_TALK (contents, props changed)
Modified:
head/libexec/Makefile
head/share/mk/src.opts.mk
head/tools/build/mk/OptionalObsoleteFiles.inc
head/usr.bin/Makefile
Modified: head/libexec/Makefile
==============================================================================
--- head/libexec/Makefile Sun Jan 25 04:20:11 2015 (r277675)
+++ head/libexec/Makefile Sun Jan 25 04:37:44 2015 (r277676)
@@ -28,7 +28,6 @@ SUBDIR= ${_atf} \
${_rtld-elf} \
save-entropy \
${_smrsh} \
- talkd \
tcpd \
${_telnetd} \
${_tests} \
@@ -81,6 +80,10 @@ _mail.local= mail.local
_smrsh= smrsh
.endif
+.if ${MK_TALK} != "no"
+SUBDIR+= talkd
+.endif
+
.if ${MK_TELNET} != "no"
_telnetd= telnetd
.endif
Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk Sun Jan 25 04:20:11 2015 (r277675)
+++ head/share/mk/src.opts.mk Sun Jan 25 04:37:44 2015 (r277676)
@@ -144,6 +144,7 @@ __DEFAULT_YES_OPTIONS = \
SYSCALL_COMPAT \
SYSCONS \
SYSINSTALL \
+ TALK \
TCSH \
TELNET \
TESTS \
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc Sun Jan 25 04:20:11
2015 (r277675)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Sun Jan 25 04:37:44
2015 (r277676)
@@ -4073,6 +4073,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
Added: head/tools/build/options/WITHOUT_TALK
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/build/options/WITHOUT_TALK Sun Jan 25 04:37:44 2015
(r277676)
@@ -0,0 +1,5 @@
+.\" $FreeBSD$
+Set to not build or install
+.Xr talk 1
+and
+.Xr talkd 8 .
Modified: head/usr.bin/Makefile
==============================================================================
--- head/usr.bin/Makefile Sun Jan 25 04:20:11 2015 (r277675)
+++ head/usr.bin/Makefile Sun Jan 25 04:37:44 2015 (r277676)
@@ -162,7 +162,6 @@ SUBDIR= ${_addr2line} \
systat \
tabs \
tail \
- talk \
tar \
tcopy \
tee \
@@ -348,6 +347,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"
