Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/qtcreator/PKGBUILD
	core/glibc/PKGBUILD
	core/openldap/PKGBUILD
	extra/libgsf/PKGBUILD
	extra/phonon/PKGBUILD
	extra/poppler/PKGBUILD
	extra/smartmontools/PKGBUILD
	extra/vlc/PKGBUILD
	extra/xfwm4/PKGBUILD
	kde-unstable/calligra/PKGBUILD
	kde-unstable/kdelibs/PKGBUILD
	multilib/lib32-glibc/PKGBUILD
	multilib/lib32-keyutils/PKGBUILD
	multilib/lib32-krb5/PKGBUILD
	multilib/lib32-libcap/PKGBUILD
	multilib/lib32-libdrm/PKGBUILD
	multilib/lib32-libogg/PKGBUILD
	multilib/lib32-libssh2/PKGBUILD
	multilib/lib32-libxcursor/PKGBUILD
	multilib/lib32-libxext/PKGBUILD
	multilib/lib32-libxfixes/PKGBUILD
	multilib/lib32-libxi/PKGBUILD
	multilib/lib32-libxrandr/PKGBUILD
	multilib/lib32-llvm/PKGBUILD
	multilib/lib32-llvm/clang-pure64.patch
	multilib/lib32-llvm/enable-lto.patch
	multilib/lib32-mesa/PKGBUILD
	multilib/lib32-pcre/PKGBUILD
	multilib/lib32-pixman/PKGBUILD
	multilib/lib32-readline/PKGBUILD
	multilib/lib32-udev/PKGBUILD
	multilib/lib32-v4l-utils/PKGBUILD

1 files changed, 58 insertions, 58 deletions

diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD
index 406764ab6..d0ccddf3d 100644
--- a/community/nginx/PKGBUILD
+++ b/community/nginx/PKGBUILD
@@ -1,17 +1,10 @@
-# $Id: PKGBUILD 58582 2011-11-15 20:13:02Z spupykin $
+# $Id: PKGBUILD 60863 2011-12-19 16:15:47Z bpiotrowski $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Bartłomiej Piotrowski <barthalion@gmal.com>
 # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl>
 
-_doc_root=/usr/share/nginx/http
-_server_root=/etc/nginx
-_conf_path=${_server_root}/conf
-_tmp_path=/var/spool/nginx
-_log_path=/var/log/nginx
-_user=http
-_group=http
-
 pkgname=nginx
-pkgver=1.0.10
+pkgver=1.0.11
 pkgrel=1
 pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server"
 arch=('i686' 'x86_64' 'mips64el')
@@ -21,65 +14,72 @@ optdepends=('passenger')
 url="http://nginx.org"
 license=('custom')
 backup=("etc/nginx/conf/fastcgi.conf"
-	"etc/nginx/conf/fastcgi_params"
-	"etc/nginx/conf/koi-win"
-	"etc/nginx/conf/koi-utf"
-	"etc/nginx/conf/mime.types"
-	"etc/nginx/conf/nginx.conf"
-	"etc/nginx/conf/scgi_params"
-	"etc/nginx/conf/uwsgi_params"
-	"etc/nginx/conf/win-utf"
-	"etc/logrotate.d/nginx"
-	"etc/conf.d/nginx")
-changelog=changelog
+        "etc/nginx/conf/fastcgi_params"
+        "etc/nginx/conf/koi-win"
+        "etc/nginx/conf/koi-utf"
+        "etc/nginx/conf/mime.types"
+        "etc/nginx/conf/nginx.conf"
+        "etc/nginx/conf/scgi_params"
+        "etc/nginx/conf/uwsgi_params"
+        "etc/nginx/conf/win-utf"
+        "etc/logrotate.d/nginx"
+        "etc/conf.d/nginx")
 source=(http://nginx.org/download/nginx-$pkgver.tar.gz
-	nginx)
-md5sums=('930b297b00fa1018fb0a1dd3e6b7e17e'
+        nginx)
+md5sums=('a41a01d7cd46e13ea926d7c9ca283a95'
          '0e8032d3ba26c3276e8c7c30588d375f')
 
