Merge remote branch 'nutyx-attapu/master'

52 files changed, 834 insertions, 128 deletions

diff --git a/base/aaabasicfs/.footprint b/base/aaabasicfs/.footprint
index 1ba3e2ac7..74c2fa46e 100644
--- a/base/aaabasicfs/.footprint
+++ b/base/aaabasicfs/.footprint
@@ -33,6 +33,7 @@ drwxr-xr-x	root/root	etc/rc.d/init.d/
 -rwxr-xr--	root/root	etc/rc.d/init.d/console
 -rwxr-xr--	root/root	etc/rc.d/init.d/consolelog
 -rw-r--r--	root/root	etc/rc.d/init.d/functions
+-rwxr-xr--	root/root	etc/rc.d/init.d/gpm
 -rwxr-xr--	root/root	etc/rc.d/init.d/halt
 -rwxr-xr--	root/root	etc/rc.d/init.d/iplink
 -rwxr-xr--	root/root	etc/rc.d/init.d/localnet
@@ -52,6 +53,7 @@ drwxr-xr-x	root/root	etc/rc.d/init.d/
 -rwxr-xr--	root/root	etc/rc.d/init.d/udev
 -rwxr-xr--	root/root	etc/rc.d/init.d/udev_retry
 drwxr-xr-x	root/root	etc/rc.d/rc0.d/
+lrwxrwxrwx	root/root	etc/rc.d/rc0.d/K10gpm -> ../init.d/gpm
 lrwxrwxrwx	root/root	etc/rc.d/rc0.d/K45random -> ../init.d/random
 lrwxrwxrwx	root/root	etc/rc.d/rc0.d/K80network -> ../init.d/network
 lrwxrwxrwx	root/root	etc/rc.d/rc0.d/K90sysklogd -> ../init.d/sysklogd
@@ -61,6 +63,7 @@ lrwxrwxrwx	root/root	etc/rc.d/rc0.d/S80mountfs -> ../init.d/mountfs
 lrwxrwxrwx	root/root	etc/rc.d/rc0.d/S90localnet -> ../init.d/localnet
 lrwxrwxrwx	root/root	etc/rc.d/rc0.d/S99halt -> ../init.d/halt
 drwxr-xr-x	root/root	etc/rc.d/rc1.d/
+lrwxrwxrwx	root/root	etc/rc.d/rc1.d/K10gpm -> ../init.d/gpm
 lrwxrwxrwx	root/root	etc/rc.d/rc1.d/K80network -> ../init.d/network
 lrwxrwxrwx	root/root	etc/rc.d/rc1.d/K90sysklogd -> ../init.d/sysklogd
 lrwxrwxrwx	root/root	etc/rc.d/rc1.d/S25random -> ../init.d/random
@@ -68,19 +71,24 @@ drwxr-xr-x	root/root	etc/rc.d/rc2.d/
 lrwxrwxrwx	root/root	etc/rc.d/rc2.d/K90sysklogd -> ../init.d/sysklogd
 lrwxrwxrwx	root/root	etc/rc.d/rc2.d/S20network -> ../init.d/network
 lrwxrwxrwx	root/root	etc/rc.d/rc2.d/S25random -> ../init.d/random
+lrwxrwxrwx	root/root	etc/rc.d/rc2.d/S70gpm -> ../init.d/gpm
 drwxr-xr-x	root/root	etc/rc.d/rc3.d/
 lrwxrwxrwx	root/root	etc/rc.d/rc3.d/S10sysklogd -> ../init.d/sysklogd
 lrwxrwxrwx	root/root	etc/rc.d/rc3.d/S20network -> ../init.d/network
 lrwxrwxrwx	root/root	etc/rc.d/rc3.d/S25random -> ../init.d/random
+lrwxrwxrwx	root/root	etc/rc.d/rc3.d/S70gpm -> ../init.d/gpm
 drwxr-xr-x	root/root	etc/rc.d/rc4.d/
 lrwxrwxrwx	root/root	etc/rc.d/rc4.d/S10sysklogd -> ../init.d/sysklogd
 lrwxrwxrwx	root/root	etc/rc.d/rc4.d/S20network -> ../init.d/network
 lrwxrwxrwx	root/root	etc/rc.d/rc4.d/S25random -> ../init.d/random
+lrwxrwxrwx	root/root	etc/rc.d/rc4.d/S70gpm -> ../init.d/gpm
 drwxr-xr-x	root/root	etc/rc.d/rc5.d/
 lrwxrwxrwx	root/root	etc/rc.d/rc5.d/S10sysklogd -> ../init.d/sysklogd
 lrwxrwxrwx	root/root	etc/rc.d/rc5.d/S20network -> ../init.d/network
 lrwxrwxrwx	root/root	etc/rc.d/rc5.d/S25random -> ../init.d/random
+lrwxrwxrwx	root/root	etc/rc.d/rc5.d/S70gpm -> ../init.d/gpm
 drwxr-xr-x	root/root	etc/rc.d/rc6.d/
+lrwxrwxrwx	root/root	etc/rc.d/rc6.d/K10gpm -> ../init.d/gpm
 lrwxrwxrwx	root/root	etc/rc.d/rc6.d/K45random -> ../init.d/random
 lrwxrwxrwx	root/root	etc/rc.d/rc6.d/K80network -> ../init.d/network
 lrwxrwxrwx	root/root	etc/rc.d/rc6.d/K90sysklogd -> ../init.d/sysklogd
@@ -110,9 +118,7 @@ drwxr-xr-x	root/root	etc/skel/
 -rw-r--r--	root/root	etc/skel/.dmrc
 lrwxrwxrwx	root/root	etc/skel/.xinitrc -> /etc/slim.xinitrc
 drwxr-xr-x	root/root	etc/sysconfig/
--rw-r--r--	root/root	etc/sysconfig/console
 -rw-r--r--	root/root	etc/sysconfig/modules
--rw-r--r--	root/root	etc/sysconfig/network
 drwxr-xr-x	root/root	etc/sysconfig/network-devices/
 -rwxr-xr--	root/root	etc/sysconfig/network-devices/ifdown
 -rwxr-xr--	root/root	etc/sysconfig/network-devices/ifup
diff --git a/base/aaabasicfs/.md5sum b/base/aaabasicfs/.md5sum
index 4307fb1ec..76781fea9 100644
--- a/base/aaabasicfs/.md5sum
+++ b/base/aaabasicfs/.md5sum
@@ -4,7 +4,6 @@ f6b42961b3c2bd3b2e0bf0082d80d216  X.sh
 427f04bb0e7ba3394054a1215fdca87c  bashrc
 3974f1b4242908346f309b096a7a6ed6  bashrc.etc
 30929d5b1257b82b1a78060219244410  blfs-bootscripts-20090302.tar.bz2
-94e5b6c4017e28684a683d39cbe4c72a  console
 248d4faa838949085a51003b2c0c3f00  dircolors.sh
 ad457024fe7ad91b8e9e0b4aad87df1f  extrapaths.sh
 0286a09ca5d7515c29ad5ff8f88fb9f3  fstab
@@ -15,7 +14,7 @@ ad457024fe7ad91b8e9e0b4aad87df1f  extrapaths.sh
 472830fe082dc77a1d30c8b2bd6b5079  lfs-bootscripts-20100529.tar.bz2
 4e77d38062489bdd53d0eb9065a37b3e  message
 f6c548de7fc44b0fbc503ba0189d5c91  network
-5478e2141b3d5504cd201b23dcc70531  nu
+4f193837349d63e6c98501f221904170  nu
 210fdabd07248f79617508807715167b  profile
 8581f546f9dce86f2f04be09cc7773ad  rc
 fa6ce99e0329c7854e0a83d022da6fe3  readline.sh
diff --git a/base/aaabasicfs/Pkgfile b/base/aaabasicfs/Pkgfile
index 6805e39f6..1b65ea798 100644
--- a/base/aaabasicfs/Pkgfile
+++ b/base/aaabasicfs/Pkgfile
@@ -10,7 +10,7 @@ scriptsversion=lfs-bootscripts-20100529
 BLFSscriptsversion=20090302
 source=(  http://www.linuxfromscratch.org/lfs/downloads/development/$scriptsversion.tar.bz2\
 	http://www.linuxfromscratch.org/blfs/downloads/svn/blfs-bootscripts-$BLFSscriptsversion.tar.bz2
- hosts console fstab inittab message inputrc network rc \
+ hosts fstab inittab message inputrc network rc \
  profile dircolors.sh extrapaths.sh bash_profile bashrc bashrc.etc lfs-bootscripts-01.patch \
  nu readline.sh unmask.sh X.sh bashrc )
 
@@ -163,8 +163,6 @@ EOF
 	mv $PKG/etc/bashrc.etc $PKG/etc/bashrc
 	cp -v {dircolors.sh,extrapaths.sh,readline.sh,unmask.sh,X.sh}\
 	$PKG/etc/profile.d/
-	cp -v console $PKG/etc/sysconfig/
-	echo "HOSTNAME=NuTyX" > $PKG/etc/sysconfig/network
 	cp -v bash_profile $PKG/etc/skel/.bash_profile
 	cp -v bashrc $PKG/etc/skel/.bashrc
 	ln -s /etc/slim.xinitrc $PKG/etc/skel/.xinitrc
@@ -179,9 +177,10 @@ EOF
 	echo "scriptsversion=$BLFSscriptsversion" >> $PKG/var/lib/pkg/blfs-bootscripts
 	ln -s /var/lib/pkg/blfs-bootscripts $PKG/etc/blfs-bootscripts
 	cp -v message $PKG/boot/
-	# Install Random Number Generation
+	# Install Random Number Generation and Mouse
 	cd $SRC/blfs-bootscripts-$BLFSscriptsversion
 	make DESTDIR=$PKG install-random
+	make DESTDIR=$PKG install-gpm
 
 	cat > $PKG/etc/skel/.dmrc << "EOF"
 [Desktop]
