-Amélioré fonctions de download des packages
[hvlinux.git] / stage5 / packages-update
index d9c8c48..5573119 100755 (executable)
@@ -4,222 +4,206 @@ USE_LFS_PATCHES=1
 USE_BLFS_PATCHES=1
 USE_HV_PATCHES=1
 
-# Reading system configuration informations, functions and package versions.
-source ../config/sysinfos
-source ../functions
-source ../functions-fpkg
-source ../config/packages-list
+source ../functions/main
 
-update_packages_init
+update_packages_init ${*}
 
-if [ ${#} -eq 1 -a "x${1}" = "xtest" ]; then
-    export TEST_INTEGRITY=1
-fi
-
-GNUPG_URL="ftp://ftp.gnupg.org/gcrypt"
-
-fpkg_gnome ${LIBSIGCPP}
+fpkg -m gnome ${LIBSIGCPP}
 fpkg -e zip ${JASPER} "http://www.ece.uvic.ca/~mdadams/jasper/software"
-fpkg_gnome ${GTK_DOC}
-fpkg_gnome ${GLIBMM}
-fpkg       ${CAIRO} "http://cairographics.org/releases"
-fpkg       ${CAIROMM} "http://cairographics.org/releases"
-fpkg_gnome ${PANGO}
-fpkg_gnome ${PANGOMM}
-fpkg_gnome ${ATK}
-fpkg_gnome ${GTK}
-fpkg_gnome ${GTKMM}
-fpkg_gnome ${GTK_ENGINES}
-fpkg_gnome ${PYGOBJECT}
-fpkg       ${PYCAIRO} "http://cairographics.org/releases"
-fpkg_gnome ${PYGTK}
-fpkg       ${GC} " http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source"
-
-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 -m gnome ${GTK_DOC}
+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 ${GTK}
+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 -e "tar.gz" ${GC} "http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source"
+
+fpkg -m gnu ${EMACS}
+fpkg -m hv ${HVCLOCK}
+fpkg -m hv ${WMNOTIFY}
+
+fpkg -e "tar.bz2" ${DESKTOP_FILE_UTILS} \
+    "http://freedesktop.org/software/desktop-file-utils/releases"
+fpkg ${SHARED_MIME_INFO} "http://people.freedesktop.org/~hadess"
+fpkg -m gnome ${STARTUP_NOTIFICATION}
+fpkg -m gnome ${LIBWNCK}
+fpkg ${ISO_CODES} "ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes"
+fpkg -m sf -s "gswitchit" ${LIBXKLAVIER}
+fpkg -m gnome ${LIBGLADE}
+fpkg -m gnu ${LIBTASN1}
+fpkg -m 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 -f "$(get_pkg_name ${CUPS_PDF})_$(get_pkg_ver ${CUPS_PDF})" ${CUPS_PDF} http://www.cups-pdf.de/src
-fpkg_sf    ${SPLIX}
-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}
-
-fpkg       ${CDRTOOLS} "ftp://ftp.berlios.de/pub/cdrecord"
-fpkg       ${DVDRWTOOLS} "http://fy.chalmers.se/~appro/linux/DVD+RW/tools"
-fpkg -s "$(get_pkg_ver ${LIBDVDCSS})"  ${LIBDVDCSS} "http://www.videolan.org/pub/libdvdcss"
-fpkg       ${LIBDVDREAD} "http://www.dtek.chalmers.se/groups/dvd/dist"
-fpkg       ${DVDFS} "http://jspenguin.org:81/dvdfs"
-
-fpkg_hv    ${TETEX_SRC}
-fpkg_hv    ${TETEX_TEXMF}
-fpkg_hv    ${TETEX_TEXMFSRC}
-fpkg       ${TETEX_CM_SUPER} "http://anduin.linuxfromscratch.org/sources/BLFS/svn/t"
+fpkg -m gnome ${LIBIDL}
+fpkg -m gnome ${ORBIT2}
+fpkg -m gnome ${GCONF}
+fpkg -e "tar.gz" ${LIBPROXY} "http://libproxy.googlecode.com/files"
+fpkg -m gnome ${GNOME_KEYRING}
+fpkg -m gnome ${LIBSOUP}
+
+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 -m sf ${GHOSTSCRIPT}
+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 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 -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.gz" ${LIBDVDREAD} "http://www.dtek.chalmers.se/groups/dvd/dist"
+fpkg -e "tar.gz" ${DVDFS} "http://jspenguin.org:81/dvdfs"
+
+fpkg -e "tar.gz" ${TETEX_SRC} "${BLFS_SVN_SRC_URL}/t"
+fpkg -e "tar.gz" ${TETEX_TEXMF} "${BLFS_SVN_SRC_URL}/t"
+fpkg -e "tar.gz" ${TETEX_TEXMFSRC} "${BLFS_SVN_SRC_URL}/t"
+fpkg ${TETEX_CM_SUPER} "http://anduin.linuxfromscratch.org/sources/BLFS/svn/t"
 # For re-generating fontconfig documentation.
-fpkg_sf    ${JADETEX}
-
-fpkg -e tar.gz -s "${SANE_BACKENDS}" ${SANE_BACKENDS} "ftp://ftp.sane-project.org/pub/sane"
-fpkg -e tar.gz -s "xsane"            ${XSANE}         "ftp://ftp.sane-project.org/pub/sane"
-
-fpkg       ${PERL_MOD_XML_SIMPLE} "http://www.cpan.org/modules/by-module/XML"
-fpkg       ${PERL_MOD_PARSE_REDESCENT} "http://search.cpan.org/CPAN/authors/id/D/DC/DCONWAY"
-fpkg       ${ICON_NAMING_UTILS}       "http://tango.freedesktop.org/releases"
-fpkg       ${TANGO_ICON_THEME}        "http://tango.freedesktop.org/releases"
-fpkg       ${TANGO_ICON_THEME_EXTRAS} "http://tango.freedesktop.org/releases"
+fpkg -m sf ${JADETEX}
 
-fpkg       ${LIBOIL} "http://liboil.freedesktop.org/download"
+fpkg -e "tar.gz" ${SANE_BACKENDS} "http://alioth.debian.org/download.php/2318"
+fpkg -e "tar.gz" ${XSANE} "ftp://ftp2.sane-project.org/pub/sane/xsane"
 
-fpkg       ${ALSA_LIB}     "ftp://ftp.alsa-project.org/pub/lib"
-fpkg       ${ALSA_UTILS}   "ftp://ftp.alsa-project.org/pub/utils"
-fpkg       ${ALSA_OSS}     "ftp://ftp.alsa-project.org/pub/oss-lib"
+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       ${LIBSAMPLERATE} "http://www.mega-nerd.com/SRC"
+fpkg -e "tar.gz" ${LIBOIL} "http://liboil.freedesktop.org/download"
 
-fpkg       ${LIBOGG}    "http://downloads.xiph.org/releases/ogg"
-fpkg       ${LIBVORBIS} "http://downloads.xiph.org/releases/vorbis"
-fpkg_hv    ${FLAC}
-fpkg_sf    ${LAME}
-fpkg_hv    ${LIBA52}
-fpkg_hv    ${LIBID3TAG}
-fpkg       ${LIBMAD} "ftp://ftp.mars.org/pub/mpeg"
+fpkg ${ALSA_LIB}   "ftp://ftp.alsa-project.org/pub/lib"
+fpkg ${ALSA_UTILS} "ftp://ftp.alsa-project.org/pub/utils"
+fpkg ${ALSA_OSS}   "ftp://ftp.alsa-project.org/pub/oss-lib"
 
-fpkg_sf    ${LIBFAAC}
-fpkg       ${LIBFAAD2} "http://downloads.sourceforge.net/faac"
-fpkg       ${LIBTHEORA} "http://downloads.xiph.org/releases/theora"
-fpkg       ${XVIDCORE} "http://downloads.xvid.org/downloads"
+fpkg -e "tar.gz" ${LIBSAMPLERATE} "http://www.mega-nerd.com/SRC"
 
-fpkg       ${AUDIOFILE} "http://www.68k.org/~michael/audiofile"
-fpkg_hv    ${PORTAUDIO}
-fpkg       ${LIBSNDFILE} "http://www.mega-nerd.com/libsndfile"
+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 ${LAME}
+fpkg -m hv ${LIBA52}
+fpkg -m hv ${LIBID3TAG}
+fpkg -e "tar.gz" ${LIBMAD} "ftp://ftp.mars.org/pub/mpeg"
 
-#fpkg_gnome ${ESOUND}
-fpkg       ${SPEEX} "http://downloads.xiph.org/releases/speex"
-###fpkg       ${PULSEAUDIO} "http://0pointer.de/lennart/projects/pulseaudio"
-fpkg_sf    ${JACK} "jackit"
+fpkg -m sf ${LIBFAAC}
+fpkg ${LIBFAAD2} "http://downloads.sourceforge.net/faac"
+fpkg ${LIBTHEORA} "http://downloads.xiph.org/releases/theora"
+fpkg ${XVIDCORE} "http://downloads.xvid.org/downloads"
 
-fpkg       ${ALSA_PLUGINS} "ftp://ftp.alsa-project.org/pub/plugins"
-fpkg       ${VORBIS_TOOLS} "http://downloads.xiph.org/releases/vorbis"
+fpkg -e "tar.gz" ${AUDIOFILE} "http://www.68k.org/~michael/audiofile"
+fpkg -e "tar.gz" -f "pa_stable_v19_20071207" ${PORTAUDIO} \
+    "http://www.portaudio.com/archives"
+fpkg -e "tar.gz" ${LIBSNDFILE} "http://www.mega-nerd.com/libsndfile/files"
 
-fpkg_sf    ${GRIP}
-fpkg_sf    ${CDRDAO}
-fpkg_sf    ${EASYTAG}
-fpkg       ${LILYPOND} "http://lilypond.org/download/sources/v$(get_pkg_ver_base ${LILYPOND})"
+fpkg -e "tar.gz" ${SPEEX} "http://downloads.xiph.org/releases/speex"
+#fpkg -m gnome ${ESOUND}
+###fpkg ${PULSEAUDIO} "http://0pointer.de/lennart/projects/pulseaudio"
+fpkg -e "tar.gz" ${JACK} "http://jackaudio.org/downloads"
+fpkg ${ALSA_PLUGINS} "ftp://ftp.alsa-project.org/pub/plugins"
+fpkg -e "tar.gz" ${VORBIS_TOOLS} "http://downloads.xiph.org/releases/vorbis"
 
-fpkg_hv    ${FFMPEG}
+fpkg -m sf ${GRIP}
+fpkg -m sf -e "tar.bz2" ${CDRDAO}
+fpkg -m sf -e "tar.bz2" ${EASYTAG}
+fpkg -e "tar.gz" ${LILYPOND} \
+    "http://lilypond.org/download/sources/v$(get_pkg_ver_base ${LILYPOND})"
+fpkg -m hv ${FFMPEG}
 
-exit 1
+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_hv    ${NSS}
-fpkg       ${FIREFOX} "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(get_pkg_ver ${FIREFOX})/source"
+fpkg -m hv ${AGG}
+fpkg ${GNASH} "http://ftp.gnu.org/pub/gnu/gnash/$(get_pkg_ver ${GNASH})"
 
-fpkg_hv    ${JAVA}
-fpkg_hv    ${AGG}
-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"
+fpkg -e "tgz" -f "openldap-stable-20070831" ${OPENLDAP} "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-stable"
+fpkg -m hv ${KERBEROS5}
 
-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}
+fpkg -e "tar.gz" -f "sendmail.$(get_pkg_ver ${SENDMAIL})" ${SENDMAIL} "ftp://ftp.sendmail.org/pub/sendmail"
+fpkg -e "tar.gz" ${LIBSPF2} "http://libspf2.org/spf"
+fpkg -e "tgz" ${MILTER_GREYLIST} "ftp://ftp.espci.fr/pub/milter-greylist"
+fpkg -m hv ${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 ${MUTT}
+fpkg -m sf ${CLAMAV}
 
-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}
-fpkg_sf    ${CLAMAV}
+fpkg -m pm -s "G/GR/GRANTM"   ${PERL_MOD_XML_SIMPLE}
+fpkg -m pm -s "D/DC/DCONWAY"  ${PERL_MOD_PARSE_REDESCENT}
 
