From 37c8e0c6c9163c0252362743825046fe6a154ada Mon Sep 17 00:00:00 2001
From: knu <knu@FreeBSD.org>
Date: Tue, 27 Feb 2001 18:27:24 +0000
Subject: Prefix "j" to the names of the binaries and the manpages.

As they are based on an old version of GNU grep (2.0), they should not
clash with those of the base system's.
---
 japanese/grep/files/patch-ab | 10 ++++++----
 japanese/grep/files/patch-ad | 11 +++++++++++
 2 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 japanese/grep/files/patch-ad

(limited to 'japanese/grep/files')

diff --git a/japanese/grep/files/patch-ab b/japanese/grep/files/patch-ab
index 2778acae1d93..3712ae594301 100644
--- a/japanese/grep/files/patch-ab
+++ b/japanese/grep/files/patch-ab
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Fri Dec  3 21:46:09 1999
-+++ Makefile.in	Fri Dec  3 21:47:39 1999
+--- Makefile.in.orig	Mon Feb 12 03:51:57 2001
++++ Makefile.in	Mon Feb 12 03:59:55 2001
 @@ -53,10 +53,10 @@
  LIBS=@LIBS@
  ALLOCA=@ALLOCA@
@@ -13,7 +13,7 @@
  exec_prefix=$(prefix)
  
  # Prefix for installed program, normally empty or `g'.
-@@ -97,9 +97,9 @@
+@@ -97,10 +97,10 @@
  install: all
  	$(INSTALL_PROGRAM) grep $(bindir)/$(binprefix)grep
  	rm -f $(bindir)/$(binprefix)egrep
@@ -21,7 +21,9 @@
 +	$(LN) -s $(binprefix)grep $(bindir)/$(binprefix)egrep
  	rm -f $(bindir)/$(binprefix)fgrep
 -	$(LN) $(bindir)/$(binprefix)grep $(bindir)/$(binprefix)fgrep	
+-	$(INSTALL_DATA) $(srcdir)/grep.man $(mandir)/grep.$(manext)
 +	$(LN) -s $(binprefix)grep $(bindir)/$(binprefix)fgrep	
- 	$(INSTALL_DATA) $(srcdir)/grep.man $(mandir)/grep.$(manext)
++	$(INSTALL_DATA) $(srcdir)/grep.man $(mandir)/$(binprefix)grep.$(manext)
  
  check:
+ 	AWK=$(AWK) sh $(srcdir)/tests/check.sh $(srcdir)/tests
diff --git a/japanese/grep/files/patch-ad b/japanese/grep/files/patch-ad
new file mode 100644
index 000000000000..126058791949
--- /dev/null
+++ b/japanese/grep/files/patch-ad
@@ -0,0 +1,11 @@
+--- grep.c.orig	Mon Feb 12 03:52:11 2001
++++ grep.c	Mon Feb 12 03:57:30 2001
+@@ -832,7 +832,7 @@
+       usage();
+ 
+   if (!matcher)
+-    matcher = prog;
++    matcher = prog[0] == 'j' ? prog + 1 : prog;
+ 
+   if (!setmatcher(matcher) && !setmatcher("default"))
+     abort();
-- 
cgit