Date: Mon, 23 Aug 2010 10:04:26 +0000 (UTC) From: Gabor Kovesdan <gabor@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r211701 - in head: gnu/usr.bin share/mk sys/sys tools/build/options usr.bin Message-ID: <201008231004.o7NA4Qk5034538@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gabor Date: Mon Aug 23 10:04:26 2010 New Revision: 211701 URL: http://svn.freebsd.org/changeset/base/211701 Log: - Change default grep back to GNU version. BSD grep can be built with the WITH_BSD_GREP knob. - Bump __FreeBSD_version Requested by: dougb Approved by: delphij (mentor) 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 Modified: head/gnu/usr.bin/Makefile ============================================================================== --- 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= groff .endif .endif +.if ${MK_BSD_GREP} != "yes" +_grep= grep +.endif + .if ${MK_CVS} != "no" _cvs= cvs .endif @@ -36,10 +40,6 @@ _cvs= cvs _dtc= dtc .endif -.if ${MK_GNU_GREP} != "no" -_grep= grep -.endif - .if ${MK_INFO} != "no" _texinfo= texinfo .endif Modified: head/share/mk/bsd.own.mk ============================================================================== --- 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}:= yes BIND_LIBS \ BIND_SIGCHASE \ BIND_XML \ + BSD_GREP \ ${_clang_no} \ FDT \ - GNU_GREP \ HESIOD \ IDEA .if defined(WITH_${var}) && defined(WITHOUT_${var}) Modified: head/sys/sys/param.h ============================================================================== --- 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 */ #ifndef LOCORE #include <sys/types.h> Added: head/tools/build/options/WITH_BSD_GREP ============================================================================== --- /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 (r211701) @@ -0,0 +1,2 @@ +.\" $FreeBSD$ +Build BSD-licensed grep instead of GNU grep. Modified: head/usr.bin/Makefile ============================================================================== --- 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= bluetooth _cpio= cpio .endif +.if ${MK_BSD_GREP} != "no" +_grep= grep +.endif + .if ${MK_CALENDAR} != "no" _calendar= calendar .endif @@ -285,10 +289,6 @@ _calendar= calendar _clang= clang .endif -.if ${MK_GNU_GREP} != "yes" -_grep= grep -.endif - .if ${MK_HESIOD} != "no" _hesinfo= hesinfo .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008231004.o7NA4Qk5034538>