From a9c64fb0c4238782ade2a056e2ccd01a84fb3092 Mon Sep 17 00:00:00 2001
From: kevans <kevans@FreeBSD.org>
Date: Wed, 16 Aug 2017 17:46:45 +0000
Subject: MFC r317678: bsdgrep: Add GNU compatible version string indicator

As reported in r218614 it's useful to have an indication of whether or not
BSD grep was built with GNU_GREP_COMPAT.

Approved by:	emaste (mentor, blanket MFC)
---
 usr.bin/grep/Makefile                | 2 +-
 usr.bin/grep/grep.c                  | 5 +++++
 usr.bin/grep/nls/C.msg               | 1 +
 usr.bin/grep/nls/es_ES.ISO8859-1.msg | 1 +
 usr.bin/grep/nls/gl_ES.ISO8859-1.msg | 1 +
 usr.bin/grep/nls/hu_HU.ISO8859-2.msg | 1 +
 usr.bin/grep/nls/ja_JP.SJIS.msg      | 1 +
 usr.bin/grep/nls/ja_JP.UTF-8.msg     | 1 +
 usr.bin/grep/nls/ja_JP.eucJP.msg     | 1 +
 usr.bin/grep/nls/pt_BR.ISO8859-1.msg | 1 +
 usr.bin/grep/nls/ru_RU.KOI8-R.msg    | 1 +
 usr.bin/grep/nls/uk_UA.UTF-8.msg     | 1 +
 usr.bin/grep/nls/zh_CN.UTF-8.msg     | 1 +
 13 files changed, 17 insertions(+), 1 deletion(-)

(limited to 'usr.bin/grep')

diff --git a/usr.bin/grep/Makefile b/usr.bin/grep/Makefile
index c6b25f0..758eac7 100644
--- a/usr.bin/grep/Makefile
+++ b/usr.bin/grep/Makefile
@@ -82,7 +82,7 @@ CFLAGS+= -DWITHOUT_BZIP2
 .endif
 
 .if ${MK_GNU_GREP_COMPAT} != "no"
-CFLAGS+= -I${DESTDIR}/usr/include/gnu
+CFLAGS+= -I${DESTDIR}/usr/include/gnu -DWITH_GNU
 LIBADD+=	gnuregex
 .endif
 
diff --git a/usr.bin/grep/grep.c b/usr.bin/grep/grep.c
index 9709ce6..8b4ff6b 100644
--- a/usr.bin/grep/grep.c
+++ b/usr.bin/grep/grep.c
@@ -75,6 +75,7 @@ const char	*errstr[] = {
 /* 7*/	"\t[--null] [pattern] [file ...]\n",
 /* 8*/	"Binary file %s matches\n",
 /* 9*/	"%s (BSD grep) %s\n",
+/* 10*/	"%s (BSD grep, GNU compatible) %s\n",
 };
 
 /* Flags passed to regcomp() and regexec() */
@@ -597,7 +598,11 @@ main(int argc, char *argv[])
 			filebehave = FILE_MMAP;
 			break;
 		case 'V':
+#ifdef WITH_GNU
+			printf(getstr(10), getprogname(), VERSION);
+#else
 			printf(getstr(9), getprogname(), VERSION);
+#endif
 			exit(0);
 		case 'v':
 			vflag = true;
diff --git a/usr.bin/grep/nls/C.msg b/usr.bin/grep/nls/C.msg
index d8a3f08..a86bafa 100644
--- a/usr.bin/grep/nls/C.msg
+++ b/usr.bin/grep/nls/C.msg
@@ -11,3 +11,4 @@ $quote "
 7 "\t[--null] [pattern] [file ...]\n"
 8 "Binary file %s matches\n"
 9 "%s (BSD grep) %s\n"
+10 "%s (BSD grep, GNU compatible) %s\n"
diff --git a/usr.bin/grep/nls/es_ES.ISO8859-1.msg b/usr.bin/grep/nls/es_ES.ISO8859-1.msg
index 8a08079..fc65913 100644
--- a/usr.bin/grep/nls/es_ES.ISO8859-1.msg
+++ b/usr.bin/grep/nls/es_ES.ISO8859-1.msg
@@ -11,3 +11,4 @@ $quote "
 7 "\t[--null] [pauta] [fichero ...]\n"
 8 "fichero binario %s se ajusta\n"
 9 "%s (BSD grep) %s\n"
+10 "%s (BSD grep, GNU compatible) %s\n"
diff --git a/usr.bin/grep/nls/gl_ES.ISO8859-1.msg b/usr.bin/grep/nls/gl_ES.ISO8859-1.msg
index f89532f..6de2798 100644
--- a/usr.bin/grep/nls/gl_ES.ISO8859-1.msg
+++ b/usr.bin/grep/nls/gl_ES.ISO8859-1.msg
@@ -11,3 +11,4 @@ $quote "
 7 "\t[--null] [pauta] [ficheiro ...]\n"
 8 "ficheiro binario %s conforma\n"
 9 "%s (BSD grep) %s\n"
+10 "%s (BSD grep, GNU compatible) %s\n"
diff --git a/usr.bin/grep/nls/hu_HU.ISO8859-2.msg b/usr.bin/grep/nls/hu_HU.ISO8859-2.msg
index 9c8aafd..c774070 100644
--- a/usr.bin/grep/nls/hu_HU.ISO8859-2.msg
+++ b/usr.bin/grep/nls/hu_HU.ISO8859-2.msg
@@ -11,3 +11,4 @@ $quote "
 7 "\t[--null] [minta] [f疔l ...]\n"
 8 "%s bin疵is f疔l illeszkedik\n"
 9 "%s (BSD grep) %s\n"
