[pkgsrc/trunk]: pkgsrc/textproc/grep grep: Ensure we use the correct path to ...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d89c47516304
branches:  trunk
changeset: 396852:d89c47516304
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Tue Jun 11 10:17:28 2019 +0000

description:
grep: Ensure we use the correct path to PKGGNUDIR grep.

Remove pointless patch-src_Makefile.am.  Bump PKGREVISION.

diffstat:

 textproc/grep/Makefile                      |   4 ++--
 textproc/grep/distinfo                      |   5 ++---
 textproc/grep/patches/patch-src_Makefile.am |  16 ----------------
 textproc/grep/patches/patch-src_Makefile.in |   4 ++--
 4 files changed, 6 insertions(+), 23 deletions(-)

diffs (66 lines):

diff -r 37eb9b693af8 -r d89c47516304 textproc/grep/Makefile
--- a/textproc/grep/Makefile    Tue Jun 11 10:06:22 2019 +0000
+++ b/textproc/grep/Makefile    Tue Jun 11 10:17:28 2019 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.53 2018/08/22 09:46:45 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2019/06/11 10:17:28 jperkin Exp $
 
 DISTNAME=      grep-3.1
+PKGREVISION=   3
 CATEGORIES=    textproc
-PKGREVISION=   2
 MASTER_SITES=  ${MASTER_SITE_GNU:=grep/}
 EXTRACT_SUFX=  .tar.xz
 
diff -r 37eb9b693af8 -r d89c47516304 textproc/grep/distinfo
--- a/textproc/grep/distinfo    Tue Jun 11 10:06:22 2019 +0000
+++ b/textproc/grep/distinfo    Tue Jun 11 10:17:28 2019 +0000
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.24 2017/08/18 21:51:40 adam Exp $
+$NetBSD: distinfo,v 1.25 2019/06/11 10:17:28 jperkin Exp $
 
 SHA1 (grep-3.1.tar.xz) = d1d677e959c7d874e18e7e3839f26a0f0c1733d5
 RMD160 (grep-3.1.tar.xz) = 6eaaac1245c653628fd57f07df25b3a60e842891
 SHA512 (grep-3.1.tar.xz) = 05494381c7dd8aad7e2ee4c17450de8d7b969a99dcfe17747db60df3475bf02d5323d091e896e8343e4f3251c29dc7f0b7a9f93c575c9d58ee2a57014c2c9d26
 Size (grep-3.1.tar.xz) = 1370880 bytes
-SHA1 (patch-src_Makefile.am) = c919a396c550f6218db8e015139c69e49217a946
-SHA1 (patch-src_Makefile.in) = f0b0b3a87d1ab0afd831144a6c7e81963735ce41
+SHA1 (patch-src_Makefile.in) = 9efe4748d4b1ff33adca4e251e2e4249c62f0035
diff -r 37eb9b693af8 -r d89c47516304 textproc/grep/patches/patch-src_Makefile.am
--- a/textproc/grep/patches/patch-src_Makefile.am       Tue Jun 11 10:06:22 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_Makefile.am,v 1.1 2017/03/30 08:52:54 bouyer Exp $
-
-Make the paths in gegrep & gfgrep absolute so if they are used without
-${PREFIX}/${PKGGNUDIR}bin being in the path, they still work.
-
---- src/Makefile.am.orig       2016-11-21 18:31:31.000000000 +0100
-+++ src/Makefile.am    2017-03-30 10:32:14.000000000 +0200
-@@ -60,7 +60,7 @@
-       fi &&                                                           \
-       sed -e 's|[@]SHELL@|$(SHELL)|g'                                 \
-           -e "$$edit_substring"                                       \
--          -e "s|[@]grep@|$$grep|g"                                    \
-+          -e "s|[@]grep@|$(PREFIX)/$(PKGGNUDIR)bin/$$grep|g"          \
-           -e "s|[@]option@|$$option|g" <$(srcdir)/egrep.sh >$@-t
-       $(AM_V_at)chmod +x $@-t
-       $(AM_V_at)mv $@-t $@
diff -r 37eb9b693af8 -r d89c47516304 textproc/grep/patches/patch-src_Makefile.in
--- a/textproc/grep/patches/patch-src_Makefile.in       Tue Jun 11 10:06:22 2019 +0000
+++ b/textproc/grep/patches/patch-src_Makefile.in       Tue Jun 11 10:17:28 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_Makefile.in,v 1.1 2017/03/30 08:52:54 bouyer Exp $
+$NetBSD: patch-src_Makefile.in,v 1.2 2019/06/11 10:17:28 jperkin Exp $
 
 Make the paths in gegrep & gfgrep absolute so if they are used without
 ${PREFIX}/${PKGGNUDIR}bin being in the path, they still work.
@@ -10,7 +10,7 @@
        sed -e 's|[@]SHELL@|$(SHELL)|g'                                 \
            -e "$$edit_substring"                                       \
 -          -e "s|[@]grep@|$$grep|g"                                    \
-+          -e "s|[@]grep@|$(PREFIX)/$(PKGGNUDIR)bin/$$grep|g"          \
++          -e "s|[@]grep@|$(PREFIX)/$(PKGGNUDIR)bin/grep|g"            \
            -e "s|[@]option@|$$option|g" <$(srcdir)/egrep.sh >$@-t
        $(AM_V_at)chmod +x $@-t
        $(AM_V_at)mv $@-t $@