Tue Jun 11 10:17:28 2019 UTC ()
grep: Ensure we use the correct path to PKGGNUDIR grep.

Remove pointless patch-src_Makefile.am.  Bump PKGREVISION.


(jperkin)
diff -r1.53 -r1.54 pkgsrc/textproc/grep/Makefile
diff -r1.24 -r1.25 pkgsrc/textproc/grep/distinfo
diff -r1.1 -r0 pkgsrc/textproc/grep/patches/patch-src_Makefile.am
diff -r1.1 -r1.2 pkgsrc/textproc/grep/patches/patch-src_Makefile.in
cvs diff -r1.53 -r1.54 pkgsrc/textproc/grep/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/grep/Makefile 2018/08/22 09:46:45 1.53
+++ pkgsrc/textproc/grep/Makefile 2019/06/11 10:17:28 1.54
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.53 2018/08/22 09:46:45 wiz Exp $ 1# $NetBSD: Makefile,v 1.54 2019/06/11 10:17:28 jperkin Exp $
2 2
3DISTNAME= grep-3.1 3DISTNAME= grep-3.1
 4PKGREVISION= 3
4CATEGORIES= textproc 5CATEGORIES= textproc
5PKGREVISION= 2 
6MASTER_SITES= ${MASTER_SITE_GNU:=grep/} 6MASTER_SITES= ${MASTER_SITE_GNU:=grep/}
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@pkgsrc.org 9MAINTAINER= pkgsrc-users@pkgsrc.org
10HOMEPAGE= https://www.gnu.org/software/grep/grep.html 10HOMEPAGE= https://www.gnu.org/software/grep/grep.html
11COMMENT= GNU grep 11COMMENT= GNU grep
12LICENSE= gnu-gpl-v3 # or later 12LICENSE= gnu-gpl-v3 # or later
13 13
14USE_PKGLOCALEDIR= yes 14USE_PKGLOCALEDIR= yes
15USE_TOOLS+= makeinfo msgfmt 15USE_TOOLS+= makeinfo msgfmt
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17CONFIGURE_ARGS+= --enable-perl-regexp 17CONFIGURE_ARGS+= --enable-perl-regexp
18CONFIGURE_ARGS+= --program-prefix=g 18CONFIGURE_ARGS+= --program-prefix=g
cvs diff -r1.24 -r1.25 pkgsrc/textproc/grep/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/grep/distinfo 2017/08/18 21:51:40 1.24
+++ pkgsrc/textproc/grep/distinfo 2019/06/11 10:17:28 1.25
@@ -1,8 +1,7 @@ @@ -1,8 +1,7 @@
1$NetBSD: distinfo,v 1.24 2017/08/18 21:51:40 adam Exp $ 1$NetBSD: distinfo,v 1.25 2019/06/11 10:17:28 jperkin Exp $
2 2
3SHA1 (grep-3.1.tar.xz) = d1d677e959c7d874e18e7e3839f26a0f0c1733d5 3SHA1 (grep-3.1.tar.xz) = d1d677e959c7d874e18e7e3839f26a0f0c1733d5
4RMD160 (grep-3.1.tar.xz) = 6eaaac1245c653628fd57f07df25b3a60e842891 4RMD160 (grep-3.1.tar.xz) = 6eaaac1245c653628fd57f07df25b3a60e842891
5SHA512 (grep-3.1.tar.xz) = 05494381c7dd8aad7e2ee4c17450de8d7b969a99dcfe17747db60df3475bf02d5323d091e896e8343e4f3251c29dc7f0b7a9f93c575c9d58ee2a57014c2c9d26 5SHA512 (grep-3.1.tar.xz) = 05494381c7dd8aad7e2ee4c17450de8d7b969a99dcfe17747db60df3475bf02d5323d091e896e8343e4f3251c29dc7f0b7a9f93c575c9d58ee2a57014c2c9d26
6Size (grep-3.1.tar.xz) = 1370880 bytes 6Size (grep-3.1.tar.xz) = 1370880 bytes
7SHA1 (patch-src_Makefile.am) = c919a396c550f6218db8e015139c69e49217a946 7SHA1 (patch-src_Makefile.in) = 9efe4748d4b1ff33adca4e251e2e4249c62f0035
8SHA1 (patch-src_Makefile.in) = f0b0b3a87d1ab0afd831144a6c7e81963735ce41 
File Deleted: pkgsrc/textproc/grep/patches/Attic/patch-src_Makefile.am
cvs diff -r1.1 -r1.2 pkgsrc/textproc/grep/patches/patch-src_Makefile.in (expand / switch to unified diff)

--- pkgsrc/textproc/grep/patches/patch-src_Makefile.in 2017/03/30 08:52:54 1.1
+++ pkgsrc/textproc/grep/patches/patch-src_Makefile.in 2019/06/11 10:17:28 1.2
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-src_Makefile.in,v 1.1 2017/03/30 08:52:54 bouyer Exp $ 1$NetBSD: patch-src_Makefile.in,v 1.2 2019/06/11 10:17:28 jperkin Exp $
2 2
3Make the paths in gegrep & gfgrep absolute so if they are used without 3Make the paths in gegrep & gfgrep absolute so if they are used without
4${PREFIX}/${PKGGNUDIR}bin being in the path, they still work. 4${PREFIX}/${PKGGNUDIR}bin being in the path, they still work.
5 5
6--- src/Makefile.in.orig 2016-12-07 08:15:19.000000000 +0100 6--- src/Makefile.in.orig 2016-12-07 08:15:19.000000000 +0100
7+++ src/Makefile.in 2017-03-30 10:33:33.000000000 +0200 7+++ src/Makefile.in 2017-03-30 10:33:33.000000000 +0200
8@@ -1601,7 +1601,7 @@ 8@@ -1601,7 +1601,7 @@
9 fi && \ 9 fi && \
10 sed -e 's|[@]SHELL@|$(SHELL)|g' \ 10 sed -e 's|[@]SHELL@|$(SHELL)|g' \
11 -e "$$edit_substring" \ 11 -e "$$edit_substring" \
12- -e "s|[@]grep@|$$grep|g" \ 12- -e "s|[@]grep@|$$grep|g" \
13+ -e "s|[@]grep@|$(PREFIX)/$(PKGGNUDIR)bin/$$grep|g" \ 13+ -e "s|[@]grep@|$(PREFIX)/$(PKGGNUDIR)bin/grep|g" \
14 -e "s|[@]option@|$$option|g" <$(srcdir)/egrep.sh >$@-t 14 -e "s|[@]option@|$$option|g" <$(srcdir)/egrep.sh >$@-t
15 $(AM_V_at)chmod +x $@-t 15 $(AM_V_at)chmod +x $@-t
16 $(AM_V_at)mv $@-t $@ 16 $(AM_V_at)mv $@-t $@