X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fgrep;h=9d9a9bf26609ead4d23f0b73d4e1767525a8c1ba;hp=3e89e584f5c00598b9659457773f4e8dcaa7230c;hb=dd714b8aad61bcff68a67ff3570018d946f09067;hpb=f522e3076bd5ed0b858ac687238a272512801ded

diff --git a/lfs/grep b/lfs/grep
index 3e89e584f5..9d9a9bf266 100644
--- a/lfs/grep
+++ b/lfs/grep
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: grep,v 1.3.2.3 2005/02/26 20:13:20 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -32,25 +26,24 @@
 
 include Config
 
-VER        = 2.5.1
+VER        = 2.5.1a
 
 THISAPP    = grep-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
-DL_FROM    = $(URL_GNU)/grep
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 # Normal build or /tools build.
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
-  EXTRA_CONFIG = --prefix=/usr --bindir=/bin \
-    --with-included-regex --disable-nls
+  EXTRA_CONFIG = --prefix=/usr --bindir=/bin --disable-nls
   EXTRA_MAKE =
   EXTRA_INSTALL =
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
   EXTRA_CONFIG = --prefix=/tools --disable-nls \
-    --disable-perl-regexp --with-included-regex
+    --disable-perl-regexp
   EXTRA_MAKE = 
   EXTRA_INSTALL = 
 endif
@@ -63,7 +56,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ddd99e2d5d4f4611357e31e97f080cf2
+$(DL_FILE)_MD5 = 52202fe462770fa6be1bb667bd6cf30c
 
 install : $(TARGET)
 
@@ -93,8 +86,10 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-redhat_fixes-2.patch
+	cd $(DIR_APP) && chmod +x tests/fmbtest.sh
 	cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
-	cd $(DIR_APP) && make $(EXTRA_MAKE)
+	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
 	cd $(DIR_APP) && make $(EXTRA_INSTALL) install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)