From owner-cvs-src@FreeBSD.ORG Mon Jun 16 05:53:10 2008 Return-Path: Delivered-To: cvs-src@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4BB591065678; Mon, 16 Jun 2008 05:53:10 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 06F918FC0A; Mon, 16 Jun 2008 05:53:05 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5G5r4Wa060118; Mon, 16 Jun 2008 05:53:04 GMT (envelope-from dougb@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5G5r4Ub060117; Mon, 16 Jun 2008 05:53:04 GMT (envelope-from dougb@repoman.freebsd.org) Message-Id: <200806160553.m5G5r4Ub060117@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to dougb@repoman.freebsd.org using -f From: Doug Barton Date: Mon, 16 Jun 2008 05:48:15 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: src/gnu/usr.bin Makefile src/gnu/usr.bin/cpio Makefile src/share/mk bsd.own.mk src/tools/build/options WITHOUT_BSD_CPIO WITHOUT_GNU_GREP WITH_GNU_CPIO src/usr.bin Makefile src/usr.bin/cpio Makefile X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Jun 2008 05:53:10 -0000 dougb 2008-06-16 05:48:15 UTC FreeBSD src repository Modified files: gnu/usr.bin Makefile gnu/usr.bin/cpio Makefile share/mk bsd.own.mk usr.bin Makefile usr.bin/cpio Makefile Added files: tools/build/options WITHOUT_BSD_CPIO WITHOUT_GNU_GREP WITH_GNU_CPIO Log: SVN rev 179813 on 2008-06-16 05:48:15Z by dougb 1. Make the BSD version of cpio the default [1] a. The BSD version will be built and installed unless WITHOUT_BSD_CPIO is defined. b. The GNU version will not be built or installed unless WITH_GNU_CPIO is defined. If this is defined, the symlink in /usr/bin will be to the GNU version whether the BSD version is present or not. When these changes are MFCed the defaults should be flipped. 2. Add a knob to disable the building of GNU grep. This will make it easier for those that want to test the BSD version in the ports. Approved by: kientzle [1] Revision Changes Path 1.97 +10 -2 src/gnu/usr.bin/Makefile 1.14 +0 -2 src/gnu/usr.bin/cpio/Makefile 1.76 +3 -0 src/share/mk/bsd.own.mk 1.1 +3 -0 src/tools/build/options/WITHOUT_BSD_CPIO (new) 1.1 +2 -0 src/tools/build/options/WITHOUT_GNU_GREP (new) 1.1 +6 -0 src/tools/build/options/WITH_GNU_CPIO (new) 1.315 +5 -1 src/usr.bin/Makefile 1.3 +1 -1 src/usr.bin/cpio/Makefile