-fpkg ${LIBXAU} ${XORG_URL}/lib
-fpkg ${LIBXDMCP} ${XORG_URL}/lib
-fpkg_sf ${LESSTIF}
-fpkg ${XBITMAPS} ${XORG_URL}/data
-fpkg ${LIBPTHREAD_STUBS} http://xcb.freedesktop.org/dist
-fpkg ${LIBDRM} http://dri.freedesktop.org/libdrm
-fpkg ${MESALIB} ftp://ftp.freedesktop.org/pub/mesa/$(get_pkg_ver ${MESALIB})
-fpkg ${XCURSOR_THEMES} ${XORG_URL}/data
-fpkg ${XKEYBOARD_CONFIG} http://xlibs.freedesktop.org/xkbdesc
-fpkg ${LUIT} ${XORG_URL}/app
-fpkg ${PIXMAN} "http://cairographics.org/releases"
-
-fpkg ${LIBFFI} "ftp://sourceware.org/pub/libffi"
-fpkg ${DBUS} "http://dbus.freedesktop.org/releases/dbus"
-fpkg_gnome ${GLIB}
-fpkg_gnome ${GOBJECT_INSTROSPECTION}
-fpkg ${DBUS_GLIB} "http://dbus.freedesktop.org/releases/dbus-glib"
-fpkg ${EGGDBUS} "http://hal.freedesktop.org/releases"
-fpkg ${POLKIT} "http://hal.freedesktop.org/releases"
-fpkg ${CONSOLEKIT} "http://www.freedesktop.org/software/ConsoleKit/dist"
-fpkg ${POLICYKIT} "http://hal.freedesktop.org/releases"
-fpkg ${HAL} http://hal.freedesktop.org/releases
-fpkg ${HAL_INFO} http://hal.freedesktop.org/releases
-
-fpkg ${XORG_SERVER} ${XORG_URL}/xserver
-
-ARCH_EXT=tgz fpkg ${XTERM} ftp://invisible-island.net/xterm
-unset ARCH_EXT
-
-fpkg ${T1LIB} "http://www.ibiblio.org/pub/Linux/libs/graphics"
-
-fpkg_sf ${TK} tcl
-
-fpkg_gnu ${EMACS}
-fpkg ${WINDOWMAKER} "http://windowmaker.info/pub/source/release"
-fpkg ${WINDOWMAKER_EXTRA} "http://windowmaker.info/pub/source/release"
+fpkg -m xorg -s util ${XORG_UTIL_MACROS}
+fpkg -m xorg -s util ${XORG_MAKEDEPEND}
+fpkg -m xorg -s lib ${LIBXAU}
+fpkg -m xorg -s lib ${LIBXDMCP}
+fpkg -m sf ${LESSTIF}
+fpkg -m xorg -s data ${XBITMAPS}
+
+fpkg -m fd -o "xcb" -s "dist" ${LIBPTHREAD_STUBS}
+fpkg -m fd -o "xcb" -s "dist" ${XCB_PROTO}
+fpkg -m fd -o "xcb" -s "dist" ${LIBXCB}
+fpkg -m fd -o "xcb" -s "dist" ${XCB_UTIL}
+fpkg -m gnu ${GPERF}
+
+fpkg ${LIBDRM} "http://dri.freedesktop.org/libdrm"
+fpkg -e "tar.gz" ${TALLOC} "http://samba.org/ftp/talloc"
+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}
+
+fpkg -m xorg -s app ${LUIT}
+fpkg -e "tar.gz" ${PIXMAN} ${CAIRO_URL}
+
+fpkg -m fd -s "releases/dbus" ${DBUS}
+fpkg -m gnome ${GOBJECT_INSTROSPECTION}
+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
+fpkg -m xorg -s xserver ${XORG_SERVER}
+fpkg -m xorg -s app ${XDM}
+fpkg ${MTDEV} "http://bitmath.org/code/mtdev"
+
+fpkg -e "tgz" ${XTERM} "ftp://invisible-island.net/xterm"
+fpkg -e "tar.gz" ${T1LIB} "http://www.ibiblio.org/pub/Linux/libs/graphics"
+
+fpkg -m sf -e "tar.bz2" -s "dejavu" ${DEJAVUFONTS}
+
+fpkg -m sf -s "tcl" ${TK}
+
+fpkg ${XDG_UTILS} "http://portland.freedesktop.org/download"
+fpkg -e "tar.gz" ${WINDOWMAKER} ${WMAKER_URL}
+fpkg -e "tar.gz" ${WINDOWMAKER_EXTRA} ${WMAKER_URL}