CVS commit: pkgsrc/textproc/grep

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Dec 19 09:36:33 UTC 2019

Modified Files:
        pkgsrc/textproc/grep: distinfo
Added Files:
        pkgsrc/textproc/grep/patches: patch-lib_sys-limits.h

Log Message:
grep: Avoid conflict with sys/limits.h guard.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/textproc/grep/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/grep/patches/patch-lib_sys-limits.h

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/distinfo
diff -u pkgsrc/textproc/grep/distinfo:1.26 pkgsrc/textproc/grep/distinfo:1.27
--- pkgsrc/textproc/grep/distinfo:1.26  Sun Dec 15 21:12:33 2019
+++ pkgsrc/textproc/grep/distinfo       Thu Dec 19 09:36:33 2019
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.26 2019/12/15 21:12:33 rhialto Exp $
+$NetBSD: distinfo,v 1.27 2019/12/19 09:36:33 jperkin Exp $
 
 SHA1 (grep-3.3.tar.xz) = e0befe21e7d9caa8e5e98385c96355d890f83123
 RMD160 (grep-3.3.tar.xz) = dd32e6f23b55fd7bde6adec25c4d2666b9d4daf1
 SHA512 (grep-3.3.tar.xz) = e4805dbddf7cd0f0faf412557d408509650c1ccf703bc450f10a3f727c690dbfaa1235aa81939a0e4b7ac6190f88c15ea1fcc562b343d4b4c7550f967aeb15db
 Size (grep-3.3.tar.xz) = 1473056 bytes
+SHA1 (patch-lib_sys-limits.h) = 5676dd55df15d5dc8460d2e5e9bbe2e8848ebccc
 SHA1 (patch-src_Makefile.in) = 9efe4748d4b1ff33adca4e251e2e4249c62f0035

Added files:

Index: pkgsrc/textproc/grep/patches/patch-lib_sys-limits.h
diff -u /dev/null pkgsrc/textproc/grep/patches/patch-lib_sys-limits.h:1.1
--- /dev/null   Thu Dec 19 09:36:33 2019
+++ pkgsrc/textproc/grep/patches/patch-lib_sys-limits.h Thu Dec 19 09:36:33 2019
@@ -0,0 +1,17 @@
+$NetBSD: patch-lib_sys-limits.h,v 1.1 2019/12/19 09:36:33 jperkin Exp $
+
+Avoid conflict with sys/limits.h guard.
+
+--- lib/sys-limits.h.orig      2018-06-24 23:17:59.000000000 +0000
++++ lib/sys-limits.h
+@@ -15,8 +15,8 @@
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, see <https://www.gnu.org/licenses/>.  */
+ 
+-#ifndef _SYS_LIMITS_H
+-#define _SYS_LIMITS_H
++#ifndef _GREP_SYS_LIMITS_H
++#define _GREP_SYS_LIMITS_H
+ 
+ #include <limits.h>
+