X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage5%2Fpackages-update;h=2e01e0c4287ec6c82a39219335b3ad57ccb66e82;hb=91225b782d7c0309719e45df4c603e52d28d96d3;hp=0e50c20f0fafb95b092ac85e7288400a6c01dce7;hpb=82375c336cb78838feda12d1501112c86a436d4c;p=hvlinux.git

diff --git a/stage5/packages-update b/stage5/packages-update
index 0e50c20..2e01e0c 100755
--- a/stage5/packages-update
+++ b/stage5/packages-update
@@ -1,245 +1,225 @@
-#!/bin/sh
-
-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 ../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
-
-update_packages_init
-
-if [ ${#} -eq 1 -a "x${1}" = "xtest" ]; then
-    export TEST_INTEGRITY=1
-fi
-
-GNUPG_URL="ftp://ftp.gnupg.org/gcrypt"
-
-# Gtk
-fpkg_gnome ${GTK_DOC}
-fpkg       ${GLITZ} "http://cairographics.org/snapshots"
-fpkg       ${CAIRO} "http://cairographics.org/releases"
-fpkg       ${CAIROMM} "http://cairographics.org/releases"
-fpkg_gnome ${PANGO}
-fpkg_gnome ${ATK}
-fpkg_gnome ${GTK}
-fpkg_gnome ${GTK_ENGINES}
-fpkg_gnome ${PYGOBJECT}
-fpkg       ${PYCAIRO} "http://cairographics.org/releases"
-fpkg_gnome ${PYGTK}
-fpkg_gnome ${LIBSIGCPP}
-fpkg       ${GC} " http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source"
-fpkg_gnome ${GLIBMM}
-fpkg_gnome ${GTKMM}
-
-fpkg_gnu   ${EMACS}
-fpkg_hv    ${HVCLOCK}
-fpkg_hv    ${WMNOTIFY}
-
-fpkg       ${DESKTOP_FILE_UTILS} "http://freedesktop.org/software/desktop-file-utils/releases"
-fpkg       ${SHARED_MIME_INFO} "http://people.freedesktop.org/~hadess"
-fpkg_gnome ${STARTUP_NOTIFICATION}
-fpkg_gnome ${LIBWNCK}
-fpkg       ${ISO_CODES} ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes
-fpkg_sf    ${LIBXKLAVIER} gswitchit
-fpkg_gnome ${LIBGLADE}
-fpkg_gnu   ${LIBTASN1}
-fpkg_gnu   ${GUILE}
-fpkg -s "libgpg-error" ${LIBGPG_ERROR} ${GNUPG_URL}
-fpkg -s "libgcrypt"    ${LIBGCRYPT}    ${GNUPG_URL}
-fpkg -s "gnutls"       ${GNUTLS}       ${GNUPG_URL}
-fpkg_gnome ${LIBIDL}
-fpkg_gnome ${ORBIT2}
-fpkg_gnome ${GCONF}
-fpkg       ${LIBPROXY} "http://libproxy.googlecode.com/files"
-fpkg_gnome ${GNOME_KEYRING}
-fpkg_gnome ${LIBSOUP}
-
-
-
-fpkg_gnu   ${HELP2MAN}
-fpkg_gnu   ${GSL}
-fpkg -s "$(get_pkg_ver ${CUPS})" -f "${CUPS}-source" ${CUPS} "http://ftp.easysw.com/pub/cups"
-fpkg_sf    ${SPLIX}
-fpkg -e zip ${JASPER} "http://www.ece.uvic.ca/~mdadams/jasper/software"
-fpkg_sf    ${GHOSTSCRIPT}
-fpkg_sf    ${GHOSTSCRIPT_FONTS_STD} "ghostscript"
-fpkg_sf    ${GHOSTSCRIPT_FONTS_OTHER} "ghostscript"
-
-fpkg_sf    ${IMAGE_MAGICK} "imagemagick"
-fpkg       ${POPPLER} "http://poppler.freedesktop.org"
-fpkg_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})"
-fpkg       ${GIMP} "ftp://ftp.gimp.org/pub/gimp/v$(get_pkg_ver_base ${GIMP})"
-fpkg_sf    ${GUTENPRINT} "gimp-print"
-fpkg_sf    ${BOOST} "boost"
-fpkg_sf    ${INKSCAPE}
-
-exit 1
-exit 1
-
-
-
-fpkg       ${CDRTOOLS} "ftp://ftp.berlios.de/pub/cdrecord"
-fpkg       ${DVDRWTOOLS} "http://fy.chalmers.se/~appro/linux/DVD+RW/tools"
-fpkg       ${LIBDVDCSS}  "ftp://ftp.linux.ee/pub/gentoo/distfiles/distfiles"
-fpkg       ${LIBDVDREAD} "ftp://ftp.linux.ee/pub/gentoo/distfiles/distfiles"
-fpkg       ${DVDFS} "http://jspenguin.org:81/dvdfs"
-
-fpkg       ${TETEX_SRC}      "${TETEX_URL}/$(get_pkg_ver ${TETEX_SRC})/distrib"
-fpkg       ${TETEX_TEXMF}    "${TETEX_URL}/$(get_pkg_ver ${TETEX_TEXMF})/distrib"
-fpkg       ${TETEX_TEXMFSRC} "${TETEX_URL}/$(get_pkg_ver ${TETEX_TEXMFSRC})/distrib"
-fpkg       ${TETEX_CM_SUPER} "http://anduin.linuxfromscratch.org/sources/BLFS/svn/t"
-# For re-generating fontconfig documentation.
-fpkg_sf    ${JADETEX}
-
-fpkg       ${SANE_BACKENDS} "ftp://ftp.sane-project.org/pub/sane/${SANE_BACKENDS}"
-fpkg       ${XSANE}         "ftp://ftp.sane-project.org/pub/sane/xsane"
-
-fpkg       ${PERL_MOD_XML_SIMPLE} "http://www.cpan.org/modules/by-module/XML"
-fpkg       ${PERL_MOD_PARSE_REDESCENT} "http://www.cpan.org/modules/by-module/Parse"
-fpkg       ${ICON_NAMING_UTILS}       "http://tango.freedesktop.org/releases"
-fpkg       ${TANGO_ICON_THEME}        "http://tango-project.org/releases"
-fpkg       ${TANGO_ICON_THEME_EXTRAS} "http://tango-project.org/releases"
-
-
-
-
-
-fpkg_sf    ${JACK} "jackit"
-fpkg       ${ALSA_LIB}     "ftp://ftp.alsa-project.org/pub/lib"
-fpkg       ${ALSA_PLUGINS} "ftp://ftp.alsa-project.org/pub/plugins"
-fpkg       ${ALSA_UTILS}   "ftp://ftp.alsa-project.org/pub/utils"
-fpkg       ${ALSA_OSS}     "ftp://ftp.alsa-project.org/pub/oss-lib"
-
-# Multimedia libraries and drivers.
-fpkg       ${AUDIOFILE} "http://www.68k.org/~michael/audiofile"
-fpkg_gnome ${ESOUND}
-
-fpkg       ${LIBSAMPLERATE} "http://www.mega-nerd.com/SRC"
-fpkg       ${LIBOIL} "http://liboil.freedesktop.org/download"
-fpkg       ${SPEEX} "http://downloads.xiph.org/releases/speex"
-fpkg       ${PULSEAUDIO} "http://0pointer.de/lennart/projects/pulseaudio"
-
-# Temporaire, version beta
-fpkg       ${LIBSNDFILE} "http://www.mega-nerd.com/tmp"
-#fpkg       ${LIBSNDFILE} "http://www.mega-nerd.com/libsndfile"
-
-fpkg       ${LIBOGG}    "http://downloads.xiph.org/releases/ogg"
-fpkg       ${LIBVORBIS} "http://downloads.xiph.org/releases/vorbis"
-fpkg       ${LIBTHEORA} "http://downloads.xiph.org/releases/theora"
-
-fpkg_hv    ${FLAC}
-fpkg_hv    ${FFMPEG}
-fpkg       ${XVIDCORE} "http://downloads.xvid.org/downloads"
-
-# Audio utilities
-fpkg_sf    ${LAME}
-fpkg       ${VORBIS_TOOLS} "http://downloads.xiph.org/releases/vorbis"
-fpkg_hv    ${LIBA52}
-fpkg_hv    ${LIBID3TAG}
-fpkg       ${LIBMAD} "ftp://ftp.mars.org/pub/mpeg"
-fpkg_sf    ${LIBFAAC}
-fpkg       ${LIBFAAD2} "http://downloads.sourceforge.net/faac"
-fpkg_sf    ${GRIP}
-fpkg_sf    ${CDRDAO}
-fpkg_hv    ${PORTAUDIO}
-fpkg_hv    ${SWEEP}
-fpkg       ${LILYPOND} "http://lilypond.org/download/sources/v$(get_pkg_ver_base ${LILYPOND})"
-fpkg       ${SYLPHEED} "http://sylpheed.good-day.net/sylpheed/v$(get_pkg_ver_base ${SYLPHEED})"
-
-fpkg_hv    ${NSS}
-fpkg       ${FIREFOX} "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(get_pkg_ver ${FIREFOX})/source"
+#!/bin/bash
 
