Zwischencommit fuer LFS.

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

diff --git a/lfs/capi4k-utils b/lfs/capi4k-utils
index 64610dd2cc2d23c2ba7a6d5fc98673850884a5f5..dd8d21e03297287fc1921842fede61f94bf27db4 100644 (file)
--- a/lfs/capi4k-utils
+++ b/lfs/capi4k-utils
@@ -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: capi4k-utils,v 1.6.2.11 2005/03/15 17:46:33 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -32,11 +26,11 @@
 
 include Config
 
-VER        = 2004-10-06
+VER        = 2005-07-18
 
 THISAPP    = capi4k-utils-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = ftp://ftp.in-berlin.de/pub/capi4linux/OLD
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/capi4k-utils
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -48,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 54992ff362ca44629fdf59773a6864cd
+$(DL_FILE)_MD5 = c745759b6b3d64e19763727176648cdf
 
 install : $(TARGET)
 
@@ -78,20 +72,19 @@ $(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/capi4k-utils-2004-10-06_ppp-2.4.3.patch
        cd $(DIR_APP)/avmb1 && ./configure
-       cd $(DIR_APP)/avmb1 && make
+       cd $(DIR_APP)/avmb1 && make $(MAKETUNING)
        cd $(DIR_APP)/avmb1 && make install
        cd $(DIR_APP)/capiinit && ./configure
-       cd $(DIR_APP)/capiinit && make
+       cd $(DIR_APP)/capiinit && make $(MAKETUNING)
        cd $(DIR_APP)/capiinit && make install
-       cd $(DIR_APP)/capiinfo && ./configure
-       cd $(DIR_APP)/capiinfo && make
-       cd $(DIR_APP)/capiinfo && make install
        cd $(DIR_APP)/capi20 && SED=sed ./configure
-       cd $(DIR_APP)/capi20 && SED=sed make
+       cd $(DIR_APP)/capi20 && SED=sed make $(MAKETUNING)
        cd $(DIR_APP)/capi20 && make install
-       PPPVER=`grep --max-count=1 VER $(DIR_SRC)/lfs/ppp | awk '{ print $$3 }'` && \
+       PPPVER=2.4.3 && \
                 cd $(DIR_APP)/pppdcapiplugin && PPPVERSIONS="$$PPPVER" make && PPPVERSIONS="$$PPPVER" make install
+       cd $(DIR_APP)/capiinfo && ./configure
+       cd $(DIR_APP)/capiinfo && make $(MAKETUNING)
+       cd $(DIR_APP)/capiinfo && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)