From 24f6f4f0d5d973df83e2fd790840e9151d4eb97e Mon Sep 17 00:00:00 2001
From: tnut <thierryn1 at hispeed dot ch>
Date: Tue, 4 May 2010 22:54:37 +0200
Subject: maj aaabasicfs#2010-beta-2-1

---
 base/aaabasicfs/.md5sum |  2 +-
 base/aaabasicfs/Pkgfile |  2 +-
 base/aaabasicfs/X.sh    | 14 ++++++--------
 3 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'base')

diff --git a/base/aaabasicfs/.md5sum b/base/aaabasicfs/.md5sum
index 5b549de79..5fad92ff6 100644
--- a/base/aaabasicfs/.md5sum
+++ b/base/aaabasicfs/.md5sum
@@ -1,4 +1,4 @@
-d5dda9fafee54d7caa37493ca42f384c  X.sh
+f6b42961b3c2bd3b2e0bf0082d80d216  X.sh
 61ba4859757a54bf1f514de5213802e0  bash_profile
 427f04bb0e7ba3394054a1215fdca87c  bashrc
 427f04bb0e7ba3394054a1215fdca87c  bashrc
diff --git a/base/aaabasicfs/Pkgfile b/base/aaabasicfs/Pkgfile
index da8e7091a..393f6a9ce 100644
--- a/base/aaabasicfs/Pkgfile
+++ b/base/aaabasicfs/Pkgfile
@@ -6,7 +6,7 @@
 
 name=aaabasicfs
 version=2010
-release=beta-1
+release=beta-2
 scriptsversion=lfs-bootscripts-20100124
 source=(  http://www.linuxfromscratch.org/lfs/downloads/development/$scriptsversion.tar.bz2\
  hosts clock console fstab inittab message inputrc network \
diff --git a/base/aaabasicfs/X.sh b/base/aaabasicfs/X.sh
index e6c0be818..b71f190ce 100644
--- a/base/aaabasicfs/X.sh
+++ b/base/aaabasicfs/X.sh
@@ -2,22 +2,20 @@ export GNOME_PREFIX=/usr
 export GNOME_LIBCONFIG_PATH=/usr/lib:$GNOME_PREFIX/lib
 export LIBGLADE_MODULE_PATH=$GNOME_PREFIX/lib/libglade/2.0
 export QTDIR=/opt/qt
-export KDE3_PREFIX=/opt/kde3
 export KDE_PREFIX=/opt/kde
 export KDEDIR=$KDE_PREFIX
-export KDE3DIR=$KDE3_PREFIX
-export MANPATH=$MANPATH:$GNOME_PREFIX/man:$KDEDIR/man:$KDE3DIR/man
-export PATH=$PATH:$GNOME_PREFIX/bin:$KDE_PREFIX/bin:$KDE3_PREFIX/bin
+export MANPATH=$MANPATH:$GNOME_PREFIX/man:$KDEDIR/man
+export PATH=$PATH:$GNOME_PREFIX/bin:$KDE_PREFIX/bin
 export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$GNOME_PREFIX/lib/pkgconfig:\
-$GNOME_PREFIX/share/pkgconfig:$KDE3_PREFIX/lib/pkgconfig:/opt/qt/lib/pkgconfig
-export INFOPATH=/usr/share/info:$GNOME_PREFIX/share/info:$KDE_PREFIX/share/info:$KDE3_PREFIX/share/info
+$GNOME_PREFIX/share/pkgconfig:/opt/qt/lib/pkgconfig
+export INFOPATH=/usr/share/info:$GNOME_PREFIX/share/info:$KDE_PREFIX/share/info
 export PYTHONPATH=/usr/lib/python2.6/site-packages:\
 $GNOME_PREFIX/lib/python2.6/site-packages:\
 $GNOME_PREFIX/lib/python2.6/site-packages/GMenuSimpleEditor
 if [ -x /usr/X11R6/bin/X ]; then
  pathappend /usr/X11R6/bin
- XDG_DATA_DIRS=/usr/share:$GNOME_PREFIX/share:$KDE_PREFIX/share:$KDE3_PREFIX/share:/usr/local/share
- XDG_CONFIG_DIRS=/etc/gnome/xdg:/etc/kde/xdg:/etc/kde3/xdg:/etc/xdg
+ XDG_DATA_DIRS=/usr/share:$GNOME_PREFIX/share:/usr/share/akonadi/agents:/usr/local/share
+ XDG_CONFIG_DIRS=/etc/gnome/xdg:/etc/kde/xdg:/etc/xdg
  export XDG_DATA_DIRS XDG_CONFIG_DIRS
 	
 fi
-- 
cgit v1.2.3-54-g00ecf