-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 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 "J/JM/JMASON"   ${SPAMASSASSIN}
 
-# 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 -e "tar.gz" ${UW_IMAP} "ftp://ftp.cac.washington.edu/imap"
 
-fpkg       ${SPAMASSASSIN} "http://apache.sunsite.ualberta.ca/spamassassin/source"
-fpkg       ${UW_IMAP} "ftp://ftp.cac.washington.edu/imap"
+fpkg -m apa ${HTTPD}
 
-fpkg       ${HTTPD} "http://www.apache.org/dist/httpd"
+fpkg -e "tar.gz" ${SAMBA} "ftp://ftp.samba.org/pub/samba/old-versions"
 
-fpkg       ${SAMBA} "ftp://ftp.samba.org/pub/samba/old-versions"
+fpkg ${PHP}   "http://us2.php.net/distributions"
 
-fpkg       ${PHP}   "http://us2.php.net/distributions"
+#####lpkg 2 ${SUBVERSION} # Déja installé au stage 3 ?? Module webdav?
+fpkg -m gnu ${INDENT}
 
-lpkg     2 ${SUBVERSION}
-fpkg_gnu   ${INDENT}
+fpkg -e "tgz" ${LTSP_UTILS} "http://ltsp.mirrors.tds.net/pub/ltsp/utils"
+fpkg -s "software/network/tftp" ${TFTP_HPA} ${KERNEL_URL}
 
