X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fexpect;h=ac4752be9855055430da639a697ddd7506a923a8;hp=d885f2f7f9124039826639a753b42290f1ce9502;hb=2378f373dd2fd58eaf734877be3827c8d1682b32;hpb=b5548cbb5ccb07c77fd8336f822b830aaf7278e5

diff --git a/lfs/expect b/lfs/expect
index d885f2f7f9..ac4752be98 100644
--- a/lfs/expect
+++ b/lfs/expect
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2016   IPFire Team   <info@ipfire.org>                   #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,12 +24,12 @@
 
 include Config
 
-VER        = 5.43.0
+VER        = 5.45
 
-THISAPP    = expect-$(VER)
+THISAPP    = expect$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/expect-5.43
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)-tools
 
 ###############################################################################
@@ -40,7 +40,7 @@ objects=$(DL_FILE)
 
 $(DL_FILE)        = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5    = 43e1dc0e0bc9492cf2e1a6f59f276bc3
+$(DL_FILE)_MD5    = 44e1a4f4c877e9ddc5a542dfa7ecc92b
 
 install : $(TARGET)
 
@@ -70,8 +70,13 @@ $(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_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-spawn-1.patch
-	cd $(DIR_APP) && ./configure --prefix=/tools --host=$(BUILDTARGET) --with-tcl=/tools/lib --with-tclinclude=/tools/include --with-x=no --disable-nls
+	cd $(DIR_APP) && ./configure \
+			--prefix=$(TOOLS_DIR) \
+			--build=$(BUILDTARGET) \
+			--with-tcl=$(TOOLS_DIR)/lib \
+			--with-tclinclude=$(TOOLS_DIR)/include \
+			--with-x=no \
+			--disable-nls
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make SCRIPTS="" install
 	@rm -rf $(DIR_APP) $(DIR_SRC)/tcl*