diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-18 17:12:10 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-18 17:12:10 +0100 |
| commit | fb5b6b28f363547abcbfa026fcae050236861425 (patch) | |
| tree | 850e29f1f9f42ada20e1c6818316988505970dae /community/nginx | |
| parent | 67eabbfbd9364ee57f122c9ec9a03dd61bba850b (diff) | |
| parent | ab63d8d49f68847a68c2ba0014bf0d3338cb3df6 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/ettercap/PKGBUILD
community/mplayer2/PKGBUILD
community/nginx/PKGBUILD
community/pidgin-libnotify/PKGBUILD
core/util-linux/PKGBUILD
extra/aspell-pt/PKGBUILD
extra/glpk/PKGBUILD
extra/libgdiplus/PKGBUILD
extra/llvm/PKGBUILD
extra/mesa/PKGBUILD
extra/rhythmbox/PKGBUILD
extra/texmacs/PKGBUILD
Diffstat (limited to 'community/nginx')
| -rw-r--r-- | community/nginx/PKGBUILD | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index ead5920c7..40c3e359e 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,6 +1,6 @@ -# $Id: PKGBUILD 79831 2012-11-13 15:52:46Z bpiotrowski $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Bartłomiej Piotrowski <barthalion@gmal.com> +# $Id: PKGBUILD 80209 2012-11-17 16:39:31Z bpiotrowski $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl> _cfgdir=/etc/nginx @@ -8,10 +8,10 @@ _tmpdir=/var/lib/nginx pkgname=nginx pkgver=1.2.5 -pkgrel=1 -pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server" +pkgrel=2 +pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server' arch=('i686' 'x86_64' 'mips64el') -depends=('pcre' 'zlib' 'openssl') +depends=('pcre' 'zlib' 'openssl' 'geoip') makedepends=('passenger') optdepends=('passenger') url="http://nginx.org" @@ -57,17 +57,16 @@ build() { --with-ipv6 --with-pcre-jit \ --with-file-aio \ --with-http_dav_module \ + --with-http_geoip_module \ --with-http_gzip_static_module \ --with-http_realip_module \ --with-http_ssl_module \ --with-http_stub_status_module \ --add-module=/usr/lib/passenger/ext/nginx \ #--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 \ |