X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fzaptel;h=98cee78f8a0f680c46b8907fae6ba422b695ba30;hp=e82b8036657c2dc1194a78b2548454f9a66024d4;hb=f86b0cc33aa1a7778f24a9e6bd7759c868da482d;hpb=5bd13f01482a0e25bd279d056a61e448d6778e59

diff --git a/lfs/zaptel b/lfs/zaptel
index e82b803665..98cee78f8a 100644
--- a/lfs/zaptel
+++ b/lfs/zaptel
@@ -1,22 +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  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# 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>                        #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -26,13 +24,13 @@
 
 include Config
 
-VER        = 1.2.10
+VER        = 1.4.4
 
 THISAPP    = zaptel-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-ifeq "$(PASS)" "S"
+ifeq "$(SMP)" "1"
 	TARGET     = $(DIR_INFO)/$(THISAPP)-smp
 else
 	TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,6 +38,8 @@ endif
 PROG       = zaptel
 PAK_VER    = 1
 
+DEPS = ""
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 25f9a78272104efdbd44261e33edb725
+$(DL_FILE)_MD5 = 46c0b34dc9279265a54cbbee827bae7c
 
 install : $(TARGET)
 
@@ -59,7 +59,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 md5 : $(subst %,%_MD5,$(objects))
 
 dist: 
-	@$(PAK)
+	$(PAK)
 
 ###############################################################################
 # Downloading, checking, md5sum
@@ -81,24 +81,28 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	# Build Zaptel
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/zaptel.patch
-ifeq "$(PASS)" "S"
-	cd $(DIR_APP) && make $(MAKETUNING) linux26 KVERS=$(KVER)-smp
-	cd $(DIR_APP) && make install KVERS=$(KVER)-smp
+ifeq "$(SMP)" "1"
+	cd $(DIR_APP) && ./configure --prefix=/usr
+	cd $(DIR_APP) && cp -f $(DIR_SRC)/config/asterisk/zaptel.makeopts \
+		menuselect.makeopts
+	cd $(DIR_APP) && make KVERS=$(KVER)-ipfire-smp
+	cd $(DIR_APP) && make install KVERS=$(KVER)-ipfire-smp
 else
-	cd $(DIR_APP) && make $(MAKETUNING) linux26 KVERS=$(KVER)
-	cd $(DIR_APP) && make install KVERS=$(KVER)
+	cd $(DIR_APP) && ./configure --prefix=/usr
+	cd $(DIR_APP) && cp -f $(DIR_SRC)/config/asterisk/zaptel.makeopts \
+		menuselect.makeopts
+	cd $(DIR_APP) && make KVERS=$(KVER)-ipfire
+	cd $(DIR_APP) && make install KVERS=$(KVER)-ipfire
 endif
-	cd $(DIR_APP) && install -D -m 644 zaptel.h /usr/include/zaptel.h
-	cd $(DIR_APP) && install -D -m 644 zconfig.h /usr/include/zconfig.h
-	cd $(DIR_APP) && install -D -m 644 ecdis.h /usr/include/ecdis.h
-	cd $(DIR_APP) && install -D -m 644 fasthdlc.h /usr/include/fasthdlc.h
-	cd $(DIR_APP) && install -D -m 644 kb1ec.h /usr/include/kb1ec.h
-	cd $(DIR_APP) && install -D -m 644 kb1ec_const.h /usr/include/kb1ec_const.h
-	cd $(DIR_APP) && install -D -m 644 biquad.h /usr/include/biquad.h
-	cd $(DIR_APP) && install -D -m 644 arith.h /usr/include/arith.h
-	cd $(DIR_APP) && install -D -m 644 mg2ec.h /usr/include/mg2ec.h
-	cd $(DIR_APP) && install -D -m 644 mg2ec_const.h /usr/include/mg2ec_const.h
+	#cd $(DIR_APP) && install -D -m 644 zaptel.h /usr/include/zaptel.h
+	#cd $(DIR_APP) && install -D -m 644 zconfig.h /usr/include/zconfig.h
+	#cd $(DIR_APP) && install -D -m 644 ecdis.h /usr/include/ecdis.h
+	#cd $(DIR_APP) && install -D -m 644 fasthdlc.h /usr/include/fasthdlc.h
+	#cd $(DIR_APP) && install -D -m 644 kb1ec.h /usr/include/kb1ec.h
+	#cd $(DIR_APP) && install -D -m 644 kb1ec_const.h /usr/include/kb1ec_const.h
+	#cd $(DIR_APP) && install -D -m 644 biquad.h /usr/include/biquad.h
+	#cd $(DIR_APP) && install -D -m 644 arith.h /usr/include/arith.h
+	#cd $(DIR_APP) && install -D -m 644 mg2ec.h /usr/include/mg2ec.h
+	#cd $(DIR_APP) && install -D -m 644 mg2ec_const.h /usr/include/mg2ec_const.h
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)