-fpkg -m fd -o "dbus" ${DBUS_GLIB}
-fpkg -m fd -o "hal" ${EGGDBUS}
-fpkg -m fd -o "hal" ${POLKIT}
-fpkg ${CONSOLEKIT} "http://www.freedesktop.org/software/ConsoleKit/dist"
-fpkg -m fd -o "hal" ${POLICYKIT}
-fpkg -m fd ${HAL}
-fpkg -m fd -o "hal" ${HAL_INFO}
-
-fpkg -m hv ${XORG_VIDEO_NOUVEAU}
+fpkg -m fd -o "dbus" -s "releases/dbus-glib" ${DBUS_GLIB}
+
+if [ "x${XORG_VIDEO_DRIVER}" = "xnouveau" ]; then
+ fpkg ${XORG_VIDEO_NOUVEAU} "http://anduin.linuxfromscratch.org/sources/BLFS/svn/Xorg"
+fi