diff options
| author | Kyle Evans <kevans@FreeBSD.org> | 2020-12-05 02:21:58 +0000 |
|---|---|---|
| committer | Kyle Evans <kevans@FreeBSD.org> | 2020-12-05 02:21:58 +0000 |
| commit | 7c2f310f6dd8cf0ed249933eea7c643f2c311745 (patch) | |
| tree | 4313eebc938e42c02f9d20b0354289e255166c62 /usr.bin/grep | |
| parent | 78599c32efed3247d165302a1fbe8d9203e38974 (diff) | |
Notes
Diffstat (limited to 'usr.bin/grep')
| -rw-r--r-- | usr.bin/grep/Makefile | 3 | ||||
| -rw-r--r-- | usr.bin/grep/grep.c | 7 |
2 files changed, 1 insertions, 9 deletions
diff --git a/usr.bin/grep/Makefile b/usr.bin/grep/Makefile index 418889047052..4ff56e342c6a 100644 --- a/usr.bin/grep/Makefile +++ b/usr.bin/grep/Makefile @@ -60,10 +60,7 @@ MLINKS+= grep.1 egrep.1 \ grep.1 rgrep.1 .endif -.if ${MK_GNU_GREP_COMPAT} != "no" -CFLAGS+= -DWITH_GNU_COMPAT LIBADD+= regex -.endif HAS_TESTS= SUBDIR.${MK_TESTS}+= tests diff --git a/usr.bin/grep/grep.c b/usr.bin/grep/grep.c index 576ea96d4f96..90d1c270f1f4 100644 --- a/usr.bin/grep/grep.c +++ b/usr.bin/grep/grep.c @@ -62,8 +62,7 @@ const char *errstr[] = { /* 5*/ "\t[--context[=num]] [--directories=action] [--label] [--line-buffered]\n", /* 6*/ "\t[--null] [pattern] [file ...]\n", /* 7*/ "Binary file %s matches\n", -/* 8*/ "%s (BSD grep) %s\n", -/* 9*/ "%s (BSD grep, GNU compatible) %s\n", +/* 8*/ "%s (BSD grep, GNU compatible) %s\n", }; /* Flags passed to regcomp() and regexec() */ @@ -555,11 +554,7 @@ main(int argc, char *argv[]) filebehave = FILE_MMAP; break; case 'V': -#ifdef WITH_GNU_COMPAT - printf(errstr[9], getprogname(), VERSION); -#else printf(errstr[8], getprogname(), VERSION); -#endif exit(0); case 'v': vflag = true; |