-fpkg ${LIBXAU} ${XORG_URL}/lib
-fpkg ${LIBXDMCP} ${XORG_URL}/lib
-fpkg ${XBITMAPS} ${XORG_URL}/data
-fpkg ${XCURSOR_THEMES} ${XORG_URL}/data
-fpkg ${XKEYBOARD_CONFIG} http://xlibs.freedesktop.org/xkbdesc
-fpkg ${LUIT} ${XORG_URL}/app
-fpkg ${XORG_SERVER} ${XORG_URL}/xserver
+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"