X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fexpect;h=ac4752be9855055430da639a697ddd7506a923a8;hp=0d24c4e7caae8fcd87c67e4a35c72b736fec909a;hb=af9aa1556e6329e7af3d8939c51316fe1599295a;hpb=cd1a2927226c734d96478e12bb768256fb64a06a

diff --git a/lfs/expect b/lfs/expect
index 0d24c4e7ca..ac4752be98 100644
--- a/lfs/expect
+++ b/lfs/expect
@@ -1,28 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# 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        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# 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 $
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -32,24 +24,23 @@
 
 include Config
 
-VER        = 5.41.0
+VER        = 5.45
 
-THISAPP    = expect-$(VER)
+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)/$(THISAPP)
 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    = 44e1a4f4c877e9ddc5a542dfa7ecc92b
 
 install : $(TARGET)
 
@@ -79,10 +70,14 @@ $(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) && ./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*
 	@$(POSTBUILD)