-fpkg -s "$(get_pkg_ver ${MESALIB})" ${MESALIB} ftp://ftp.freedesktop.org/pub/mesa
-fpkg_xorg ${XCURSOR_THEMES} data
-fpkg ${XKEYBOARD_CONFIG} "http://xlibs.freedesktop.org/xkbdesc"
-fpkg_xorg ${LUIT} app
-fpkg -e "tar.gz" ${PIXMAN} "http://cairographics.org/releases"
-fpkg -e "tar.gz" ${LIBFFI} "ftp://sourceware.org/pub/libffi"
-fpkg ${DBUS} "http://dbus.freedesktop.org/releases/dbus"
-fpkg_gnome ${GLIB}
-fpkg_gnome ${GOBJECT_INSTROSPECTION}
-fpkg -e "tar.gz" ${DBUS_GLIB} "http://dbus.freedesktop.org/releases/dbus-glib"
-fpkg -e "tar.gz" ${EGGDBUS} "http://hal.freedesktop.org/releases"
-fpkg -e "tar.gz" ${POLKIT} "http://hal.freedesktop.org/releases"
-fpkg ${CONSOLEKIT} "http://www.freedesktop.org/software/ConsoleKit/dist"
-fpkg -e "tar.gz" ${POLICYKIT} "http://hal.freedesktop.org/releases"
-fpkg ${HAL} "http://hal.freedesktop.org/releases"
-fpkg ${HAL_INFO} "http://hal.freedesktop.org/releases"
-
-fpkg_hv ${XORG_VIDEO_NOUVEAU}
-fpkg_xorg ${XORG_SERVER} xserver
-fpkg_xorg ${XDM} app
+fpkg -e "tar.gz" -f "${LLVM}.src" ${LLVM} "http://llvm.org/releases/$(get_pkg_ver ${LLVM})"
+fpkg -s "$(get_pkg_ver ${MESALIB})" ${MESALIB} \
+ ftp://ftp.freedesktop.org/pub/mesa
+fpkg -m xorg -s data ${XCURSOR_THEMES}
+fpkg -s data/xkeyboard-config ${XKEYBOARD_CONFIG} ${XORG_URL}