4 files changed, 48 insertions, 44 deletions
diff --git a/libraries/eaccelerator/README b/libraries/eaccelerator/README
index 7bae24b53e356..917f0bf5829c4 100644
--- a/libraries/eaccelerator/README
+++ b/libraries/eaccelerator/README
@@ -1,6 +1,7 @@
-eAccelerator is a free open-source PHP accelerator, optimizer, and dynamic
-content cache. It increases the performance of PHP scripts by caching
-them in their compiled state, so that the overhead of compiling is almost
-completely eliminated. It also optimizes scripts to speed up their execution.
-eAccelerator typically reduces server load and increases the speed of your
-PHP code by 1-10 times.
+eAccelerator is a free open source PHP accelerator and optimizer.  
+It increases the performance of PHP scripts by caching them in compiled 
+state, so the overhead of compiling is almost completely eliminated.  
+It also optimizes the scripts to speed up execution.
+
+eAccelerator typically reduces server load and increases the speed of
+your PHP code by 1-10 times.
diff --git a/libraries/eaccelerator/eaccelerator.SlackBuild b/libraries/eaccelerator/eaccelerator.SlackBuild
index 49aa29065e2d6..0052d6788c308 100644
--- a/libraries/eaccelerator/eaccelerator.SlackBuild
+++ b/libraries/eaccelerator/eaccelerator.SlackBuild
@@ -1,35 +1,32 @@
 #!/bin/sh
 
 # Slackware build script for eaccelerator
-# Written by javivf@gmail.com 2008/07/27
+# Originally written by javivf@gmail.com 2008/07/27
+# Updated by sl@not-only-pixel.de 2010/06/24
 
-APP=eaccelerator
-VERSION=0.9.5.3
+PRGNAM=eaccelerator
+VERSION=${VERSION:-0.9.6.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$APP
+PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCS="AUTHORS COPYING NEWS README"
-
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
@@ -39,14 +36,22 @@ else
   LIBDIRSUFFIX=""
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-rm -rf $TMP/$APP-$VERSION
-cd $TMP || exit 1
-tar -xjvf $CWD/$APP-$VERSION.tar.bz2 || exit 1
-cd $APP-$VERSION
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
+find . \
+  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+  -exec chmod 755 {} \; -o \
+  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+  -exec chmod 644 {} \;
+
+phpize
 
 CFLAGS="$SLKCFLAGS" \
    ./configure \
@@ -55,23 +60,21 @@ CFLAGS="$SLKCFLAGS" \
    --sysconfdir=/etc \
    --localstatedir=/var \
    --build=$ARCH-slackware-linux \
-  || exit 1
+   --enable-eaccelerator=shared \
+   --with-php-config=/usr/bin/php-config
 
-make || exit 1
-make install DESTDIR=$PKG || exit 1
+make
+make test
 
-install -D -m 755 modules/eaccelerator.so $PKG/usr/lib$LIBDIRSUFFIX/php/extensions/eaccelerator.so || exit 1
+mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/php/extensions
+cp -a modules/$PRGNAM.so $PKG/usr/lib$LIBDIRSUFFIX/php/extensions
 
-mkdir -p $PKG/usr/doc/$APP-$VERSION
-cp -a $DOCS $PKG/usr/doc/$APP-$VERSION
-find $PKG/usr/doc/$APP-$VERSION -type f -exec chmod 644 {} \;
-cat $CWD/$APP.SlackBuild > $PKG/usr/doc/$APP-$VERSION/$APP-SlackBuild
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING NEWS README eaccelerator.ini $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM-SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$APP-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/eaccelerator/eaccelerator.info b/libraries/eaccelerator/eaccelerator.info
index bb3ea7878ccd6..0e496ef429cfe 100644
--- a/libraries/eaccelerator/eaccelerator.info
+++ b/libraries/eaccelerator/eaccelerator.info
@@ -1,10 +1,10 @@
 PRGNAM="eaccelerator"
-VERSION="0.9.5.3"
+VERSION="0.9.6.1"
 HOMEPAGE="http://eaccelerator.net/"
-DOWNLOAD="http://bart.eaccelerator.net/source/0.9.5.3/eaccelerator-0.9.5.3.tar.bz2"
-MD5SUM="caf797223739516882f870342f74b935"
+DOWNLOAD="http://bart.eaccelerator.net/source/0.9.6.1/eaccelerator-0.9.6.1.tar.bz2"
+MD5SUM="32ccd838e06ef5613c2610c1c65ed228"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-MAINTAINER="javivf"
-EMAIL="javivf@gmail.com"
-APPROVED="David Somero"
+MAINTAINER="Stephan Lucas"
+EMAIL="sl@not-only-pixel.de"
+APPROVED="rworkman"
diff --git a/libraries/eaccelerator/slack-desc b/libraries/eaccelerator/slack-desc
index bb6bbb9691c0b..4be7c3e2d2d3f 100644
--- a/libraries/eaccelerator/slack-desc
+++ b/libraries/eaccelerator/slack-desc
@@ -8,12 +8,12 @@
             |-----handy-ruler------------------------------------------------------|
 eaccelerator: eAccelerator (PHP accelerator)
 eaccelerator:
-eaccelerator: eAccelerator is a free open-source PHP accelerator, optimizer,
-eaccelerator: and dynamic content cache.
-eaccelerator:
-eaccelerator: Homepage: http://eaccelerator.net/
-eaccelerator:
+eaccelerator: eAccelerator is a free open source PHP accelerator and optimizer for
+eaccelerator: PHP. It increases the performance of PHP scripts by caching them in
+eaccelerator: compiled state, so the overhead of compiling  is  almost completely
+eaccelerator: eliminated.
 eaccelerator:
+eaccelerator: Homepage: http://www.eaccelerator.net/
 eaccelerator:
 eaccelerator:
 eaccelerator: