diff options
| author | minskim <minskim@pkgsrc.org> | 2004-12-11 08:04:25 +0000 |
|---|---|---|
| committer | minskim <minskim@pkgsrc.org> | 2004-12-11 08:04:25 +0000 |
| commit | c0d5fa368dc36a6b6736f7dc5319b7d67d685746 (patch) | |
| tree | 2a6087546a39563de44fb9b08d4db3c969b9d3b4 /textproc/ja-grep | |
| parent | 65139bfcce56bc3707e8b98acfb769c0d67affa2 (diff) | |
| download | pkgsrc-c0d5fa368dc36a6b6736f7dc5319b7d67d685746.tar.gz | |
Merge two patches modifying the same file. As a side effect, this
removes fuzz with GNU patch.
Diffstat (limited to 'textproc/ja-grep')
| -rw-r--r-- | textproc/ja-grep/distinfo | 5 | ||||
| -rw-r--r-- | textproc/ja-grep/patches/patch-ab | 25 | ||||
| -rw-r--r-- | textproc/ja-grep/patches/patch-ac | 25 |
3 files changed, 21 insertions, 34 deletions
diff --git a/textproc/ja-grep/distinfo b/textproc/ja-grep/distinfo index 6cbcd7f2495..ca54b3699b3 100644 --- a/textproc/ja-grep/distinfo +++ b/textproc/ja-grep/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/05/31 13:00:42 seb Exp $ +$NetBSD: distinfo,v 1.2 2004/12/11 08:04:25 minskim Exp $ SHA1 (grep-2.0.tar.gz) = 99e8f917557f1496cd3786e6c13f3900b8de24d8 Size (grep-2.0.tar.gz) = 127065 bytes SHA1 (patch-aa) = 41d2bd451f1332b8dbc3f72e6c6a56308a2c081b -SHA1 (patch-ab) = 4431f51bdfff5c5d710a80fe51b27886e9239956 -SHA1 (patch-ac) = e66d5d68f2e37139e1d706b1cfd51551b3075433 +SHA1 (patch-ab) = ee7821abf28e1cdfab00068f86c1454362d7f25d diff --git a/textproc/ja-grep/patches/patch-ab b/textproc/ja-grep/patches/patch-ab index 072386d9d5d..9bab1a4dd9b 100644 --- a/textproc/ja-grep/patches/patch-ab +++ b/textproc/ja-grep/patches/patch-ab @@ -1,8 +1,20 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/05/31 13:00:43 seb Exp $ +$NetBSD: patch-ab,v 1.2 2004/12/11 08:04:25 minskim Exp $ ---- grep-2.0/Makefile.in.orig Tue Apr 4 02:25:58 1995 -+++ grep-2.0/Makefile.in Tue Apr 4 02:27:57 1995 -@@ -74,7 +74,7 @@ +--- grep-2.0/Makefile.in.orig 2004-12-11 01:56:57.000000000 -0600 ++++ grep-2.0/Makefile.in +@@ -60,9 +60,9 @@ prefix=/usr/local + exec_prefix=$(prefix) + + # Prefix for installed program, normally empty or `g'. +-binprefix= ++binprefix=j + # Prefix for installed man page, normally empty or `g'. +-manprefix= ++manprefix=j + + # Where to install executables. + bindir=$(exec_prefix)/bin +@@ -74,7 +74,7 @@ mandir=$(prefix)/man/man1 manext=1 # How to make a hard link. @@ -11,7 +23,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/05/31 13:00:43 seb Exp $ #### End of system configuration section. #### -@@ -97,10 +97,10 @@ +@@ -97,10 +97,10 @@ grep.lint: $(SRCS) install: all $(INSTALL_PROGRAM) grep $(bindir)/$(binprefix)grep rm -f $(bindir)/$(binprefix)egrep @@ -19,8 +31,9 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/05/31 13:00:43 seb Exp $ + cd $(bindir); $(LN) $(binprefix)grep $(binprefix)egrep rm -f $(bindir)/$(binprefix)fgrep - $(LN) $(bindir)/$(binprefix)grep $(bindir)/$(binprefix)fgrep +- $(INSTALL_DATA) $(srcdir)/grep.man $(mandir)/grep.$(manext) + cd $(bindir); $(LN) $(binprefix)grep $(binprefix)fgrep - $(INSTALL_DATA) $(srcdir)/grep.man $(mandir)/grep.$(manext) ++ $(INSTALL_DATA) $(srcdir)/grep.man $(mandir)/$(manprefix)grep.$(manext) check: AWK=$(AWK) sh $(srcdir)/tests/check.sh $(srcdir)/tests diff --git a/textproc/ja-grep/patches/patch-ac b/textproc/ja-grep/patches/patch-ac deleted file mode 100644 index 645796f349a..00000000000 --- a/textproc/ja-grep/patches/patch-ac +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 2002/05/31 13:00:43 seb Exp $ - ---- Makefile.in.orig Tue Jun 8 10:04:26 1999 -+++ Makefile.in Tue Jun 8 10:08:26 1999 -@@ -60,9 +60,9 @@ - exec_prefix=$(prefix) - - # Prefix for installed program, normally empty or `g'. --binprefix= -+binprefix=j - # Prefix for installed man page, normally empty or `g'. --manprefix= -+manprefix=j - - # Where to install executables. - bindir=$(exec_prefix)/bin -@@ -100,7 +100,7 @@ - cd $(bindir); $(LN) $(binprefix)grep $(binprefix)egrep - rm -f $(bindir)/$(binprefix)fgrep - cd $(bindir); $(LN) $(binprefix)grep $(binprefix)fgrep -- $(INSTALL_DATA) $(srcdir)/grep.man $(mandir)/grep.$(manext) -+ $(INSTALL_DATA) $(srcdir)/grep.man $(mandir)/$(manprefix)grep.$(manext) - - check: - AWK=$(AWK) sh $(srcdir)/tests/check.sh $(srcdir)/tests |