Upgrade stage4 xorg packages

[hvlinux.git] / stage4 / packages-update

diff --git a/stage4/packages-update b/stage4/packages-update
index 1e30740..c6aec96 100755 (executable)
--- a/stage4/packages-update
+++ b/stage4/packages-update
@@ -7,15 +7,15 @@ update_packages_init ${*}
 lpkg     2 ${PYTHON}
 lpkg     2 ${GLIB}
 
-XORG_MODULES_LIST="${XORG_APP} ${XORG_DRIVER} ${XORG_FONT} ${XORG_LIB} \
-    ${XORG_PROTO}"
+XORG_MODULES_LIST="app driver font lib proto"
 
 VERSIONS_DIR="${SCRDIR}/versions"
 
 for module in ${XORG_MODULES_LIST}; do
     MOD_NAME=$(get_pkg_name ${module})
 
-    SUBMODS="$(grep -v '^#' ${VERSIONS_DIR}/${module}.wget | \
+    SUBMODS="$(grep -v '^#' ${VERSIONS_DIR}/${module}.md5 | \
+        awk '{print $2}' | \
         sed 's!\.tar\.bz2$!!')"
 
     for submod in ${SUBMODS}; do
@@ -31,7 +31,6 @@ for module in ${XORG_MODULES_LIST}; do
 done
 
 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}
@@ -49,7 +48,6 @@ fpkg -v 0 ${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}
@@ -57,6 +55,7 @@ fpkg -m gnome ${GOBJECT_INSTROSPECTION}
 fpkg -m fd -o "dbus" -s "releases/dbus-glib" ${DBUS_GLIB}
 
 fpkg ${LIBEPOXY} "http://crux.nu/files"
+fpkg -e "tar.xz" ${LIBEVDEV} "http://www.freedesktop.org/software/libevdev"
 fpkg -m xorg -s xserver ${XORG_SERVER}
 fpkg -m xorg -s app ${XDM}
 fpkg ${MTDEV} "http://bitmath.org/code/mtdev"