1 files changed, 13 insertions, 44 deletions
diff --git a/network/lighttpd2/lighttpd2.SlackBuild b/network/lighttpd2/lighttpd2.SlackBuild
index 19de071ad6..1f7e9d8815 100644
--- a/network/lighttpd2/lighttpd2.SlackBuild
+++ b/network/lighttpd2/lighttpd2.SlackBuild
@@ -25,9 +25,7 @@
 # twisted for lighttpd2 by Matteo Bernardini <ponce@slackbuilds.org>
 
 PRGNAM=lighttpd2
-VERSION=${VERSION:-20120616_2634c77}
-PRGNAM2=spawn-fcgi
-VERSION2=${VERSION2:-r57}
+VERSION=${VERSION:-20121206_01abf70}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -109,59 +107,30 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install-strip DESTDIR=$PKG
 
-( # build also spawn-fcgi
-cd ..
-rm -rf $PRGNAM2-$VERSION2
-tar xvf $CWD/$PRGNAM2-$VERSION2.tar.?z*
-cd $PRGNAM2-$VERSION2
-chown -R root:root .
-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 {} \;
-
-sh autogen.sh
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --mandir=/usr/man \
-  --build=$ARCH-slackware-linux
-
-make
-install -m 0755 -D src/$PRGNAM2 $PKG/usr/bin/$PRGNAM2 
-mkdir -p $PKG/usr/doc/$PRGNAM2-$VERSION2
-install -m 0644 AUTHORS COPYING NEWS README doc/run* $PKG/usr/doc/$PRGNAM2-$VERSION2
-install -m 0644 -D $PRGNAM2.1 $PKG/usr/man/man1/$PRGNAM2.1
-cd -
-)
-
-mkdir -p $PKG/var/{cache,log,run}/$PRGNAM
-chmod 0770 $PKG/var/{cache,log,run}/$PRGNAM
-touch $PKG/var/log/$PRGNAM/{access,error}.log.new
-chown -R $LIGHTTPD_USER:$LIGHTTPD_GROUP $PKG/var/{cache,run}/$PRGNAM
+mkdir -p $PKG/var/cache/$PRGNAM $PKG/var/log/$PRGNAM $PKG/var/run/$PRGNAM
+chmod 0770 $PKG/var/cache/$PRGNAM $PKG/var/log/$PRGNAM $PKG/var/run/$PRGNAM
+( cd $PKG/var/log/$PRGNAM ; touch access.log.new error.log.new )
+chown -R $LIGHTTPD_USER:$LIGHTTPD_GROUP $PKG/var/cache/$PRGNAM $PKG/var/run/$PRGNAM
 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 -m 0755 $CWD/conf/rc.$PRGNAM2 $PKG/etc/rc.d/rc.$PRGNAM2.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 -D -m 0644 $CWD/conf/$PRGNAM.logrotate $PKG/etc/logrotate.d/lighttpd2.new
-install -D -m 0644 doc/default.html $PKG/var/www/htdocs-lighttpd/default.html
+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
 
-sed -i "s|user \"lighttpd|user \"$LIGHTTPD_USER|" $PKG/etc/$PRGNAM/angel.conf.new
-sed -i "s|group \"lighttpd|group \"$LIGHTTPD_GROUP|" $PKG/etc/$PRGNAM/angel.conf.new
+sed -i \
+  -e "s|user \"lighttpd|user \"$LIGHTTPD_USER|" \
+  -e "s|group \"lighttpd|group \"$LIGHTTPD_GROUP|" \
+  $PKG/etc/$PRGNAM/angel.conf.new
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING doc/* \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING doc/* $CWD/README.SLACKWARE $PKG/usr/doc/$PRGNAM-$VERSION
 rm -f $PKG/usr/doc/$PRGNAM-$VERSION/Makefile*
-cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install