X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage6%2Fpackages-update;h=f9869fea99eb8be594720f1a3224117f6e70c2b7;hb=166111908c2cff78986972e0d2668feb7ee9d42b;hp=203366db2959b159061c08532386443739c666bd;hpb=77ec517a212986d1b0c2c1bdc72750f47a63e585;p=hvlinux.git

diff --git a/stage6/packages-update b/stage6/packages-update
old mode 100644
new mode 100755
index 203366d..f9869fe
--- a/stage6/packages-update
+++ b/stage6/packages-update
@@ -1,109 +1,98 @@
-#!/bin/sh
+#!/bin/bash
 
-# Must be defined before sourcing other files.
-LFS_STAGE="stage4"
+USE_LFS_PATCHES=1
+USE_BLFS_PATCHES=1
+USE_HV_PATCHES=1
 
-# Reading system configuration informations, functions and package versions.
-source ../functions
-source ../functions-update
-source ../packages-list
+source ../functions/main
 
-update_packages_init
-
-# Begin
+update_packages_init ${*}
 
 # Gnome 2 core packages
-fpkg_gnome ${ORBIT2}
-fpkg_gnome ${LIBBONOBO}
-fpkg_gnome ${GCONF}
-fpkg_gnome ${GNOME_MIME_DATA}
-fpkg_gnome ${GNOME_VFS}
-fpkg_gnome ${GNOME_VFS_MONIKERS}
-fpkg_gnome ${LIBGNOME}
-fpkg_gnome ${LIBGNOMECANVAS}
-fpkg_gnome ${LIBBONOBOUI}
-fpkg_gnome ${GNOME_ICON_THEME}
-fpkg_gnu   ${LIBTASN1}
-fpkg_gnome ${GNOME_KEYRING}
-fpkg_gnome ${LIBGNOMEUI}
-fpkg_gnome ${GNOME_THEMES}
-fpkg_gnome ${SCROLLKEEPER}
-fpkg_gnome ${GNOME_DOC_UTILS}
-fpkg_gnome ${GNOME_DESKTOP}
-fpkg_gnome ${GNOME_BACKGROUNDS}
-fpkg_gnome ${GNOME_MENUS}
-fpkg_gnome ${GNOME_PANEL}
-fpkg_gnome ${GNOME_SESSION}
-fpkg_gnome ${VTE}
-fpkg_gnome ${GNOME_TERMINAL}
-fpkg_gnome ${LIBGTOP}
-fpkg_gnome ${LIBGNOMEKBD}
-fpkg_gnome ${LIBGAIL_GNOME}
-fpkg_gnome ${GNOME_APPLETS}
-fpkg_gnome ${EEL}
-fpkg_gnome ${NAUTILUS}
-fpkg_gnome ${YELP}
-fpkg_gnome ${METACITY}
-fpkg_gnome ${GNOME_CONTROL_CENTER}
-fpkg_gnome ${GNOME_USER_DOCS}
+fpkg -m gnome ${ORBIT2}
+fpkg -m gnome ${LIBBONOBO}
+fpkg -m gnome ${GCONF}
+fpkg -m gnome ${GNOME_MIME_DATA}
+fpkg -m gnome ${GNOME_VFS}
+fpkg -m gnome ${GNOME_VFS_MONIKERS}
+fpkg -m gnome ${LIBGNOME}
+fpkg -m gnome ${LIBGNOMECANVAS}
+fpkg -m gnome ${LIBBONOBOUI}
+fpkg -m gnome ${GNOME_ICON_THEME}
+fpkg -m gnome ${GNOME_KEYRING}
+fpkg -m gnome ${LIBGNOMEUI}
+fpkg -m gnome ${GNOME_THEMES}
+fpkg -m gnome ${SCROLLKEEPER}
+fpkg -m gnome ${GNOME_DOC_UTILS}
+fpkg -m gnome ${GNOME_DESKTOP}
+fpkg -m gnome ${GNOME_BACKGROUNDS}
+fpkg -m gnome ${GNOME_MENUS}
+fpkg -m gnome ${GNOME_PANEL}
+fpkg -m gnome ${GNOME_SESSION}
+fpkg -m gnome ${VTE}
+fpkg -m gnome ${GNOME_TERMINAL}
+fpkg -m gnome ${LIBGTOP}
+fpkg -m gnome ${LIBGNOMEKBD}
+fpkg -m gnome ${LIBGAIL_GNOME}
+fpkg -m gnome ${GNOME_APPLETS}
+fpkg -m gnome ${EEL}
+fpkg -m gnome ${NAUTILUS}
+fpkg -m gnome ${YELP}
+fpkg -m gnome ${METACITY}
+fpkg -m gnome ${GNOME_CONTROL_CENTER}
+fpkg -m gnome ${GNOME_USER_DOCS}
 
 # Gnome 2 additional packages - Libraries
-fpkg_gnome ${LIBGNOMECUPS}
-fpkg_gnome ${LIBGNOMEPRINT}
-fpkg_gnome ${LIBGNOMEPRINTUI}
-fpkg_gnome ${GTKHTML}
-fpkg_gnome ${EVOLUTION_DATA_SERVER}
-fpkg_gnome ${GTKSOURCEVIEW}
-fpkg_gnome ${SYSTEM_TOOLS_BACKENDS}
-fpkg_gnome ${GNOME_AUDIO}
+fpkg -m gnome ${LIBGNOMECUPS}
+fpkg -m gnome ${LIBGNOMEPRINT}
+fpkg -m gnome ${LIBGNOMEPRINTUI}
+fpkg -m gnome ${GTKHTML}
+fpkg -m gnome ${EVOLUTION_DATA_SERVER}
+fpkg -m gnome ${GTKSOURCEVIEW}
+fpkg -m gnome ${SYSTEM_TOOLS_BACKENDS}
+fpkg -m gnome ${GNOME_AUDIO}
 
 # Gnome 2 additional packages - Utilities
