diff options
| -rw-r--r-- | gnu/usr.bin/Makefile | 8 | ||||
| -rw-r--r-- | share/mk/bsd.own.mk | 2 | ||||
| -rw-r--r-- | sys/sys/param.h | 2 | ||||
| -rw-r--r-- | tools/build/options/WITH_BSD_GREP | 2 | ||||
| -rw-r--r-- | tools/build/options/WITH_GNU_GREP | 2 | ||||
| -rw-r--r-- | usr.bin/Makefile | 8 |
6 files changed, 12 insertions, 12 deletions
diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile index 0a6d51f..2d9ad72 100644 --- a/gnu/usr.bin/Makefile +++ b/gnu/usr.bin/Makefile @@ -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 diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 24b2ca4..477a83a 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -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}) diff --git a/sys/sys/param.h b/sys/sys/param.h index 7e781d2..8d3e34e 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -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> diff --git a/tools/build/options/WITH_BSD_GREP b/tools/build/options/WITH_BSD_GREP new file mode 100644 index 0000000..702ca25 --- /dev/null +++ b/tools/build/options/WITH_BSD_GREP @@ -0,0 +1,2 @@ +.\" $FreeBSD$ +Build BSD-licensed grep instead of GNU grep. diff --git a/tools/build/options/WITH_GNU_GREP b/tools/build/options/WITH_GNU_GREP deleted file mode 100644 index c4bd008..0000000 --- a/tools/build/options/WITH_GNU_GREP +++ /dev/null @@ -1,2 +0,0 @@ -.\" $FreeBSD$ -Set to build the base system with GNU grep instead of BSD grep diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 08c10c3..3214761 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -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 |
