X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage5%2Fpackages-update;h=d9c8c48b9ab907ab740b607e46dd608f003794e2;hb=56e6ade2828debbb8210ffba1faa2193cb78d05c;hp=b6199d534840d327db14d34b5ed22eeb76f50e7c;hpb=2f337c932e5c659d31b4860d4414dde540cb74bb;p=hvlinux.git

diff --git a/stage5/packages-update b/stage5/packages-update
index b6199d5..d9c8c48 100755
--- a/stage5/packages-update
+++ b/stage5/packages-update
@@ -1,19 +1,14 @@
-#!/bin/sh
+#!/bin/bash
 
-LFS_STAGE="stage5"
 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
-
-# Execute a return statement instead of exit, to be able to continue with
-# downloading other packages
-export RCMD_NO_EXIT=1
+source ../functions-fpkg
+source ../config/packages-list
 
 update_packages_init
 
@@ -139,7 +134,6 @@ fpkg       ${VORBIS_TOOLS} "http://downloads.xiph.org/releases/vorbis"
 
 fpkg_sf    ${GRIP}
 fpkg_sf    ${CDRDAO}
-fpkg_hv    ${SWEEP}
 fpkg_sf    ${EASYTAG}
 fpkg       ${LILYPOND} "http://lilypond.org/download/sources/v$(get_pkg_ver_base ${LILYPOND})"
 
@@ -167,10 +161,6 @@ fpkg_hv    ${MILTER_SPF}
 fpkg       ${PROCMAIL} "http://www.procmail.org"
 fpkg       ${FETCHMAIL} "http://download.berlios.de/fetchmail"
 fpkg_sf    ${MUTT}
-
-fpkg -f "${FCRON}.src" ${FCRON} "ftp://ftp.seul.org/pub/fcron"
-fpkg_hv    ${GETDATE}
-
 fpkg_sf    ${CLAMAV}
 
 fpkg       ${PERL_MOD_HTML_TAGSET} "http://anduin.linuxfromscratch.org/sources/BLFS/svn/perl-modules"
@@ -196,8 +186,6 @@ fpkg       ${UW_IMAP} "ftp://ftp.cac.washington.edu/imap"
 
 fpkg       ${HTTPD} "http://www.apache.org/dist/httpd"
 
-fpkg_sf    ${MAILMAN}
-
 fpkg       ${SAMBA} "ftp://ftp.samba.org/pub/samba/old-versions"
 
 fpkg       ${PHP}   "http://us2.php.net/distributions"