CVS commit: pkgsrc/textproc/grep

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Jun 11 10:17:28 UTC 2019

Modified Files:
        pkgsrc/textproc/grep: Makefile distinfo
        pkgsrc/textproc/grep/patches: patch-src_Makefile.in
Removed Files:
        pkgsrc/textproc/grep/patches: patch-src_Makefile.am

Log Message:
grep: Ensure we use the correct path to PKGGNUDIR grep.

Remove pointless patch-src_Makefile.am.  Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 pkgsrc/textproc/grep/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/textproc/grep/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/textproc/grep/patches/patch-src_Makefile.am
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/grep/patches/patch-src_Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/grep/Makefile
diff -u pkgsrc/textproc/grep/Makefile:1.53 pkgsrc/textproc/grep/Makefile:1.54
--- pkgsrc/textproc/grep/Makefile:1.53  Wed Aug 22 09:46:45 2018
+++ pkgsrc/textproc/grep/Makefile       Tue Jun 11 10:17:28 2019
@@ -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
 

Index: pkgsrc/textproc/grep/distinfo
diff -u pkgsrc/textproc/grep/distinfo:1.24 pkgsrc/textproc/grep/distinfo:1.25
--- pkgsrc/textproc/grep/distinfo:1.24  Fri Aug 18 21:51:40 2017
+++ pkgsrc/textproc/grep/distinfo       Tue Jun 11 10:17:28 2019
@@ -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

Index: pkgsrc/textproc/grep/patches/patch-src_Makefile.in
diff -u pkgsrc/textproc/grep/patches/patch-src_Makefile.in:1.1 pkgsrc/textproc/grep/patches/patch-src_Makefile.in:1.2
--- pkgsrc/textproc/grep/patches/patch-src_Makefile.in:1.1      Thu Mar 30 08:52:54 2017
+++ pkgsrc/textproc/grep/patches/patch-src_Makefile.in  Tue Jun 11 10:17:28 2019
@@ -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 @@ ${PREFIX}/${PKGGNUDIR}bin being in the p
        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 $@