CVS commit: [pkgsrc-2017Q1] pkgsrc/textproc/grep

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sat Apr  1 14:55:18 UTC 2017

Modified Files:
        pkgsrc/textproc/grep [pkgsrc-2017Q1]: Makefile distinfo
Added Files:
        pkgsrc/textproc/grep/patches [pkgsrc-2017Q1]: patch-src_Makefile.am
            patch-src_Makefile.in

Log Message:
Pullup ticket #5225 - requested by sevan
textproc/grep: bugfix

Revisions pulled up:
- textproc/grep/Makefile                                        1.49
- textproc/grep/distinfo                                        1.22
- textproc/grep/patches/patch-src_Makefile.am                   1.1
- textproc/grep/patches/patch-src_Makefile.in                   1.1

---
   Module Name:    pkgsrc
   Committed By:   bouyer
   Date:           Thu Mar 30 08:52:54 UTC 2017

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

   Log Message:
   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


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.48.2.1 pkgsrc/textproc/grep/Makefile
cvs rdiff -u -r1.21 -r1.21.2.1 pkgsrc/textproc/grep/distinfo
cvs rdiff -u -r0 -r1.1.2.2 pkgsrc/textproc/grep/patches/patch-src_Makefile.am \
    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.48 pkgsrc/textproc/grep/Makefile:1.48.2.1
--- pkgsrc/textproc/grep/Makefile:1.48  Mon Jan 30 04:46:13 2017
+++ pkgsrc/textproc/grep/Makefile       Sat Apr  1 14:55:18 2017
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.48 2017/01/30 04:46:13 wen Exp $
+# $NetBSD: Makefile,v 1.48.2.1 2017/04/01 14:55:18 bsiegert Exp $
 
 DISTNAME=      grep-2.27
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_GNU:=grep/}
 EXTRACT_SUFX=  .tar.xz
+PKGREVISION=   1
 
 MAINTAINER=    bouyer%NetBSD.org@localhost
 HOMEPAGE=      http://www.gnu.org/software/grep/grep.html

Index: pkgsrc/textproc/grep/distinfo
diff -u pkgsrc/textproc/grep/distinfo:1.21 pkgsrc/textproc/grep/distinfo:1.21.2.1
--- pkgsrc/textproc/grep/distinfo:1.21  Mon Jan 30 04:46:13 2017
+++ pkgsrc/textproc/grep/distinfo       Sat Apr  1 14:55:18 2017
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.21 2017/01/30 04:46:13 wen Exp $
+$NetBSD: distinfo,v 1.21.2.1 2017/04/01 14:55:18 bsiegert 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

Added files:

Index: pkgsrc/textproc/grep/patches/patch-src_Makefile.am
diff -u /dev/null pkgsrc/textproc/grep/patches/patch-src_Makefile.am:1.1.2.2
--- /dev/null   Sat Apr  1 14:55:18 2017
+++ pkgsrc/textproc/grep/patches/patch-src_Makefile.am  Sat Apr  1 14:55:18 2017
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_Makefile.am,v 1.1.2.2 2017/04/01 14:55:18 bsiegert 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 $@
Index: pkgsrc/textproc/grep/patches/patch-src_Makefile.in
diff -u /dev/null pkgsrc/textproc/grep/patches/patch-src_Makefile.in:1.1.2.2
--- /dev/null   Sat Apr  1 14:55:18 2017
+++ pkgsrc/textproc/grep/patches/patch-src_Makefile.in  Sat Apr  1 14:55:18 2017
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_Makefile.in,v 1.1.2.2 2017/04/01 14:55:18 bsiegert 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 $@