-Mises à jour pour linux-2.6.38 (nouveau)

-udev patch car v4l_v1 est enlevé dans 2.6.38
-sysvinit-2.88dsf pour régler bug avec 2.6.38
-Test intégrité: un test échoué n'arrête pas la séquence
-Ajout de get_pkg_ver3() pour régler problème de version avec kernel linux-2.6.38-rc1 et eglibc
-Rendu le mode fd (freedesktop) plus logique en inversant les options -o et -s

diff --git a/config/packages-list b/config/packages-list
index 0bbbc64..24b8f5f 100644 (file)
--- a/config/packages-list
+++ b/config/packages-list
@@ -3,7 +3,7 @@
 # This file contains the name and version of all packages,
 # as well the corresponding patches, if needed.
 
-ABIWORD="abiword-2.6.4"
+ABIWORD="abiword-2.8.6"
 AGG="agg-2.5"
 ALSA_DRIVER="alsa-driver-1.0.21"
 ALSA_LIB="alsa-lib-1.0.21"
@@ -35,7 +35,7 @@ CAIRO="cairo-1.8.10"
 CAIROMM="cairomm-1.8.4"
 CDRTOOLS="cdrtools-2.01"
 CDRDAO="cdrdao-1.2.2"
-CKERMIT="ckermit-8.0.211"
+CKERMIT="cku211"
 CLAMAV="clamav-0.93.3"
 CLOOG_PPL="cloog-ppl-0.15.10"
 CONSOLEKIT="ConsoleKit-0.4.1"
@@ -234,11 +234,11 @@ ISO_CODES="iso-codes-3.23"
 JACK="jack-audio-connection-kit-0.120.1"
 JADETEX="jadetex-3.13"
 JASPER="jasper-1.900.1"
-JAVA="jre-1.6.0_05"
 
 KBD="kbd-1.15.2"
 KERBEROS5="krb5-1.4.1"
 KERNEL="linux-2.6.37.1"
+NOUVEAU_NVIDIA_KERNEL="linux-2.6.38-rc7-g3d3d123-nouveau-git"
 KVM="kvm-84"
 
 LAME="lame-398-2"
@@ -395,10 +395,10 @@ SQUIRRELMAIL="squirrelmail-1.5.1"
 STARTUP_NOTIFICATION="startup-notification-0.9"
 STRACE="strace-4.5.20"
 SUBVERSION="subversion-1.6.6"
-SYLPHEED="sylpheed-3.1"
+SYLPHEED="sylpheed-3.1.0"
 SUDO="sudo-1.7.2p2"
 SYSKLOGD="sysklogd-1.5"
-SYSVINIT="sysvinit-2.86"
+SYSVINIT="sysvinit-2.88dsf"
 
 T1LIB="t1lib-5.1.2"
 TALLOC="talloc-2.0.1"
@@ -418,7 +418,7 @@ TIFF="tiff-3.9.4"
 TK="tk8.5.8-src"
 TRANSMISSION="transmission-1.34"
 
-UDEV="udev-160"
+UDEV="udev-166"
 UDEV_CONFIG="udev-config-20100128"
 UML_UTILITIES="uml_utilities_20070815"
 UNRAR="unrar-3.7.8"
@@ -437,7 +437,7 @@ WINDOWMAKER_EXTRA="WindowMaker-extra-0.1"
 WIRELESS_TOOLS="wireless_tools.29"
 WMNOTIFY="wmnotify-0.3.2"
 WPA_SUPPLICANT="wpa_supplicant-0.7.3"
-WV="wv-1.2.4"
+WV="wv-1.2.9"
 
 XORG_VER="7.6-1"
 XORG_APP=app-${XORG_VER}

diff --git a/config/sysinfos.amd64 b/config/sysinfos.amd64
index ff6b1ed..29fc4cb 100644 (file)
--- a/config/sysinfos.amd64
+++ b/config/sysinfos.amd64
@@ -37,4 +37,4 @@ BOOTPROTO[0]="dhcp"
 USE_SAMBA="no"
 
 # Override some packages
-KERNEL="linux-2.6-nouveau-git-20110310"
+KERNEL="${NOUVEAU_NVIDIA_KERNEL}"

diff --git a/config/urls b/config/urls
index cf1b6cd..4d1ba2c 100644 (file)
--- a/config/urls
+++ b/config/urls
@@ -28,3 +28,4 @@ GNUPG_URL="ftp://ftp.gnupg.org/gcrypt"
 WMAKER_URL="http://windowmaker.info/pub/source/release"
 CAIRO_URL="http://cairographics.org/releases"
 KERNEL_URL="http://www.kernel.org/pub"
+ABIWORD_URL="http://www.abisource.com/downloads"

