Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 23 Aug 2010 03:12:08 -0700
From:      Brian Somers <brian@FreeBSD.org>
To:        Gabor Kovesdan <gabor@FreeBSD.org>
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
Message-ID:  <20100823031208.3f6d23e8@dev.lan.Awfulhak.org>
In-Reply-To: <201008231004.o7NA4Qk5034538@svn.freebsd.org>
References:  <201008231004.o7NA4Qk5034538@svn.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
--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 <gabor@FreeBSD.org>=
 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 <sys/types.h>
>=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                                          <brian@Awfulhak.org>
Don't _EVER_ lose your sense of humour !               <brian@FreeBSD.org>

--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--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100823031208.3f6d23e8>