diff --git a/base/aaabasicfs/console b/base/aaabasicfs/console
deleted file mode 100644
index 7963f5c30..000000000
--- a/base/aaabasicfs/console
+++ /dev/null
@@ -1,7 +0,0 @@
-# Begin /etc/sysconfig/console
-
-KEYMAP="fr-latin9.map"
-FONT="lat0-16 -m 8859-15"
-UNICODE="1"
-
-# End /etc/sysconfig/console
diff --git a/base/aaabasicfs/nu b/base/aaabasicfs/nu
index 214a019b1..3ba4434e6 100755
--- a/base/aaabasicfs/nu
+++ b/base/aaabasicfs/nu
@@ -6,7 +6,7 @@
 ######################################
 
 user_groups=""
-default_groups=(users disk network floppy fuse video lp audio cdrom halusers scanner)
+default_groups=(users disk network floppy fuse video lp tty audio cdrom halusers scanner)
 
 # Avoid spaces troubles :)
 OLD_IFS=$IFS
diff --git a/base/busybox/.footprint b/base/busybox/.footprint
index 93d44014a..6b268765c 100644
--- a/base/busybox/.footprint
+++ b/base/busybox/.footprint
@@ -21,12 +21,9 @@ lrwxrwxrwx	root/root	bin/dnsdomainname -> busybox
 lrwxrwxrwx	root/root	bin/dumpkmap -> busybox
 lrwxrwxrwx	root/root	bin/echo -> busybox
 lrwxrwxrwx	root/root	bin/ed -> busybox
-lrwxrwxrwx	root/root	bin/egrep -> busybox
 lrwxrwxrwx	root/root	bin/false -> busybox
 lrwxrwxrwx	root/root	bin/fdflush -> busybox
-lrwxrwxrwx	root/root	bin/fgrep -> busybox
 lrwxrwxrwx	root/root	bin/getopt -> busybox
-lrwxrwxrwx	root/root	bin/grep -> busybox
 lrwxrwxrwx	root/root	bin/gunzip -> busybox
 lrwxrwxrwx	root/root	bin/gzip -> busybox
 lrwxrwxrwx	root/root	bin/hostname -> busybox
@@ -64,7 +61,6 @@ lrwxrwxrwx	root/root	bin/pwd -> busybox
 lrwxrwxrwx	root/root	bin/rm -> busybox
 lrwxrwxrwx	root/root	bin/rmdir -> busybox
 lrwxrwxrwx	root/root	bin/run-parts -> busybox
-lrwxrwxrwx	root/root	bin/sed -> busybox
 lrwxrwxrwx	root/root	bin/setarch -> busybox
 lrwxrwxrwx	root/root	bin/sh -> busybox
 lrwxrwxrwx	root/root	bin/sleep -> busybox
@@ -86,7 +82,6 @@ lrwxrwxrwx	root/root	linuxrc -> bin/busybox
 drwxr-xr-x	root/root	sbin/
 lrwxrwxrwx	root/root	sbin/adjtimex -> ../bin/busybox
 lrwxrwxrwx	root/root	sbin/arp -> ../bin/busybox
-lrwxrwxrwx	root/root	sbin/depmod -> ../bin/busybox
 lrwxrwxrwx	root/root	sbin/fbsplash -> ../bin/busybox
 lrwxrwxrwx	root/root	sbin/fdisk -> ../bin/busybox
 lrwxrwxrwx	root/root	sbin/findfs -> ../bin/busybox
@@ -103,12 +98,10 @@ lrwxrwxrwx	root/root	sbin/ifenslave -> ../bin/busybox
 lrwxrwxrwx	root/root	sbin/ifup -> ../bin/busybox
 lrwxrwxrwx	root/root	sbin/init -> ../bin/busybox
 lrwxrwxrwx	root/root	sbin/inotifyd -> ../bin/busybox
-lrwxrwxrwx	root/root	sbin/insmod -> ../bin/busybox
 lrwxrwxrwx	root/root	sbin/klogd -> ../bin/busybox
 lrwxrwxrwx	root/root	sbin/loadkmap -> ../bin/busybox
 lrwxrwxrwx	root/root	sbin/logread -> ../bin/busybox
 lrwxrwxrwx	root/root	sbin/losetup -> ../bin/busybox
-lrwxrwxrwx	root/root	sbin/lsmod -> ../bin/busybox
 lrwxrwxrwx	root/root	sbin/lspci -> ../bin/busybox
 lrwxrwxrwx	root/root	sbin/lsusb -> ../bin/busybox
 lrwxrwxrwx	root/root	sbin/makedevs -> ../bin/busybox
@@ -118,16 +111,13 @@ lrwxrwxrwx	root/root	sbin/mkdosfs -> ../bin/busybox
 lrwxrwxrwx	root/root	sbin/mke2fs -> ../bin/busybox
 lrwxrwxrwx	root/root	sbin/mkfs.ext2 -> ../bin/busybox
 lrwxrwxrwx	root/root	sbin/mkfs.minix -> ../bin/busybox
-lrwxrwxrwx	root/root	sbin/mkfs.reiser -> ../bin/busybox
 lrwxrwxrwx	root/root	sbin/mkfs.vfat -> ../bin/busybox
 lrwxrwxrwx	root/root	sbin/mkswap -> ../bin/busybox
-lrwxrwxrwx	root/root	sbin/modprobe -> ../bin/busybox
 lrwxrwxrwx	root/root	sbin/nameif -> ../bin/busybox
 lrwxrwxrwx	root/root	sbin/pivot_root -> ../bin/busybox
 lrwxrwxrwx	root/root	sbin/poweroff -> ../bin/busybox
 lrwxrwxrwx	root/root	sbin/raidautorun -> ../bin/busybox
 lrwxrwxrwx	root/root	sbin/reboot -> ../bin/busybox
-lrwxrwxrwx	root/root	sbin/rmmod -> ../bin/busybox
 lrwxrwxrwx	root/root	sbin/route -> ../bin/busybox
 lrwxrwxrwx	root/root	sbin/runlevel -> ../bin/busybox
 lrwxrwxrwx	root/root	sbin/setconsole -> ../bin/busybox
diff --git a/base/busybox/.md5sum b/base/busybox/.md5sum
index 58dd28502..a69ae28d3 100644
--- a/base/busybox/.md5sum
+++ b/base/busybox/.md5sum
@@ -1,2 +1,2 @@
-2130884e71a1648bfb63c3250c1d288c  busybox-1.16.0.tar.bz2
-2d9024716a3f68ddf12dda8a930e0393  config
+2ba980f720a5bdce4ec05423519acc35  busybox-1.16.2.tar.bz2
+4915377842a64a3a096a414ab1e485b4  config
diff --git a/base/busybox/Pkgfile b/base/busybox/Pkgfile
index 46046dc12..6033bf995 100644
--- a/base/busybox/Pkgfile
+++ b/base/busybox/Pkgfile
@@ -4,7 +4,7 @@
 # Packager: thierryn1 at hispeed dot ch
 
 name=busybox
-version=1.16.0
+version=1.16.2
 release=1
 source=(http://busybox.net/downloads/$name-$version.tar.bz2 \
 	config)
diff --git a/base/busybox/config b/base/busybox/config
index daecc9660..42fdcca54 100644
--- a/base/busybox/config
+++ b/base/busybox/config
@@ -329,7 +329,7 @@ CONFIG_FEATURE_DIFF_LONG_OPTIONS=y
 CONFIG_FEATURE_DIFF_DIR=y
 CONFIG_ED=y
 CONFIG_PATCH=y
-CONFIG_SED=y
+CONFIG_SED=n
 CONFIG_VI=y
 CONFIG_FEATURE_VI_MAX_LEN=4096
 # CONFIG_FEATURE_VI_8BIT is not set
@@ -371,7 +371,7 @@ CONFIG_FEATURE_FIND_PATH=y
 CONFIG_FEATURE_FIND_REGEX=y
 # CONFIG_FEATURE_FIND_CONTEXT is not set
 CONFIG_FEATURE_FIND_LINKS=y
-CONFIG_GREP=y
+CONFIG_GREP=n
 CONFIG_FEATURE_GREP_EGREP_ALIAS=y
 CONFIG_FEATURE_GREP_FGREP_ALIAS=y
 CONFIG_FEATURE_GREP_CONTEXT=y
@@ -445,9 +445,9 @@ CONFIG_LSATTR=y
 #
 # Linux Module Utilities
 #
-CONFIG_MODPROBE_SMALL=y
-CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE=y
-CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED=y
+# CONFIG_MODPROBE_SMALL is not set
+# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set
+# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
 # CONFIG_INSMOD is not set
 # CONFIG_RMMOD is not set
 # CONFIG_LSMOD is not set
@@ -503,7 +503,7 @@ CONFIG_MKFS_MINIX=y
 # Minix filesystem support
 #
 CONFIG_FEATURE_MINIX2=y
-CONFIG_MKFS_REISER=y
+# CONFIG_MKFS_REISER is not set
 CONFIG_MKFS_VFAT=y
 CONFIG_GETOPT=y
 CONFIG_FEATURE_GETOPT_LONG=y
