Merge branch 'master' of ssh://kiao.no-ip.info:443/~/pakxe

4 files changed, 11 insertions, 13 deletions

diff --git a/base/aaabasicfs/.md5sum.i686 b/base/aaabasicfs/.md5sum.i686
index fbb7b820e..3219f4255 100644
--- a/base/aaabasicfs/.md5sum.i686
+++ b/base/aaabasicfs/.md5sum.i686
@@ -1,4 +1,4 @@
-b9bdd0860e6e4810f5b5e094e4d50aa4  X.sh
+4c4b8a20548cf20d1aeb0a820fa92211  X.sh
 61ba4859757a54bf1f514de5213802e0  bash_profile
 f29eb765bd7c24471d055cc72b0edd4e  bashrc
 3974f1b4242908346f309b096a7a6ed6  bashrc.etc
@@ -8,7 +8,7 @@ ad457024fe7ad91b8e9e0b4aad87df1f  extrapaths.sh
 64514eb39b4878f060065cab28191ee5  fstab
 4e641aa7a51f285c0a832b8a7dd8ed29  inittab
 2ca09cd10bcc4f6adb0c5b1521bfdb7e  inputrc
-7a45a1acf3566ca924f9a32f069bd7f2  lfs-bootscripts-02.patch
+f05a15125a4c6008471d96b096445e21  lfs-bootscripts-03.patch
 5041ee97992e3f10d3be44f46a6aeb76  lfs-bootscripts-20110424.tar.bz2
 6bd38769ed6f5df86e8046b68326f7f4  network
 4f193837349d63e6c98501f221904170  nu
diff --git a/base/aaabasicfs/.md5sum.x86_64 b/base/aaabasicfs/.md5sum.x86_64
index fbb7b820e..3219f4255 100644
--- a/base/aaabasicfs/.md5sum.x86_64
+++ b/base/aaabasicfs/.md5sum.x86_64
@@ -1,4 +1,4 @@
-b9bdd0860e6e4810f5b5e094e4d50aa4  X.sh
+4c4b8a20548cf20d1aeb0a820fa92211  X.sh
 61ba4859757a54bf1f514de5213802e0  bash_profile
 f29eb765bd7c24471d055cc72b0edd4e  bashrc
 3974f1b4242908346f309b096a7a6ed6  bashrc.etc
@@ -8,7 +8,7 @@ ad457024fe7ad91b8e9e0b4aad87df1f  extrapaths.sh
 64514eb39b4878f060065cab28191ee5  fstab
 4e641aa7a51f285c0a832b8a7dd8ed29  inittab
 2ca09cd10bcc4f6adb0c5b1521bfdb7e  inputrc
-7a45a1acf3566ca924f9a32f069bd7f2  lfs-bootscripts-02.patch
+f05a15125a4c6008471d96b096445e21  lfs-bootscripts-03.patch
 5041ee97992e3f10d3be44f46a6aeb76  lfs-bootscripts-20110424.tar.bz2
 6bd38769ed6f5df86e8046b68326f7f4  network
 4f193837349d63e6c98501f221904170  nu
diff --git a/base/aaabasicfs/Pkgfile b/base/aaabasicfs/Pkgfile
index 3aed95859..cfc75eea1 100644
--- a/base/aaabasicfs/Pkgfile
+++ b/base/aaabasicfs/Pkgfile
@@ -5,16 +5,14 @@
 
 name=aaabasicfs
 version=2011
-release=0
+release=1
 scriptsversion=lfs-bootscripts-20110424
 BLFSscriptsversion=20100825
 XORG_PREFIX=/usr
-source=(  http://www.linuxfromscratch.org/lfs/downloads/development/$scriptsversion.tar.bz2\
-	http://www.linuxfromscratch.org/blfs/downloads/svn/blfs-bootscripts-$BLFSscriptsversion.tar.bz2
- fstab inittab inputrc network rc \
- profile dircolors.sh extrapaths.sh bash_profile bashrc bashrc.etc \
-	http://nutyx.meticul.eu/files/patchs/$name/lfs-bootscripts-02.patch \
- nu readline.sh unmask.sh X.sh )
+source=(http://www.linuxfromscratch.org/lfs/downloads/development/$scriptsversion.tar.bz2 \
+ http://www.linuxfromscratch.org/blfs/downloads/svn/blfs-bootscripts-$BLFSscriptsversion.tar.bz2 \
+ fstab inittab inputrc network rc profile dircolors.sh extrapaths.sh bash_profile bashrc bashrc.etc \
+ http://nutyx.meticul.eu/files/patchs/$name/lfs-bootscripts-03.patch nu readline.sh unmask.sh X.sh )
 
 
 build() {
@@ -161,7 +159,7 @@ EOF
 	chmod -v 664 $PKG/var/run/utmp $PKG/var/log/lastlog
 	# Bootscripts
 	cd $scriptsversion
-	patch -Np1 -i ../lfs-bootscripts-02.patch
+	patch -Np1 -i ../lfs-bootscripts-03.patch
 	make DESTDIR=$PKG install
 	# Rename network script
 	mv $PKG/etc/rc.d/init.d/{network,iplink}
diff --git a/base/aaabasicfs/X.sh b/base/aaabasicfs/X.sh
index a6360fdd1..4fc5a6a29 100644
--- a/base/aaabasicfs/X.sh
+++ b/base/aaabasicfs/X.sh
@@ -5,7 +5,7 @@ export PYTHONPATH=/usr/lib/python2.7/site-packages:/usr/lib/python2.7/site-packa
 if [ -x /usr/X11R6/bin/X ]; then
 	pathappend /usr/X11R6/bin
 	XDG_DATA_DIRS=/usr/share:/usr/share/akonadi/agents:/usr/local/share
-	XDG_CONFIG_DIRS=/etc/kde/xdg:/etc/xdg
+	XDG_CONFIG_DIRS=/etc/xdg
 	export XDG_DATA_DIRS XDG_CONFIG_DIRS
 	
 fi