X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage4%2Fpackages-update;h=a3e3976e554c459e960c91f5e91dfd1be79c41a0;hb=496fe638ddb82977bb02578cc9e1c39ffcc8c41e;hp=f2ffa4fa423ee4dabba698163b4601a2456b21aa;hpb=c6741cb82c13737af3d22ba52c34dd1fe22fc887;p=hvlinux.git

diff --git a/stage4/packages-update b/stage4/packages-update
index f2ffa4f..a3e3976 100755
--- a/stage4/packages-update
+++ b/stage4/packages-update
@@ -8,7 +8,7 @@ source ../functions/main
 
 update_packages_init ${*}
 
-lpkg     3 ${PYTHON}
+lpkg     2 ${PYTHON}
 lpkg     2 ${GLIB}
 
 XORG_MODULES_LIST="${XORG_APP} ${XORG_DRIVER} ${XORG_FONT} ${XORG_LIB} ${XORG_PROTO}"
@@ -22,10 +22,12 @@ for module in ${XORG_MODULES_LIST}; do
 
     if [ "${MOD_NAME}" = "driver" ]; then
 	if [ -n "${XORG_VIDEO_DRIVER}" ]; then
-	    # Install only specified video driver
+	    # Install only specified video driver, with also VESA
             for ext in wget md5; do
                 # Comment all xf86-video entries, except for specified driver:
                 sed -e "/xf86-video-${XORG_VIDEO_DRIVER}/!s/\(.*xf86-video.*\)/#\1/" -i ${LFS_PKG_DIR}/${MOD_NAME}/${module}.${ext}
+                # Re-add VESA if necessary
+                sed -e "s/#\(.*xf86-video-vesa.*\)/\1/" -i ${LFS_PKG_DIR}/${MOD_NAME}/${module}.${ext}
             done
 	else
             # Install all drivers, except some unwanted drivers
@@ -77,11 +79,11 @@ 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" ${LLVM} "http://llvm.org/releases/3.0"
+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 -m xorg -s data/xkeyboard-config ${XKEYBOARD_CONFIG}
+fpkg -s data/xkeyboard-config ${XKEYBOARD_CONFIG} ${XORG_URL}
 
 fpkg -m xorg -s app ${LUIT}
 fpkg -e "tar.gz" ${PIXMAN} ${CAIRO_URL}
@@ -89,12 +91,6 @@ 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}
-######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 ${XORG_VIDEO_NOUVEAU} "http://anduin.linuxfromscratch.org/sources/BLFS/svn/Xorg"
@@ -105,8 +101,10 @@ 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 -e "tar.bz2" -s "dejavu" ${DEJAVUFONTS}
+
 fpkg -m sf -s "tcl" ${TK}
-fpkg ${WINDOWMAKER} ${WMAKER_URL}
+fpkg -e "tar.gz" ${WINDOWMAKER} ${WMAKER_URL}
 fpkg -e "tar.gz" ${WINDOWMAKER_EXTRA} ${WMAKER_URL}
 
 exit $?