fpkg -e "tar.bz2" ${PYCAIRO} ${CAIRO_URL}
fpkg -m gnome ${PYGTK}
+fpkg -m gnome ${ADWAITA_ICON_THEME}
+
fpkg -m gnu ${EMACS}
fpkg -m hv ${MMM_MODE}
fpkg -e "tar.gz" ${HVCLOCK} "http://www.hugovil.com/repository/hvclock"
fpkg -m gnome ${LIBXKLAVIER}
fpkg -m gnome ${LIBGLADE}
fpkg -m gnome ${GCONF}
+
+fpkg -e "txt" ${CERTDATA} "http://anduin.linuxfromscratch.org/sources/other"
+fpkg -e "tar.gz" ${P11KIT} "http://p11-glue.freedesktop.org/releases"
+fpkg -m gnome ${GCR}
fpkg -m gnome ${GNOME_KEYRING}
fpkg -m gnome ${LIBSOUP}
fpkg -e "tar.gz" ${XSCREENSAVER} "http://www.jwz.org/xscreensaver"
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 -e "tar.gz" ${EVIV2} "http://www.exiv2.org"
+fpkg -e "tar.gz" ${VIEWNIOR} "https://github.com/xsisqox/Viewnior/archive"
+
fpkg -e "tar.xz" -m fd -s "none" ${POPPLER}
fpkg -m gnome ${LIBCROCO}
fpkg -m gnome ${LIBRSVG}
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 -e "tar.gz" ${SANE_BACKENDS} "http://fossies.org/linux/misc"
+fpkg -e "tar.gz" ${XSANE} "http://www.xsane.org/download"
fpkg ${ICON_NAMING_UTILS} "http://tango.freedesktop.org/releases"
fpkg ${TANGO_ICON_THEME} "http://tango.freedesktop.org/releases"
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 -f "midori_$(get_pkg_ver ${MIDORI})_all_" ${MIDORI} \
+ "http://www.midori-browser.org/downloads"
-fpkg -m hv ${NSPR}
-fpkg -m hv ${NSS}
+fpkg -e "tar.gz" -s "v$(get_pkg_ver ${NSPR})/src" ${NSPR} \
+ "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases"
+fpkg -e "tar.gz" -s "NSS_$(ver_dots_to_underscore ${NSS})_RTM/src" ${NSS} \
+ "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases"
fpkg -f "${FIREFOX}.source" ${FIREFOX} \
"http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(get_pkg_ver ${FIREFOX})/source"
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" -f "${LIBEVENT}-stable" ${LIBEVENT} \
+ "https://github.com/downloads/libevent/libevent"
+fpkg -e "tar.xz" ${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}