Erstmal ein Commit:

[ipfire-2.x.git] / lfs / isdn4k-utils

diff --git a/lfs/isdn4k-utils b/lfs/isdn4k-utils
index d8cfb3417deed9e18e614927834dfd9e7d3865e6..cac21fdd333b53a20b0ef91eb3134a010bfb85de 100644 (file)
--- a/lfs/isdn4k-utils
+++ b/lfs/isdn4k-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: isdn4k-utils,v 1.8.2.4 2005/02/05 15:38:15 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -32,24 +26,24 @@
 
 include Config
 
-VER        = v3.2p1
+VER        = CVS-2006-07-20
 
-THISAPP    = isdn4k-utils.$(VER)
+THISAPP    = isdn4k-utils-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
-DL_FROM    = ftp://ftp.isdn4linux.de/pub/isdn4linux/utils
-DIR_APP    = $(DIR_SRC)/isdn4k-utils
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+CFLAGS     += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+RPM_OPT_FLAGS = "$(CFLAGS)"
 
 ###############################################################################
 # Top-level Rules
 ###############################################################################
-objects = $(DL_FILE) isdn4k-utils_ippp-filter.diff
+objects = $(DL_FILE)
 
-$(DL_FILE)                         = $(DL_FROM)/$(DL_FILE)
-isdn4k-utils_ippp-filter.diff      = http://trash.net/~kaber/ippp-filter/isdn4k-utils_ippp-filter.diff
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5                     = d347afa462e46eccfd1284aebae227b6
-isdn4k-utils_ippp-filter.diff_MD5  = b8ff58859b9e379d1f9842d43ce5956e
+$(DL_FILE)_MD5 = 7cde4a61e870bb7e53cd912a3fc30207
 
 install : $(TARGET)
 
@@ -79,30 +73,28 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np1 < $(DIR_DL)/isdn4k-utils_ippp-filter.diff
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/isdn4k-utils-v3.2p1-c89.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/isdn4k-utils-v3.2p1-config.patch
-       cd $(DIR_APP) && sed -i 's%-lt 64%-lt 16%' scripts/makedev.sh
-       cd $(DIR_APP)/capi20 && rm -f lt* aclocal.m4 
-       cd $(DIR_APP)/capi20 && aclocal
-       cd $(DIR_APP)/capi20 && libtoolize --force --automake
-       cd $(DIR_APP)/capi20 && automake --add-missing
-       cd $(DIR_APP)/capi20 && autoconf
-       cd $(DIR_APP)/capiinfo && rm -f aclocal.m4
-       cd $(DIR_APP)/capiinfo && aclocal
-       cd $(DIR_APP)/capiinfo && libtoolize --force --automake
-       cd $(DIR_APP)/capiinfo && automake --add-missing
-       cd $(DIR_APP)/capiinfo && autoconf
-       cd $(DIR_APP)/capiinit && rm -f aclocal.m4
-       cd $(DIR_APP)/capiinit && aclocal
-       cd $(DIR_APP)/capiinit && libtoolize --force --automake
-       cd $(DIR_APP)/capiinit && automake --add-missing
-       cd $(DIR_APP)/capiinit && autoconf
-       cd $(DIR_APP)/ipppd && autoconf
-       cd $(DIR_APP)/ipppd && sed -i -e 's/net\/bpf/pcap/' sys-linux.c
-       cd $(DIR_APP)/ipppd && sed -i -e 's/net\/bpf/pcap/' ipppd.h
+       #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/isdn4k-utils_ippp-filter.diff
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/isdn4k-utils-CVS-2006-07-20-redhat.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/isdn4k-utils-CVS-2004-11-18-autoconf25x.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/isdn4k-utils-0202131200-true.patch
+       cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/isdn4k-utils-CVS-2006-02-13-cleanup.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/isdn4k-utils-statfs.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/isdn4k-utils-capiinit.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/isdn4k-utils-CVS-2006-07-20-pppd-2.4.4.patch
+
+       cd $(DIR_APP) && for i in */configure; do       \
+               cd `dirname $$i`; \
+               autoreconf --force --install; \
+               cd ..; \
+       done
+       
+       cd $(DIR_APP) && iconv -f iso-8859-1 -t utf-8 < imontty/imontty.8.in > imontty/imontty.8.in_
+       cd $(DIR_APP) && mv imontty/imontty.8.in_ imontty/imontty.8.in
+       
+       cd $(DIR_APP) && cp -fv $(DIR_SRC)/config/isdn4k-utils/config .config
+       cd $(DIR_APP) && sed -e "s,',,g" .config > .config.h
+       
        cd $(DIR_APP) && make subconfig
-       cd $(DIR_APP)/ipppd && sed -i 's/^IPPP_FILTER.*$$/IPPP_FILTER := 1/' Makefile
        cd $(DIR_APP) && make
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)