-fpkg_sf ${PERL_MOD_PDL} pdl
-fpkg ${PERL_MOD_XML_WRITER} "http://www.cpan.org/modules/by-module/XML"
-fpkg ${PERL_MOD_XML_PARSER} "http://www.cpan.org/modules/by-module/XML"
-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"
-
-# Gtk
-fpkg_gnome ${GTK_DOC}
-fpkg_gnome ${GLIB2}
-fpkg ${PIXMAN} "http://cairographics.org/releases"
-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 ${GTK2}
-fpkg_gnome ${GTK_ENGINES}
-fpkg_gnome ${PYGOBJECT}
-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 ${HICOLOR_ICON_THEME} "http://icon-theme.freedesktop.org/releases"
-
-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_sf ${LIBXKLAVIER} gswitchit
-fpkg_gnome ${LIBGLADE}
-fpkg_gnome ${LIBSOUP}
-fpkg_gnome ${LIBIDL}
-fpkg_gnome ${LIBRSVG}
-
-fpkg_gnome ${INTLTOOL}
-fpkg_gnu ${GSL}
-
-fpkg_sf ${LIBUSB}
-fpkg_sf ${LIBGPHOTO2} "gphoto"
-
-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}
-fpkg_hv ${INKSCAPE}
-
-fpkg_gnu ${BC}
-fpkg ${CDRTOOLS} "ftp://ftp.berlios.de/pub/cdrecord"
-fpkg ${DVDRWTOOLS} "http://fy.chalmers.se/~appro/linux/DVD+RW/tools"
-
-fpkg_mis ${CUPS} "${CUPS}-source" "http://ftp.easysw.com/pub/cups/$(get_pkg_ver ${CUPS})"
-fpkg_sf ${SPLIX}
-
-fpkg_mis ${ESPGS} "${ESPGS}-source" "http://ftp.easysw.com/pub/ghostscript/$(get_pkg_ver ${ESPGS})"
-fpkg_sf ${GHOSTSCRIPT_FONTS_STD} "ghostscript"
-fpkg_sf ${GHOSTSCRIPT_FONTS_OTHER} "ghostscript"
-
-fpkg_hv ${IMAGE_MAGICK}
-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_gnu ${ED}
-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 ${POPPLER} "http://poppler.freedesktop.org"
-
-fpkg ${SANE_BACKENDS} "ftp://ftp.sane-project.org/pub/sane/${SANE_BACKENDS}"
-fpkg ${XSANE} "ftp://ftp.sane-project.org/pub/sane/xsane"
-
-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"
-
-fpkg_hv ${JAVA}
-fpkg_hv ${AGG}
-fpkg ${GNASH} "http://ftp.gnu.org/pub/gnu/gnash/$(get_pkg_ver ${GNASH})"
-
-fpkg ${DBUS} "http://dbus.freedesktop.org/releases/dbus"
-fpkg ${DBUS_GLIB} "http://dbus.freedesktop.org/releases/dbus-glib"
-fpkg ${HAL} "http://people.freedesktop.org/~david/dist"
-
-fpkg ${SASL2} "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail"
-fpkg_mis ${OPENLDAP} "openldap-stable-20070831" \
- "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-stable"
-fpkg_hv ${KERBEROS5}
-
-fpkg_mis ${SENDMAIL} "sendmail.$(get_pkg_ver ${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_mis ${FCRON} "${FCRON}.src" "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"
-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"
-
-# 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 ${CURL} "http://curl.haxx.se/download"
-
-fpkg_sf ${MAILMAN}
-
-fpkg ${SAMBA} "ftp://ftp.samba.org/pub/samba/old-versions"
-
-fpkg ${PHP} "http://us2.php.net/distributions"
-
-fpkg_sf ${STRACE}
-lpkg 2 ${SUBVERSION}
-fpkg_gnu ${INDENT}
-fpkg ${GIT} "http://www.kernel.org/pub/software/scm/git"
-fpkg_hv ${GIT_MANPAGES}
-
-fpkg ${LTSP_UTILS} "http://ltsp.mirrors.tds.net/pub/ltsp/utils"
-fpkg ${TFTP_HPA} "http://freshmeat.net/redir/tftp-hpa/14040/url_bz2"
-
-fpkg_sf ${KVM}
-fpkg_hv ${BRIDGE_UTILS}
-fpkg_hv ${UML_UTILITIES}
-
-fpkg_gnu ${GUILE}
-
-fpkg_sf ${LIBBOOST}
-
-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_gnu ${HELP2MAN}
-
-fpkg ${LIBDVDCSS} "ftp://ftp.linux.ee/pub/gentoo/distfiles/distfiles"
-fpkg ${LIBDVDREAD} "ftp://ftp.linux.ee/pub/gentoo/distfiles/distfiles"
-fpkg_sf ${FUSE}
-fpkg ${DVDFS} "http://jspenguin.org:81/dvdfs"
-
-fpkg ${DOSFSTOOLS} "http://www.daniel-baumann.ch/software/dosfstools"
+fpkg -m sf -s "pdl" ${PERL_MOD_PDL}
+fpkg -m pm -s "J/JO/JOSEPHW" ${PERL_MOD_XML_WRITER}
+fpkg -m pm -s "C/CH/CHORNY" ${PERL_MOD_XML_PARSER}
+
+fpkg -m gnome ${INTLTOOL}
+fpkg ${PYTHON} "http://www.python.org/ftp/python/$(get_pkg_ver ${PYTHON})"
+
+fpkg -e "tgz" ${SGML_COMMON} \
+ "http://gd.tuwien.ac.at/hci/kde/devel/docbook/SOURCES"
+fpkg -m hv ${SGML_DTD3}
+fpkg -m hv ${SGML_DTD4}
+fpkg -m sf -s "openjade" ${OPENSP}
+fpkg -m sf ${OPENJADE}
+fpkg -m hv ${SGML_SPM}
+fpkg -m sf -s "docbook" ${DOCBOOK_DSSSL}
+fpkg -e "tar.gz" ${DOCBOOK_UTILS} \
+ "http://sources-redhat.mirrors.redwire.net/docbook-tools/new-trials/SOURCES"
+fpkg -e "tar.gz" ${LIBXML2} "http://xmlsoft.org/sources"
+fpkg -e "tar.gz" ${LIBXSLT} "http://xmlsoft.org/sources"
+fpkg -m hv ${DOCBOOK_XML}
+fpkg -m sf -s "docbook" ${DOCBOOK_XSL}
+fpkg -m sf ${XMLTOMAN}
+fpkg ${XMLTO} "https://fedorahosted.org/releases/x/m/xmlto"
+
+fpkg -f "jpegsrc.v$(get_pkg_ver ${LIBJPEG})" -e "tar.gz" ${LIBJPEG} \
+ "http://www.ijg.org/files"
+fpkg -f "openjpeg_v$(get_pkg_ver ${LIBOPENJPEG} | sed 's!\.!_!g')" \
+ -e "tar.gz" ${LIBOPENJPEG} "http://www.openjpeg.org"
+fpkg -m sf ${LIBPNG}
+fpkg -m gnome ${LIBART}
+fpkg -m sf ${LIBEXIF}
+fpkg -e "tar.gz" ${FRIBIDI} "http://fribidi.org/download"
+fpkg -m fd -o "icon-theme" ${HICOLOR_ICON_THEME}
+fpkg -e "tar.gz" ${TIFF} "http://download.osgeo.org/libtiff"
+fpkg -m sf ${GIFLIB}
+fpkg -m sf ${LCMS}
+
+fpkg -m sf ${LIBMNG}
+
+fpkg -m sf ${FREETYPE}
+fpkg -e "tar.gz" ${FONTCONFIG} "http://fontconfig.org/release"
+
+# Using HV-repackaged version, because Ckermit decompresses all of its files in
+# the current directory.
+fpkg -m hv ${CKERMIT}
+
+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 -e "tar.gz" ${SASL2} "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail"
+fpkg -e "tgz" ${OPENLDAP} \
+ "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release"
+fpkg -m hv ${KERBEROS5}
+
+if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
+ fpkg -e "tar.gz" -f "sendmail.$(get_pkg_ver ${SENDMAIL})" ${SENDMAIL} \
+ "ftp://ftp.sendmail.org/pub/sendmail"
+else
+ fpkg -m hv ${SSMTP}
+fi
+
+fpkg -s "gnupg" ${GNUPG} "ftp://ftp.gnupg.org/gcrypt"
+fpkg -m sf ${MUTT}
+
+# Audio
+if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then
+ if [ "x${SOUND_CARD}" = "xyes" ]; then
+
+ fpkg ${NASM} "http://www.nasm.us/pub/nasm/releasebuilds/$(get_pkg_ver \
+ ${NASM})"
+ fpkg ${ALSA_LIB} "ftp://ftp.alsa-project.org/pub/lib"
+ fpkg ${ALSA_UTILS} "ftp://ftp.alsa-project.org/pub/utils"
+
+ fpkg -e "tar.gz" ${LIBSAMPLERATE} "http://www.mega-nerd.com/SRC"
+ fpkg -e "tgz" -f "${CDPARANOIA}.src" ${CDPARANOIA} "http://downloads.xiph.org/releases/cdparanoia"
+
+ fpkg -e "tar.gz" ${LIBOGG} "http://downloads.xiph.org/releases/ogg"
+ fpkg ${LIBVORBIS} "http://downloads.xiph.org/releases/vorbis"
+ fpkg -m sf ${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 -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 -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 -e "tar.gz" ${SPEEX} "http://downloads.xiph.org/releases/speex"
+ 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 ${MOC} "ftp://ftp.daper.net/pub/soft/moc/stable"
+ fi
+fi