-fpkg_hv    ${JAVA}
-fpkg_hv    ${AGG}
-fpkg       ${GNASH} "http://ftp.gnu.org/pub/gnu/gnash/$(get_pkg_ver ${GNASH})"
+source ../functions/main
 
-fpkg       ${SASL2} "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail"
-fpkg -f "openldap-stable-20070831" ${OPENLDAP} "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-stable"
-fpkg_hv    ${KERBEROS5}
+update_packages_init ${*}
 
-fpkg -f "sendmail.$(get_pkg_ver ${SENDMAIL})" ${SENDMAIL} "ftp://ftp.sendmail.org/pub/sendmail"
-fpkg       ${LIBSPF2} "http://libspf2.org/spf"
-fpkg       ${MILTER_GREYLIST} "ftp://ftp.espci.fr/pub/milter-greylist"
-fpkg_hv    ${MILTER_SPF}
-fpkg       ${PROCMAIL} "http://www.procmail.org"
-fpkg       ${FETCHMAIL} "http://download.berlios.de/fetchmail"
-fpkg_sf    ${MUTT}
+# These packages were already downloaded in previous stages:
+lpkg 3 ${SUBVERSION}
 
-fpkg -f "${FCRON}.src" ${FCRON} "ftp://ftp.seul.org/pub/fcron"
-fpkg_hv    ${GETDATE}
+fpkg -m gnu ${HELP2MAN}
+fpkg -m gnu ${GSL}
+fpkg -s "$(get_pkg_ver ${CUPS})" -f "${CUPS}-source" ${CUPS} \
+    "http://ftp.easysw.com/pub/cups"
+fpkg -e "tar.gz" -f "$(get_pkg_name ${CUPS_PDF})_$(get_pkg_ver ${CUPS_PDF})" \
+    ${CUPS_PDF} "http://www.cups-pdf.de/src"
+fpkg -m sf -e "tar.bz2" ${SPLIX}
+fpkg -e "tar.gz" ${FOOMATIC_FILTERS} "http://www.openprinting.org/download/foomatic/"
+fpkg -e "tar.gz" ${FOO2ZJS} "http://foo2zjs.rkkda.com"
 
-fpkg_sf    ${CLAMAV}
+fpkg ${ITSTOOL} "http://files.itstool.org/itstool"
 
-fpkg       ${PERL_MOD_HTML_TAGSET} "http://anduin.linuxfromscratch.org/sources/BLFS/svn/perl-modules"
-fpkg       ${PERL_MOD_HTML_PARSER} "http://anduin.linuxfromscratch.org/sources/BLFS/svn/perl-modules"
-fpkg       ${PERL_MOD_APACHE_LOGGED_AUTH_DBI} "http://search.cpan.org/CPAN/authors/id/S/SI/SIMKIN"
-fpkg       ${PERL_MOD_DB_FILE} "http://search.cpan.org/CPAN/authors/id/P/PM/PMQS"
-fpkg       ${PERL_MOD_DIGEST_SHA1} "http://anduin.linuxfromscratch.org/sources/BLFS/svn/perl-modules"
-# URI is needed by LWP
-fpkg       ${PERL_MOD_URI} "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS"
-# LWP is Needed by LTSP
-fpkg       ${PERL_MOD_LWP} "http://www.linpro.no/lwp"
+fpkg -m gnome ${GLIB_NETWORKING}
 
-# ZIP is Needed by OO
-fpkg       ${PERL_MOD_ARCHIVE_ZIP} "http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK"
-fpkg       ${PERL_MOD_COMPRESS_ZLIB} "http://search.cpan.org/CPAN/authors/id/P/PM/PMQS"
-fpkg       ${PERL_MOD_IO_COMPRESS_BASE} "http://search.cpan.org/CPAN/authors/id/P/PM/PMQS"
-fpkg       ${PERL_MOD_IO_COMPRESS_ZLIB} "http://search.cpan.org/CPAN/authors/id/P/PM/PMQS"
-fpkg       ${PERL_MOD_COMPRESS_RAW_ZLIB} "http://search.cpan.org/CPAN/authors/id/P/PM/PMQS"
-fpkg       ${PERL_MOD_NET_DNS} "http://search.cpan.org/CPAN/authors/id/O/OL/OLAF"
-
-fpkg       ${SPAMASSASSIN} "http://apache.sunsite.ualberta.ca/spamassassin/source"
-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 -m gnome ${LIBSIGCPP}
+fpkg -e zip ${JASPER} "http://www.ece.uvic.ca/~mdadams/jasper/software"
+fpkg -m gnome ${GLIBMM}
+fpkg -e "tar.gz" ${CAIRO} ${CAIRO_URL}
+fpkg -e "tar.gz" ${CAIROMM} ${CAIRO_URL}
+fpkg -m gnome ${PANGO}
+fpkg -m gnome ${PANGOMM}
+fpkg -m gnome ${ATK}
+fpkg -m gnome ${GDK_PIXBUF}
+fpkg -m gnome ${GTK}
+fpkg -m gnome ${ATKMM}
+fpkg -m gnome ${GTKMM}
+fpkg -m gnome ${GTK_ENGINES}
+fpkg -m gnome ${PYGOBJECT}
+fpkg -e "tar.bz2" ${PYCAIRO} ${CAIRO_URL}
+fpkg -m gnome ${PYGTK}
+
+fpkg -m gnu ${EMACS}
+fpkg -m hv ${MMM_MODE}
+fpkg -e "tar.gz" ${HVCLOCK}  "http://www.hugovil.com/repository/hvclock"
+fpkg -e "tar.gz" ${WMNOTIFY} "http://www.hugovil.com/repository/wmnotify"
+
+fpkg -e "tar.xz" ${DESKTOP_FILE_UTILS} \
+    "http://freedesktop.org/software/desktop-file-utils/releases"
+fpkg -e "tar.xz" ${SHARED_MIME_INFO} "http://people.freedesktop.org/~hadess"
+fpkg -e "tar.gz" ${STARTUP_NOTIFICATION} "http://www.freedesktop.org/software/startup-notification/releases"
+fpkg -m gnome ${LIBWNCK}
+fpkg -e "tar.xz" ${ISO_CODES} "http://pkg-isocodes.alioth.debian.org/downloads"
+fpkg -m gnome ${LIBXKLAVIER}
+fpkg -m gnome ${LIBGLADE}
+fpkg -m gnome ${GCONF}
+fpkg -m gnome ${GNOME_KEYRING}
+fpkg -m gnome ${LIBSOUP}
+fpkg -e "tar.gz" ${XSCREENSAVER} "http://www.jwz.org/xscreensaver"
+
+fpkg -e "tar.bz2" -m sf ${GPARTED}
+fpkg -m sf ${GHOSTSCRIPT}
+fpkg -m sf -s "ghostscript" ${GHOSTSCRIPT_FONTS_STD}
+fpkg -m sf -s "ghostscript" ${GHOSTSCRIPT_FONTS_OTHER}
+fpkg -e "tar.gz" ${LIBSPECTRE} "http://libspectre.freedesktop.org/releases"
+fpkg -e "tar.xz" ${IMAGE_MAGICK} "ftp://ftp.imagemagick.org/pub/ImageMagick"
+fpkg -e "tar.gz" ${VIEWNIOR} "http://cloud.github.com/downloads/xsisqox/Viewnior"
+fpkg -m fd -s "none" ${POPPLER}
+fpkg -m gnome ${LIBCROCO}
+fpkg -m gnome ${LIBRSVG}
+fpkg ${BABL} "ftp://ftp.gtk.org/pub/babl/$(get_pkg_ver2 ${BABL})"
+fpkg ${GEGL} "ftp://ftp.gimp.org/pub/gegl/$(get_pkg_ver2 ${GEGL})"
+fpkg ${GIMP} "ftp://ftp.gimp.org/pub/gimp/v$(get_pkg_ver2 ${GIMP})"
+fpkg -m sf -s "gimp-print" -e "tar.bz2" ${GUTENPRINT}
+fpkg -m sf -s "boost" ${BOOST}
+fpkg -m sf ${INKSCAPE}
+
+fpkg ${CDRTOOLS} "ftp://ftp.berlios.de/pub/cdrecord"
+fpkg -e "tar.gz" ${DVDRWTOOLS} \
+    "http://fy.chalmers.se/~appro/linux/DVD+RW/tools"
+fpkg -s "$(get_pkg_ver ${LIBDVDCSS})" ${LIBDVDCSS} \
+    "http://www.videolan.org/pub/libdvdcss"
+fpkg -e "tar.bz2" ${LIBDVDREAD} "http://dvdnav.mplayerhq.hu/releases"
+fpkg -e "tar.gz" ${DVDFS} "http://jspenguin.org:81/dvdfs"
+fpkg -e "tar.bz2" ${VOBCOPY} "http://vobcopy.org/download"
+
+fpkg -e "tar.xz" ${TEXLIVE}       "ftp://tug.org/texlive/historic/2012"
+fpkg -e "tar.xz" ${TEXLIVE_TEXMF} "ftp://tug.org/texlive/historic/2012"
+
+fpkg -e "tar.gz" ${SANE_BACKENDS} \
+    "ftp://ftp2.sane-project.org/pub/sane/${SANE_BACKENDS}"
+fpkg -e "tar.gz" ${XSANE} "ftp://ftp2.sane-project.org/pub/sane/xsane"
+
+fpkg ${ICON_NAMING_UTILS} "http://tango.freedesktop.org/releases"
+fpkg ${TANGO_ICON_THEME}  "http://tango.freedesktop.org/releases"
+fpkg -e "tar.gz" ${TANGO_ICON_THEME_EXTRAS} \
+    "http://tango.freedesktop.org/releases"
+fpkg -m gnome ${GNOME_ICON_THEME}
+
+fpkg -m gnome ${EVINCE}
+
+fpkg -e "tar.gz" ${LIBOIL} "http://liboil.freedesktop.org/download"
+fpkg -m gnome ${VTE}
+fpkg -m sf ${GRIP}
+fpkg -m sf -e "tar.bz2" ${CDRDAO}
+fpkg -m sf ${ID3LIB}
+fpkg -e "tar.xz" ${EASYTAG} "https://download.gnome.org/sources/easytag/$(get_pkg_ver2 ${EASYTAG})"
+fpkg -m sf -e "tar.bz2" -s "fontforge/fontforge-source" ${FONTFORGE}
+fpkg -m gnu ${GUILE1}
+fpkg -e "tar.gz" ${LILYPOND} \
+    "http://lilypond.org/download/sources/v$(get_pkg_ver2 ${LILYPOND})"
+fpkg -m hv ${CHORDPACK}
+fpkg -m hv ${GUITARTEX}
+
+fpkg ${FFMPEG} "http://www.ffmpeg.org/releases"
+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 sf -s "wxwindows" ${WXGTK}
+fpkg ${AUDACITY} "http://audacity.googlecode.com/files"
+
+fpkg ${SYLPHEED} \
+    "http://sylpheed.sraoss.jp/sylpheed/v$(get_pkg_ver2 ${SYLPHEED})"
+
+fpkg -m gnome ${LIBNOTIFY}
+
+fpkg ${LIBVPX} "http://webm.googlecode.com/files"
+
+fpkg -e "tar.xz" ${WEBKIT} "http://webkitgtk.org/releases"
+fpkg -m gnome ${VALA}
+fpkg ${MIDORI} "http://archive.xfce.org/src/apps/midori/$(get_pkg_ver2 ${MIDORI})"
+
+fpkg -m hv ${NSPR}
+fpkg -m hv ${NSS}
+fpkg -f "${FIREFOX}.source" ${FIREFOX} \
+    "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(get_pkg_ver ${FIREFOX})/source"
+
+fpkg ${KEYUTILS} "http://people.redhat.com/~dhowells/keyutils"
+fpkg -f "${ECRYPTFS_UTILS}.orig" ${ECRYPTFS_UTILS} \
+    "https://launchpad.net/ecryptfs/trunk/$(get_pkg_ver_underscore ${ECRYPTFS_UTILS})/+download"
+
+fpkg -e "tar.gz" ${QT} "http://download.qt-project.org/official_releases/qt/$(get_pkg_ver2 ${QT})/$(get_pkg_ver ${QT})"
+
+fpkg -e "tar.gz" ${LUA} "http://www.lua.org/ftp"
+fpkg -e "tar.xz" -m sf ${VLC}
+fpkg -e "tar.gz" ${SDL} "http://www.libsdl.org/release"
+fpkg -e "tar.gz" ${AGG} "http://www.antigrain.com"
+fpkg ${GNASH} "http://ftp.gnu.org/pub/gnu/gnash/$(get_pkg_ver ${GNASH})"
+
+fpkg -e "tar.gz" ${LIBSPF2} "http://libspf2.org/spf"
+fpkg -e "tgz" ${MILTER_GREYLIST} "ftp://ftp.espci.fr/pub/milter-greylist"
+fpkg -m sf -s "smfs" ${MILTER_SPF}
+fpkg -e "tar.gz" ${PROCMAIL} "http://www.ring.gr.jp/archives/net/mail/procmail"
+fpkg ${FETCHMAIL} "http://download.berlios.de/fetchmail"
+fpkg -m sf ${CLAMAV}
+
+fpkg -m pm -s "G/GR/GRANTM"   ${PERL_MOD_XML_SIMPLE}
+fpkg -m pm -s "J/JT/JTBRAUN"  ${PERL_MOD_PARSE_REDESCENT}
+fpkg -m pm -s "P/PE/PETDANCE" ${PERL_MOD_HTML_TAGSET}
+fpkg -m pm -s "S/SI/SIMKIN"   ${PERL_MOD_APACHE_LOGGED_AUTH_DBI}
+fpkg -m pm -s "G/GA/GAAS"     ${PERL_MOD_HTML_PARSER}
+fpkg -m pm -s "G/GA/GAAS"     ${PERL_MOD_DIGEST_SHA1}
+fpkg -m pm -s "G/GA/GAAS"     ${PERL_MOD_URI}
+fpkg -m pm -s "G/GA/GAAS"     ${PERL_MOD_LWP}
+fpkg -m pm -s "O/OL/OLAF"     ${PERL_MOD_NET_DNS}
+fpkg -m pm -s "K/KM/KMCGRAIL" ${SPAMASSASSIN}
+
+fpkg -e "tar.gz" ${UW_IMAP} "ftp://ftp.cac.washington.edu/imap"
+
+fpkg -m apa ${HTTPD}
+fpkg -e "tar.bz2" ${LIGHTTPD} "http://download.lighttpd.net/lighttpd/releases-$(get_pkg_ver2 ${LIGHTTPD}).x"
+
+fpkg -e "tar.gz" ${SAMBA} "ftp://ftp.samba.org/pub/samba/old-versions"
+
+fpkg ${PHP}   "http://us2.php.net/distributions"
+
+fpkg -e "tar.gz" ${MERCURIAL} "http://mercurial.selenic.com/release"
+
+fpkg -m gnu ${INDENT}
+
+fpkg -e "tgz" ${LTSP_UTILS} "http://ltsp.mirrors.tds.net/pub/ltsp/utils"
+fpkg -s "software/network/tftp/tftp-hpa" ${TFTP_HPA} ${KERNEL_URL}
+fpkg ${QEMU} "http://wiki.qemu-project.org/download"
+fpkg -m sf -s "bridge" ${BRIDGE_UTILS}
+fpkg -m sf ${TUNCTL}
+
+fpkg -e "tar.gz" ${LIBEVENT} "https://github.com/downloads/libevent/libevent"
+fpkg ${TRANSMISSION} "http://mirrors.m0k.org/transmission/files"
+
+fpkg -e "tar.gz" ${LIBGAMIN} "http://www.gnome.org/~veillard/gamin/sources"
+fpkg -m sf -s "lxde" ${MENU_CACHE}
+
+fpkg -m gnome ${GVFS}
 
-fpkg       ${PHP}   "http://us2.php.net/distributions"
+fpkg -m sf -e "tar.bz2" ${XARCHIVER}
+
+fpkg -m gnome ${GNOME_MENUS}
+fpkg -m sf -s "pcmanfm" -e "tar.gz" ${LIBFM}
+fpkg -m sf ${PCMANFM}
+
+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"
 
-lpkg     2 ${SUBVERSION}
-fpkg_gnu   ${INDENT}
+#fpkg_mis   ${SPLINT} "${SPLINT}.src" "http://splint.org/downloads"
 
-fpkg       ${LTSP_UTILS} "http://ltsp.mirrors.tds.net/pub/ltsp/utils"
-fpkg       ${TFTP_HPA} "http://www.kernel.org/pub/software/network/tftp"
-
-fpkg_sf    ${KVM}
-fpkg_hv    ${BRIDGE_UTILS}
-fpkg_hv    ${UML_UTILITIES}
-
-fpkg       ${TRANSMISSION} "http://mirrors.m0k.org/transmission/files"
-
-fpkg_hv    ${CKERMIT}
-
-fpkg       ${LIBGAMIN} "ftp://ftp.linux.ee/pub/gentoo/distfiles/distfiles"
-fpkg_sf    ${PCMANFM}
-
-fpkg -s "gnupg" ${GNUPG} "ftp://ftp.gnupg.org/gcrypt"
+fpkg -e "tar.gz" ${GEDA_GAF} "http://ftp.geda-project.org/geda-gaf/stable/v$(get_pkg_ver2 ${GEDA_GAF})/$(get_pkg_ver ${GEDA_GAF})"
 
