X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage4%2Fpackages-update;h=c5af9dc3faafe5ae6f11a9d9a1793add960dc4af;hb=b996d3c2b81d7ec21d29583f6b2b840ea7760bc6;hp=1ed28486ea2e34764f7639a76d25eca9f003f675;hpb=0364372bf9bf57502160adc0402e38b8ea235c24;p=hvlinux.git

diff --git a/stage4/packages-update b/stage4/packages-update
index 1ed2848..c5af9dc 100755
--- a/stage4/packages-update
+++ b/stage4/packages-update
@@ -2,13 +2,12 @@
 
 USE_LFS_PATCHES=1
 USE_BLFS_PATCHES=1
-USE_HV_PATCHES=1
 
 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}"
@@ -38,6 +37,11 @@ for module in ${XORG_MODULES_LIST}; do
                 done
             done
         fi
+
+        # Always install synaptics driver
+        for ext in wget md5; do
+            sed -e "s/#\(.*xf86-input-synaptics.*\)/\1/" -i ${LFS_PKG_DIR}/${MOD_NAME}/${module}.${ext}
+        done
     fi
     if [ "${MOD_NAME}" = "app" ]; then
         # Remove unneeded apps
@@ -75,7 +79,6 @@ 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"
@@ -97,12 +100,17 @@ if [ "x${XORG_VIDEO_DRIVER}" = "xnouveau" ]; then
 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 ${WINDOWMAKER} ${WMAKER_URL}
+
+fpkg ${XDG_UTILS} "http://portland.freedesktop.org/download"
+fpkg -e "tar.gz" ${WINDOWMAKER} ${WMAKER_URL}
 fpkg -e "tar.gz" ${WINDOWMAKER_EXTRA} ${WMAKER_URL}
 
 exit $?