From 1a2a5c4742003b21ad4f4fed008db9b4507295da Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 6 Mar 2010 14:39:48 +0100
Subject: add grep package, busybox grep lacks -w

---
 Config.in                                  |  1 +
 package/Config.in                          |  1 +
 package/busybox/config/findutils/Config.in |  3 ++-
 package/grep/Makefile                      | 32 ++++++++++++++++++++++++++++++
 4 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 package/grep/Makefile

diff --git a/Config.in b/Config.in
index e22136582..8b7d40cd6 100644
--- a/Config.in
+++ b/Config.in
@@ -36,6 +36,7 @@ config ADK_DEVELSYSTEM
 	select ADK_PACKAGE_GAWK
 	select ADK_PACKAGE_GCC
 	select ADK_PACKAGE_GIT
+	select ADK_PACKAGE_GREP
 	select ADK_PACKAGE_UCLIBC_DEV if ADK_TARGET_LIB_UCLIBC
 	select ADK_PACKAGE_EGLIBC_DEV if ADK_TARGET_LIB_EGLIBC
 	select ADK_PACKAGE_GLIBC_DEV if ADK_TARGET_LIB_GLIBC
diff --git a/package/Config.in b/package/Config.in
index 68c81aad1..1d5743055 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -551,6 +551,7 @@ source "package/cpufrequtils/Config.in"
 source "package/fbset/Config.in"
 source "package/file/Config.in"
 source "package/findutils/Config.in"
+source "package/grep/Config.in"
 source "package/hdparm/Config.in"
 source "package/usbutils/Config.in"
 source "package/patch/Config.in"
diff --git a/package/busybox/config/findutils/Config.in b/package/busybox/config/findutils/Config.in
index ba2e5f557..1a1e0f4d5 100644
--- a/package/busybox/config/findutils/Config.in
+++ b/package/busybox/config/findutils/Config.in
@@ -182,7 +182,8 @@ config BUSYBOX_FEATURE_FIND_CONTEXT
 
 config BUSYBOX_GREP
 	bool "grep"
-	default y
+	default y if !ADK_PACKAGE_GREP
+	depends on !ADK_PACKAGE_GREP
 	help
 	  grep is used to search files for a specified pattern.
 
diff --git a/package/grep/Makefile b/package/grep/Makefile
new file mode 100644
index 000000000..9508508c3
--- /dev/null
+++ b/package/grep/Makefile
@@ -0,0 +1,32 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		grep
+PKG_VERSION:=		2.5.4
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		92258031d98d4f12dfc6a6d24057e672
+PKG_DESCR:=		global search for a regular expression and print out matched lines
+PKG_SECTION:=		text
+PKG_URL:=		http://www.gnu.org/software/grep/
+PKG_SITES:=		ftp://ftp.gnu.org/gnu/grep/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,GREP,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+#CONFIG_STYLE:=		manual
+# use following to add ./configure options
+#CONFIGURE_ARGS+=	--disable-foo
+# overwrite any configure variables
+#CONFIGURE_ENV+=	ac_cv_func_setpgrp_void=yes
+#BUILD_STYLE:=		manual
+#INSTALL_STYLE:=	manual
+
+post-install:
+	$(INSTALL_DIR) $(IDIR_GREP)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/grep \
+		$(IDIR_GREP)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
-- 
cgit v1.2.3