-fpkg_gnome ${GEDIT}
-fpkg_gnome ${EOG}
-fpkg_gnome ${EVINCE}
-fpkg_gnome ${FILE_ROLLER}
-fpkg_gnome ${GCONF_EDITOR}
-fpkg_gnome ${GNOME_UTILS}
-fpkg_gnome ${GNOME_SYSTEM_MONITOR}
-fpkg_gnome ${NAUTILUS_CD_BURNER}
-fpkg_gnome ${GSTREAMER}
-fpkg_gnome ${GST_PLUGINS_BASE}
-fpkg       ${GST_PLUGINS_GOOD} "http://gstreamer.freedesktop.org/src/gst-plugins-good"
-fpkg       ${GST_PLUGINS_BAD}  "http://gstreamer.freedesktop.org/src/gst-plugins-bad"
-fpkg       ${GST_PLUGINS_UGLY} "http://gstreamer.freedesktop.org/src/gst-plugins-ugly"
-fpkg       ${GST_FFMPEG} "http://gstreamer.freedesktop.org/src/gst-ffmpeg"
-fpkg_gnome ${GNOME_MEDIA}
-fpkg_gnome ${GNOME_NETSTATUS}
-fpkg_gnome ${GCALCTOOL}
-fpkg_gnome ${GUCHARMAP}
-fpkg_gnome ${ZENITY}
-
-fpkg_gnome ${GNOME_KEYRING_MANAGER}
-fpkg_gnome ${GNOME_VOLUME_MANAGER}
-fpkg       ${LIBMUSICBRAINZ} "http://ftp.musicbrainz.org/pub/musicbrainz"
-fpkg_gnome ${GNOME_SOUND_JUICER}
-fpkg       ${ISO_CODES} "ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes"
+fpkg -m gnome ${GEDIT}
+fpkg -m gnome ${EOG}
+fpkg -m gnome ${EVINCE}
+fpkg -m gnome ${FILE_ROLLER}
+fpkg -m gnome ${GCONF_EDITOR}
+fpkg -m gnome ${GNOME_UTILS}
+fpkg -m gnome ${GNOME_SYSTEM_MONITOR}
+fpkg -m gnome ${NAUTILUS_CD_BURNER}
+fpkg -m gnome ${GSTREAMER}
+fpkg -m gnome ${GST_PLUGINS_BASE}
+fpkg -m fd -o "gstreamer" -s "src/gst-plugins-good" ${GST_PLUGINS_GOOD}
+fpkg -m fd -o "gstreamer" -s "src/gst-plugins-bad"  ${GST_PLUGINS_BAD}
+fpkg -m fd -o "gstreamer" -s "src/gst-plugins-ugly" ${GST_PLUGINS_UGLY}
+fpkg -m fd -o "gstreamer" -s "src/gst-ffmpeg"       ${GST_FFMPEG}
+fpkg -m gnome ${GNOME_MEDIA}
+fpkg -m gnome ${GNOME_NETSTATUS}
+fpkg -m gnome ${GCALCTOOL}
+fpkg -m gnome ${GUCHARMAP}
+fpkg -m gnome ${ZENITY}
 
-fpkg_gnome ${GNOME_TOTEM}
-fpkg_gnome ${GDM}
-fpkg       ${LIBNOTIFY} "http://www.galago-project.org/files/releases/source/libnotify"
-fpkg       ${GNOME_MOUNT} "http://people.freedesktop.org/~david/dist"
+fpkg -m gnome ${GNOME_KEYRING_MANAGER}
+fpkg -m gnome ${GNOME_VOLUME_MANAGER}
+fpkg -e "tar.gz" ${LIBMUSICBRAINZ} "http://ftp.musicbrainz.org/pub/musicbrainz"
+fpkg -m gnome ${GNOME_SOUND_JUICER}
 
-fpkg_gnome ${RHYTHMBOX}
+fpkg -m gnome ${GNOME_TOTEM}
+fpkg -m gnome ${GDM}
+fpkg ${LIBNOTIFY} \
+    "http://www.galago-project.org/files/releases/source/libnotify"
 
-fpkg_gnome ${LIBGSF}
-fpkg_gnome ${GOFFICE}
-fpkg_gnome ${GNUMERIC}
-fpkg_sf    ${WV}
-fpkg       ${ABIWORD} "http://www.abisource.com/downloads/abiword/$(get_pkg_ver ${ABIWORD})/source"
+fpkg -m gnome ${RHYTHMBOX}
 
-fpkg_gnome ${EVOLUTION_EXCHANGE}
-fpkg_gnome ${EVOLUTION}
+fpkg -m gnome ${LIBGSF}
+fpkg -m gnome ${GOFFICE}
+fpkg -m gnome ${GNUMERIC}
+fpkg -e "tar.gz" ${WV} "${ABIWORD_URL}/wv/$(get_pkg_ver ${WV})"
+fpkg -e "tar.gz" ${ABIWORD} \
+    "${ABIWORD_URL}/abiword/$(get_pkg_ver ${ABIWORD})/source"
 
-fpkg       ${LIBGPG_ERROR} "http://ftp.gnupg.org/gcrypt/libgpg-error"
-fpkg       ${LIBGCRYPT} "http://ftp.gnupg.org/gcrypt/libgcrypt"
-fpkg       ${GNUTLS} "http://ftp.gnupg.org/gcrypt/gnutls"
-fpkg_sf    ${PIDGIN}
+fpkg -m gnome ${EVOLUTION_EXCHANGE}
+fpkg -m gnome ${EVOLUTION}
 
-# Return last error
 exit $?