-fpkg_xorg ${LIBXAU} lib
-fpkg_xorg ${LIBXDMCP} lib
-fpkg_sf ${LESSTIF}
-fpkg_xorg ${XBITMAPS} data
-fpkg ${LIBPTHREAD_STUBS} "http://xcb.freedesktop.org/dist"
-fpkg ${LIBDRM} "http://dri.freedesktop.org/libdrm"
-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 ${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 ${XORG_SERVER} xserver
-fpkg_xorg ${XDM} app
-
-fpkg -e tgz ${XTERM} "ftp://invisible-island.net/xterm"
-
-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 -m hv ${LIBDRM}
+fpkg -e "tar.gz" ${TALLOC} "http://samba.org/ftp/talloc"
+fpkg -s "$(get_pkg_ver ${MESALIB})" ${MESALIB} \
+ ftp://ftp.freedesktop.org/pub/mesa
+fpkg -m xorg -s data ${XCURSOR_THEMES}
+fpkg -m fd -o "xlibs" -s "xkbdesc" -e "tar.bz2" ${XKEYBOARD_CONFIG}
+
+fpkg -m xorg -s app ${LUIT}
+fpkg -e "tar.gz" ${PIXMAN} ${CAIRO_URL}
+fpkg -e "tar.gz" ${LIBFFI} "ftp://sourceware.org/pub/libffi"
+
+fpkg -m fd -s "releases/dbus" ${DBUS}
+fpkg -m gnome ${GLIB}
+fpkg -m gnome ${GOBJECT_INSTROSPECTION}
+fpkg -m fd -o "dbus" -s "releases/dbus-glib" ${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}
+
+if [ "x${XORG_VIDEO_DRIVER}" = "xnouveau" ]; then
+ fpkg -m hv ${XORG_VIDEO_NOUVEAU}
+fi
+fpkg -m xorg -s xserver ${XORG_SERVER}
+fpkg -m xorg -s app ${XDM}
+
+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 -s "tcl" ${TK}
+fpkg -m gnu ${EMACS}
+fpkg ${WINDOWMAKER} ${WMAKER_URL}
+fpkg -e "tar.gz" ${WINDOWMAKER_EXTRA} ${WMAKER_URL}