From owner-svn-src-stable@FreeBSD.ORG Wed Feb 11 08:33:24 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 735B05EB; Wed, 11 Feb 2015 08:33:24 +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 5CF39C79; Wed, 11 Feb 2015 08:33:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1B8XOur050136; Wed, 11 Feb 2015 08:33:24 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1B8XNpZ050127; Wed, 11 Feb 2015 08:33:23 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201502110833.t1B8XNpZ050127@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 11 Feb 2015 08:33:23 +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: r278568 - in stable/9: 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@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Feb 2015 08:33:24 -0000 Author: ngie Date: Wed Feb 11 08:33:22 2015 New Revision: 278568 URL: https://svnweb.freebsd.org/changeset/base/278568 Log: MFstable/10 r278554: r278554: MFC r277663: r277663: Add MK_EE knob to control installing edit, ee, etc Sponsored by: EMC / Isilon Storage Division Added: stable/9/tools/build/options/WITHOUT_EE - copied unchanged from r278554, stable/10/tools/build/options/WITHOUT_EE Modified: 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/share/mk/bsd.own.mk ============================================================================== --- stable/9/share/mk/bsd.own.mk Wed Feb 11 08:28:57 2015 (r278567) +++ stable/9/share/mk/bsd.own.mk Wed Feb 11 08:33:22 2015 (r278568) @@ -358,6 +358,7 @@ __DEFAULT_YES_OPTIONS = \ CXX \ DICT \ DYNAMICROOT \ + EE \ EXAMPLES \ FLOPPY \ FORTH \ Modified: stable/9/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- stable/9/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 11 08:28:57 2015 (r278567) +++ stable/9/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 11 08:33:22 2015 (r278568) @@ -1458,6 +1458,23 @@ OLD_FILES+=usr/share/dict/web2a OLD_FILES+=usr/share/dict/words .endif +.if ${MK_EE} == no +OLD_FILES+=usr/bin/edit +OLD_FILES+=usr/bin/ee +OLD_FILES+=usr/bin/ree +OLD_FILES+=usr/share/man/man1/edit.1.gz +OLD_FILES+=usr/share/man/man1/ee.1.gz +OLD_FILES+=usr/share/man/man1/ree.1.gz +OLD_FILES+=usr/share/nls/C/ee.cat +OLD_FILES+=usr/share/nls/de_DE.ISO8859-1/ee.cat +OLD_FILES+=usr/share/nls/fr_FR.ISO8859-1/ee.cat +OLD_FILES+=usr/share/nls/hu_HU.ISO8859-2/ee.cat +OLD_FILES+=usr/share/nls/pl_PL.ISO8859-2/ee.cat +OLD_FILES+=usr/share/nls/pt_BR.ISO8859-1/ee.cat +OLD_FILES+=usr/share/nls/ru_RU.KOI8-R/ee.cat +OLD_FILES+=usr/share/nls/uk_UA.KOI8-U/ee.cat +.endif + #.if ${MK_EXAMPLES} == no # to be filled in #.endif Copied: stable/9/tools/build/options/WITHOUT_EE (from r278554, stable/10/tools/build/options/WITHOUT_EE) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/9/tools/build/options/WITHOUT_EE Wed Feb 11 08:33:22 2015 (r278568, copy of r278554, stable/10/tools/build/options/WITHOUT_EE) @@ -0,0 +1,5 @@ +.\" $FreeBSD$ +Set to not build and install +.Xr edit 1 , +.Xr ee 1 , +and related programs. Modified: stable/9/usr.bin/Makefile ============================================================================== --- stable/9/usr.bin/Makefile Wed Feb 11 08:28:57 2015 (r278567) +++ stable/9/usr.bin/Makefile Wed Feb 11 08:33:22 2015 (r278568) @@ -37,7 +37,6 @@ SUBDIR= alias \ cut \ dirname \ du \ - ee \ elf2aout \ elfdump \ enigma \ @@ -236,6 +235,10 @@ SUBDIR+= calendar _clang= clang .endif +.if ${MK_EE} != "no" +SUBDIR+= ee +.endif + .if ${MK_HESIOD} != "no" SUBDIR+= hesinfo .endif