3 files changed, 33 insertions, 25 deletions
diff --git a/network/lighttpd/lighttpd.SlackBuild b/network/lighttpd/lighttpd.SlackBuild
index cf491dea72482..7cd2044b60b4e 100644
--- a/network/lighttpd/lighttpd.SlackBuild
+++ b/network/lighttpd/lighttpd.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Slackware build script for lighttpd 
+# Slackware build script for lighttpd
 #
 # Copyright (c) 2007 Daniel de Kok <moc.mikciat@leinad>
 # All rights reserved.
@@ -23,12 +23,12 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=lighttpd
-VERSION=1.4.22
+VERSION=1.4.25
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-CWD=$(pwd)               
+CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -38,24 +38,30 @@ OUTPUT=${OUTPUT:-/tmp}
 LIGHTTPD_USER=${LIGHTTPD_USER:-lighttpd}
 LIGHTTPD_GROUP=${LIGHTTPD_GROUP:-lighttpd}
 
-if ! grep -q ^$LIGHTTPD_GROUP: /etc/group 2>/dev/null ; then
-        echo "    Error: LIGHTTPD group ($LIGHTTPD_GROUP) doesn't exist."
-        echo "    Try creating one with: groupadd -g 208 $LIGHTTPD_GROUP"
-        exit 1
-fi
+bailout() {
+  printf "         The $LIGHTTPD_GROUP group and/or $LIGHTTPD_USER user account
+         does not exist.  You should create it/them with the following:
+           groupadd -g 208 $LIGHTTPD_GROUP
+           useradd -u 208 -g $LIGHTTPD_GROUP -d /var/www $LIGHTTPD_USER\n"
+}
 
-if ! grep -q ^$LIGHTTPD_USER: /etc/passwd 2>/dev/null ; then
-        echo "    Error: LIGHTTPD user ($LIGHTTPD_USER) doesn't exist."
-        echo "    Try creating one with: useradd -u 208 -g $LIGHTTPD_GROUP -d /var/www $LIGHTTPD_USER"
-        exit 1
+if ! grep -q ^$LIGHTTPD_GROUP: /etc/group 2>/dev/null ; then
+  bailout
+  exit 1
+elif ! grep -q ^$LIGHTTPD_USER: /etc/passwd 2>/dev/null ; then
+  bailout
+  exit 1
 fi
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e # Exit on most errors
@@ -64,7 +70,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
@@ -73,7 +79,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --libdir=/usr/lib/$PRGNAM \
+  --libdir=/usr/lib${LIBDIRSUFFIX}/$PRGNAM \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
@@ -111,7 +117,7 @@ chown -R $LIGHTTPD_USER:$LIGHTTPD_GROUP $PKG/var/cache/lighttpd
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README doc/* \
+cp -a AUTHORS COPYING INSTALL NEWS README doc/* \
   $PKG/usr/doc/$PRGNAM-$VERSION
 rm -f $PKG/usr/doc/$PRGNAM-$VERSION/Makefile*
 cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
@@ -122,4 +128,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 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/lighttpd/lighttpd.info b/network/lighttpd/lighttpd.info
index 7edb25ad2df70..b9dfe27544f4e 100644
--- a/network/lighttpd/lighttpd.info
+++ b/network/lighttpd/lighttpd.info
@@ -1,8 +1,10 @@
 PRGNAM="lighttpd"
-VERSION="1.4.22"
+VERSION="1.4.25"
 HOMEPAGE="http://www.lighttpd.net/"
-DOWNLOAD="http://www.lighttpd.net/download/lighttpd-1.4.22.tar.gz"
-MD5SUM="949c33a81e83f7718a47280bef21b90c"
+DOWNLOAD="http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.25.tar.bz2"
+MD5SUM="2027c49fb46530e45338c5e2da13c02f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="paul wisehart"
 EMAIL="wise@lupulin.net"
 APPROVED="rworkman"
diff --git a/network/lighttpd/slack-desc b/network/lighttpd/slack-desc
index b105c7ff60dc1..dd746b1bf34cc 100644
--- a/network/lighttpd/slack-desc
+++ b/network/lighttpd/slack-desc
@@ -7,13 +7,13 @@
 
         |-----handy-ruler------------------------------------------------------|
 lighttpd: lighttpd (Light, fast, and secure webserver) 
-lighttpd: 
+lighttpd:
 lighttpd: lighttpd is a fast, secure, and flexible webserver. It is optimized
 lighttpd: for high-performance environments, and provides an extensive feature 
 lighttpd: set, including FastCGI, CGI, Auth, output compression, and URL
 lighttpd: rewriting support.
-lighttpd: 
-lighttpd: The lighttpd webpage can be found at: 
-lighttpd: http://www.lighttpd.net/
-lighttpd: 
-lighttpd: 
+lighttpd:
+lighttpd: Homepage: http://www.lighttpd.net/
+lighttpd:
+lighttpd:
+lighttpd: