1 files changed, 29 insertions, 25 deletions
diff --git a/network/nginx/nginx.SlackBuild b/network/nginx/nginx.SlackBuild
index 57f6868ba7..8dc2e4f9ca 100644
--- a/network/nginx/nginx.SlackBuild
+++ b/network/nginx/nginx.SlackBuild
@@ -21,12 +21,9 @@
 # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# Notes:
-# + This SlackBuild is for v0.7.0 and newer.
 
 PRGNAM=nginx
-VERSION=${VERSION:-0.7.27}
+VERSION=${VERSION:-0.7.62}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -36,16 +33,15 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-NGINXUSER=${NGINXUSER:-nobody}
-NGINXGROUP=${NGINXGROUP:-nobody}
-PERL=$( eval "`perl -V:version`"; echo $version )
-
 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
@@ -53,12 +49,11 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
-chown -R root:root $PRGNAM-$VERSION
-chmod -R u+w,go+r-w,a-s $PRGNAM-$VERSION
+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" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -69,8 +64,8 @@ CXXFLAGS="$SLKCFLAGS" \
   --error-log-path=/var/log/nginx_error.log \
   --pid-path=/var/run/nginx.pid \
   --lock-path=/var/lock/nginx \
-  --user=${NGINXUSER} \
-  --group=${NGINXGROUP} \
+  --user=${NGINXUSER:-nobody} \
+  --group=${NGINXGROUP:-nogroup} \
   --with-rtsig_module \
   --with-select_module \
   --with-poll_module \
@@ -97,18 +92,15 @@ CXXFLAGS="$SLKCFLAGS" \
 
 make 
 sed -r -i 's|/usr/share/man|/usr/man|g' objs/src/http/modules/perl/Makefile
-make install DESTDIR=$PKG || exit 1
-
-mkdir -p $PKG/{etc/rc.d,usr/doc/nginx-$VERSION}
-cp -a CHANGES CHANGES.ru LICENSE README $PKG/usr/doc/nginx-$VERSION
-cat $CWD/nginx.SlackBuild > $PKG/usr/doc/nginx-$VERSION/nginx.SlackBuild
-cat $CWD/rc.nginx > $PKG/etc/rc.d/rc.nginx.new
-rm -rf $PKG/{var,usr/{html,lib/perl5/${PERL}}}
+make install DESTDIR=$PKG
 
 ( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-  find . -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f 2> /dev/null
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null || true
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null || true
+  find . -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | \
+    xargs rm -f 2> /dev/null
   find . -perm 444 -exec chmod 0644 {} \;
   find . -perm 555 -exec chmod 0755 {} \;
 )
@@ -118,6 +110,18 @@ rm -rf $PKG/{var,usr/{html,lib/perl5/${PERL}}}
   for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 )
 
+# Remove some other empty and/or unnecessary directories from the package
+eval $(perl '-V:archlib')
+rm -rf $PKG/$archlib $PKG/usr/html $PKG/var
+
+# Add an init script
+mkdir -p $PKG/etc/rc.d
+cat $CWD/rc.nginx > $PKG/etc/rc.d/rc.nginx.new
+
+mkdir -p $PKG/usr/doc/nginx-$VERSION
+cp -a CHANGES CHANGES.ru LICENSE README $PKG/usr/doc/nginx-$VERSION
+cat $CWD/nginx.SlackBuild > $PKG/usr/doc/nginx-$VERSION/nginx.SlackBuild
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
@@ -131,4 +135,4 @@ 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}