Zwischencommit beim Umzug auf LFS 6.2.

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

diff --git a/lfs/inetutils b/lfs/inetutils
index 4f0b6067eac3c93d673e72888dc1803762c7b2e0..69cc272e9220924b6da920b3f45b7b3ba8b61a65 100644 (file)
--- a/lfs/inetutils
+++ b/lfs/inetutils
@@ -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: inetutils,v 1.3.2.3 2005/02/05 15:38:15 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -36,7 +30,7 @@ VER        = 1.4.2
 
 THISAPP    = inetutils-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_GNU)/inetutils
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -78,13 +72,14 @@ $(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/$(THISAPP)-ping-1.patch
-       cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls --disable-syslogd \
-           --libexecdir=/usr/sbin --disable-logger \
-           --sysconfdir=/etc --localstatedir=/var \
-           --disable-whois --disable-servers
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-gcc4_fixes-3.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-no_server_man_pages-1.patch
+       cd $(DIR_APP) && ./configure --prefix=/usr --libexecdir=/usr/sbin \
+                                       --sysconfdir=/etc --localstatedir=/var \
+                                       --disable-logger --disable-syslogd \
+                                       --disable-whois --disable-servers
+       cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
-       mv -f /usr/bin/ping /bin
+       mv -v /usr/bin/ping /bin
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)