4 files changed, 29 insertions, 18 deletions
diff --git a/network/memcached/README b/network/memcached/README
index c2470754ec..9791cef646 100644
--- a/network/memcached/README
+++ b/network/memcached/README
@@ -1,3 +1,5 @@
 memcached is a high-performance, distributed memory object caching system,
 generic in nature, but intended for use in speeding up dynamic web
 applications by alleviating database load.
+
+This requires libevent.
diff --git a/network/memcached/memcached.SlackBuild b/network/memcached/memcached.SlackBuild
index 9d70c3d6a2..70a009ed0d 100644
--- a/network/memcached/memcached.SlackBuild
+++ b/network/memcached/memcached.SlackBuild
@@ -4,7 +4,7 @@
 # Written by Conrado Ruch Jr  conradojr@gmail.com
 
 PRGNAM=memcached
-VERSION=1.2.6
+VERSION=1.2.8
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -16,32 +16,37 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- elif [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
-cd $PRGNAM-$VERSION || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
-  --enable-static=no \
-  || exit 1
+  --build=$ARCH-slackware-linux
 
-make || exit 1
-make install-strip DESTDIR=$PKG || exit 1
+make
+make install-strip DESTDIR=$PKG
 
 ( cd $PKG/usr/man || exit
   find . -type f -exec gzip -9 {} \;
@@ -49,11 +54,13 @@ make install-strip DESTDIR=$PKG || exit 1
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README sample $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING ChangeLog NEWS README TODO \
+    $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
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/memcached/memcached.info b/network/memcached/memcached.info
index 74dd441d93..6cf20e9a59 100644
--- a/network/memcached/memcached.info
+++ b/network/memcached/memcached.info
@@ -1,8 +1,10 @@
 PRGNAM="memcached"
-VERSION="1.2.6"
-HOMEPAGE="http://danga.com:80/memcached/"
-DOWNLOAD="http://danga.com:80/memcached/dist/memcached-1.2.6.tar.gz"
-MD5SUM="200d22f7ac2d114f74a6904552e9eb70"
+VERSION="1.2.8"
+HOMEPAGE="http://danga.com/memcached/"
+DOWNLOAD="http://memcached.googlecode.com/files/memcached-1.2.8.tar.gz"
+MD5SUM="e5a4ee04e517a5cad110f29e4490e4ab"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Conrado Ruch Jr"
 EMAIL="conradojr@gmail.com"
-APPROVED="David Somero"
-\ No newline at end of file
+APPROVED="rworkman"
diff --git a/network/memcached/slack-desc b/network/memcached/slack-desc
index 2cf4bccc42..1390a5f3b2 100644
--- a/network/memcached/slack-desc
+++ b/network/memcached/slack-desc
@@ -7,12 +7,12 @@
 
         |-----handy-ruler-----------------------------------------------------|
 memcached: memcached (object caching system)
-memcached: 
+memcached:
 memcached: memcached is a high-performance, distributed memory object
 memcached: caching system, generic in nature, but intended for use in 
 memcached: speeding up dynamic web applications by alleviating database load.
 memcached:
-memcached: http://danga.com:80/memcached/
+memcached: Homepage: http://danga.com/memcached/
 memcached:
 memcached:
 memcached: