diff options
| author | bouyer <bouyer> | 2017-03-30 08:52:54 +0000 |
|---|---|---|
| committer | bouyer <bouyer> | 2017-03-30 08:52:54 +0000 |
| commit | 8fb2e8be5143e98e7e31d954cea1035559976988 (patch) | |
| tree | 026176633b4008453567663ddba62de92f6d1416 /textproc | |
| parent | cb6a50aa278e4ef23d1cd0aff162fd9b2ec469ad (diff) | |
| download | pkgsrc-8fb2e8be5143e98e7e31d954cea1035559976988.tar.gz | |
Use absolute paths in /usr/pkg/bin/g*grep, so they can be used even if
/usr/pkg/bin/ is not in $PATH.
Bump PKGREVISION
From Tim Zingelman
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/grep/Makefile | 3 | ||||
| -rw-r--r-- | textproc/grep/distinfo | 4 | ||||
| -rw-r--r-- | textproc/grep/patches/patch-src_Makefile.am | 16 | ||||
| -rw-r--r-- | textproc/grep/patches/patch-src_Makefile.in | 16 |
4 files changed, 37 insertions, 2 deletions
diff --git a/textproc/grep/Makefile b/textproc/grep/Makefile index 71e51c0a58c..9d740db8a02 100644 --- a/textproc/grep/Makefile +++ b/textproc/grep/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.48 2017/01/30 04:46:13 wen Exp $ +# $NetBSD: Makefile,v 1.49 2017/03/30 08:52:54 bouyer Exp $ DISTNAME= grep-2.27 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_GNU:=grep/} EXTRACT_SUFX= .tar.xz +PKGREVISION= 1 MAINTAINER= bouyer@NetBSD.org HOMEPAGE= http://www.gnu.org/software/grep/grep.html diff --git a/textproc/grep/distinfo b/textproc/grep/distinfo index 695eb1f5f26..f7bd38697e0 100644 --- a/textproc/grep/distinfo +++ b/textproc/grep/distinfo @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.21 2017/01/30 04:46:13 wen Exp $ +$NetBSD: distinfo,v 1.22 2017/03/30 08:52:54 bouyer Exp $ SHA1 (grep-2.27.tar.xz) = ac68dd7d07cd4318ef5545c29c9a37ed2e96aef6 RMD160 (grep-2.27.tar.xz) = 87db92c2f7dafd88e70e1717e66a17a06d4e8b64 SHA512 (grep-2.27.tar.xz) = d67f16cc5f931a455d5287badbaf080967da573d290430f440e578a563cff4f4c0c2668f60dbb8bc71eaed289f075957006c10c6827f0da1a49df49efd3f0781 Size (grep-2.27.tar.xz) = 1360388 bytes +SHA1 (patch-src_Makefile.am) = c919a396c550f6218db8e015139c69e49217a946 +SHA1 (patch-src_Makefile.in) = f0b0b3a87d1ab0afd831144a6c7e81963735ce41 diff --git a/textproc/grep/patches/patch-src_Makefile.am b/textproc/grep/patches/patch-src_Makefile.am new file mode 100644 index 00000000000..94205a3a6ae --- /dev/null +++ b/textproc/grep/patches/patch-src_Makefile.am @@ -0,0 +1,16 @@ +$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 --git a/textproc/grep/patches/patch-src_Makefile.in b/textproc/grep/patches/patch-src_Makefile.in new file mode 100644 index 00000000000..4fef54ad1de --- /dev/null +++ b/textproc/grep/patches/patch-src_Makefile.in @@ -0,0 +1,16 @@ +$NetBSD: patch-src_Makefile.in,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.in.orig 2016-12-07 08:15:19.000000000 +0100 ++++ src/Makefile.in 2017-03-30 10:33:33.000000000 +0200 +@@ -1601,7 +1601,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 $@ |