diff --git a/base/dev/Pkgfile b/base/dev/Pkgfile
index e44b9811b..5b9cf1f1b 100644
--- a/base/dev/Pkgfile
+++ b/base/dev/Pkgfile
@@ -2,7 +2,7 @@
 # URL: http://www.nutyx.org/
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: ant, autoconf, autogen, automake, bison, cvs, dejagnu, diffutils, texinfo, expect, flex, gcc, groff, guile, gettext, less, libarchive, libtool, m4, make, cmake, man-db, mktemp, nasm, neon, perl, patch, pkg-config, python, ruby, tcl, tk, yasm, automoc4, docbook-xml, docbook-xsl, ctags, xorg-bigreqsproto, xorg-compositeproto, xorg-damageproto, xorg-dmxproto, xorg-dri2proto, evieext, xorg-fixesproto, xorg-fontsproto, xorg-glproto, xorg-inputproto, xorg-kbproto, xorg-printproto, xorg-randrproto, xorg-recordproto, xorg-renderproto, xorg-resourceproto, xorg-scrnsaverproto, xorg-trapproto, xorg-videoproto, xorg-xcmiscproto, xorg-xextproto, xorg-xf86bigfontproto, xorg-xf86dgaproto, xorg-xf86driproto, xorg-xf86miscproto, xorg-xf86rushproto, xorg-xf86vidmodeproto, xorg-xineramaproto, xorg-xproto, git, subversion
+# Depends on: ant, autoconf, autogen, automake, bison, cvs, dejagnu, diffutils, texinfo, expect, flex, gcc, groff, guile, gettext, less, libarchive, libtool, m4, make, cmake, man-db, mktemp, nasm, neon, perl, patch, pkg-config, python, ruby, tcl, tk, yasm, automoc4, docbook-xml, docbook-xsl, ctags, xorg-bigreqsproto, xorg-compositeproto, xorg-damageproto, xorg-dmxproto, xorg-dri2proto, evieext, xorg-fixesproto, xorg-fontsproto, xorg-glproto, xorg-inputproto, xorg-kbproto, xorg-printproto, xorg-randrproto, xorg-recordproto, xorg-renderproto, xorg-resourceproto, xorg-scrnsaverproto, xorg-trapproto, xorg-videoproto, xorg-xcmiscproto, xorg-xextproto, xorg-xf86bigfontproto, xorg-xf86dgaproto, xorg-xf86driproto, xorg-xf86miscproto, xorg-xf86rushproto, xorg-xf86vidmodeproto, xorg-xineramaproto, xorg-xcb-proto, xorg-xproto, git, subversion
 
 name=dev
 version=2010
diff --git a/base/dialog/.md5sum b/base/dialog/.md5sum
index cb8776fef..ed50243b4 100644
--- a/base/dialog/.md5sum
+++ b/base/dialog/.md5sum
@@ -1 +1,2 @@
+df9eb8903a922832df05fe68c59b4007  calendar.patch
 3caebd641a9f337b980becb4444336c5  dialog-1.1-20080819.tgz
diff --git a/base/dialog/Pkgfile b/base/dialog/Pkgfile
index e88b7b3d1..1f55efbad 100644
--- a/base/dialog/Pkgfile
+++ b/base/dialog/Pkgfile
@@ -2,15 +2,16 @@
 # URL: http://hightek.org/dialog/
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: 
 
 name=dialog
 version=1.1-20080819
 release=1
