3 files changed, 24 insertions, 11 deletions
diff --git a/network/zarafa-webaccess-ajax/slack-desc b/network/zarafa-webaccess-ajax/slack-desc
index 87e7f38794..1668dbbdaa 100644
--- a/network/zarafa-webaccess-ajax/slack-desc
+++ b/network/zarafa-webaccess-ajax/slack-desc
@@ -11,7 +11,7 @@ zarafa-webaccess-ajax:
 zarafa-webaccess-ajax: The webaccess module of Zarafa is a Ajax / PHP based solution to
 zarafa-webaccess-ajax: access your e-mail, agenda, contacts, etc. via a browser.
 zarafa-webaccess-ajax:
-zarafa-webaceess-ajax: http://www.zarafa.com/
+zarafa-webaccess-ajax: http://www.zarafa.com/
 zarafa-webaccess-ajax:
 zarafa-webaccess-ajax:
 zarafa-webaccess-ajax:
diff --git a/network/zarafa-webaccess-ajax/zarafa-webaccess-ajax.SlackBuild b/network/zarafa-webaccess-ajax/zarafa-webaccess-ajax.SlackBuild
index a7277db9f7..37b84a9456 100644
--- a/network/zarafa-webaccess-ajax/zarafa-webaccess-ajax.SlackBuild
+++ b/network/zarafa-webaccess-ajax/zarafa-webaccess-ajax.SlackBuild
@@ -4,10 +4,10 @@
 # Ajax-based solution for webaccess to zarafa
 
 # Written by Niels Horn <niels.horn@gmail.com>
-# revision date 2010/05/28
+# revision date 2010/09/07
 
 PRGNAM=zarafa-webaccess-ajax
-VERSION=${VERSION:-6.30.14}
+VERSION=${VERSION:-6.40.2}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -17,6 +17,13 @@ DOCDIR=${DOCDIR:-webaccess}
 PHPUSER=${PHPUSER:-root}
 PHPGROUP=${PHPGROUP:-apache}
 
+# To create valid symlinks, we need a relative path from DOCROOT
+RELPATH=""
+for i in $(echo $DOCROOT | tr "/" " "); do
+  RELPATH="${RELPATH}../"
+done
+
+SRCNAM=zarafa
 UNTARDIR=php-webclient-ajax
 CONFDIR=etc/zarafa
 
@@ -27,11 +34,11 @@ OUTPUT=${OUTPUT:-/tmp}
 
 set -e
 
-rm -rf $TMP/$UNTARDIR $PKG
+rm -rf $TMP/$SRCNAM-$VERSION $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $UNTARDIR
+tar --wildcards -xvf $CWD/$SRCNAM-$VERSION.tar.gz $SRCNAM-$VERSION/$UNTARDIR/*
+cd $SRCNAM-$VERSION/$UNTARDIR
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
@@ -47,7 +54,13 @@ mv $PKG/$DOCROOT/$DOCDIR/config.php.dist $PKG/$CONFDIR/config.php.new
 chown root:$PHPGROUP $PKG/$CONFDIR/config.php.new
 chmod 640 $PKG/$CONFDIR/config.php.new
 
-( cd $PKG/$DOCROOT/$DOCDIR ; ln -s /$CONFDIR/config.php )
+# Create tmp dir
+mkdir -p $PKG/var/lib/zarafa-webaccess/tmp
+chown $PHPUSER:$PHPGROUP $PKG/var/lib/zarafa-webaccess/tmp
+
+cd $PKG/$DOCROOT/$DOCDIR
+  ln -s ../${RELPATH}$CONFDIR/config.php config.php
+cd -
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/network/zarafa-webaccess-ajax/zarafa-webaccess-ajax.info b/network/zarafa-webaccess-ajax/zarafa-webaccess-ajax.info
index da45634190..e07919a6c6 100644
--- a/network/zarafa-webaccess-ajax/zarafa-webaccess-ajax.info
+++ b/network/zarafa-webaccess-ajax/zarafa-webaccess-ajax.info
@@ -1,10 +1,10 @@
 PRGNAM="zarafa-webaccess-ajax"
-VERSION="6.30.14"
+VERSION="6.40.2"
 HOMEPAGE="http://www.zarafa.com/"
-DOWNLOAD="http://download.zarafa.com/zarafa/drupal/ondemand.php?version=6.30.14&src=zarafa-webaccess-ajax-6.30.14"
-MD5SUM="914dc200e5ffdfb8cc1ea797d9149730"
+DOWNLOAD="http://www.nielshorn.net/_download/slackware/source/zarafa-6.40.2.tar.gz"
+MD5SUM="0e297c5b7d4a476806bcc60a86901838"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Niels Horn"
 EMAIL="niels.horn@gmail.com"
-APPROVED="rworkman"
+APPROVED="dsomero"