-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 -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 ${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 -e "tar.gz" ${HVCLOCK} "http://www.hugovil.com/repository/hvclock"
+fpkg -e "tar.gz" ${WMNOTIFY} "http://www.hugovil.com/repository/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 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 ${IMAGE_MAGICK} "ftp://ftp.imagemagick.org/pub/ImageMagick"
+fpkg -m fd -s "none" ${POPPLER}
+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 ${BABL})"
+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.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"