Calamaris-Proxy-Logdatei-Analyzer eingebaut.

[people/pmueller/ipfire-2.x.git] / lfs / expect

diff --git a/lfs/expect b/lfs/expect
index 0d24c4e7caae8fcd87c67e4a35c72b736fec909a..289cad35c84804d36e05a7c79ddc396488a6f312 100644 (file)
--- a/lfs/expect
+++ b/lfs/expect
@@ -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: expect,v 1.3.2.5 2005/02/05 15:38:14 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -32,24 +26,23 @@
 
 include Config
 
-VER        = 5.41.0
+VER        = 5.43.0
 
 THISAPP    = expect-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = http://expect.nist.gov/old
-DIR_APP    = $(DIR_SRC)/expect-5.41
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/expect-5.43
 TARGET     = $(DIR_INFO)/$(THISAPP)-tools
 
 ###############################################################################
 # Top-level Rules
 ###############################################################################
-objects=$(DL_FILE) $(THISAPP)-spawn-1.patch
 
-$(DL_FILE)                   = $(DL_FROM)/$(DL_FILE)
-$(THISAPP)-spawn-1.patch     = $(URL_LFS)/expect/$(THISAPP)-spawn-1.patch
+objects=$(DL_FILE)
+
+$(DL_FILE)        = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5               = 490664773286690d111d9cd055c50700
-$(THISAPP)-spawn-1.patch_MD5 = ef6d0d0221c571fb420afb7033b3bbba
+$(DL_FILE)_MD5    = 43e1dc0e0bc9492cf2e1a6f59f276bc3
 
 install : $(TARGET)
 
@@ -79,10 +72,9 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) $(DIR_SRC)/tcl* && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_SRC) && tar zxf $(DIR_DL)/tcl8.4.6*.tar.gz
-       cd $(DIR_APP) && patch -Np1 < $(DIR_DL)/$(THISAPP)-spawn-1.patch
-       cd $(DIR_APP) && ./configure --prefix=/tools --with-tcl=/tools/lib --with-x=no --disable-nls
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-spawn-1.patch
+       cd $(DIR_APP) && ./configure --prefix=/tools --with-tcl=/tools/lib --with-tclinclude=/tools/include --with-x=no --disable-nls
+       cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make SCRIPTS="" install
        @rm -rf $(DIR_APP) $(DIR_SRC)/tcl*
        @$(POSTBUILD)