From dddf2f900094885d2896df06d2f7f1dcecca4e7e Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Thu, 18 Sep 2003 19:13:50 +0000
Subject: Update to 2.5.1nb2: Use the right grep binary in fgrep and egrep
 shell scripts. Patch provided by Nicolas Fugier in PR 20905.

---
 textproc/grep/Makefile         |  4 ++--
 textproc/grep/distinfo         |  3 ++-
 textproc/grep/patches/patch-aa | 19 +++++++++++++++++++
 3 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 textproc/grep/patches/patch-aa

(limited to 'textproc/grep')

diff --git a/textproc/grep/Makefile b/textproc/grep/Makefile
index 31f81c6c025..2dc3e39e19a 100644
--- a/textproc/grep/Makefile
+++ b/textproc/grep/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2003/08/09 11:27:48 seb Exp $
+# $NetBSD: Makefile,v 1.13 2003/09/18 19:13:50 wiz Exp $
 #
 
 DISTNAME=	grep-2.5.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU:=grep/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/textproc/grep/distinfo b/textproc/grep/distinfo
index ff1162b2a07..e6825f14fed 100644
--- a/textproc/grep/distinfo
+++ b/textproc/grep/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.4 2003/02/13 07:33:34 wiz Exp $
+$NetBSD: distinfo,v 1.5 2003/09/18 19:13:52 wiz Exp $
 
 SHA1 (grep-2.5.1.tar.bz2) = 551db1f0014e44d428e1c3482ac9418ff5d15950
 Size (grep-2.5.1.tar.bz2) = 559232 bytes
+SHA1 (patch-aa) = f08f91903053a32c497c1a8a453116bfa9029ed6
 SHA1 (patch-ab) = 353f079d4b6c6853a16eb00c79462e32e8e1cf19
 SHA1 (patch-ac) = f0e672a0f29bc9a41e9918114e527f0ce1947f51
diff --git a/textproc/grep/patches/patch-aa b/textproc/grep/patches/patch-aa
new file mode 100644
index 00000000000..32b0f2ddb3b
--- /dev/null
+++ b/textproc/grep/patches/patch-aa
@@ -0,0 +1,19 @@
+$NetBSD: patch-aa,v 1.3 2003/09/18 19:13:54 wiz Exp $
+
+--- src/Makefile.in.orig	2002-03-26 17:09:36.000000000 +0100
++++ src/Makefile.in
+@@ -379,12 +379,12 @@ uninstall-am: uninstall-binPROGRAMS unin
+ 
+ egrep:
+ 	echo '#!/bin/sh' >$@
+-	echo 'exec grep -E $${1+"$$@"}' >>$@
++	echo 'exec $(bindir)/'`echo grep|sed '$(transform)'`' -E $${1+"$$@"}' >>$@
+ 	chmod a+x $@
+ 
+ fgrep:
+ 	echo '#!/bin/sh' >$@
+-	echo 'exec grep -F $${1+"$$@"}' >>$@
++	echo 'exec $(bindir)/'`echo grep|sed '$(transform)'`' -F $${1+"$$@"}' >>$@
+ 	chmod a+x $@
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
-- 
cgit v1.2.3