Page MenuHomeFreeBSD
Files F144288814

D10451.id27620.diff
No OneTemporary
Actions

D10451.id27620.diff
View Options

Index: usr.bin/grep/Makefile
===================================================================
--- usr.bin/grep/Makefile
+++ usr.bin/grep/Makefile
@@ -82,7 +82,7 @@
.endif
.if ${MK_GNU_GREP_COMPAT} != "no"
-CFLAGS+= -I${DESTDIR}/usr/include/gnu
+CFLAGS+= -I${DESTDIR}/usr/include/gnu -DWITH_GNU
LIBADD+= gnuregex
.endif
Index: usr.bin/grep/grep.c
===================================================================
--- usr.bin/grep/grep.c
+++ usr.bin/grep/grep.c
@@ -74,6 +74,7 @@
/* 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 @@
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;
Index: usr.bin/grep/nls/C.msg
===================================================================
--- usr.bin/grep/nls/C.msg
+++ usr.bin/grep/nls/C.msg
@@ -11,3 +11,4 @@
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"
Index: usr.bin/grep/nls/ja_JP.UTF-8.msg
===================================================================
--- usr.bin/grep/nls/ja_JP.UTF-8.msg
+++ usr.bin/grep/nls/ja_JP.UTF-8.msg
@@ -11,3 +11,4 @@
7 "\t[--null] [パターン] [ファイル名 ...]\n"
8 "バイナリファイル %s にマッチしました\n"
9 "%s (BSD grep) %s\n"
+10 "%s (BSD grep, GNU compatible) %s\n"
Index: usr.bin/grep/nls/uk_UA.UTF-8.msg
===================================================================
--- usr.bin/grep/nls/uk_UA.UTF-8.msg
+++ usr.bin/grep/nls/uk_UA.UTF-8.msg
@@ -10,3 +10,4 @@
7 "\t[--null] [шаблон] [файл ...]\n"
8 "двійковий файл %s співпадає\n"
9 "%s (BSD grep) %s\n"
+10 "%s (BSD grep, GNU compatible) %s\n"
Index: usr.bin/grep/nls/zh_CN.UTF-8.msg
===================================================================
--- usr.bin/grep/nls/zh_CN.UTF-8.msg
+++ usr.bin/grep/nls/zh_CN.UTF-8.msg
@@ -11,3 +11,4 @@
7 "\t[--null] [模式] [文件名 ...]\n"
8 "二进制文件 %s 包含模式\n"
9 "%s (BSD grep) %s\n"
+10 "%s (BSD grep, GNU compatible) %s\n"

File Metadata

Mime Type
text/plain
Expires
Sun, Feb 8, 4:15 PM (18 h, 35 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28471817
Default Alt Text
D10451.id27620.diff (2 KB)

Event Timeline