diff --git a/functions/fpkg b/functions/fpkg
index cffb6f1..ae6e0b4 100644 (file)
--- a/functions/fpkg
+++ b/functions/fpkg
@@ -167,7 +167,7 @@ detect_file_not_found()
     # FTP: will say "File not found"
     if grep --ignore-case "not found" ${WGET_LOG_FILE} \
         1> /dev/null 2>&1; then
-        echo "404 NOTFOUND"
+        #echo "404 NOTFOUND"
         return 0
     fi
     
@@ -408,30 +408,29 @@ fpkg()
                 # Most common layout:
                 # http://pkg-config.freedesktop.org/releases/
 
-                if [ -z "${SRC_DIR}" ]; then
+                if [ -z "${MODE_OPT}" ]; then
                     # Default subdirectory or module on server
-                   SRC_DIR=$(get_pkg_name ${PACK})
+                   MODE_OPT=$(get_pkg_name ${PACK})
                 fi
-
                 if [ -z "${FILE_EXT}" ]; then
                     # Default file extension is always tar.gz???
                     FILE_EXT="tar.gz"
                 fi
 
                 FD_SUBDIR_FINAL="releases"
-                if [ -n "${MODE_OPT}" ]; then
+                if [ -n "${SRC_DIR}" ]; then
                     # Optional final subdir:
                     #   releases (default)
                     #   dist
                     #   none (don't append anything)
-                    if [ "x${MODE_OPT}" = "xnone" ]; then
+                    if [ "x${SRC_DIR}" = "xnone" ]; then
                         FD_SUBDIR_FINAL=""
                     else
-                        FD_SUBDIR_FINAL=${MODE_OPT}
+                        FD_SUBDIR_FINAL=${SRC_DIR}
                     fi
                 fi
 
-                URL="http://${SRC_DIR}.freedesktop.org/${FD_SUBDIR_FINAL}"
+                URL="http://${MODE_OPT}.freedesktop.org/${FD_SUBDIR_FINAL}"
                 SRC_DIR=""
                 ;;
             apa)
@@ -526,8 +525,10 @@ fpkg()
     fi
 
     if [ -n "${TEST_INTEGRITY}" ]; then
+        set +e
         test_archive_integrity "${PACK}" "${DEST_FILE}" "${FINAL_EXT}"
-        
+        set -e
+
         # We do not want to fetch patches when testing integrity,
         # so return immediately
         return 0

diff --git a/functions/main b/functions/main
index ae0d163..6916952 100644 (file)
--- a/functions/main
+++ b/functions/main
@@ -168,6 +168,20 @@ get_pkg_ver_base()
     echo ${1} | sed "s!^.*-\([0-9]*\.[0-9]*\).*!\1!g"
 }
 
