X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fpcre;h=f507bd33c17d959b5aa4934da62d87ff430bbaa4;hp=13ad31199ed903f424c391e8a8fd4fff62d7dcb6;hb=411afd1f4b028dc0b6434a737dc62104577ce442;hpb=bea6ab0a052c082290092a6cd290f585b0827e2f

diff --git a/lfs/pcre b/lfs/pcre
index 13ad31199e..f507bd33c1 100644
--- a/lfs/pcre
+++ b/lfs/pcre
@@ -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: pcre,v 1.2.2.3 2005/09/10 17:22:31 rkerr Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -32,11 +26,11 @@
 
 include Config
 
-VER        = 4.5
+VER        = 6.7
 
 THISAPP    = pcre-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre
+DL_FILE    = $(THISAPP).tar.bz2
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -48,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = a58971177114a3b7a5da0e5a89a43c96
+$(DL_FILE)_MD5 = dbbec9d178ce199e67e98c9a4f994f90
 
 install : $(TARGET)
 
@@ -77,10 +71,11 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pcre-4.5-CAN-2005-2491.patch
-	cd $(DIR_APP) && ./configure --prefix=/usr --disable-static --enable-utf8
-	cd $(DIR_APP) && make
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && ./configure --prefix=/usr --enable-utf8
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
+	cd $(DIR_APP) && mv -v /usr/lib/libpcre.so.* /lib/
+	cd $(DIR_APP) && ln -v -sf ../../lib/libpcre.so.0 /usr/lib/libpcre.so
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)