Merge branche make

[hvlinux.git] / stage3 / packages-update

diff --git a/stage3/packages-update b/stage3/packages-update
index a2d167e..1ce421c 100755 (executable)
--- a/stage3/packages-update
+++ b/stage3/packages-update
@@ -1,15 +1,14 @@
-#!/bin/sh
+#!/bin/bash
 
-LFS_STAGE="stage3"
 USE_LFS_PATCHES=1
 USE_BLFS_PATCHES=1
 USE_HV_PATCHES=1
 
 # Reading system configuration informations, functions and package versions.
-source ../sysinfos
+source ../config/sysinfos
 source ../functions
-source ../functions-update
-source ../packages-list
+source ../functions-fpkg
+source ../config/packages-list
 
 update_packages_init
 
@@ -17,12 +16,6 @@ if [ ${#} -eq 1 -a "x${1}" = "xtest" ]; then
     export TEST_INTEGRITY=1
 fi
 
-# These packages were already downloaded for stage1:
-lpkg     1 ${NANO}
-
-# These packages were already downloaded for stage2:
-lpkg     2 ${INETUTILS}
-
 # These packages are only for stage3
 fpkg_gnu   ${WHICH}
 fpkg       ${PCIUTILS} ftp://ftp.kernel.org/pub/software/utils/pciutils
@@ -30,13 +23,13 @@ fpkg_sf    ${LIBUSB}
 fpkg_sf    ${LIBUSB_COMPAT} libusb
 fpkg       ${USBUTILS} ${SOURCEFORGE_URL}/project/linux-usb/usbutils
 fpkg       ${REISERFSPROGS} http://www.kernel.org/pub/linux/utils/fs/reiserfs
-fpkg       ${NET_TOOLS} http://www.tazenda.demon.co.uk/phil/net-tools
-fpkg       ${DHCP} ftp://ftp.isc.org/isc/dhcp/dhcp-3.0-history
 fpkg       ${POPT} http://rpm5.org/files/popt
 fpkg       ${PAM} http://www.kernel.org/pub/linux/libs/pam/library
+fpkg -e "tar.gz" -f "${FCRON}.src" ${FCRON} http://fcron.free.fr/archives
 fpkg       ${OPENSSL} ftp://ftp.openssl.org/source
 fpkg       ${OPENSSL_ROOT_CERTS} http://anduin.linuxfromscratch.org/files/BLFS
 fpkg       ${OPENSSH} ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable
+fpkg       ${LYNX} http://lynx.isc.org/current
 fpkg_sf    ${EXPAT}
 fpkg       ${APR}      http://apache.sunsite.ualberta.ca/apr
 fpkg       ${APR_UTIL} http://apache.sunsite.ualberta.ca/apr
@@ -52,6 +45,7 @@ fpkg_gnu   ${WGET}
 fpkg       ${TCPWRAPPERS} ftp://ftp.porcupine.org/pub/security
 fpkg       ${PORTMAP} http://neil.brown.name/portmap
 fpkg       ${NFS_UTILS} ftp://ftp.kernel.org/pub/linux/utils/nfs
+fpkg       ${XINETD} "http://www.xinetd.org"
 fpkg_sf    ${DDCLIENT}
 fpkg       ${LIBPCAP} "http://www.tcpdump.org/release"
 fpkg       ${TCPDUMP} "http://www.tcpdump.org/release"
@@ -73,7 +67,7 @@ fpkg_gnu   ${ED}
 fpkg_gnu   ${BC}
 fpkg_sf    ${FUSE}
 fpkg       ${DOSFSTOOLS} "http://www.daniel-baumann.ch/software/dosfstools"
-fpkg       ${CVS} "ftp://ftp.gnu.org/non-gnu/cvs/source/stable/$(get_pkg_ver ${CVS})"
+##fpkg       ${CVS} "ftp://ftp.gnu.org/non-gnu/cvs/source/stable/$(get_pkg_ver ${CVS})"
 fpkg       ${GIT}          "http://www.kernel.org/pub/software/scm/git"
 fpkg       ${GIT_MANPAGES} "http://www.kernel.org/pub/software/scm/git"
 
@@ -107,7 +101,7 @@ fpkg_gnome ${LIBART}
 fpkg_sf    ${LIBEXIF}
 fpkg       ${FRIBIDI} "http://fribidi.org/download"
 fpkg       ${HICOLOR_ICON_THEME} "http://icon-theme.freedesktop.org/releases"
-fpkg       ${TIFF} "http://libtiff.maptools.org/dl"
+fpkg       ${TIFF} "http://download.osgeo.org/libtiff"
 fpkg_sf    ${GIFLIB}
 fpkg       ${LCMS}    "http://www.littlecms.com"
 fpkg_sf    ${LIBMNG}