Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cb9b8345a906faa3024b6416e7c62aabc58db866
commit cb9b8345a906faa3024b6416e7c62aabc58db866 Author: voroskoi <[EMAIL PROTECTED]> Date: Wed May 14 13:08:55 2008 +0200 nginx-0.6.31-1-i686 version bump updated nginx-install.patch diff --git a/source/network-extra/nginx/FrugalBuild b/source/network-extra/nginx/FrugalBuild index ba92b2f..7c46e6e 100644 --- a/source/network-extra/nginx/FrugalBuild +++ b/source/network-extra/nginx/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi <[EMAIL PROTECTED]> pkgname=nginx -pkgver=0.5.35 +pkgver=0.6.31 pkgrel=1 pkgdesc="[engine x] is a HTTP server and mail proxy server." url="http://nginx.net/"; @@ -12,7 +12,7 @@ groups=('network-extra') archs=('i686' 'x86_64') provides=('httpd') backup=(etc/$pkgname/$pkgname.conf) -up2date="lynx -dump ${url} |grep stable |sed 's/.*-\(.*\),.*/\1/'" +up2date="lynx -dump ${url} |grep stable |sed -ne 's/.*-\(.*\),.*/\1/;1p'" source=(http://sysoev.ru/nginx/nginx-$pkgver.tar.gz rc.$pkgname nginx.logrotate \ nginx-install.patch) @@ -49,9 +49,9 @@ build() { Fmv $Fsysconfdir/$pkgname/html $Flocalstatedir/www/$pkgname Fln $Flocalstatedir/www/$pkgname $Fsysconfdir/$pkgname/html } -sha1sums=('9e97e6723ee605db14d9cde54053496729f73c18' \ +sha1sums=('c2c45eb2ae352dcce82fa997a8cfc76cce649c1a' \ 'e8cc09710ba365eb932d1710f4aac629e49452ff' \ 'da58d8a74dbb081c3dfb69317999e10f1ebf991e' \ - '3a4cc4564ce610400e012d7c391107f33a258f1e') + 'a7bbebc8e604d53642b38fcf59265b6c768e040e') # optimization OK diff --git a/source/network-extra/nginx/nginx-install.patch b/source/network-extra/nginx/nginx-install.patch index 30f921d..6583ddf 100644 --- a/source/network-extra/nginx/nginx-install.patch +++ b/source/network-extra/nginx/nginx-install.patch @@ -1,15 +1,7 @@ ---- auto/install-orig 2006-12-16 13:31:19.000000000 +0100 -+++ auto/install 2006-12-16 13:32:47.000000000 +0100 -@@ -7,7 +7,7 @@ - cat << END >> $NGX_MAKEFILE - - install_perl_modules: -- cd $NGX_OBJS/src/http/modules/perl && make install -+ cd $NGX_OBJS/src/http/modules/perl && make DESTDIR=\$(DESTDIR) install - END - - NGX_INSTALL_PERL_MODULES=install_perl_modules -@@ -19,42 +19,41 @@ +diff -aur nginx-0.6.31/auto/install fw_nginx-0.6.31/auto/install +--- nginx-0.6.31/auto/install 2007-07-30 12:51:55.000000000 +0200 ++++ fw_nginx-0.6.31/auto/install 2008-05-14 13:00:57.000000000 +0200 +@@ -19,45 +19,45 @@ install: $NGX_OBJS${ngx_dirsep}nginx${ngx_binext} \ $NGX_INSTALL_PERL_MODULES @@ -25,28 +17,34 @@ + test ! -f '\$(DESTDIR)/$NGX_SBIN_PATH' || mv '\$(DESTDIR)/$NGX_SBIN_PATH' '\$(DESTDIR)/$NGX_SBIN_PATH.old' + cp $NGX_OBJS/nginx '\$(DESTDIR)/$NGX_SBIN_PATH' -- test -d '`dirname "$NGX_CONF_PATH"`' \ -- || mkdir -p '`dirname "$NGX_CONF_PATH"`' -+ test -d '\$(DESTDIR)/`dirname "$NGX_CONF_PATH"`' \ -+ || mkdir -p '\$(DESTDIR)/`dirname "$NGX_CONF_PATH"`' +- test -d '$NGX_CONF_PREFIX' || mkdir -p '$NGX_CONF_PREFIX' ++ test -d '\$(DESTDIR)/$NGX_CONF_PREFIX' || mkdir -p '\$(DESTDIR)/$NGX_CONF_PREFIX' + +- cp conf/koi-win '$NGX_CONF_PREFIX' +- cp conf/koi-utf '$NGX_CONF_PREFIX' +- cp conf/win-utf '$NGX_CONF_PREFIX' ++ cp conf/koi-win '\$(DESTDIR)/$NGX_CONF_PREFIX' ++ cp conf/koi-utf '\$(DESTDIR)/$NGX_CONF_PREFIX' ++ cp conf/win-utf '\$(DESTDIR)/$NGX_CONF_PREFIX' -- cp conf/koi-win '`dirname "$NGX_CONF_PATH"`' -- cp conf/koi-utf '`dirname "$NGX_CONF_PATH"`' -- cp conf/win-utf '`dirname "$NGX_CONF_PATH"`' -+ cp conf/koi-win '\$(DESTDIR)/`dirname "$NGX_CONF_PATH"`' -+ cp conf/koi-utf '\$(DESTDIR)/`dirname "$NGX_CONF_PATH"`' -+ cp conf/win-utf '\$(DESTDIR)/`dirname "$NGX_CONF_PATH"`' -+ cp conf/fastcgi_params '\$(DESTDIR)/`dirname "$NGX_CONF_PATH"`' +- test -f '$NGX_CONF_PREFIX/mime.types' \ +- || cp conf/mime.types '$NGX_CONF_PREFIX' +- cp conf/mime.types '$NGX_CONF_PREFIX/mime.types.default' ++ test -f '\$(DESTDIR)/$NGX_CONF_PREFIX/mime.types' \ ++ || cp conf/mime.types '\$(DESTDIR)/$NGX_CONF_PREFIX' ++ cp conf/mime.types '\$(DESTDIR)/$NGX_CONF_PREFIX/mime.types.default' -- test -f '`dirname "$NGX_CONF_PATH"`/mime.types' || \ -- cp conf/mime.types '`dirname "$NGX_CONF_PATH"`/mime.types' -- cp conf/mime.types '`dirname "$NGX_CONF_PATH"`/mime.types.default' -+ test -f '\$(DESTDIR)/`dirname "$NGX_CONF_PATH"`/mime.types' || \ -+ cp conf/mime.types '\$(DESTDIR)/`dirname "$NGX_CONF_PATH"`/mime.types' +- test -f '$NGX_CONF_PREFIX/fastcgi_params' \ +- || cp conf/fastcgi_params '$NGX_CONF_PREFIX' +- cp conf/fastcgi_params '$NGX_CONF_PREFIX/fastcgi_params.default' ++ test -f '\$(DESTDIR)/$NGX_CONF_PREFIX/fastcgi_params' \ ++ || cp conf/fastcgi_params '\$(DESTDIR)/$NGX_CONF_PREFIX' ++ cp conf/fastcgi_params '\$(DESTDIR)/$NGX_CONF_PREFIX/fastcgi_params.default' -- test -f '$NGX_CONF_PATH' || cp conf/nginx.conf '$NGX_CONF_PATH' -- cp conf/nginx.conf '`dirname "$NGX_CONF_PATH"`/nginx.conf.default' -+ test -f '\$(DESTDIR)/$NGX_CONF_PATH' || cp conf/nginx.conf '\$(DESTDIR)/$NGX_CONF_PATH' +- test -f '$NGX_CONF_PATH' || cp conf/nginx.conf '$NGX_CONF_PREFIX' +- cp conf/nginx.conf '$NGX_CONF_PREFIX/nginx.conf.default' ++ test -f '\$(DESTDIR)/$NGX_CONF_PATH' || cp conf/nginx.conf '\$(DESTDIR)/$NGX_CONF_PREFIX' ++ cp conf/nginx.conf '\$(DESTDIR)/$NGX_CONF_PREFIX/nginx.conf.default' - test -d '`dirname "$NGX_PID_PATH"`' \ - || mkdir -p '`dirname "$NGX_PID_PATH"`' @@ -63,7 +61,8 @@ END - if test -n "$NGX_ERROR_LOG_PATH"; then +-if test -n "$NGX_ERROR_LOG_PATH"; then ++if test -n "\$(DESTDIR)/$NGX_ERROR_LOG_PATH"; then cat << END >> $NGX_MAKEFILE - test -d '`dirname "$NGX_ERROR_LOG_PATH"`' || \ _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
