4 files changed, 16 insertions, 19 deletions
diff --git a/network/lighttpd2/conf/angel.conf b/network/lighttpd2/conf/angel.conf
index 49d8890740..d02e674fe5 100644
--- a/network/lighttpd2/conf/angel.conf
+++ b/network/lighttpd2/conf/angel.conf
@@ -1,11 +1,6 @@
-instance {
-	user "lighttpd";
-	group "lighttpd";
+user "lighttpd";
+group "lighttpd";
 
-	max-open-files 16384;
+max_open_files 16384;
 
-	copy-env ( "PATH" );
-
-#	env ( "G_SLICE=always-malloc", "G_DEBUG=gc-friendly" );
-#	wrapper ("/usr/bin/valgrind", "--leak-check=full", "--show-reachable=yes", "--leak-resolution=high" );
-}
+copy_env ( "PATH" );
diff --git a/network/lighttpd2/conf/rc.lighttpd2 b/network/lighttpd2/conf/rc.lighttpd2
index e7a8ca286a..635092e071 100644
--- a/network/lighttpd2/conf/rc.lighttpd2
+++ b/network/lighttpd2/conf/rc.lighttpd2
@@ -28,7 +28,7 @@ PIDOF=$(pidof lighttpd2)
 
 lighttpd_start() {
   echo "Starting lighttpd2: $LIGHTTPD"
-  if [ $PIDOF ]; then
+  if [ "$PIDOF" ]; then
     echo "Already running!"
     return
   fi
@@ -39,8 +39,9 @@ lighttpd_start() {
 
 lighttpd_stop() {
   echo "Stopping lighttpd2: $LIGHTTPD"
-  if [ $PIDOF ]; then
+  if [ "$PIDOF" ]; then
     kill $PIDOF
+    sleep 2
     rm /var/run/lighttpd2/lighttpd2.pid
   else
     echo "Not running!"
@@ -50,7 +51,7 @@ lighttpd_stop() {
 lighttpd_restart() {
   lighttpd_stop
   PIDOF=
-  sleep 1
+  sleep 2
   lighttpd_start
 }
 
diff --git a/network/lighttpd2/lighttpd2.SlackBuild b/network/lighttpd2/lighttpd2.SlackBuild
index 984dbcfaaa..fefcab2cd0 100644
--- a/network/lighttpd2/lighttpd2.SlackBuild
+++ b/network/lighttpd2/lighttpd2.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for lighttpd2
 
 # Copyright (c) 2007 Daniel de Kok <moc.mikciat@leinad>
+# Copyright (c) 2012-2015 Matteo Bernardini <ponce@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +23,10 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# twisted for lighttpd2 by Matteo Bernardini <ponce@slackbuilds.org>
+# Twisted for lighttpd2 by Matteo Bernardini <ponce@slackbuilds.org>
 
 PRGNAM=lighttpd2
-VERSION=${VERSION:-20130910_0d40b25}
+VERSION=${VERSION:-20150125_6b22f2f}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -120,10 +121,10 @@ chown -R $LIGHTTPD_USER:root $PKG/var/log/$PRGNAM
 install -D -m 0755 $CWD/conf/rc.$PRGNAM $PKG/etc/rc.d/rc.$PRGNAM.new
 install -D -m 0644 $CWD/conf/lighttpd.conf $PKG/etc/$PRGNAM/lighttpd.conf.new
 install -m 0644 $CWD/conf/angel.conf $PKG/etc/$PRGNAM/angel.conf.new
-install -m 0644 doc/mimetypes.conf $PKG/etc/$PRGNAM/mimetypes.conf.new
+install -m 0644 contrib/mimetypes.conf $PKG/etc/$PRGNAM/mimetypes.conf.new
 install -m 0644 $CWD/conf/php-fpm.lua $PKG/etc/$PRGNAM/php-fpm.lua.new
 install -D -m 0644 $CWD/conf/$PRGNAM.logrotate $PKG/etc/logrotate.d/$PRGNAM.new
-install -D -m 0644 doc/default.html $PKG/var/www/htdocs-lighttpd/index.html
+install -D -m 0644 contrib/default.html $PKG/var/www/htdocs-lighttpd/index.html
 
 sed -i \
   -e "s|user \"lighttpd|user \"$LIGHTTPD_USER|" \
diff --git a/network/lighttpd2/lighttpd2.info b/network/lighttpd2/lighttpd2.info
index 083a77aefe..0eb23452df 100644
--- a/network/lighttpd2/lighttpd2.info
+++ b/network/lighttpd2/lighttpd2.info
@@ -1,8 +1,8 @@
 PRGNAM="lighttpd2"
-VERSION="20130910_0d40b25"
+VERSION="20150125_6b22f2f"
 HOMEPAGE="http://www.lighttpd.net/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/lighttpd2-20130910_0d40b25.tar.xz"
-MD5SUM="f58b899b029007ae738fa879a05a5dcc"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/lighttpd2-20150125_6b22f2f.tar.xz"
+MD5SUM="d10e9d2c419f5e62458fb31549948727"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libev lua ragel"