Merge remote branch 'nutyx-attapu/master'

9 files changed, 76 insertions, 16 deletions

diff --git a/base/aaabasicfs/.md5sum b/base/aaabasicfs/.md5sum
index 04b2ed449..a8e41b53e 100644
--- a/base/aaabasicfs/.md5sum
+++ b/base/aaabasicfs/.md5sum
@@ -9,7 +9,7 @@ f6b42961b3c2bd3b2e0bf0082d80d216  X.sh
 ad457024fe7ad91b8e9e0b4aad87df1f  extrapaths.sh
 0286a09ca5d7515c29ad5ff8f88fb9f3  fstab
 57ddbea584220ac4e74d0504a03721f4  hosts
-9099d0e8faf5da80580c1652c919859a  inittab
+00ead57ee36e532fa3e88a0a99e2de3b  inittab
 2ca09cd10bcc4f6adb0c5b1521bfdb7e  inputrc
 5d7c952bd09d718298dd60d3b976c349  lfs-bootscripts-01.patch
 5a8b2aacde330663828176064c77b72d  lfs-bootscripts-20100124.tar.bz2
diff --git a/base/aaabasicfs/Pkgfile b/base/aaabasicfs/Pkgfile
index ef3c9d102..ac743569f 100644
--- a/base/aaabasicfs/Pkgfile
+++ b/base/aaabasicfs/Pkgfile
@@ -6,7 +6,7 @@
 
 name=aaabasicfs
 version=2010
