summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-03-01 21:42:15 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2011-03-01 21:42:15 +0100
commitc8034b6c5297caa7124070065ec156812219471c (patch)
treef14ac4434e948d08db3d632235cbd5293a62d9c1 /package
parentf2463372c9e35cf640f1b0ccede0314a239b0d25 (diff)
update to latest stable version
Diffstat (limited to 'package')
-rw-r--r--package/grep/Makefile7
-rw-r--r--package/grep/patches/patch-src_system_h18
2 files changed, 4 insertions, 21 deletions
diff --git a/package/grep/Makefile b/package/grep/Makefile
index b59a2f69f..4227e3a45 100644
--- a/package/grep/Makefile
+++ b/package/grep/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= grep
-PKG_VERSION:= 2.5.4
-PKG_RELEASE:= 3
-PKG_MD5SUM:= 92258031d98d4f12dfc6a6d24057e672
+PKG_VERSION:= 2.7
+PKG_RELEASE:= 1
+PKG_MD5SUM:= e848f07e3e79aa7899345d17c7e4115e
PKG_DESCR:= global search for a regular expression and print out matched lines
PKG_SECTION:= utils
PKG_DEPENDS:= libpcre
@@ -19,6 +19,7 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,GREP,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+TARGET_LDFLAGS+= -liconv
CONFIGURE_ARGS+= --without-included-regex
post-install:
diff --git a/package/grep/patches/patch-src_system_h b/package/grep/patches/patch-src_system_h
deleted file mode 100644
index 1eb3e7f03..000000000
--- a/package/grep/patches/patch-src_system_h
+++ /dev/null
@@ -1,18 +0,0 @@
---- grep-2.5.4.orig/src/system.h 2009-01-31 06:39:54.000000000 +0100
-+++ grep-2.5.4/src/system.h 2010-05-29 00:08:24.703125000 +0200
-@@ -56,6 +56,7 @@ extern char *sys_errlist[];
- #ifdef __BEOS__
- # undef O_BINARY /* BeOS 5 has O_BINARY and O_TEXT, but they have no effect. */
- #endif
-+/*
- #ifdef HAVE_DOS_FILE_CONTENTS
- # include <io.h>
- # ifdef HAVE_SETMODE
-@@ -64,6 +65,7 @@ extern char *sys_errlist[];
- # define SET_BINARY(fd) _setmode (fd, O_BINARY)
- # endif
- #endif
-+*/
-
- #ifdef HAVE_DOS_FILE_NAMES
- # define IS_SLASH(c) ((c) == '/' || (c) == '\\')