-fpkg       ${LTSP_UTILS} "http://ltsp.mirrors.tds.net/pub/ltsp/utils"
-fpkg       ${TFTP_HPA} "http://www.kernel.org/pub/software/network/tftp"
+fpkg -m sf ${KVM}
+fpkg -m hv ${BRIDGE_UTILS}
+fpkg -m hv ${UML_UTILITIES}
 
-fpkg_sf    ${KVM}
-fpkg_hv    ${BRIDGE_UTILS}
-fpkg_hv    ${UML_UTILITIES}
+fpkg ${TRANSMISSION} "http://mirrors.m0k.org/transmission/files"
 
-fpkg       ${TRANSMISSION} "http://mirrors.m0k.org/transmission/files"
+fpkg -m hv ${CKERMIT}
 
-fpkg_hv    ${CKERMIT}
+fpkg -e "tar.gz" ${LIBGAMIN} "http://www.gnome.org/~veillard/gamin/sources"
 
-fpkg       ${LIBGAMIN} "ftp://ftp.linux.ee/pub/gentoo/distfiles/distfiles"
-fpkg_sf    ${PCMANFM}
+fpkg -m sf ${PCMANFM}
 
 fpkg -s "gnupg" ${GNUPG} "ftp://ftp.gnupg.org/gcrypt"
 
-#fpkg_gnu   ${AVR_GDB}
-#fpkg       ${AVRDUDE} "http://download.savannah.gnu.org/releases/avrdude"
 #fpkg_mis   ${SPLINT} "${SPLINT}.src" "http://splint.org/downloads"
 
 GEDA_BASE_URL=http://geda.seul.org/release/v$(get_pkg_ver_base ${LIBGEDA})/$(get_pkg_ver ${LIBGEDA})
 
-#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 ${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}
 
 exit $?