Update grep to 3.1

5 files changed, 2 insertions, 21 deletions

diff --git a/data/grep/_metadata/version b/data/grep/_metadata/version
index fe16b348d..8c50098d8 100644
--- a/data/grep/_metadata/version
+++ b/data/grep/_metadata/version
@@ -1 +1 @@
-2.5.4
+3.1
diff --git a/data/grep/grep-2.5.4.tar.bz2 b/data/grep/grep-2.5.4.tar.bz2
deleted file mode 100644
index 48ee68c90..000000000
--- a/data/grep/grep-2.5.4.tar.bz2
+++ /dev/null
diff --git a/data/grep/grep-3.1.tar.xz b/data/grep/grep-3.1.tar.xz
new file mode 100644
index 000000000..cd1ab0cda
--- /dev/null
+++ b/data/grep/grep-3.1.tar.xz
diff --git a/data/grep/make.sh b/data/grep/make.sh
index 38d617b80..21ddfb614 100644
--- a/data/grep/make.sh
+++ b/data/grep/make.sh
@@ -1,4 +1,4 @@
 pkg:setup
-pkg:configure --disable-perl-regexp --bindir=/bin
+pkg:configure --disable-perl-regexp --bindir=/bin ac_use_included_regex=no
 make
 pkg:install
diff --git a/data/grep/regcomp.diff b/data/grep/regcomp.diff
deleted file mode 100644
index f4922f80d..000000000
--- a/data/grep/regcomp.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ru grep-2.5/lib/regex.c grep-2.5+iPhone/lib/regex.c
---- grep-2.5/lib/regex.c	2001-04-02 18:04:45.000000000 +0000
-+++ grep-2.5+iPhone/lib/regex.c	2008-04-05 05:18:34.000000000 +0000
-@@ -80,13 +80,13 @@
- # define PUT_CHAR(c) putchar (c)
- #endif /* MBS_SUPPORT */
- 
--#ifdef _LIBC
--/* We have to keep the namespace clean.  */
- # define regfree(preg) __regfree (preg)
- # define regexec(pr, st, nm, pm, ef) __regexec (pr, st, nm, pm, ef)
- # define regcomp(preg, pattern, cflags) __regcomp (preg, pattern, cflags)
- # define regerror(errcode, preg, errbuf, errbuf_size) \
- 	__regerror(errcode, preg, errbuf, errbuf_size)
-+#ifdef _LIBC
-+/* We have to keep the namespace clean.  */
- # define re_set_registers(bu, re, nu, st, en) \
- 	__re_set_registers (bu, re, nu, st, en)
- # define re_match_2(bufp, string1, size1, string2, size2, pos, regs, stop) \