From owner-svn-src-head@FreeBSD.ORG Mon Aug 23 10:13:54 2010 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C9DAD1065675; Mon, 23 Aug 2010 10:13:54 +0000 (UTC) (envelope-from prvs=1844a38e31=brian@FreeBSD.org) Received: from idcmail-mo2no.shaw.ca (idcmail-mo2no.shaw.ca [64.59.134.9]) by mx1.freebsd.org (Postfix) with ESMTP id 71AE18FC16; Mon, 23 Aug 2010 10:13:54 +0000 (UTC) Received: from pd5ml3no-ssvc.prod.shaw.ca ([10.0.153.148]) by pd7mo1no-svcs.prod.shaw.ca with ESMTP; 23 Aug 2010 04:13:53 -0600 X-Cloudmark-SP-Filtered: true X-Cloudmark-SP-Result: v=1.1 cv=EPI+Anp5axUU12/DJ58YCKzU/28JrKwJBM9MxN4j1qY= c=1 sm=1 a=EQYUhsiSGKsA:10 a=VphdPIyG4kEA:10 a=MJPcHhXccCG8eBs0us8XwA==:17 a=6I5d2MoRAAAA:8 a=MMwg4So0AAAA:8 a=OBlIFFXcqL3Mi_WKgWQA:9 a=xLBoPPJG_dkswh6zPccA:7 a=DBZ5gsgBFwulzg9d5_W2HmfEPFAA:4 a=CjuIK1q_8ugA:10 a=SV7veod9ZcQA:10 a=WJ3hkfHDukgA:10 a=ba-t8vnvHnTbQcImUF0A:9 a=7yj-52yHm9kZRRlWNE0NnJ3zdq0A:4 a=HpAAvcLHHh0Zw7uRqdWCyQ==:117 Received: from unknown (HELO store.lan.Awfulhak.org) ([70.79.162.198]) by pd5ml3no-dmz.prod.shaw.ca with ESMTP; 23 Aug 2010 04:13:53 -0600 Received: from store.lan.Awfulhak.org (localhost.localdomain [127.0.0.1]) by localhost (Email Security Appliance) with SMTP id 0D1CCC433AC_C724983B; Mon, 23 Aug 2010 10:12:19 +0000 (GMT) Received: from gw.Awfulhak.org (gw.lan.Awfulhak.org [172.16.0.1]) by store.lan.Awfulhak.org (Sophos Email Appliance) with ESMTP id 860FAC460F7_C72497FF; Mon, 23 Aug 2010 10:12:15 +0000 (GMT) Received: from dev.lan.Awfulhak.org (brian@dev.lan.Awfulhak.org [172.16.0.5]) by gw.Awfulhak.org (8.14.4/8.14.4) with ESMTP id o7NACFZM091651; Mon, 23 Aug 2010 03:12:15 -0700 (PDT) (envelope-from brian@FreeBSD.org) Date: Mon, 23 Aug 2010 03:12:08 -0700 From: Brian Somers To: Gabor Kovesdan Message-ID: <20100823031208.3f6d23e8@dev.lan.Awfulhak.org> In-Reply-To: <201008231004.o7NA4Qk5034538@svn.freebsd.org> References: <201008231004.o7NA4Qk5034538@svn.freebsd.org> X-Mailer: Claws Mail 3.7.6 (GTK+ 2.20.1; i386-portbld-freebsd9.0) Mime-Version: 1.0 Content-Type: multipart/signed; micalg=PGP-SHA1; boundary="Sig_/3qAEb9tyi1_0LwHHQ9pnjM9"; protocol="application/pgp-signature" Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn commit: r211701 - in head: gnu/usr.bin share/mk sys/sys tools/build/options usr.bin X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Aug 2010 10:13:54 -0000 --Sig_/3qAEb9tyi1_0LwHHQ9pnjM9 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Is this a permanent switch or is there a list of issues to be resolved befo= re switching back to the BSD grep? On Mon, 23 Aug 2010 10:04:26 +0000 (UTC) Gabor Kovesdan = wrote: > Author: gabor > Date: Mon Aug 23 10:04:26 2010 > New Revision: 211701 > URL: http://svn.freebsd.org/changeset/base/211701 >=20 > Log: > - Change default grep back to GNU version. BSD grep can be built with t= he > WITH_BSD_GREP knob. > - Bump __FreeBSD_version > =20 > Requested by: dougb > Approved by: delphij (mentor) >=20 > Added: > head/tools/build/options/WITH_BSD_GREP (contents, props changed) > Deleted: > head/tools/build/options/WITH_GNU_GREP > Modified: > head/gnu/usr.bin/Makefile > head/share/mk/bsd.own.mk > head/sys/sys/param.h > head/usr.bin/Makefile >=20 > Modified: head/gnu/usr.bin/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/gnu/usr.bin/Makefile Mon Aug 23 09:54:32 2010 (r211700) > +++ head/gnu/usr.bin/Makefile Mon Aug 23 10:04:26 2010 (r211701) > @@ -28,6 +28,10 @@ _groff=3D groff > .endif > .endif > =20 > +.if ${MK_BSD_GREP} !=3D "yes" > +_grep=3D grep > +.endif > + > .if ${MK_CVS} !=3D "no" > _cvs=3D cvs > .endif > @@ -36,10 +40,6 @@ _cvs=3D cvs > _dtc=3D dtc > .endif > =20 > -.if ${MK_GNU_GREP} !=3D "no" > -_grep=3D grep > -.endif > - > .if ${MK_INFO} !=3D "no" > _texinfo=3D texinfo > .endif >=20 > Modified: head/share/mk/bsd.own.mk > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/share/mk/bsd.own.mk Mon Aug 23 09:54:32 2010 (r211700) > +++ head/share/mk/bsd.own.mk Mon Aug 23 10:04:26 2010 (r211701) > @@ -419,9 +419,9 @@ MK_${var}:=3D yes > BIND_LIBS \ > BIND_SIGCHASE \ > BIND_XML \ > + BSD_GREP \ > ${_clang_no} \ > FDT \ > - GNU_GREP \ > HESIOD \ > IDEA > .if defined(WITH_${var}) && defined(WITHOUT_${var}) >=20 > Modified: head/sys/sys/param.h > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/sys/param.h Mon Aug 23 09:54:32 2010 (r211700) > +++ head/sys/sys/param.h Mon Aug 23 10:04:26 2010 (r211701) > @@ -58,7 +58,7 @@ > * in the range 5 to 9. > */ > #undef __FreeBSD_version > -#define __FreeBSD_version 900016 /* Master, propagated to newvers */ > +#define __FreeBSD_version 900017 /* Master, propagated to newvers */ > =20 > #ifndef LOCORE > #include >=20 > Added: head/tools/build/options/WITH_BSD_GREP > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/tools/build/options/WITH_BSD_GREP Mon Aug 23 10:04:26 2010 (r211= 701) > @@ -0,0 +1,2 @@ > +.\" $FreeBSD$ > +Build BSD-licensed grep instead of GNU grep. >=20 > Modified: head/usr.bin/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/usr.bin/Makefile Mon Aug 23 09:54:32 2010 (r211700) > +++ head/usr.bin/Makefile Mon Aug 23 10:04:26 2010 (r211701) > @@ -277,6 +277,10 @@ _bluetooth=3D bluetooth > _cpio=3D cpio > .endif > =20 > +.if ${MK_BSD_GREP} !=3D "no" > +_grep=3D grep > +.endif > + > .if ${MK_CALENDAR} !=3D "no" > _calendar=3D calendar > .endif > @@ -285,10 +289,6 @@ _calendar=3D calendar > _clang=3D clang > .endif > =20 > -.if ${MK_GNU_GREP} !=3D "yes" > -_grep=3D grep > -.endif > - > .if ${MK_HESIOD} !=3D "no" > _hesinfo=3D hesinfo > .endif >=20 --=20 Brian Somers Don't _EVER_ lose your sense of humour ! --Sig_/3qAEb9tyi1_0LwHHQ9pnjM9 Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (FreeBSD) iQCVAwUBTHJJfg7tvOdmanQhAQIVXQP/Rjjj6WOTZ3+HpmMfUyhF1ci9ff16AAso n5XNYPXLULdO5wFHH3p9z1/WOZCP2IpwaVHP6/GpcEKk2XhBKRn09s6MVBEXLb5j lg9iG3ePDcxBxlqZTdKf4NAjzlu/vM5kc+mK2gIr82MCx2iSB1VlR2dnuYprNbMb 6nSylufyTOo= =Fx+m -----END PGP SIGNATURE----- --Sig_/3qAEb9tyi1_0LwHHQ9pnjM9--