From da08fd150d4de46e4ab94184bb7f89dbed4eb93e Mon Sep 17 00:00:00 2001
From: Diogo Leal <diogo@diogoleal.com>
Date: Sat, 11 Dec 2010 17:38:17 -0600
Subject: network/nginx: Updated for version 0.8.53.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 network/nginx/0.7.67-fix_perl_man_path.patch | 12 ------------
 network/nginx/fix_perl_man_path.patch        | 12 ++++++++++++
 network/nginx/nginx.SlackBuild               | 14 ++++++++------
 network/nginx/nginx.info                     | 12 ++++++------
 4 files changed, 26 insertions(+), 24 deletions(-)
 delete mode 100644 network/nginx/0.7.67-fix_perl_man_path.patch
 create mode 100644 network/nginx/fix_perl_man_path.patch

(limited to 'network')

diff --git a/network/nginx/0.7.67-fix_perl_man_path.patch b/network/nginx/0.7.67-fix_perl_man_path.patch
deleted file mode 100644
index de54627363..0000000000
--- a/network/nginx/0.7.67-fix_perl_man_path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nru nginx-0.7.65.orig//auto/lib/perl/conf nginx-0.7.65/auto/lib/perl/conf
---- nginx-0.7.65.orig//auto/lib/perl/conf	2006-12-24 16:23:11.000000000 -0200
-+++ nginx-0.7.65/auto/lib/perl/conf	2010-06-07 00:42:23.398070172 -0300
-@@ -47,7 +47,7 @@
-     if test -n "$NGX_PERL_MODULES"; then
-         have=NGX_PERL_MODULES value="(u_char *) \"$NGX_PERL_MODULES\""
-         . auto/define
--        NGX_PERL_MODULES_MAN=$NGX_PERL_MODULES/man3
-+        NGX_PERL_MODULES_MAN=/usr/man/man3
-     fi
- 
- else
diff --git a/network/nginx/fix_perl_man_path.patch b/network/nginx/fix_perl_man_path.patch
new file mode 100644
index 0000000000..437f3953a6
--- /dev/null
+++ b/network/nginx/fix_perl_man_path.patch
@@ -0,0 +1,12 @@
+diff -Nur nginx-0.8.53.orig//auto/lib/perl/conf nginx-0.8.53//auto/lib/perl/conf
+--- nginx-0.8.53.orig//auto/lib/perl/conf	2006-12-24 12:23:11.000000000 -0600
++++ nginx-0.8.53//auto/lib/perl/conf	2010-12-11 17:01:03.152535901 -0600
+@@ -47,7 +47,7 @@
+     if test -n "$NGX_PERL_MODULES"; then
+         have=NGX_PERL_MODULES value="(u_char *) \"$NGX_PERL_MODULES\""
+         . auto/define
+-        NGX_PERL_MODULES_MAN=$NGX_PERL_MODULES/man3
++        NGX_PERL_MODULES_MAN=/usr/man/man3
+     fi
+ 
+ else
diff --git a/network/nginx/nginx.SlackBuild b/network/nginx/nginx.SlackBuild
index 3b0a99250f..2e063c477f 100644
--- a/network/nginx/nginx.SlackBuild
+++ b/network/nginx/nginx.SlackBuild
@@ -25,7 +25,7 @@
 # Modified by Max Miorim <miorimmax@gmail.com>
 
 PRGNAM=nginx
-VERSION=${VERSION:-0.7.67}
+VERSION=${VERSION:-0.8.53}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -74,7 +74,7 @@ find . \
  -exec chmod 644 {} \;
 
 # patch to install the perl man pages in /usr/man/man3
-patch -p1 --verbose < $CWD/0.7.67-fix_perl_man_path.patch
+patch -p1 --verbose < $CWD/fix_perl_man_path.patch
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -155,11 +155,13 @@ EOF
 
 # Let's not clobber config files on upgrade
 ( cd $PKG/etc/nginx
-  for i in fastcgi_params mime.types nginx.conf koi-utf koi-win win-utf; do
-    mv $i $i.new;
-    echo "config etc/nginx/$i.new" >> $PKG/install/doinst.sh;
+  for i in * ; do
+    if ! echo "$i" | grep -q '.default' ; then
+      mv $i $i.new;
+      echo "config etc/nginx/$i.new" >> $PKG/install/doinst.sh;
+    fi
   done
 )
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -p -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/nginx/nginx.info b/network/nginx/nginx.info
index 0795f21eef..98cd7ad9b5 100644
--- a/network/nginx/nginx.info
+++ b/network/nginx/nginx.info
@@ -1,10 +1,10 @@
 PRGNAM="nginx"
-VERSION="0.7.67"
+VERSION="0.8.53"
 HOMEPAGE="http://nginx.org/"
-DOWNLOAD="http://nginx.org/download/nginx-0.7.67.tar.gz"
-MD5SUM="abc4f76af450eedeb063158bd963feaa"
+DOWNLOAD="http://nginx.org/download/nginx-0.8.53.tar.gz"
+MD5SUM="717eaea1b34e8663849f64b9aa05a9da"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-MAINTAINER="Max Miorim"
-EMAIL="miorimmax@gmail.com"
-APPROVED="Erik Hanson"
+MAINTAINER="Diogo Leal"
+EMAIL="diogo@diogoleal.com"
+APPROVED="rworkman"
-- 
cgit v1.2.3