+_doc_root=/usr/share/nginx/http
+_server_root=/etc/nginx
+_conf_path=${_server_root}/conf
+_tmp_path=/var/spool/nginx
+_log_path=/var/log/nginx
+_user=http
+_group=http
+
 build() {
-	cd $srcdir/nginx-${pkgver}
+	cd "$srcdir/nginx-${pkgver}"
+
 	./configure \
-		--prefix=${_server_root} \
-		--sbin-path=/usr/sbin/nginx \
-		--pid-path=/var/run/nginx.pid \
-		--lock-path=/var/lock/nginx.lock \
-		--http-client-body-temp-path=${_tmp_path}/client_body_temp \
-		--http-proxy-temp-path=${_tmp_path}/proxy_temp \
-		--http-fastcgi-temp-path=${_tmp_path}/fastcgi_temp \
-		--http-log-path=${_log_path}/access.log \
-		--error-log-path=${_log_path}/error.log \
-		--user=${_user} --group=${_group} \
-		--with-imap --with-imap_ssl_module --with-http_ssl_module \
-		--with-http_stub_status_module \
-		--with-http_dav_module \
-		--with-http_gzip_static_module \
-		--with-ipv6 \
-		--add-module=/usr/lib/passenger/ext/nginx \
-		--http-scgi-temp-path=${_tmp_path} \
-		--http-uwsgi-temp-path=${_tmp_path}
-		#--with-http_mp4_module \
-		#--with-http_realip_module \
-		#--with-http_addition_module \
-		#--with-http_xslt_module \
-		#--with-http_image_filter_module \
-		#--with-http_geoip_module \
-		#--with-http_sub_module \
-		#--with-http_flv_module \
-		#--with-http_gzip_static_module \
-		#--with-http_random_index_module \
-		#--with-http_secure_link_module \
-		#--with-http_degradation_module \
-		#--with-http_perl_module \
+        --prefix=${_server_root} \
+        --sbin-path=/usr/sbin/nginx \
+        --pid-path=/var/run/nginx.pid \
+        --lock-path=/var/lock/nginx.lock \
+        --http-client-body-temp-path=${_tmp_path}/client_body_temp \
+        --http-proxy-temp-path=${_tmp_path}/proxy_temp \
+        --http-fastcgi-temp-path=${_tmp_path}/fastcgi_temp \
+        --http-log-path=${_log_path}/access.log \
+        --error-log-path=${_log_path}/error.log \
+        --user=${_user} --group=${_group} \
+        --with-imap --with-imap_ssl_module --with-http_ssl_module \
+        --with-http_stub_status_module \
+        --with-http_dav_module \
+        --with-http_gzip_static_module \
+        --with-ipv6 \
+        --add-module=/usr/lib/passenger/ext/nginx \
+        --http-scgi-temp-path=${_tmp_path} \
+        --http-uwsgi-temp-path=${_tmp_path}
+        #--with-http_mp4_module \
+        #--with-http_realip_module \
+        #--with-http_addition_module \
+        #--with-http_xslt_module \
+        #--with-http_image_filter_module \
+        #--with-http_geoip_module \
+        #--with-http_sub_module \
+        #--with-http_flv_module \
+        #--with-http_random_index_module \
+        #--with-http_secure_link_module \
+        #--with-http_degradation_module \
+        #--with-http_perl_module \
 
 	make
 }
 
 package() {
-	cd $srcdir/nginx-${pkgver}
-	make DESTDIR=$pkgdir install
+	cd "$srcdir/nginx-${pkgver}"
+	make DESTDIR="$pkgdir" install
 
-	install -d $pkgdir/etc/logrotate.d/
+	install -d "$pkgdir"/etc/logrotate.d/
 	cat <<EOF > $pkgdir/etc/logrotate.d/nginx
 	$_log_path/*log {
 		create 640 http log