Author: kevans
Date: Wed Aug 16 17:46:45 2017
New Revision: 322584
URL: https://svnweb.freebsd.org/changeset/base/322584
Log:
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)
Modified:
stable/11/usr.bin/grep/Makefile
stable/11/usr.bin/grep/grep.c
stable/11/usr.bin/grep/nls/C.msg
stable/11/usr.bin/grep/nls/es_ES.ISO8859-1.msg
stable/11/usr.bin/grep/nls/gl_ES.ISO8859-1.msg
stable/11/usr.bin/grep/nls/hu_HU.ISO8859-2.msg
stable/11/usr.bin/grep/nls/ja_JP.SJIS.msg
stable/11/usr.bin/grep/nls/ja_JP.UTF-8.msg
stable/11/usr.bin/grep/nls/ja_JP.eucJP.msg
stable/11/usr.bin/grep/nls/pt_BR.ISO8859-1.msg
stable/11/usr.bin/grep/nls/ru_RU.KOI8-R.msg
stable/11/usr.bin/grep/nls/uk_UA.UTF-8.msg
stable/11/usr.bin/grep/nls/zh_CN.UTF-8.msg
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/usr.bin/grep/Makefile
==============================================================================
--- stable/11/usr.bin/grep/Makefile Wed Aug 16 17:42:39 2017
(r322583)
+++ stable/11/usr.bin/grep/Makefile Wed Aug 16 17:46:45 2017
(r322584)
@@ -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: stable/11/usr.bin/grep/grep.c
==============================================================================
--- stable/11/usr.bin/grep/grep.c Wed Aug 16 17:42:39 2017
(r322583)
+++ stable/11/usr.bin/grep/grep.c Wed Aug 16 17:46:45 2017
(r322584)
@@ -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;
Modified: stable/11/usr.bin/grep/nls/C.msg
==============================================================================
--- stable/11/usr.bin/grep/nls/C.msg Wed Aug 16 17:42:39 2017
(r322583)
+++ stable/11/usr.bin/grep/nls/C.msg Wed Aug 16 17:46:45 2017
(r322584)
@@ -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: stable/11/usr.bin/grep/nls/es_ES.ISO8859-1.msg
==============================================================================
--- stable/11/usr.bin/grep/nls/es_ES.ISO8859-1.msg Wed Aug 16 17:42:39
2017 (r322583)
+++ stable/11/usr.bin/grep/nls/es_ES.ISO8859-1.msg Wed Aug 16 17:46:45
2017 (r322584)
@@ -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: stable/11/usr.bin/grep/nls/gl_ES.ISO8859-1.msg
==============================================================================
--- stable/11/usr.bin/grep/nls/gl_ES.ISO8859-1.msg Wed Aug 16 17:42:39
2017 (r322583)
+++ stable/11/usr.bin/grep/nls/gl_ES.ISO8859-1.msg Wed Aug 16 17:46:45
2017 (r322584)
@@ -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: stable/11/usr.bin/grep/nls/hu_HU.ISO8859-2.msg
==============================================================================
--- stable/11/usr.bin/grep/nls/hu_HU.ISO8859-2.msg Wed Aug 16 17:42:39
2017 (r322583)
+++ stable/11/usr.bin/grep/nls/hu_HU.ISO8859-2.msg Wed Aug 16 17:46:45
2017 (r322584)
@@ -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: stable/11/usr.bin/grep/nls/ja_JP.SJIS.msg
==============================================================================
--- stable/11/usr.bin/grep/nls/ja_JP.SJIS.msg Wed Aug 16 17:42:39 2017
(r322583)
+++ stable/11/usr.bin/grep/nls/ja_JP.SJIS.msg Wed Aug 16 17:46:45 2017
(r322584)
@@ -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: stable/11/usr.bin/grep/nls/ja_JP.UTF-8.msg
==============================================================================
--- stable/11/usr.bin/grep/nls/ja_JP.UTF-8.msg Wed Aug 16 17:42:39 2017
(r322583)
+++ stable/11/usr.bin/grep/nls/ja_JP.UTF-8.msg Wed Aug 16 17:46:45 2017
(r322584)
@@ -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: stable/11/usr.bin/grep/nls/ja_JP.eucJP.msg
==============================================================================
--- stable/11/usr.bin/grep/nls/ja_JP.eucJP.msg Wed Aug 16 17:42:39 2017
(r322583)
+++ stable/11/usr.bin/grep/nls/ja_JP.eucJP.msg Wed Aug 16 17:46:45 2017
(r322584)
@@ -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: stable/11/usr.bin/grep/nls/pt_BR.ISO8859-1.msg
==============================================================================
--- stable/11/usr.bin/grep/nls/pt_BR.ISO8859-1.msg Wed Aug 16 17:42:39
2017 (r322583)
+++ stable/11/usr.bin/grep/nls/pt_BR.ISO8859-1.msg Wed Aug 16 17:46:45
2017 (r322584)
@@ -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: stable/11/usr.bin/grep/nls/ru_RU.KOI8-R.msg
==============================================================================
--- stable/11/usr.bin/grep/nls/ru_RU.KOI8-R.msg Wed Aug 16 17:42:39 2017
(r322583)
+++ stable/11/usr.bin/grep/nls/ru_RU.KOI8-R.msg Wed Aug 16 17:46:45 2017
(r322584)
@@ -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: stable/11/usr.bin/grep/nls/uk_UA.UTF-8.msg
==============================================================================
--- stable/11/usr.bin/grep/nls/uk_UA.UTF-8.msg Wed Aug 16 17:42:39 2017
(r322583)
+++ stable/11/usr.bin/grep/nls/uk_UA.UTF-8.msg Wed Aug 16 17:46:45 2017
(r322584)
@@ -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: stable/11/usr.bin/grep/nls/zh_CN.UTF-8.msg
==============================================================================
--- stable/11/usr.bin/grep/nls/zh_CN.UTF-8.msg Wed Aug 16 17:42:39 2017
(r322583)
+++ stable/11/usr.bin/grep/nls/zh_CN.UTF-8.msg Wed Aug 16 17:46:45 2017
(r322584)
@@ -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"
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