-#fpkg_gnu   ${AVR_GDB}
-#fpkg       ${AVRDUDE} "http://download.savannah.gnu.org/releases/avrdude"
-#fpkg_mis   ${SPLINT} "${SPLINT}.src" "http://splint.org/downloads"
+fpkg -e "tar.gz" ${AVRDUDE} "http://download.savannah.gnu.org/releases/avrdude"
 
-GEDA_BASE_URL=http://geda.seul.org/release/v$(get_pkg_ver_base ${LIBGEDA})/$(get_pkg_ver ${LIBGEDA})
+# Astronomie
+fpkg -e "tar.gz" -m hv ${STELLARIUM}
+fpkg -m sf ${GTKGLEXT}
+fpkg -e "tar.gz" -m hv ${CELESTIA}
 
-#fpkg       ${LIBGEDA}       ${GEDA_BASE_URL}
-#fpkg       ${GEDA_SYMBOLS}  ${GEDA_BASE_URL}
-#fpkg       ${GEDA_GSCHEM}   ${GEDA_BASE_URL}
-#fpkg       ${GEDA_GNETLIST} ${GEDA_BASE_URL}
-#fpkg       ${GEDA_SYMCHECK} ${GEDA_BASE_URL}
-#fpkg       ${GEDA_GATTRIB}  ${GEDA_BASE_URL}
+fpkg ${I2C_TOOLS} "http://dl.lm-sensors.org/i2c-tools/releases"
+fpkg -m sf ${HDPARM}
 
 exit $?