+10 "%s (BSD grep, GNU compatible) %s\n"
diff --git a/usr.bin/grep/nls/ja_JP.SJIS.msg b/usr.bin/grep/nls/ja_JP.SJIS.msg
index da0677e..8f532c4 100644
--- a/usr.bin/grep/nls/ja_JP.SJIS.msg
+++ b/usr.bin/grep/nls/ja_JP.SJIS.msg
@@ -11,3 +11,4 @@ $quote "
 7 "\t[--null] [パターン] [ファイル名 ...]\n"
 8 "バイナリファイル %s にマッチしました\n"
 9 "%s (BSD grep) %s\n"
+10 "%s (BSD grep, GNU compatible) %s\n"
diff --git a/usr.bin/grep/nls/ja_JP.UTF-8.msg b/usr.bin/grep/nls/ja_JP.UTF-8.msg
index e842b25..e59708b 100644
--- a/usr.bin/grep/nls/ja_JP.UTF-8.msg
+++ b/usr.bin/grep/nls/ja_JP.UTF-8.msg
@@ -11,3 +11,4 @@ $quote "
 7 "\t[--null] [繝代ち繝ｼ繝ｳ] [繝輔ぃ繧､繝ｫ蜷� ...]\n"
 8 "繝舌う繝翫Μ繝輔ぃ繧､繝ｫ %s 縺ｫ繝槭ャ繝√＠縺ｾ縺励◆\n"
 9 "%s (BSD grep) %s\n"
+10 "%s (BSD grep, GNU compatible) %s\n"
diff --git a/usr.bin/grep/nls/ja_JP.eucJP.msg b/usr.bin/grep/nls/ja_JP.eucJP.msg
index 922b25a..8f2e97d 100644
--- a/usr.bin/grep/nls/ja_JP.eucJP.msg
+++ b/usr.bin/grep/nls/ja_JP.eucJP.msg
@@ -11,3 +11,4 @@ $quote "
 7 "\t[--null] [･ﾑ･ｿ｡ｼ･�] [･ﾕ･｡･､･�ﾌｾ ...]\n"
 8 "･ﾐ･､･ﾊ･�･ﾕ･｡･､･� %s ､ﾋ･ﾞ･ﾃ･ﾁ､ｷ､ﾞ､ｷ､ｿ\n"
 9 "%s (BSD grep) %s\n"
+10 "%s (BSD grep, GNU compatible) %s\n"
diff --git a/usr.bin/grep/nls/pt_BR.ISO8859-1.msg b/usr.bin/grep/nls/pt_BR.ISO8859-1.msg
index c049fde..15d777a 100644
--- a/usr.bin/grep/nls/pt_BR.ISO8859-1.msg
+++ b/usr.bin/grep/nls/pt_BR.ISO8859-1.msg
@@ -11,3 +11,4 @@ $quote "
 7 "\t[--null] [padr縊] [arquivo ...]\n"
 8 "arquivo bin疵io %s casa com o padr縊\n"
 9 "%s (BSD grep) %s\n"
+10 "%s (BSD grep, GNU compatible) %s\n"
diff --git a/usr.bin/grep/nls/ru_RU.KOI8-R.msg b/usr.bin/grep/nls/ru_RU.KOI8-R.msg
index d6d308f..f12b1b6 100644
--- a/usr.bin/grep/nls/ru_RU.KOI8-R.msg
+++ b/usr.bin/grep/nls/ru_RU.KOI8-R.msg
@@ -11,3 +11,4 @@ $quote "
 7 "\t[--null] [ﾛﾁﾂﾌﾏﾎ] [ﾆﾁﾊﾌ ...]\n"
 8 "ﾄﾗﾏﾉﾞﾎﾙﾊ ﾆﾁﾊﾌ %s ﾓﾏﾗﾐﾁﾄﾁﾅﾔ\n"
 9 "%s (BSD grep) %s\n"
+10 "%s (BSD grep, GNU compatible) %s\n"
diff --git a/usr.bin/grep/nls/uk_UA.UTF-8.msg b/usr.bin/grep/nls/uk_UA.UTF-8.msg
index e601ca2..4564a59 100644
--- a/usr.bin/grep/nls/uk_UA.UTF-8.msg
+++ b/usr.bin/grep/nls/uk_UA.UTF-8.msg
@@ -10,3 +10,4 @@ $quote "
 7 "\t[--null] [ﾑ威ｰﾐｱﾐｻﾐｾﾐｽ] [ﾑ�ﾐｰﾐｹﾐｻ ...]\n"
 8 "ﾐｴﾐｲﾑ孟ｹﾐｺﾐｾﾐｲﾐｸﾐｹ ﾑ�ﾐｰﾐｹﾐｻ %s ﾑ�ﾐｿﾑ孟ｲﾐｿﾐｰﾐｴﾐｰﾑ能n"
 9 "%s (BSD grep) %s\n"
+10 "%s (BSD grep, GNU compatible) %s\n"
diff --git a/usr.bin/grep/nls/zh_CN.UTF-8.msg b/usr.bin/grep/nls/zh_CN.UTF-8.msg
index 921ff4b..b727316 100644
--- a/usr.bin/grep/nls/zh_CN.UTF-8.msg
+++ b/usr.bin/grep/nls/zh_CN.UTF-8.msg
@@ -11,3 +11,4 @@ $quote "
 7 "\t[--null] [讓｡蠑従 [譁�莉ｶ蜷� ...]\n"
 8 "莠瑚ｿ帛宛譁�莉ｶ %s 蛹�蜷ｫ讓｡蠑十n"
 9 "%s (BSD grep) %s\n"
+10 "%s (BSD grep, GNU compatible) %s\n"
-- 
cgit v1.1