-source=(ftp://dickey.his.com/dialog/$name-$version.tgz)
+source=(ftp://dickey.his.com/dialog/$name-$version.tgz\
+	calendar.patch)
 
 build() {
 	cd $name-$version
+	patch -Np1 -i ../calendar.patch
 	./configure --prefix=/usr \
 	--with-ncursesw \
 	--mandir=/usr/share/man
diff --git a/base/dialog/calendar.c b/base/dialog/calendar.c
new file mode 100644
index 000000000..92936e698
--- /dev/null
+++ b/base/dialog/calendar.c
@@ -0,0 +1,645 @@
+/*
+ * $Id: calendar.c,v 1.54 2008/06/21 12:36:41 tom Exp $
+ *
+ *  calendar.c -- implements the calendar box
+ *
+ *  Copyright 2001-2007,2008	Thomas E. Dickey
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License, version 2.1
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful, but
+ *  WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this program; if not, write to
+ *	Free Software Foundation, Inc.
+ *	51 Franklin St., Fifth Floor
+ *	Boston, MA 02110, USA.
+ */
+
+#include <dialog.h>
+#include <dlg_keys.h>
+
+#include <time.h>
+
+#define ONE_DAY  (60 * 60 * 24)
+
+#define MON_WIDE 4		/* width of a month-name */
+#define DAY_HIGH 6		/* maximum lines in day-grid */
+#define DAY_WIDE (8 * MON_WIDE)	/* width of the day-grid */
+#define HDR_HIGH 1		/* height of cells with month/year */
+#define BTN_HIGH 1		/* height of button-row excluding margin */
+
+/* two more lines: titles for day-of-week and month/year boxes */
+#define MIN_HIGH (DAY_HIGH + 2 + HDR_HIGH + BTN_HIGH + (7 * MARGIN))
+#define MIN_WIDE (DAY_WIDE + (4 * MARGIN))
+
+typedef enum {
+    sMONTH = -3
+    ,sYEAR = -2
+    ,sDAY = -1
+} STATES;
+
+struct _box;
+
+typedef int (*BOX_DRAW) (struct _box *, struct tm *);
+
+typedef struct _box {
+    WINDOW *parent;
+    WINDOW *window;
+    int x;
+    int y;
+    int width;
+    int height;
+    BOX_DRAW box_draw;
+} BOX;
+
+static int
+days_in_month(struct tm *current, int offset /* -1, 0, 1 */ )
+{
+    static const int nominal[] =
+    {
+	31, 28, 31, 30, 31, 30,
+	31, 31, 30, 31, 30, 31
+    };
+    int year = current->tm_year;
+    int month = current->tm_mon + offset;
+    int result;
+
+    while (month < 0) {
+	month += 12;
+	year -= 1;
+    }
+    while (month >= 12) {
+	month -= 12;
+	year += 1;
+    }
+    result = nominal[month];
+    if (month == 1)
+	result += ((year % 4) == 0);
+    return result;
+}
+
+static int
+days_in_year(struct tm *current, int offset /* -1, 0, 1 */ )
+{
+    int year = current->tm_year + 1900 + offset;
+
+    return ((year % 4) == 0) ? 366 : 365;
+}
+
+static int
+day_cell_number(struct tm *current)
+{
+    int cell;
+    cell = current->tm_mday - ((6 + current->tm_mday - current->tm_wday) % 7);
+    if ((current->tm_mday - 1) % 7 != current->tm_wday)
+	cell += 6;
+    else
+	cell--;
+    return cell;
+}
+
+static int
+next_or_previous(int key, int two_d)
+{
+    int result = 0;
+
+    switch (key) {
+    case DLGK_GRID_UP:
+	result = two_d ? -7 : -1;
+	break;
+    case DLGK_GRID_LEFT:
+	result = -1;
+	break;
+    case DLGK_GRID_DOWN:
+	result = two_d ? 7 : 1;
+	break;
+    case DLGK_GRID_RIGHT:
+	result = 1;
+	break;
+    default:
+	beep();
+	break;
+    }
+    return result;
+}
+
+/*
+ * Draw the day-of-month selection box
+ */
+static int
+draw_day(BOX * data, struct tm *current)
+{
+#ifdef ENABLE_NLS
+    char *of_week[] =
+    {
+	nl_langinfo(ABDAY_1),
+	nl_langinfo(ABDAY_2),
+	nl_langinfo(ABDAY_3),
+	nl_langinfo(ABDAY_4),
+	nl_langinfo(ABDAY_5),
+	nl_langinfo(ABDAY_6),
+	nl_langinfo(ABDAY_7)
+    };
+#else
+    static const char *const of_week[] =
+    {
+	"Dimanche",
+	"Lundi",
+	"Mardi",
+	"Mercredi",
+	"Jeudi",
+	"Vendredi",
+	"Samedi"
+    };
+#endif
+    int cell_wide = MON_WIDE;
+    int y, x, this_x = 0;
+    int save_y = 0, save_x = 0;
+    int day = current->tm_mday;
+    int mday;
+    int week;
+    int last = days_in_month(current, 0);
+    int prev = days_in_month(current, -1);
+
+    werase(data->window);
+    dlg_draw_box(data->parent,
+		 data->y - MARGIN, data->x - MARGIN,
+		 data->height + (2 * MARGIN), data->width + (2 * MARGIN),
+		 menubox_border_attr, menubox_attr);	/* border of daybox */
+
+    wattrset(data->window, menubox_attr);	/* daynames headline */
+    for (x = 0; x < 7; x++) {
+	mvwprintw(data->window,
+		  0, (x + 1) * cell_wide, "%*.*s ",
+		  cell_wide - 1,
+		  cell_wide - 1,
+		  of_week[x]);
+    }
+
+    mday = ((6 + current->tm_mday - current->tm_wday) % 7) - 7;
+    if (mday <= -7)
+	mday += 7;
+    /* mday is now in the range -6 to 0. */
+    week = (current->tm_yday + 6 + mday - current->tm_mday) / 7;
+
+    for (y = 1; mday < last; y++) {
+	wattrset(data->window, menubox_attr);	/* weeknumbers headline */
+	mvwprintw(data->window,
+		  y, 0,
+		  "%*d ",
+		  cell_wide - 1,
+		  ++week);
+	for (x = 0; x < 7; x++) {
+	    this_x = 1 + (x + 1) * cell_wide;
+	    ++mday;
+	    if (wmove(data->window, y, this_x) == ERR)
+		continue;
+	    wattrset(data->window, item_attr);	/* not selected days */
+	    if (mday == day) {
+		wattrset(data->window, item_selected_attr);	/* selected day */
+		save_y = y;
+		save_x = this_x;
+	    }
+	    if (mday > 0) {
+		if (mday <= last) {
+		    wprintw(data->window, "%*d", cell_wide - 2, mday);
+		} else if (mday == day) {
+		    wprintw(data->window, "%*d", cell_wide - 2, mday - last);
+		}
+	    } else if (mday == day) {
+		wprintw(data->window, "%*d", cell_wide - 2, mday + prev);
+	    }
+	}
+	wmove(data->window, save_y, save_x);
+    }
+    dlg_draw_arrows(data->parent, TRUE, TRUE,
+		    data->x + ARROWS_COL,
+		    data->y - 1,
+		    data->y + data->height);
+
+    return 0;
+}
+
+/*
+ * Draw the month-of-year selection box
+ */
+static int
+draw_month(BOX * data, struct tm *current)
+{
+#ifdef ENABLE_NLS
+    char *months[] =
+    {
+	nl_langinfo(MON_1),
+	nl_langinfo(MON_2),
+	nl_langinfo(MON_3),
+	nl_langinfo(MON_4),
+	nl_langinfo(MON_5),
+	nl_langinfo(MON_6),
+	nl_langinfo(MON_7),
+	nl_langinfo(MON_8),
+	nl_langinfo(MON_9),
+	nl_langinfo(MON_10),
+	nl_langinfo(MON_11),
+	nl_langinfo(MON_12)
+    };
+#else
+    static const char *const months[] =
+    {
+	"Janvier",
+	"Fevrier",
+	"Mars",
+	"Avril",
+	"Mai",
+	"Juin",
+	"Juillet",
+	"Aout",
+	"Septembre",
+	"Octobre",
+	"Novembre",
+	"Decembre"
+    };
+#endif
+    int month;
+
+    month = current->tm_mon + 1;
+
+    wattrset(data->parent, dialog_attr);	/* Headline "Month" */
+    (void) mvwprintw(data->parent, data->y - 2, data->x - 1, _("Mois"));
+    dlg_draw_box(data->parent,
+		 data->y - 1, data->x - 1,
+		 data->height + 2, data->width + 2,
+		 menubox_border_attr, menubox_attr);	/* borders of monthbox */
+    wattrset(data->window, item_attr);	/* color the month selection */
+    mvwprintw(data->window, 0, 0, "%s", months[month - 1]);
+    wmove(data->window, 0, 0);
+    return 0;
+}
+
+/*
+ * Draw the year selection box
+ */
+static int
+draw_year(BOX * data, struct tm *current)
+{
+    int year = current->tm_year + 1900;
+
+    wattrset(data->parent, dialog_attr);	/* Headline "Year" */
+    (void) mvwprintw(data->parent, data->y - 2, data->x - 1, _("Année"));
+    dlg_draw_box(data->parent,
+		 data->y - 1, data->x - 1,
+		 data->height + 2, data->width + 2,
+		 menubox_border_attr, menubox_attr);	/* borders of yearbox */
+    wattrset(data->window, item_attr);	/* color the year selection */
+    mvwprintw(data->window, 0, 0, "%4d", year);
+    wmove(data->window, 0, 0);
+    return 0;
+}
+
+static int
+init_object(BOX * data,
+	    WINDOW *parent,
+	    int x, int y,
+	    int width, int height,
+	    BOX_DRAW box_draw,
+	    int code)
+{
+    data->parent = parent;
+    data->x = x;
+    data->y = y;
+    data->width = width;
+    data->height = height;
+    data->box_draw = box_draw;
+
+    data->window = derwin(data->parent,
+			  data->height, data->width,
+			  data->y, data->x);
+    if (data->window == 0)
+	return -1;
+    (void) keypad(data->window, TRUE);
+
+    dlg_mouse_setbase(getbegx(parent), getbegy(parent));
+    if (code == 'D') {
+	dlg_mouse_mkbigregion(y + 1, x + MON_WIDE, height - 1, width - MON_WIDE,
+			      KEY_MAX, 1, MON_WIDE, 3);
+    } else {
+	dlg_mouse_mkregion(y, x, height, width, code);
+    }
+
+    return 0;
+}
+
+static int
+CleanupResult(int code, WINDOW *dialog, char *prompt, DIALOG_VARS * save_vars)
+{
+    if (dialog != 0)
+	dlg_del_window(dialog);
+    dlg_mouse_free_regions();
+    if (prompt != 0)
+	free(prompt);
+    dlg_restore_vars(save_vars);
+
+    return code;
+}
+
+#define DrawObject(data) (data)->box_draw(data, &current)
+
+/*
+ * Display a dialog box for entering a date
+ */
+int
+dialog_calendar(const char *title,
+		const char *subtitle,
+		int height,
+		int width,
+		int day,
+		int month,
+		int year)
+{
+    /* *INDENT-OFF* */
+    static DLG_KEYS_BINDING binding[] = {
+	ENTERKEY_BINDINGS,
+	DLG_KEYS_DATA( DLGK_ENTER,	' ' ),
+	DLG_KEYS_DATA( DLGK_FIELD_NEXT, TAB ),
+	DLG_KEYS_DATA( DLGK_FIELD_PREV, KEY_BTAB ),
+	DLG_KEYS_DATA( DLGK_GRID_DOWN,	'j' ),
+	DLG_KEYS_DATA( DLGK_GRID_DOWN,	KEY_DOWN ),
+	DLG_KEYS_DATA( DLGK_GRID_DOWN,	KEY_NPAGE ),
+	DLG_KEYS_DATA( DLGK_GRID_DOWN,	DLGK_MOUSE(KEY_NPAGE) ),
+	DLG_KEYS_DATA( DLGK_GRID_LEFT,  'h' ),
+	DLG_KEYS_DATA( DLGK_GRID_LEFT,  CHR_BACKSPACE ),
+	DLG_KEYS_DATA( DLGK_GRID_LEFT,  CHR_PREVIOUS ),
+	DLG_KEYS_DATA( DLGK_GRID_LEFT,  KEY_LEFT ),
+	DLG_KEYS_DATA( DLGK_GRID_RIGHT, 'l' ),
+	DLG_KEYS_DATA( DLGK_GRID_RIGHT, CHR_NEXT ),
+	DLG_KEYS_DATA( DLGK_GRID_RIGHT, KEY_NEXT ),
+	DLG_KEYS_DATA( DLGK_GRID_RIGHT, KEY_RIGHT ),
+	DLG_KEYS_DATA( DLGK_GRID_UP,	'k' ),
+	DLG_KEYS_DATA( DLGK_GRID_UP,	KEY_PPAGE ),
+	DLG_KEYS_DATA( DLGK_GRID_UP,	KEY_PREVIOUS ),
+	DLG_KEYS_DATA( DLGK_GRID_UP,	KEY_UP ),
+	DLG_KEYS_DATA( DLGK_GRID_UP,  	DLGK_MOUSE(KEY_PPAGE) ),
+	END_KEYS_BINDING
+    };
+    /* *INDENT-ON* */
+
+#ifdef KEY_RESIZE
+    int old_height = height;
+    int old_width = width;
+#endif
+    BOX dy_box, mn_box, yr_box;
+    int fkey;
+    int key = 0;
+    int key2;
+    int step;
+    int button;
+    int result = DLG_EXIT_UNKNOWN;
+    WINDOW *dialog;
+    time_t now_time = time((time_t *) 0);
+    struct tm current;
+    int state = dlg_defaultno_button();
+    const char **buttons = dlg_ok_labels();
+    char *prompt = dlg_strclone(subtitle);
+    int longest;
+    int mincols;
+    char buffer[MAX_LEN];
+    DIALOG_VARS save_vars;
+
+    dlg_save_vars(&save_vars);
+    dialog_vars.separate_output = TRUE;
+
+    dlg_does_output();
+
+    now_time = time((time_t *) 0);
+    current = *localtime(&now_time);
+    if (day < 0)
+	day = current.tm_mday;
+    if (month < 0)
+	month = current.tm_mon + 1;
+    if (year < 0)
+	year = current.tm_year + 1900;
+
+    /* compute a struct tm that matches the day/month/year parameters */
+    if (((year -= 1900) > 0) && (year < 200)) {
+	/* ugly, but I'd like to run this on older machines w/o mktime -TD */
+	for (;;) {
+	    if (year > current.tm_year) {
+		now_time += ONE_DAY * days_in_year(&current, 0);
+	    } else if (year < current.tm_year) {
+		now_time -= ONE_DAY * days_in_year(&current, -1);
+	    } else if (month > current.tm_mon + 1) {
+		now_time += ONE_DAY * days_in_month(&current, 0);
+	    } else if (month < current.tm_mon + 1) {
+		now_time -= ONE_DAY * days_in_month(&current, -1);
+	    } else if (day > current.tm_mday) {
+		now_time += ONE_DAY;
+	    } else if (day < current.tm_mday) {
+		now_time -= ONE_DAY;
+	    } else {
+		break;
+	    }
+	    current = *localtime(&now_time);
+	}
+    }
+
+    dlg_button_sizes(buttons, FALSE, &longest, &mincols);
+    mincols += (0 * MARGIN) + (dlg_button_count(buttons) * 3) - 1;
+    if (mincols < MIN_WIDE)
+	mincols = MIN_WIDE;
+
+#ifdef KEY_RESIZE
+  retry:
+#endif
+
+    dlg_auto_size(title, prompt, &height, &width, 0, mincols);
+    height += MIN_HIGH - 1;
+    if (width < MIN_WIDE)
+	width = MIN_WIDE;
+    dlg_print_size(height, width);
+    dlg_ctl_size(height, width);
+
+    dialog = dlg_new_window(height, width,
+			    dlg_box_y_ordinate(height),
+			    dlg_box_x_ordinate(width));
+    dlg_register_window(dialog, "calendar", binding);
+    dlg_register_buttons(dialog, "calendar", buttons);
+
+    /* mainbox */
+    dlg_draw_box(dialog, 0, 0, height, width, dialog_attr, border_attr);
+    dlg_draw_bottom_box(dialog);
+    dlg_draw_title(dialog, title);
+
+    wattrset(dialog, dialog_attr);	/* text mainbox */
+    dlg_print_autowrap(dialog, prompt, height, width);
+
+    /* compute positions of day, month and year boxes */
+    memset(&dy_box, 0, sizeof(dy_box));
+    memset(&mn_box, 0, sizeof(mn_box));
+    memset(&yr_box, 0, sizeof(yr_box));
+
+    if (init_object(&dy_box,
+		    dialog,
+		    (width - DAY_WIDE) / 2,
+		    1 + (height - (DAY_HIGH + BTN_HIGH + (5 * MARGIN))),
+		    DAY_WIDE,
+		    DAY_HIGH + 1,
+		    draw_day,
+		    'D') < 0
+	|| DrawObject(&dy_box) < 0) {
+	return CleanupResult(DLG_EXIT_ERROR, dialog, prompt, &save_vars);
+    }
+
+    if (init_object(&mn_box,
+		    dialog,
+		    dy_box.x,
+		    dy_box.y - (HDR_HIGH + 2 * MARGIN),
+		    (DAY_WIDE / 2) - MARGIN,
+		    HDR_HIGH,
+		    draw_month,
+		    'M') < 0
+	|| DrawObject(&mn_box) < 0) {
+	return CleanupResult(DLG_EXIT_ERROR, dialog, prompt, &save_vars);
+    }
+
+    if (init_object(&yr_box,
+		    dialog,
+		    dy_box.x + mn_box.width + 2,
+		    mn_box.y,
+		    mn_box.width,
+		    mn_box.height,
+		    draw_year,
+		    'Y') < 0
+	|| DrawObject(&yr_box) < 0) {
+	return CleanupResult(DLG_EXIT_ERROR, dialog, prompt, &save_vars);
+    }
+
+    while (result == DLG_EXIT_UNKNOWN) {
+	BOX *obj = (state == sDAY ? &dy_box
+		    : (state == sMONTH ? &mn_box :
+		       (state == sYEAR ? &yr_box : 0)));
+
+	button = (state < 0) ? 0 : state;
+	dlg_draw_buttons(dialog, height - 2, 0, buttons, button, FALSE, width);
+	if (obj != 0)
+	    dlg_set_focus(dialog, obj->window);
+
+	key = dlg_mouse_wgetch(dialog, &fkey);
+	if (dlg_result_key(key, fkey, &result))
+	    break;
+
+	if (fkey && (key >= DLGK_MOUSE(KEY_MIN) && key <= DLGK_MOUSE(KEY_MAX))) {
+	    key = dlg_lookup_key(dialog, key - M_EVENT, &fkey);
+	}
+
+	if ((key2 = dlg_char_to_button(key, buttons)) >= 0) {
+	    result = key2;
+	} else if (fkey) {
+	    /* handle function-keys */
+	    switch (key) {
+	    case DLGK_MOUSE('D'):
+		state = sDAY;
+		break;
+	    case DLGK_MOUSE('M'):
+		state = sMONTH;
+		break;
+	    case DLGK_MOUSE('Y'):
+		state = sYEAR;
+		break;
+	    case DLGK_ENTER:
+		result = dlg_ok_buttoncode(button);
+		break;
+	    case DLGK_FIELD_PREV:
+		state = dlg_prev_ok_buttonindex(state, sMONTH);
+		break;
+	    case DLGK_FIELD_NEXT:
+		state = dlg_next_ok_buttonindex(state, sMONTH);
+		break;
+#ifdef KEY_RESIZE
+	    case KEY_RESIZE:
+		/* reset data */
+		height = old_height;
+		width = old_width;
+		/* repaint */
+		dlg_clear();
+		dlg_del_window(dialog);
+		refresh();
+		dlg_mouse_free_regions();
+		goto retry;
+#endif
+	    default:
+		step = 0;
+		key2 = -1;
+		if (is_DLGK_MOUSE(key)) {
+		    if ((key2 = dlg_ok_buttoncode(key - M_EVENT)) >= 0) {
+			result = key2;
+			break;
+		    } else if (key >= DLGK_MOUSE(KEY_MAX)) {
+			state = sDAY;
+			obj = &dy_box;
+			key2 = 1;
+			step = (key
+				- DLGK_MOUSE(KEY_MAX)
+				- day_cell_number(&current));
+		    }
+		}
+		if (obj != 0) {
+		    if (key2 < 0)
+			step = next_or_previous(key, (obj == &dy_box));
+		    if (step != 0) {
+			struct tm old = current;
+
+			/* see comment regarding mktime -TD */
+			if (obj == &dy_box) {
+			    now_time += ONE_DAY * step;
+			} else if (obj == &mn_box) {
+			    if (step > 0)
+				now_time += ONE_DAY *
+				    days_in_month(&current, 0);
+			    else
+				now_time -= ONE_DAY *
+				    days_in_month(&current, -1);
+			} else if (obj == &yr_box) {
+			    if (step > 0)
+				now_time += (ONE_DAY
+					     * days_in_year(&current, 0));
+			    else
+				now_time -= (ONE_DAY
+					     * days_in_year(&current, -1));
+			}
+
+			current = *localtime(&now_time);
+
+			if (obj != &dy_box
+			    && (current.tm_mday != old.tm_mday
+				|| current.tm_mon != old.tm_mon
+				|| current.tm_year != old.tm_year))
+			    DrawObject(&dy_box);
+			if (obj != &mn_box && current.tm_mon != old.tm_mon)
+			    DrawObject(&mn_box);
+			if (obj != &yr_box && current.tm_year != old.tm_year)
+			    DrawObject(&yr_box);
+			(void) DrawObject(obj);
+		    }
+		} else if (state >= 0) {
+		    if (next_or_previous(key, FALSE) < 0)
+			state = dlg_prev_ok_buttonindex(state, sMONTH);
+		    else if (next_or_previous(key, FALSE) > 0)
+			state = dlg_next_ok_buttonindex(state, sMONTH);
+		}
+		break;
+	    }
+	}
+    }
+
+    sprintf(buffer, "%02d/%02d/%0d",
+	    current.tm_mday, current.tm_mon + 1, current.tm_year + 1900);
+    dlg_add_result(buffer);
+    dlg_add_separator();
+
+    return CleanupResult(result, dialog, prompt, &save_vars);
+}
diff --git a/base/dialog/calendar.patch b/base/dialog/calendar.patch
new file mode 100644
index 000000000..eddad4d13
--- /dev/null
+++ b/base/dialog/calendar.patch
@@ -0,0 +1,72 @@
+--- dialog-1.1-20080819/calendar.c	2008-06-21 12:36:41.000000000 +0000
++++ /usr/ports/base/dialog/calendar.c	2010-06-19 18:37:55.000000000 +0000
+@@ -149,13 +149,13 @@
+ #else
+     static const char *const of_week[] =
+     {
+-	"Sunday",
+-	"Monday",
+-	"Tuesday",
+-	"Wednesday",
+-	"Thursday",
+-	"Friday",
+-	"Saturday"
++	"Dimanche",
++	"Lundi",
++	"Mardi",
++	"Mercredi",
++	"Jeudi",
++	"Vendredi",
++	"Samedi"
+     };
+ #endif
+     int cell_wide = MON_WIDE;
+@@ -251,18 +251,18 @@
+ #else
+     static const char *const months[] =
+     {
+-	"January",
+-	"February",
+-	"March",
+-	"April",
+-	"May",
+-	"June",
+-	"July",
+-	"August",
+-	"September",
+-	"October",
+-	"November",
+-	"December"
++	"Janvier",
++	"Fevrier",
++	"Mars",
++	"Avril",
++	"Mai",
++	"Juin",
++	"Juillet",
++	"Aout",
++	"Septembre",
++	"Octobre",
++	"Novembre",
++	"Decembre"
+     };
+ #endif
+     int month;
+@@ -270,7 +270,7 @@
+     month = current->tm_mon + 1;
+ 
+     wattrset(data->parent, dialog_attr);	/* Headline "Month" */
+-    (void) mvwprintw(data->parent, data->y - 2, data->x - 1, _("Month"));
++    (void) mvwprintw(data->parent, data->y - 2, data->x - 1, _("Mois"));
+     dlg_draw_box(data->parent,
+ 		 data->y - 1, data->x - 1,
+ 		 data->height + 2, data->width + 2,
+@@ -290,7 +290,7 @@
+     int year = current->tm_year + 1900;
+ 
+     wattrset(data->parent, dialog_attr);	/* Headline "Year" */
+-    (void) mvwprintw(data->parent, data->y - 2, data->x - 1, _("Year"));
++    (void) mvwprintw(data->parent, data->y - 2, data->x - 1, _("Année"));
+     dlg_draw_box(data->parent,
+ 		 data->y - 1, data->x - 1,
+ 		 data->height + 2, data->width + 2,
diff --git a/extra/gpm/.footprint b/base/gpm/.footprint
index fc80310d3..fc80310d3 100644
--- a/extra/gpm/.footprint
+++ b/base/gpm/.footprint
diff --git a/extra/gpm/.md5sum b/base/gpm/.md5sum
index a9c6b4271..a9c6b4271 100644
--- a/extra/gpm/.md5sum
+++ b/base/gpm/.md5sum
diff --git a/extra/gpm/Pkgfile b/base/gpm/Pkgfile
index 236667e75..236667e75 100755
--- a/extra/gpm/Pkgfile
+++ b/base/gpm/Pkgfile
diff --git a/extra/gpm/gpm-1.20.5-make-install-fixes.patch b/base/gpm/gpm-1.20.5-make-install-fixes.patch
index 098d5d509..098d5d509 100644
--- a/extra/gpm/gpm-1.20.5-make-install-fixes.patch
+++ b/base/gpm/gpm-1.20.5-make-install-fixes.patch
diff --git a/extra/gpm/gpm-1.20.5-no-dumb-error-messages.patch b/base/gpm/gpm-1.20.5-no-dumb-error-messages.patch
index 44f4e7655..44f4e7655 100644
--- a/extra/gpm/gpm-1.20.5-no-dumb-error-messages.patch
+++ b/base/gpm/gpm-1.20.5-no-dumb-error-messages.patch
diff --git a/extra/gpm/gpm-1.20.5-nodebug.patch b/base/gpm/gpm-1.20.5-nodebug.patch
index a77aa233e..a77aa233e 100644
--- a/extra/gpm/gpm-1.20.5-nodebug.patch
+++ b/base/gpm/gpm-1.20.5-nodebug.patch
diff --git a/base/initrd/Pkgfile b/base/initrd/Pkgfile
index fc1a0d424..619234078 100644
--- a/base/initrd/Pkgfile
+++ b/base/initrd/Pkgfile
@@ -5,8 +5,8 @@
 
 name=initrd
 version=2.6.34
-release=1
-_tools=03062010
+release=2
+_tools=20062010
 _baseversion=2.6.34
 SCRIPT_VERSION="attapu"
 source=()
diff --git a/extra/irssi/.footprint b/base/irssi/.footprint
index a5bbbe19f..a5bbbe19f 100755
--- a/extra/irssi/.footprint
+++ b/base/irssi/.footprint
diff --git a/extra/irssi/.md5sum b/base/irssi/.md5sum
index 6e719d734..6e719d734 100755
--- a/extra/irssi/.md5sum
+++ b/base/irssi/.md5sum
diff --git a/extra/irssi/Pkgfile b/base/irssi/Pkgfile
index 9d5beff32..9d5beff32 100755
--- a/extra/irssi/Pkgfile
+++ b/base/irssi/Pkgfile
diff --git a/extra/links/.footprint b/base/links/.footprint
index a8509153f..a8509153f 100644
--- a/extra/links/.footprint
+++ b/base/links/.footprint
diff --git a/extra/links/.md5sum b/base/links/.md5sum
index 64f50c55a..64f50c55a 100644
--- a/extra/links/.md5sum
+++ b/base/links/.md5sum
diff --git a/extra/links/Pkgfile b/base/links/Pkgfile
index d805b6948..be0d508e4 100644
--- a/extra/links/Pkgfile
+++ b/base/links/Pkgfile
@@ -16,8 +16,8 @@ build() {
         ./configure --prefix=/usr \
 		    --mandir=/usr/share/man \
 		    --enable-javascript \
-		    --disable-graphics \
-		    --without-x 
+		    --enable-graphics \
+		    --with-fb --with-directfb 
         make
         make DESTDIR=$PKG install
 }
diff --git a/extra/mc/.footprint b/base/mc/.footprint
index 1df2cee02..bd02f1046 100644
--- a/extra/mc/.footprint
+++ b/base/mc/.footprint
@@ -4,9 +4,6 @@ drwxr-xr-x	root/root	etc/mc/
 -rw-r--r--	root/root	etc/mc/cedit.menu
 -rw-r--r--	root/root	etc/mc/edit.indent.rc
 -rw-r--r--	root/root	etc/mc/edit.spell.rc
-drwxr-xr-x	root/root	etc/mc/extfs/
--rw-r--r--	root/root	etc/mc/extfs/extfs.ini
--rw-r--r--	root/root	etc/mc/extfs/sfs.ini
 -rw-r--r--	root/root	etc/mc/filehighlight.ini
 -rw-r--r--	root/root	etc/mc/mc.charsets
 -rw-r--r--	root/root	etc/mc/mc.ext
@@ -16,15 +13,49 @@ drwxr-xr-x	root/root	etc/mc/extfs/
 -rw-r--r--	root/root	etc/mc/mc.lib
 -rw-r--r--	root/root	etc/mc/mc.menu
 -rw-r--r--	root/root	etc/mc/mc.menu.sr
+-rw-r--r--	root/root	etc/mc/sfs.ini
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/mc
+lrwxrwxrwx	root/root	usr/bin/mcdiff -> mc
 lrwxrwxrwx	root/root	usr/bin/mcedit -> mc
 -rwxr-xr-x	root/root	usr/bin/mcmfmt
 lrwxrwxrwx	root/root	usr/bin/mcview -> mc
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/mc/
 -rwxr-xr-x	root/root	usr/lib/mc/cons.saver
+drwxr-xr-x	root/root	usr/lib/mc/extfs.d/
+-rw-r--r--	root/root	usr/lib/mc/extfs.d/README
+-rw-r--r--	root/root	usr/lib/mc/extfs.d/README.extfs
+-rwxr-xr-x	root/root	usr/lib/mc/extfs.d/a+
+-rwxr-xr-x	root/root	usr/lib/mc/extfs.d/apt+
+-rwxr-xr-x	root/root	usr/lib/mc/extfs.d/audio
+-rwxr-xr-x	root/root	usr/lib/mc/extfs.d/bpp
+-rwxr-xr-x	root/root	usr/lib/mc/extfs.d/deb
+-rwxr-xr-x	root/root	usr/lib/mc/extfs.d/deba
+-rwxr-xr-x	root/root	usr/lib/mc/extfs.d/debd
+-rwxr-xr-x	root/root	usr/lib/mc/extfs.d/dpkg+
+-rwxr-xr-x	root/root	usr/lib/mc/extfs.d/hp48+
+-rwxr-xr-x	root/root	usr/lib/mc/extfs.d/iso9660
+-rwxr-xr-x	root/root	usr/lib/mc/extfs.d/lslR
+-rwxr-xr-x	root/root	usr/lib/mc/extfs.d/mailfs
+-rwxr-xr-x	root/root	usr/lib/mc/extfs.d/patchfs
+-rwxr-xr-x	root/root	usr/lib/mc/extfs.d/rpm
+-rwxr-xr-x	root/root	usr/lib/mc/extfs.d/rpms+
+-rwxr-xr-x	root/root	usr/lib/mc/extfs.d/s3+
+-rwxr-xr-x	root/root	usr/lib/mc/extfs.d/trpm
+-rwxr-xr-x	root/root	usr/lib/mc/extfs.d/uace
+-rwxr-xr-x	root/root	usr/lib/mc/extfs.d/ualz
+-rwxr-xr-x	root/root	usr/lib/mc/extfs.d/uar
+-rwxr-xr-x	root/root	usr/lib/mc/extfs.d/uarc
+-rwxr-xr-x	root/root	usr/lib/mc/extfs.d/uarj
+-rwxr-xr-x	root/root	usr/lib/mc/extfs.d/uc1541
+-rwxr-xr-x	root/root	usr/lib/mc/extfs.d/ucab
+-rwxr-xr-x	root/root	usr/lib/mc/extfs.d/uha
+-rwxr-xr-x	root/root	usr/lib/mc/extfs.d/ulha
+-rwxr-xr-x	root/root	usr/lib/mc/extfs.d/urar
+-rwxr-xr-x	root/root	usr/lib/mc/extfs.d/uzip
+-rwxr-xr-x	root/root	usr/lib/mc/extfs.d/uzoo
 -rwxr-xr-x	root/root	usr/lib/mc/mc-wrapper.csh
 -rwxr-xr-x	root/root	usr/lib/mc/mc-wrapper.sh
 -rwxr-xr-x	root/root	usr/lib/mc/mc.csh
@@ -61,37 +92,6 @@ drwxr-xr-x	root/root	usr/share/man/sr/man1/
 -rw-r--r--	root/root	usr/share/man/sr/man1/mc.1.gz
 drwxr-xr-x	root/root	usr/share/man/sr/man8/
 drwxr-xr-x	root/root	usr/share/mc/
-drwxr-xr-x	root/root	usr/share/mc/extfs/
--rw-r--r--	root/root	usr/share/mc/extfs/README
--rwxr-xr-x	root/root	usr/share/mc/extfs/a
--rwxr-xr-x	root/root	usr/share/mc/extfs/apt
--rwxr-xr-x	root/root	usr/share/mc/extfs/audio
--rwxr-xr-x	root/root	usr/share/mc/extfs/bpp
--rwxr-xr-x	root/root	usr/share/mc/extfs/deb
--rwxr-xr-x	root/root	usr/share/mc/extfs/deba
--rwxr-xr-x	root/root	usr/share/mc/extfs/debd
--rwxr-xr-x	root/root	usr/share/mc/extfs/dpkg
--rwxr-xr-x	root/root	usr/share/mc/extfs/hp48
--rwxr-xr-x	root/root	usr/share/mc/extfs/iso9660
--rwxr-xr-x	root/root	usr/share/mc/extfs/lslR
--rwxr-xr-x	root/root	usr/share/mc/extfs/mailfs
--rwxr-xr-x	root/root	usr/share/mc/extfs/patchfs
--rwxr-xr-x	root/root	usr/share/mc/extfs/rpm
--rwxr-xr-x	root/root	usr/share/mc/extfs/rpms
--rwxr-xr-x	root/root	usr/share/mc/extfs/s3
--rwxr-xr-x	root/root	usr/share/mc/extfs/trpm
--rwxr-xr-x	root/root	usr/share/mc/extfs/uace
--rwxr-xr-x	root/root	usr/share/mc/extfs/ualz
--rwxr-xr-x	root/root	usr/share/mc/extfs/uar
--rwxr-xr-x	root/root	usr/share/mc/extfs/uarc
--rwxr-xr-x	root/root	usr/share/mc/extfs/uarj
--rwxr-xr-x	root/root	usr/share/mc/extfs/uc1541
--rwxr-xr-x	root/root	usr/share/mc/extfs/ucab
--rwxr-xr-x	root/root	usr/share/mc/extfs/uha
--rwxr-xr-x	root/root	usr/share/mc/extfs/ulha
--rwxr-xr-x	root/root	usr/share/mc/extfs/urar
--rwxr-xr-x	root/root	usr/share/mc/extfs/uzip
--rwxr-xr-x	root/root	usr/share/mc/extfs/uzoo
 -rw-r--r--	root/root	usr/share/mc/mc.hint
 -rw-r--r--	root/root	usr/share/mc/mc.hint.cs
 -rw-r--r--	root/root	usr/share/mc/mc.hint.es
@@ -116,6 +116,7 @@ drwxr-xr-x	root/root	usr/share/mc/skins/
 -rw-r--r--	root/root	usr/share/mc/skins/double-lines.ini
 -rw-r--r--	root/root	usr/share/mc/skins/featured.ini
 -rw-r--r--	root/root	usr/share/mc/skins/gotar.ini
+-rw-r--r--	root/root	usr/share/mc/skins/nicedark.ini
 drwxr-xr-x	root/root	usr/share/mc/syntax/
 -rw-r--r--	root/root	usr/share/mc/syntax/PKGBUILD.syntax
 -rw-r--r--	root/root	usr/share/mc/syntax/ada95.syntax
@@ -144,6 +145,7 @@ drwxr-xr-x	root/root	usr/share/mc/syntax/
 -rw-r--r--	root/root	usr/share/mc/syntax/haskell.syntax
 -rw-r--r--	root/root	usr/share/mc/syntax/html.syntax
 -rw-r--r--	root/root	usr/share/mc/syntax/idl.syntax
+-rw-r--r--	root/root	usr/share/mc/syntax/ini.syntax
 -rw-r--r--	root/root	usr/share/mc/syntax/j.syntax
 -rw-r--r--	root/root	usr/share/mc/syntax/java.syntax
 -rw-r--r--	root/root	usr/share/mc/syntax/js.syntax
diff --git a/base/mc/.md5sum b/base/mc/.md5sum
new file mode 100644
index 000000000..3fa378b4f
--- /dev/null
+++ b/base/mc/.md5sum
@@ -0,0 +1 @@
+82d0f923f686e462eeb739760f8c45bd  mc-4.7.2.tar.bz2
diff --git a/extra/mc/Pkgfile b/base/mc/Pkgfile
index 7d98637a2..fa7abd998 100755
--- a/extra/mc/Pkgfile
+++ b/base/mc/Pkgfile
@@ -2,17 +2,15 @@
 # URL: http://www.ibiblio.org/mc/
 # Maintainer: NuTyX coreteam
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: p7zip, e2fsprogs, glib2, pcre, gpm, slang, glib
+# Depends on: p7zip, e2fsprogs, pcre, gpm, slang, glib
 
 name=mc
-version=4.7.0.2
+version=4.7.2
 release=1
-source=(http://www.midnight-commander.org/downloads/$name-$version.tar.bz2 \
-	mc-4.7.0.2_hotlist_syntax.patch)
+source=(http://www.midnight-commander.org/downloads/$name-$version.tar.bz2)
 
 build() {
 	cd $name-$version
-	patch -p1 < ../mc-4.7.0.2_hotlist_syntax.patch
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
@@ -35,10 +33,7 @@ build() {
 
 	make
 	make DESTDIR=$PKG install
-	# Fix FS#15177
         sed -i 's|op_has_zipinfo = 0|op_has_zipinfo = 1|' \
-            $PKG/usr/share/mc/extfs/uzip
-
-        # Fix FS#18312
-        rm $PKG/usr/share/mc/extfs/u7z
+            $PKG/usr/lib/mc/extfs.d/uzip
+        rm $PKG/usr/lib/mc/extfs.d/u7z
 }
diff --git a/extra/mc/mc-4.7.0.2_hotlist_syntax.patch b/base/mc/mc-4.7.0.2_hotlist_syntax.patch
index 2dc115ec2..2dc115ec2 100644
--- a/extra/mc/mc-4.7.0.2_hotlist_syntax.patch
+++ b/base/mc/mc-4.7.0.2_hotlist_syntax.patch
diff --git a/base/module-init-tools/.footprint b/base/module-init-tools/.footprint
index 07b28a8cc..7b1b094ae 100644
--- a/base/module-init-tools/.footprint
+++ b/base/module-init-tools/.footprint
@@ -3,7 +3,7 @@ drwxr-xr-x	root/root	bin/
 drwxr-xr-x	root/root	etc/
 drwxr-xr-x	root/root	etc/depmod.d/
 drwxr-xr-x	root/root	etc/modprobe.d/
--rw-r--r--	root/root	etc/modprobe.d/blacklist-fb
+-rw-r--r--	root/root	etc/modprobe.d/blacklist-fb.conf
 -rw-r--r--	root/root	etc/modprobe.d/modprobe.conf
 drwxr-xr-x	root/root	sbin/
 -rwxr-xr-x	root/root	sbin/depmod
diff --git a/base/module-init-tools/.md5sum b/base/module-init-tools/.md5sum
index e02bfcb3d..2282ff491 100644
--- a/base/module-init-tools/.md5sum
+++ b/base/module-init-tools/.md5sum
@@ -1,3 +1,3 @@
-4148adea745af5121963f6b731b60013  blacklist-fb
+7eac77556a1edc257b128e257f9aae57  blacklist-fb.conf
 9b4b6f3a50e9d352bba107488c053cd2  modprobe.conf
 28dfcb9e24cdbeb12b99ac1eb8af7dea  module-init-tools-3.11.1.tar.bz2
diff --git a/base/module-init-tools/Pkgfile b/base/module-init-tools/Pkgfile
index 70f9cbfcb..869c5b313 100755
--- a/base/module-init-tools/Pkgfile
+++ b/base/module-init-tools/Pkgfile
@@ -5,8 +5,8 @@
 # Depends on:
 
 name=module-init-tools
-version=3.12
-release=1
+version=3.11.1
+release=2
 source=(http://www.kernel.org/pub/linux/utils/kernel/$name/$name-$version.tar.bz2\
 	modprobe.conf blacklist-fb.conf)
 
diff --git a/base/qingy/.footprint b/base/qingy/.footprint
index 8deb67dc0..354613ddb 100644
--- a/base/qingy/.footprint
+++ b/base/qingy/.footprint
@@ -2,6 +2,9 @@ drwxr-xr-x	root/root	etc/
 drwxr-xr-x	root/root	etc/pam.d/
 drwxr-xr-x	root/root	etc/qingy/
 drwxr-xr-x	root/root	etc/qingy/sessions/
+-rwxr-xr-x	root/root	etc/qingy/sessions/ChatIrssi
+-rwxr-xr-x	root/root	etc/qingy/sessions/MidnightCommander
+-rwxr-xr-x	root/root	etc/qingy/sessions/NaviLinks
 -rw-r--r--	root/root	etc/qingy/settings
 -rw-r--r--	root/root	etc/qingy/welcomes
 drwxr-xr-x	root/root	usr/
diff --git a/base/qingy/.md5sum b/base/qingy/.md5sum
index 631b8a2bb..436b51b9f 100644
--- a/base/qingy/.md5sum
+++ b/base/qingy/.md5sum
@@ -1,3 +1,6 @@
+6c790e02a808602886b32b7151dac514  ChatIrssi
+25711f0c332211078ed48d44cfaaede6  MidnightCommander
+25bf7aa4b5b321872853692dc69fc0c1  NaviLinks
 9e3d5d8a8c89d6db10c6b41ec498a566  nutyx-attapu.jpg
 34f40172a71e9a6c2c77ddce11d2a63a  qingy-0.9.9.tar.bz2
 832d24179d659b66abb14ae922df5146  theme
diff --git a/base/qingy/ChatIrssi b/base/qingy/ChatIrssi
new file mode 100755
index 000000000..1ffe8c624
--- /dev/null
+++ b/base/qingy/ChatIrssi
@@ -0,0 +1 @@
+irssi
diff --git a/base/qingy/MidnightCommander b/base/qingy/MidnightCommander
new file mode 100755
index 000000000..dfd5d4cff
--- /dev/null
+++ b/base/qingy/MidnightCommander
@@ -0,0 +1 @@
+mc
diff --git a/base/qingy/NaviLinks b/base/qingy/NaviLinks
new file mode 100755
index 000000000..35e037516
--- /dev/null
+++ b/base/qingy/NaviLinks
@@ -0,0 +1 @@
+links -mode 1024x768x16
diff --git a/base/qingy/Pkgfile b/base/qingy/Pkgfile
index 86f3f6692..f9d3bf1e5 100644
--- a/base/qingy/Pkgfile
+++ b/base/qingy/Pkgfile
@@ -7,7 +7,7 @@ name=qingy
 version=0.9.9
 release=1
 source=(http://downloads.sourceforge.net/$name/$name-$version.tar.bz2\
-	nutyx-attapu.jpg theme)
+	nutyx-attapu.jpg theme ChatIrssi NaviLinks MidnightCommander)
 build() {
 	cd  $name-$version
 	./configure --prefix=/usr \
@@ -28,4 +28,9 @@ build() {
 	cp ../nutyx-attapu.jpg $PKG/usr/share/qingy/themes/default/background.jpg
 	echo "root Soyez prudent, vous avez tous les droits..." >\
 	$PKG/etc/qingy/welcomes
+	for i  in ChatIrssi NaviLinks MidnightCommander
+	do
+		install -m755 ../$i \
+		$PKG/etc/qingy/sessions/$i
+	done
 }
diff --git a/extra/slang/.footprint b/base/slang/.footprint
index 5b95556a7..0ac7589c6 100644
--- a/extra/slang/.footprint
+++ b/base/slang/.footprint
@@ -7,13 +7,16 @@ drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/slang.h
 -rw-r--r--	root/root	usr/include/slcurses.h
 drwxr-xr-x	root/root	usr/lib/
-lrwxrwxrwx	root/root	usr/lib/libslang.so -> libslang.so.2.1.4
-lrwxrwxrwx	root/root	usr/lib/libslang.so.2 -> libslang.so.2.1.4
--rwxr-xr-x	root/root	usr/lib/libslang.so.2.1.4
+lrwxrwxrwx	root/root	usr/lib/libslang.so -> libslang.so.2.2.2
+lrwxrwxrwx	root/root	usr/lib/libslang.so.2 -> libslang.so.2.2.2
+-rwxr-xr-x	root/root	usr/lib/libslang.so.2.2.2
+drwxr-xr-x	root/root	usr/lib/pkgconfig/
+-rw-r--r--	root/root	usr/lib/pkgconfig/slang.pc
 drwxr-xr-x	root/root	usr/lib/slang/
 drwxr-xr-x	root/root	usr/lib/slang/v2/
 drwxr-xr-x	root/root	usr/lib/slang/v2/modules/
 -rwxr-xr-x	root/root	usr/lib/slang/v2/modules/fcntl-module.so
+-rwxr-xr-x	root/root	usr/lib/slang/v2/modules/fork-module.so
 -rwxr-xr-x	root/root	usr/lib/slang/v2/modules/iconv-module.so
 -rwxr-xr-x	root/root	usr/lib/slang/v2/modules/pcre-module.so
 -rwxr-xr-x	root/root	usr/lib/slang/v2/modules/png-module.so
@@ -21,29 +24,11 @@ drwxr-xr-x	root/root	usr/lib/slang/v2/modules/
 -rwxr-xr-x	root/root	usr/lib/slang/v2/modules/select-module.so
 -rwxr-xr-x	root/root	usr/lib/slang/v2/modules/slsmg-module.so
 -rwxr-xr-x	root/root	usr/lib/slang/v2/modules/socket-module.so
+-rwxr-xr-x	root/root	usr/lib/slang/v2/modules/sysconf-module.so
 -rwxr-xr-x	root/root	usr/lib/slang/v2/modules/termios-module.so
 -rwxr-xr-x	root/root	usr/lib/slang/v2/modules/varray-module.so
+-rwxr-xr-x	root/root	usr/lib/slang/v2/modules/zlib-module.so
 drwxr-xr-x	root/root	usr/share/
-drwxr-xr-x	root/root	usr/share/doc/
-drwxr-xr-x	root/root	usr/share/doc/slang/
-drwxr-xr-x	root/root	usr/share/doc/slang/v2/
--rw-r--r--	root/root	usr/share/doc/slang/v2/COPYING
--rw-r--r--	root/root	usr/share/doc/slang/v2/changes.txt
--rw-r--r--	root/root	usr/share/doc/slang/v2/cref.txt
--rw-r--r--	root/root	usr/share/doc/slang/v2/cslang.txt
--rw-r--r--	root/root	usr/share/doc/slang/v2/slang.txt
--rw-r--r--	root/root	usr/share/doc/slang/v2/slangdoc.html
--rw-r--r--	root/root	usr/share/doc/slang/v2/slangfun.txt
-drwxr-xr-x	root/root	usr/share/doc/slsh/
-drwxr-xr-x	root/root	usr/share/doc/slsh/html/
--rw-r--r--	root/root	usr/share/doc/slsh/html/slshfun-1.html
--rw-r--r--	root/root	usr/share/doc/slsh/html/slshfun-2.html
--rw-r--r--	root/root	usr/share/doc/slsh/html/slshfun-3.html
--rw-r--r--	root/root	usr/share/doc/slsh/html/slshfun-4.html
--rw-r--r--	root/root	usr/share/doc/slsh/html/slshfun-5.html
--rw-r--r--	root/root	usr/share/doc/slsh/html/slshfun-6.html
--rw-r--r--	root/root	usr/share/doc/slsh/html/slshfun-7.html
--rw-r--r--	root/root	usr/share/doc/slsh/html/slshfun.html
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/slsh.1.gz
@@ -75,15 +60,18 @@ drwxr-xr-x	root/root	usr/share/slsh/cmaps/
 -rw-r--r--	root/root	usr/share/slsh/cmaps/wysiwyg.map
 -rw-r--r--	root/root	usr/share/slsh/cmdopt.sl
 -rw-r--r--	root/root	usr/share/slsh/fcntl.sl
+-rw-r--r--	root/root	usr/share/slsh/fork.sl
 -rw-r--r--	root/root	usr/share/slsh/glob.sl
 drwxr-xr-x	root/root	usr/share/slsh/help/
 -rw-r--r--	root/root	usr/share/slsh/help/arrayfuns.hlp
 -rw-r--r--	root/root	usr/share/slsh/help/cmdopt.hlp
+-rw-r--r--	root/root	usr/share/slsh/help/forkfuns.hlp
 -rw-r--r--	root/root	usr/share/slsh/help/glob.hlp
 -rw-r--r--	root/root	usr/share/slsh/help/onigfuns.hlp
 -rw-r--r--	root/root	usr/share/slsh/help/pcrefuns.hlp
 -rw-r--r--	root/root	usr/share/slsh/help/pngfuns.hlp
 -rw-r--r--	root/root	usr/share/slsh/help/print.hlp
+-rw-r--r--	root/root	usr/share/slsh/help/process.hlp
 -rw-r--r--	root/root	usr/share/slsh/help/profile.hlp
 -rw-r--r--	root/root	usr/share/slsh/help/randfuns.hlp
 -rw-r--r--	root/root	usr/share/slsh/help/readascii.hlp
@@ -96,6 +84,7 @@ drwxr-xr-x	root/root	usr/share/slsh/local-packages/
 -rw-r--r--	root/root	usr/share/slsh/pcre.sl
 -rw-r--r--	root/root	usr/share/slsh/png.sl
 -rw-r--r--	root/root	usr/share/slsh/print.sl
+-rw-r--r--	root/root	usr/share/slsh/process.sl
 -rw-r--r--	root/root	usr/share/slsh/profile.sl
 -rw-r--r--	root/root	usr/share/slsh/rand.sl
 -rw-r--r--	root/root	usr/share/slsh/readascii.sl
@@ -123,5 +112,7 @@ drwxr-xr-x	root/root	usr/share/slsh/scripts/
 -rw-r--r--	root/root	usr/share/slsh/socket.sl
 -rw-r--r--	root/root	usr/share/slsh/stkcheck.sl
 -rw-r--r--	root/root	usr/share/slsh/structfuns.sl
+-rw-r--r--	root/root	usr/share/slsh/sysconf.sl
 -rw-r--r--	root/root	usr/share/slsh/termios.sl
 -rw-r--r--	root/root	usr/share/slsh/varray.sl
+-rw-r--r--	root/root	usr/share/slsh/zlib.sl
diff --git a/base/slang/.md5sum b/base/slang/.md5sum
new file mode 100644
index 000000000..e606a0d2d
--- /dev/null
+++ b/base/slang/.md5sum
@@ -0,0 +1 @@
+974437602a781cfe92ab61433dd16d03  slang-2.2.2.tar.bz2
diff --git a/extra/slang/Pkgfile b/base/slang/Pkgfile
index 990a13884..7c0db7ddc 100755
--- a/extra/slang/Pkgfile
+++ b/base/slang/Pkgfile
@@ -5,9 +5,9 @@
 # Depends on: libpng, pcre
 
 name=slang
-version=2.1.4
+version=2.2.2
 release=1
-source=( ftp://space.mit.edu/pub/davis/$name/v2.1/$name-$version.tar.bz2)
+source=( ftp://space.mit.edu/pub/davis/$name/v2.2/$name-$version.tar.bz2)
 
 
 build() {
@@ -18,6 +18,7 @@ build() {
 		--infodir=/usr/share/info
 	make
 	make DESTDIR=$PKG install
-	chmod -v 755 $PKG/usr/lib/libslang.so.2.1.4 \
+	chmod -v 755 $PKG/usr/lib/libslang.so.$version \
              $PKG/usr/lib/slang/v2/modules/*.so
+	rm -r $PKG/usr/share/doc
 }
diff --git a/base/splashy/.md5sum b/base/splashy/.md5sum
index 811466af3..af45639bc 100644
--- a/base/splashy/.md5sum
+++ b/base/splashy/.md5sum
@@ -1,3 +1,3 @@
 9e3d5d8a8c89d6db10c6b41ec498a566  nutyx-attapu.jpg
-a6ba5548cfacc3db268a62c76be61cab  splashy
+ecd26e8203aa99320f3eb26fd47f503c  splashy
 03b7ee4f31c56ee61463772f74bad8a0  splashy-0.3.13.tar.gz
diff --git a/base/splashy/splashy b/base/splashy/splashy
index ef3b986c5..98ab883d2 100755
--- a/base/splashy/splashy
+++ b/base/splashy/splashy
@@ -93,8 +93,6 @@ check_to_enable () {
 }
 
 calculate_steps () {
-        boot_mesg "(Re)generating splash steps"
-	echo_ok
 	[ -f /etc/inittab ] &&	RLVL=`sed -n 's/id:\([2345]\):initdefault:/\1/ p' /etc/inittab`
 
         [ ! -d $STEPS_DIR ] && mkdir -p $STEPS_DIR
diff --git a/extra/ktsuss/Pkgfile b/extra/ktsuss/Pkgfile
index 74b986131..89ca79ffd 100644
--- a/extra/ktsuss/Pkgfile
+++ b/extra/ktsuss/Pkgfile
@@ -2,7 +2,7 @@
 # URL: http://developer.berlios.de/projects/ktsuss
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: atk, directfb, expat, fontconfig, freetype, glib, gtk, libpng, pango, xorg-libxcb
+# Depends on: atk, expat, fontconfig, freetype, glib, gtk, libpng, pango, xorg-libxcb
 
 name=ktsuss
 version=1.4
diff --git a/extra/mc/.md5sum b/extra/mc/.md5sum
deleted file mode 100644
index f1262a2b6..000000000
--- a/extra/mc/.md5sum
+++ /dev/null
@@ -1,2 +0,0 @@
-4618626cacd3481e39719a4571c1b5be  mc-4.7.0.2.tar.bz2
-e43b3c780de82c1a70a98fc31ec5fbf9  mc-4.7.0.2_hotlist_syntax.patch
diff --git a/extra/newt/Pkgfile b/extra/newt/Pkgfile
index d6b85946f..1b7fdd1b5 100644
--- a/extra/newt/Pkgfile
+++ b/extra/newt/Pkgfile
@@ -2,7 +2,7 @@
 # URL: "http://www.redhat.com"
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: slang
+# Depends on: slang, python
 
 name=newt
 version=0.52.11
diff --git a/extra/parted/.md5sum b/extra/parted/.md5sum
index c2e95496e..bd5bf9b95 100644
--- a/extra/parted/.md5sum
+++ b/extra/parted/.md5sum
@@ -1 +1 @@
-9c262afd6673d7724a60b7c632ce80fa  parted-2.2.tar.gz
+30ceb6df7e8681891e865e2fe5a7903d  parted-2.3.tar.gz
diff --git a/extra/parted/Pkgfile b/extra/parted/Pkgfile
index 596921cee..3d98b77fb 100644
--- a/extra/parted/Pkgfile
+++ b/extra/parted/Pkgfile
@@ -7,7 +7,7 @@
 # e2fsprogs, lvm2, btrfs-progs
 
 name=parted
-version=2.2
+version=2.3
 release=1
 source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.gz)
 #	parted-1.9.0-btrfs-02.patch	)
diff --git a/extra/sdl/Pkgfile b/extra/sdl/Pkgfile
index 6113abe86..a3ad237c1 100755
--- a/extra/sdl/Pkgfile
+++ b/extra/sdl/Pkgfile
@@ -2,7 +2,7 @@
 # URL: http://www.libsdl.org/
 # Maintainer: NuTyX
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: alsa-lib, esound, nas, directfb, mesa3d
+# Depends on: alsa-lib, esound, nas, mesa3d
 
 name=sdl
 version=1.2.13
diff --git a/extra/slang/.md5sum b/extra/slang/.md5sum
deleted file mode 100644
index 3ff79e5ef..000000000
--- a/extra/slang/.md5sum
+++ /dev/null
@@ -1 +0,0 @@
-1299d5d3317e2aa7e2d75c8ce889474c  slang-2.1.4.tar.bz2