svn commit: r317678 - in head/usr.bin/grep: . nls

[Ed Maste]

Author: emaste
Date: Tue May  2 13:38:20 2017
New Revision: 317678
URL: https://svnweb.freebsd.org/changeset/base/317678

Log:
  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.
  
  Submitted by:	Kyle Evans <kevans91 at ksu.edu>
  Reported by:	mandree
  Differential Revision:	https://reviews.freebsd.org/D10451

Modified:
  head/usr.bin/grep/Makefile
  head/usr.bin/grep/grep.c
  head/usr.bin/grep/nls/C.msg
  head/usr.bin/grep/nls/es_ES.ISO8859-1.msg
  head/usr.bin/grep/nls/gl_ES.ISO8859-1.msg
  head/usr.bin/grep/nls/hu_HU.ISO8859-2.msg
  head/usr.bin/grep/nls/ja_JP.SJIS.msg
  head/usr.bin/grep/nls/ja_JP.UTF-8.msg
  head/usr.bin/grep/nls/ja_JP.eucJP.msg
  head/usr.bin/grep/nls/pt_BR.ISO8859-1.msg
  head/usr.bin/grep/nls/ru_RU.KOI8-R.msg
  head/usr.bin/grep/nls/uk_UA.UTF-8.msg
  head/usr.bin/grep/nls/zh_CN.UTF-8.msg

Modified: head/usr.bin/grep/Makefile
==============================================================================
--- head/usr.bin/grep/Makefile	Tue May  2 10:13:50 2017	(r317677)
+++ head/usr.bin/grep/Makefile	Tue May  2 13:38:20 2017	(r317678)
@@ -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
 

Modified: head/usr.bin/grep/grep.c
==============================================================================
--- head/usr.bin/grep/grep.c	Tue May  2 10:13:50 2017	(r317677)
+++ head/usr.bin/grep/grep.c	Tue May  2 13:38:20 2017	(r317678)
@@ -74,6 +74,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() */
@@ -596,7 +597,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;

Modified: head/usr.bin/grep/nls/C.msg
==============================================================================
--- head/usr.bin/grep/nls/C.msg	Tue May  2 10:13:50 2017	(r317677)
+++ head/usr.bin/grep/nls/C.msg	Tue May  2 13:38:20 2017	(r317678)
@@ -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"

Modified: head/usr.bin/grep/nls/es_ES.ISO8859-1.msg
==============================================================================
--- head/usr.bin/grep/nls/es_ES.ISO8859-1.msg	Tue May  2 10:13:50 2017	(r317677)
+++ head/usr.bin/grep/nls/es_ES.ISO8859-1.msg	Tue May  2 13:38:20 2017	(r317678)
@@ -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"

Modified: head/usr.bin/grep/nls/gl_ES.ISO8859-1.msg
==============================================================================
--- head/usr.bin/grep/nls/gl_ES.ISO8859-1.msg	Tue May  2 10:13:50 2017	(r317677)
+++ head/usr.bin/grep/nls/gl_ES.ISO8859-1.msg	Tue May  2 13:38:20 2017	(r317678)
@@ -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"

Modified: head/usr.bin/grep/nls/hu_HU.ISO8859-2.msg
==============================================================================
--- head/usr.bin/grep/nls/hu_HU.ISO8859-2.msg	Tue May  2 10:13:50 2017	(r317677)
+++ head/usr.bin/grep/nls/hu_HU.ISO8859-2.msg	Tue May  2 13:38:20 2017	(r317678)
@@ -11,3 +11,4 @@ $quote "
 7 "\t[--null] [minta] [fájl ...]\n"
 8 "%s bináris fájl illeszkedik\n"
 9 "%s (BSD grep) %s\n"
+10 "%s (BSD grep, GNU compatible) %s\n"

Modified: head/usr.bin/grep/nls/ja_JP.SJIS.msg
==============================================================================
--- head/usr.bin/grep/nls/ja_JP.SJIS.msg	Tue May  2 10:13:50 2017	(r317677)
+++ head/usr.bin/grep/nls/ja_JP.SJIS.msg	Tue May  2 13:38:20 2017	(r317678)
@@ -11,3 +11,4 @@ $quote "
 7 "\t[--null] [ƒpƒ^[ƒ“] [ƒtƒ@ƒCƒ‹–¼ ...]\n"
 8 "ƒoƒCƒiƒŠƒtƒ@ƒCƒ‹ %s ‚Ƀ}ƒbƒ`‚µ‚Ü‚µ‚½\n"
 9 "%s (BSD grep) %s\n"
+10 "%s (BSD grep, GNU compatible) %s\n"

Modified: head/usr.bin/grep/nls/ja_JP.UTF-8.msg
==============================================================================
--- head/usr.bin/grep/nls/ja_JP.UTF-8.msg	Tue May  2 10:13:50 2017	(r317677)
+++ head/usr.bin/grep/nls/ja_JP.UTF-8.msg	Tue May  2 13:38:20 2017	(r317678)
@@ -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"

Modified: head/usr.bin/grep/nls/ja_JP.eucJP.msg
==============================================================================
--- head/usr.bin/grep/nls/ja_JP.eucJP.msg	Tue May  2 10:13:50 2017	(r317677)
+++ head/usr.bin/grep/nls/ja_JP.eucJP.msg	Tue May  2 13:38:20 2017	(r317678)
@@ -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"

Modified: head/usr.bin/grep/nls/pt_BR.ISO8859-1.msg
==============================================================================
--- head/usr.bin/grep/nls/pt_BR.ISO8859-1.msg	Tue May  2 10:13:50 2017	(r317677)
+++ head/usr.bin/grep/nls/pt_BR.ISO8859-1.msg	Tue May  2 13:38:20 2017	(r317678)
@@ -11,3 +11,4 @@ $quote "
 7 "\t[--null] [padrão] [arquivo ...]\n"
 8 "arquivo binário %s casa com o padrão\n"
 9 "%s (BSD grep) %s\n"
+10 "%s (BSD grep, GNU compatible) %s\n"

Modified: head/usr.bin/grep/nls/ru_RU.KOI8-R.msg
==============================================================================
--- head/usr.bin/grep/nls/ru_RU.KOI8-R.msg	Tue May  2 10:13:50 2017	(r317677)
+++ head/usr.bin/grep/nls/ru_RU.KOI8-R.msg	Tue May  2 13:38:20 2017	(r317678)
@@ -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"

Modified: head/usr.bin/grep/nls/uk_UA.UTF-8.msg
==============================================================================
--- head/usr.bin/grep/nls/uk_UA.UTF-8.msg	Tue May  2 10:13:50 2017	(r317677)
+++ head/usr.bin/grep/nls/uk_UA.UTF-8.msg	Tue May  2 13:38:20 2017	(r317678)
@@ -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"

Modified: head/usr.bin/grep/nls/zh_CN.UTF-8.msg
==============================================================================
--- head/usr.bin/grep/nls/zh_CN.UTF-8.msg	Tue May  2 10:13:50 2017	(r317677)
+++ head/usr.bin/grep/nls/zh_CN.UTF-8.msg	Tue May  2 13:38:20 2017	(r317678)
@@ -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"