+# Extracting the 3-digit version number from a complete package name.
+# Arg. #1: Complete package name with version
+# (ex: linux-2.6.37.1 will output 2.6.37)
+get_pkg_ver3()
+{
+    # Checking for correct number of arguments
+    if [ $# -ne 1 ]; then
+       echo "${FUNCNAME}(), wrong number of arguments: ${*}"
+       return 1
+    fi
+
+    echo ${1} | sed "s!^.*-\([0-9]*\.[0-9]*\.[0-9]*\).*!\1!g"
+}
+
 # Extracting the base version number from a complete package name.
 # Arg. #1: Complete package name with version (ex: gcc-3.4.4 will output 3)
 get_pkg_ver_major()

diff --git a/stage0/packages-update b/stage0/packages-update
index c1be74b..932c6a1 100755 (executable)
--- a/stage0/packages-update
+++ b/stage0/packages-update
@@ -9,7 +9,13 @@ source ../functions/main
 
 update_packages_init ${*}
 
-fpkg -s "linux/kernel/v2.6" ${KERNEL} ${KERNEL_URL}
+if [ "x${KERNEL}" = "x${NOUVEAU_NVIDIA_KERNEL}" ]; then
+    # Special case
+    fpkg -m hv ${KERNEL}
+else
+    fpkg -s "linux/kernel/v2.6" ${KERNEL} ${KERNEL_URL}
+fi
+
 fpkg ${FILE_PKG} "ftp://ftp.astron.com/pub/file"
 fpkg -m gnu ${NCURSES}
 fpkg -m gnu ${GMP}

diff --git a/stage0/pkg/eglibc b/stage0/pkg/eglibc
index be97599..2f8d9f9 100644 (file)
--- a/stage0/pkg/eglibc
+++ b/stage0/pkg/eglibc
@@ -14,7 +14,7 @@ hvconfig_pre()
         --disable-profile \
         --enable-add-ons \
         --with-tls \
-        --enable-kernel=$(get_pkg_ver ${KERNEL}) \
+        --enable-kernel=$(get_pkg_ver3 ${KERNEL}) \
         --with-__thread \
         --with-binutils=/cross-tools/bin \
         --with-headers=/tools/include"

diff --git a/stage3/packages-update b/stage3/packages-update
index 179b95c..17826ba 100755 (executable)
--- a/stage3/packages-update
+++ b/stage3/packages-update
@@ -98,7 +98,7 @@ fpkg -m sf ${LIBPNG}
 fpkg -m gnome ${LIBART}
 fpkg -m sf ${LIBEXIF}
 fpkg -e "tar.gz" ${FRIBIDI} "http://fribidi.org/download"
-fpkg -m fd -s "icon-theme" ${HICOLOR_ICON_THEME}
+fpkg -m fd -o "icon-theme" ${HICOLOR_ICON_THEME}
 fpkg ${TIFF} "http://download.osgeo.org/libtiff"
 fpkg -m sf ${GIFLIB}
 fpkg -m sf ${LCMS}

diff --git a/stage4/packages-update b/stage4/packages-update
index e18e1c9..957e213 100755 (executable)
--- a/stage4/packages-update
+++ b/stage4/packages-update
@@ -64,9 +64,9 @@ fpkg -m xorg -s lib ${LIBXDMCP}
 fpkg -m sf ${LESSTIF}
 fpkg -m xorg -s data ${XBITMAPS}
 
-fpkg -m fd -o "dist" -s "xcb" ${LIBPTHREAD_STUBS}
-fpkg -m fd -o "dist" -s "xcb" ${XCB_PROTO}
-fpkg -m fd -o "dist" -s "xcb" ${XCB_UTIL}
+fpkg -m fd -o "xcb" -s "dist" ${LIBPTHREAD_STUBS}
+fpkg -m fd -o "xcb" -s "dist" ${XCB_PROTO}
+fpkg -m fd -o "xcb" -s "dist" ${XCB_UTIL}
 fpkg -m gnu ${GPERF}
 
 fpkg -m hv ${LIBDRM}
@@ -74,16 +74,16 @@ fpkg -e "tar.gz" ${TALLOC} "http://samba.org/ftp/talloc"
 fpkg -s "$(get_pkg_ver ${MESALIB})" ${MESALIB} \
     ftp://ftp.freedesktop.org/pub/mesa
 fpkg -m xorg -s data ${XCURSOR_THEMES}
-fpkg -m fd -o "xlibs" -s "xkbdesc" ${XKEYBOARD_CONFIG}
+fpkg -m fd -o "xlibs" -s "xkbdesc" -e "tar.bz2" ${XKEYBOARD_CONFIG}
 
 fpkg -m xorg -s app ${LUIT}
 fpkg -e "tar.gz" ${PIXMAN} ${CAIRO_URL}
 fpkg -e "tar.gz" ${LIBFFI} "ftp://sourceware.org/pub/libffi"
 
-fpkg -m fd -o "releases/dbus" ${DBUS}
+fpkg -m fd -s "releases/dbus" ${DBUS}
 fpkg -m gnome ${GLIB}
 fpkg -m gnome ${GOBJECT_INSTROSPECTION}
-fpkg -m fd -o "dbus" ${DBUS_GLIB}
+fpkg -m fd -o "dbus" -s "releases/dbus-glib" ${DBUS_GLIB}
 fpkg -m fd -o "hal" ${EGGDBUS}
 fpkg -m fd -o "hal" ${POLKIT}
 fpkg ${CONSOLEKIT} "http://www.freedesktop.org/software/ConsoleKit/dist"

diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index 6320665..55940a6 100755 (executable)
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -228,7 +228,7 @@ ipkg -m acnb ${KVM}
 ipkg -m acnb ${BRIDGE_UTILS}
 ipkg ${UML_UTILITIES}
 
-ipkg ${CKERMIT}
+ipkg -s ckermit ${CKERMIT}
 
 ipkg ${TRANSMISSION} "--disable-daemon"
 

diff --git a/stage5/packages-update b/stage5/packages-update
index 5573119..676af74 100755 (executable)
--- a/stage5/packages-update
+++ b/stage5/packages-update
@@ -61,7 +61,7 @@ fpkg -m sf -s "ghostscript" ${GHOSTSCRIPT_FONTS_STD}
 fpkg -m sf -s "ghostscript" ${GHOSTSCRIPT_FONTS_OTHER}
 
 fpkg -m sf -s "imagemagick" ${IMAGE_MAGICK}
-fpkg -m fd -o "none" ${POPPLER}
+fpkg -m fd -s "none" ${POPPLER}
 fpkg -m gnome ${LIBRSVG}
 fpkg ${BABL} "ftp://ftp.gtk.org/pub/babl/$(get_pkg_ver_base ${BABL})"
 fpkg ${GEGL} "ftp://ftp.gimp.org/pub/gegl/$(get_pkg_ver_base ${BABL})"
@@ -103,7 +103,7 @@ fpkg -e "tar.gz" ${LIBSAMPLERATE} "http://www.mega-nerd.com/SRC"
 
 fpkg -e "tar.gz" ${LIBOGG} "http://downloads.xiph.org/releases/ogg"
 fpkg ${LIBVORBIS} "http://downloads.xiph.org/releases/vorbis"
-fpkg -m hv ${FLAC}
+fpkg -m sf ${FLAC}
 fpkg -m sf ${LAME}
 fpkg -m hv ${LIBA52}
 fpkg -m hv ${LIBID3TAG}
@@ -133,13 +133,13 @@ fpkg -e "tar.gz" ${LILYPOND} \
     "http://lilypond.org/download/sources/v$(get_pkg_ver_base ${LILYPOND})"
 fpkg -m hv ${FFMPEG}
 
-fpkg ${SYLPHEED} "http://sylpheed.good-day.net/sylpheed/v$(get_pkg_ver_base ${SYLPHEED})"
-
+fpkg ${SYLPHEED} \
+    "http://sylpheed.good-day.net/sylpheed/v$(get_pkg_ver_base ${SYLPHEED})"
 fpkg -m hv ${NSS}
 fpkg -f "${FIREFOX}.source" ${FIREFOX} \
     "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(get_pkg_ver ${FIREFOX})/source"
 
-fpkg -m hv ${AGG}
+fpkg -m hv ${AGG} "http://www.antigrain.com"
 fpkg ${GNASH} "http://ftp.gnu.org/pub/gnu/gnash/$(get_pkg_ver ${GNASH})"
 
 fpkg -e "tar.gz" ${SASL2} "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail"
@@ -187,7 +187,7 @@ fpkg -m hv ${UML_UTILITIES}
 
 fpkg ${TRANSMISSION} "http://mirrors.m0k.org/transmission/files"
 
-fpkg -m hv ${CKERMIT}
+fpkg -e "tar.gz" ${CKERMIT} "ftp://kermit.columbia.edu/kermit/archives"
 
 fpkg -e "tar.gz" ${LIBGAMIN} "http://www.gnome.org/~veillard/gamin/sources"
 

diff --git a/stage5/pkg/firefox b/stage5/pkg/firefox
index 119fc8d..abd04a3 100644 (file)
--- a/stage5/pkg/firefox
+++ b/stage5/pkg/firefox
@@ -121,7 +121,6 @@ EOF
     # Remove old links
     rm -f /usr/lib/mozilla
     rm -f /usr/lib/firefox
-    rm -f /usr/lib/${FIREFOX_PKG_VERSION}/plugins/libjavaplugin_oji.so
 
     ln -v -sf ${FIREFOX_PKG_VERSION} /usr/lib/mozilla
     ln -v -sf ${FIREFOX_PKG_VERSION} /usr/lib/firefox

diff --git a/stage6/hv-install-1 b/stage6/hv-install-1
index 091286f..84e4231 100755 (executable)
--- a/stage6/hv-install-1
+++ b/stage6/hv-install-1
@@ -96,7 +96,6 @@ ipkg_gnome ${GNOME_SOUND_JUICER}
 ipkg_gnome ${GNOME_TOTEM}
 ipkg ${GDM}
 ipkg ${LIBNOTIFY}
-ipkg -m gnomenb ${GNOME_MOUNT}
 
 ipkg ${RHYTHMBOX} "--disable-python"
 

diff --git a/stage6/packages-update b/stage6/packages-update
index d56ebdc..f9869fe 100755 (executable)
--- a/stage6/packages-update
+++ b/stage6/packages-update
@@ -9,89 +9,90 @@ source ../functions/main
 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_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 -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_KEYRING_MANAGER}
-fpkg_gnome ${GNOME_VOLUME_MANAGER}
-fpkg       ${LIBMUSICBRAINZ} "http://ftp.musicbrainz.org/pub/musicbrainz"
-fpkg_gnome ${GNOME_SOUND_JUICER}
+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 ${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_TOTEM}
+fpkg -m gnome ${GDM}
+fpkg ${LIBNOTIFY} \
+    "http://www.galago-project.org/files/releases/source/libnotify"
 
-fpkg_gnome ${RHYTHMBOX}
+fpkg -m gnome ${RHYTHMBOX}
 
-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 ${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_gnome ${EVOLUTION_EXCHANGE}
-fpkg_gnome ${EVOLUTION}
+fpkg -m gnome ${EVOLUTION_EXCHANGE}
+fpkg -m gnome ${EVOLUTION}
 
 exit $?