From owner-svn-src-stable-9@FreeBSD.ORG Fri Feb 13 21:21:54 2015 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D9F7C5D3; Fri, 13 Feb 2015 21:21:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C1A98CC9; Fri, 13 Feb 2015 21:21:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1DLLrLk002688; Fri, 13 Feb 2015 21:21:53 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1DLLqd9002682; Fri, 13 Feb 2015 21:21:52 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201502132121.t1DLLqd9002682@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Fri, 13 Feb 2015 21:21:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r278712 - in stable/9: libexec share/mk tools/build/mk tools/build/options usr.bin X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Feb 2015 21:21:54 -0000 Author: ngie Date: Fri Feb 13 21:21:51 2015 New Revision: 278712 URL: https://svnweb.freebsd.org/changeset/base/278712 Log: MFstable/10 r278710: r278710: MFC r277676: r277676: Add MK_TALK knob for building the talk and talkd Sponsored by: EMC / Isilon Storage Division Added: stable/9/tools/build/options/WITHOUT_TALK - copied unchanged from r278710, stable/10/tools/build/options/WITHOUT_TALK Modified: stable/9/libexec/Makefile stable/9/share/mk/bsd.own.mk stable/9/tools/build/mk/OptionalObsoleteFiles.inc stable/9/usr.bin/Makefile Directory Properties: stable/9/ (props changed) stable/9/share/ (props changed) stable/9/share/mk/ (props changed) stable/9/tools/ (props changed) stable/9/tools/build/ (props changed) stable/9/tools/build/options/ (props changed) stable/9/usr.bin/ (props changed) Modified: stable/9/libexec/Makefile ============================================================================== --- stable/9/libexec/Makefile Fri Feb 13 21:21:38 2015 (r278711) +++ stable/9/libexec/Makefile Fri Feb 13 21:21:51 2015 (r278712) @@ -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 Modified: stable/9/share/mk/bsd.own.mk ============================================================================== --- stable/9/share/mk/bsd.own.mk Fri Feb 13 21:21:38 2015 (r278711) +++ stable/9/share/mk/bsd.own.mk Fri Feb 13 21:21:51 2015 (r278712) @@ -427,6 +427,7 @@ __DEFAULT_YES_OPTIONS = \ SYSINSTALL \ SYMVER \ SYSCONS \ + TALK \ TCSH \ TELNET \ TEXTPROC \ Modified: stable/9/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- stable/9/tools/build/mk/OptionalObsoleteFiles.inc Fri Feb 13 21:21:38 2015 (r278711) +++ stable/9/tools/build/mk/OptionalObsoleteFiles.inc Fri Feb 13 21:21:51 2015 (r278712) @@ -3827,6 +3827,13 @@ OLD_FILES+=usr/share/sendmail/cf/sitecon # 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/9/tools/build/options/WITHOUT_TALK (from r278710, stable/10/tools/build/options/WITHOUT_TALK) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/9/tools/build/options/WITHOUT_TALK Fri Feb 13 21:21:51 2015 (r278712, copy of r278710, stable/10/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/9/usr.bin/Makefile ============================================================================== --- stable/9/usr.bin/Makefile Fri Feb 13 21:21:38 2015 (r278711) +++ stable/9/usr.bin/Makefile Fri Feb 13 21:21:51 2015 (r278712) @@ -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