-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 ${PYTHON} "http://www.python.org/ftp/python/$(get_pkg_ver ${PYTHON})"
-
-ARCH_EXT=tgz fpkg ${SGML_COMMON} "http://gd.tuwien.ac.at/hci/kde/devel/docbook/SOURCES"
-unset ARCH_EXT
-fpkg_hv ${SGML_DTD3}
-fpkg_hv ${SGML_DTD4}
-fpkg_sf ${OPENSP} "openjade"
-fpkg_sf ${OPENJADE}
-fpkg_hv ${SGML_SPM} # For re-generating fontconfig documentation.
-fpkg_sf ${DOCBOOK_DSSSL} "docbook"
-fpkg ${DOCBOOK_UTILS} "http://sources-redhat.mirrors.redwire.net/docbook-tools/new-trials/SOURCES"
-fpkg_gnome ${LIBXML2}
-fpkg ${LIBXSLT} "http://xmlsoft.org/sources"
-fpkg_hv ${DOCBOOK_XML}
-fpkg_sf ${DOCBOOK_XSL} "docbook"
-fpkg_sf ${XMLTOMAN}
-
-fpkg_mis ${LIBJPEG} "jpegsrc.v$(get_pkg_ver ${LIBJPEG})" "http://www.ijg.org/files"
-fpkg_mis ${LIBOPENJPEG} "openjpeg_v$(get_pkg_ver ${LIBOPENJPEG} | sed 's!\.!_!g')" "http://www.openjpeg.org"
-fpkg_sf ${LIBPNG}
-fpkg_gnome ${LIBART}
-fpkg_sf ${LIBEXIF}
-fpkg ${FRIBIDI} "http://fribidi.org/download"
-fpkg ${HICOLOR_ICON_THEME} "http://icon-theme.freedesktop.org/releases"
-fpkg ${TIFF} "http://libtiff.maptools.org/dl"
-fpkg_sf ${GIFLIB}
-fpkg ${LCMS} "http://www.littlecms.com"
-fpkg_sf ${LIBMNG}
+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}