-release=rc1
+release=rc1a
 scriptsversion=lfs-bootscripts-20100124
 BLFSscriptsversion=20090302
 source=(  http://www.linuxfromscratch.org/lfs/downloads/development/$scriptsversion.tar.bz2\
diff --git a/base/aaabasicfs/inittab b/base/aaabasicfs/inittab
index 80dd89214..eb33db080 100644
--- a/base/aaabasicfs/inittab
+++ b/base/aaabasicfs/inittab
@@ -20,11 +20,11 @@ ca:12345:ctrlaltdel:/sbin/shutdown -t1 -a -h now
 
 su:S016:once:/sbin/sulogin
 
-1:2345:respawn:/sbin/agetty tty1 9600
-2:2345:respawn:/sbin/agetty tty2 9600
-3:2345:respawn:/sbin/agetty tty3 9600
-4:2345:respawn:/sbin/agetty tty4 9600
-5:2345:respawn:/sbin/agetty tty5 9600
-6:2345:respawn:/sbin/agetty tty6 9600
+1:2345:respawn:/usr/sbin/qingy tty1
+2:2345:respawn:/usr/sbin/qingy tty2
+3:2345:respawn:/usr/sbin/qingy tty3
+4:2345:respawn:/usr/sbin/qingy tty4
+5:2345:respawn:/usr/sbin/qingy tty5
+6:2345:respawn:/usr/sbin/qingy tty6
 
 # End /etc/inittab
diff --git a/base/dev/Pkgfile b/base/dev/Pkgfile
index 4205e1a9c..e44b9811b 100644
--- a/base/dev/Pkgfile
+++ b/base/dev/Pkgfile
@@ -2,11 +2,11 @@
 # 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
+# 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
 
 name=dev
 version=2010
-release=1
+release=2
 source=()
 
 build() {
diff --git a/base/qingy/.footprint b/base/qingy/.footprint
new file mode 100644
index 000000000..8deb67dc0
--- /dev/null
+++ b/base/qingy/.footprint
@@ -0,0 +1,37 @@
+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/
+-rw-r--r--	root/root	etc/qingy/settings
+-rw-r--r--	root/root	etc/qingy/welcomes
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/lib/
+drwxr-xr-x	root/root	usr/lib/qingy/
+drwxr-xr-x	root/root	usr/lib/qingy/screensavers/
+-rwxr-xr-x	root/root	usr/lib/qingy/screensavers/photos.qss
+-rwxr-xr-x	root/root	usr/lib/qingy/screensavers/pixel.qss
+-rwxr-xr-x	root/root	usr/lib/qingy/screensavers/running_time.qss
+drwxr-xr-x	root/root	usr/sbin/
+-rwxr-xr-x	root/root	usr/sbin/qingy
+-rwxr-xr-x	root/root	usr/sbin/qingy-DirectFB
+-rwxr-xr-x	root/root	usr/sbin/qingy-reset-console
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/info/
+-rw-r--r--	root/root	usr/share/info/qingy.info.gz
+drwxr-xr-x	root/root	usr/share/qingy/
+drwxr-xr-x	root/root	usr/share/qingy/themes/
+drwxr-xr-x	root/root	usr/share/qingy/themes/default/
+-rw-r--r--	root/root	usr/share/qingy/themes/default/Arrow.png
+-rw-r--r--	root/root	usr/share/qingy/themes/default/Hand.png
+-rw-r--r--	root/root	usr/share/qingy/themes/default/IBeam.png
+-rw-r--r--	root/root	usr/share/qingy/themes/default/background.jpg
+-rw-r--r--	root/root	usr/share/qingy/themes/default/decker.ttf
+-rw-r--r--	root/root	usr/share/qingy/themes/default/power_mouseover.png
+-rw-r--r--	root/root	usr/share/qingy/themes/default/power_normal.png
+-rw-r--r--	root/root	usr/share/qingy/themes/default/reset_mouseover.png
+-rw-r--r--	root/root	usr/share/qingy/themes/default/reset_normal.png
+-rw-r--r--	root/root	usr/share/qingy/themes/default/screensaver_mouseover.png
+-rw-r--r--	root/root	usr/share/qingy/themes/default/screensaver_normal.png
+-rw-r--r--	root/root	usr/share/qingy/themes/default/sleep_mouseover.png
+-rw-r--r--	root/root	usr/share/qingy/themes/default/sleep_normal.png
+-rw-r--r--	root/root	usr/share/qingy/themes/default/theme
diff --git a/base/qingy/.md5sum b/base/qingy/.md5sum
new file mode 100644
index 000000000..d094c58ac
--- /dev/null
+++ b/base/qingy/.md5sum
@@ -0,0 +1 @@
+34f40172a71e9a6c2c77ddce11d2a63a  qingy-0.9.9.tar.bz2
diff --git a/base/qingy/Pkgfile b/base/qingy/Pkgfile
new file mode 100644
index 000000000..9a93a92b0
--- /dev/null
+++ b/base/qingy/Pkgfile
@@ -0,0 +1,26 @@
+# Description: Remplace getty en mode Frame buffer
+# URL: http://qingy.sourceforge.net/
+# Maintainer: NuTyX core team
+# Packager: thierryn1 at hispeed dot ch
+
+name=qingy
+version=0.9.9
+release=1
+source=(http://downloads.sourceforge.net/$name/$name-$version.tar.bz2)
+build() {
+	cd  $name-$version
+	./configure --prefix=/usr \
+		--mandir=/usr/share/man \
+		--sysconfdir=/etc \
+		--enable-static=qingy-DirectFB \
+		--infodir=/usr/share/info \
+		--enable-x-support=no \
+		--enable-pam=no \
+		--enable-static-build
+		
+	make
+	make DESTDIR=$PKG install
+	if [ -f $PKG/usr/share/info/dir ]; then
+		rm  $PKG/usr/share/info/dir
+	fi
+}
diff --git a/extra/directfb/.footprint b/extra/directfb/.footprint
index 77d2905b3..08828814b 100644
--- a/extra/directfb/.footprint
+++ b/extra/directfb/.footprint
@@ -202,8 +202,6 @@ drwxr-xr-x	root/root	usr/lib/directfb-1.4-0/inputdrivers/
 -rwxr-xr-x	root/root	usr/lib/directfb-1.4-0/inputdrivers/libdirectfb_serialmouse.so
 -rwxr-xr-x	root/root	usr/lib/directfb-1.4-0/inputdrivers/libdirectfb_sonypi.la
 -rwxr-xr-x	root/root	usr/lib/directfb-1.4-0/inputdrivers/libdirectfb_sonypi.so
--rwxr-xr-x	root/root	usr/lib/directfb-1.4-0/inputdrivers/libdirectfb_vncinput.la
--rwxr-xr-x	root/root	usr/lib/directfb-1.4-0/inputdrivers/libdirectfb_vncinput.so
 -rwxr-xr-x	root/root	usr/lib/directfb-1.4-0/inputdrivers/libdirectfb_wm97xx_ts.la
 -rwxr-xr-x	root/root	usr/lib/directfb-1.4-0/inputdrivers/libdirectfb_wm97xx_ts.so
 -rwxr-xr-x	root/root	usr/lib/directfb-1.4-0/inputdrivers/libdirectfb_zytronic.la
@@ -235,8 +233,6 @@ drwxr-xr-x	root/root	usr/lib/directfb-1.4-0/systems/
 -rwxr-xr-x	root/root	usr/lib/directfb-1.4-0/systems/libdirectfb_devmem.so
 -rwxr-xr-x	root/root	usr/lib/directfb-1.4-0/systems/libdirectfb_fbdev.la
 -rwxr-xr-x	root/root	usr/lib/directfb-1.4-0/systems/libdirectfb_fbdev.so
--rwxr-xr-x	root/root	usr/lib/directfb-1.4-0/systems/libdirectfb_vnc.la
--rwxr-xr-x	root/root	usr/lib/directfb-1.4-0/systems/libdirectfb_vnc.so
 -rwxr-xr-x	root/root	usr/lib/directfb-1.4-0/systems/libdirectfb_x11.la
 -rwxr-xr-x	root/root	usr/lib/directfb-1.4-0/systems/libdirectfb_x11.so
 drwxr-xr-x	root/root	usr/lib/directfb-1.4-0/wm/
diff --git a/extra/directfb/Pkgfile b/extra/directfb/Pkgfile
index ceaed26ed..fd949dda6 100644
--- a/extra/directfb/Pkgfile
+++ b/extra/directfb/Pkgfile
@@ -2,7 +2,7 @@
 # URL: http://www.directfb.org
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: libjpeg , libpng, freetype, xorg-libx11, mesa3d, libvncserver
+# Depends on: libjpeg , libpng, freetype, xorg-libx11, mesa3d
 
 name=directfb
 version=1.4.3
@@ -15,7 +15,7 @@ build() {
 	patch -Np1 -i  ../libpng-1.4.patch
 	./configure --prefix=/usr \
 		--mandir=/usr/share/man \
-		--enable-zlib \
+		--enable-zlib --disable-vnc \
 		--infodir=/usr/share/info
 	make
 	make DESTDIR=$PKG install