diff options
| author | ngie <ngie@FreeBSD.org> | 2015-02-13 21:19:54 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2015-02-13 21:19:54 +0000 |
| commit | 9ed52cebd8df0b370dfda39c8adc63e6a605b828 (patch) | |
| tree | f7fd01c103ed9e2727bbba12add31047c9def0cd | |
| parent | 4c104a70d57de539b25107b2f406c13d06f66e37 (diff) | |
| download | FreeBSD-src-9ed52cebd8df0b370dfda39c8adc63e6a605b828.zip FreeBSD-src-9ed52cebd8df0b370dfda39c8adc63e6a605b828.tar.gz | |
MFC r277676:
r277676:
Add MK_TALK knob for building the talk and talkd
Sponsored by: EMC / Isilon Storage Division
| -rw-r--r-- | libexec/Makefile | 5 | ||||
| -rw-r--r-- | share/mk/bsd.own.mk | 1 | ||||
| -rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 7 | ||||
| -rw-r--r-- | tools/build/options/WITHOUT_TALK | 5 | ||||
| -rw-r--r-- | usr.bin/Makefile | 5 |
5 files changed, 21 insertions, 2 deletions
diff --git a/libexec/Makefile b/libexec/Makefile index 66e2426..69bcd77 100644 --- a/libexec/Makefile +++ b/libexec/Makefile @@ -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 diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 340cd27..f016aa8 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -357,6 +357,7 @@ __DEFAULT_YES_OPTIONS = \ SYMVER \ SYSCONS \ SYSINSTALL \ + TALK \ TCSH \ TELNET \ TEXTPROC \ diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index b2cc2ae..a0c6961 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -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 diff --git a/tools/build/options/WITHOUT_TALK b/tools/build/options/WITHOUT_TALK new file mode 100644 index 0000000..33d4167 --- /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 3ac348c..d15f32a 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -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 |
