- synchronize with www/nginx (ipv6 and uwsgi options)

- mention differences: ip/nginx is based on stable branch, www/nginx on devel
This commit is contained in:
Piotr Meyer 2010-06-04 10:04:39 +00:00 committed by Thomas Klausner
parent d89f72f6fa
commit 2840d7231a
5 changed files with 33 additions and 10 deletions

View file

@ -8,3 +8,9 @@ Online Security Blog nginx serves or proxies about 4% of all Internet virtual
hosts, although Netcraft shows much less percent.
The sources are licensed under a BSD-like license.
===========================================================================
NOTE!
This is stable nginx branch. For newest available (devel) see www/nginx.
===========================================================================

View file

@ -1,13 +1,14 @@
# $NetBSD: Makefile,v 1.27 2010/06/01 16:05:05 anielski Exp $
# $NetBSD: Makefile,v 1.28 2010/06/04 10:04:39 anielski Exp $
DISTNAME= nginx-0.7.65
#PKGREVISION= 2
DISTFILES= ${DEFAULT_DISTFILES}
#PKGREVISION= 3
CATEGORIES= www
MASTER_SITES= http://sysoev.ru/nginx/
MAINTAINER= aniou@smutek.pl
HOMEPAGE= http://nginx.net/
COMMENT= Lightweight HTTP server and mail proxy server
COMMENT= Lightweight HTTP server and mail proxy server (stable branch)
LICENSE= 2-clause-bsd
PKG_DESTDIR_SUPPORT= user-destdir
@ -50,7 +51,8 @@ CONFIGURE_ARGS+= --http-fastcgi-temp-path=${NGINX_DATADIR}/fstcgi_temp
PKG_SYSCONFSUBDIR= nginx
EGDIR= ${PREFIX}/share/examples/nginx
EGFILES= fastcgi_params koi-utf koi-win mime.types nginx.conf win-utf
EGFILES= fastcgi.conf fastcgi_params koi-utf koi-win \
mime.types nginx.conf win-utf
.for file in ${EGFILES}
CONF_FILES+= ${EGDIR}/conf/${file} ${PKG_SYSCONFDIR}/${file}
@ -62,7 +64,7 @@ INSTALLATION_DIRS= sbin share/examples/nginx/conf share/examples/nginx/html
OWN_DIRS= ${NGINX_LOGDIR}
OWN_DIRS_PERMS+= ${NGINX_DATADIR} ${NGINX_USER} ${NGINX_GROUP} 0700
BUILD_DEFS+= PKG_SYSCONFBASE NGINX_LOGDIR ${NGINX_PIDDIR} VARBASE
BUILD_DEFS+= NGINX_DATADIR NGINX_LOGDIR NGINX_PIDDIR
BUILD_TARGET= build

View file

@ -1,5 +1,6 @@
@comment $NetBSD: PLIST,v 1.7 2009/09/14 16:41:10 anielski Exp $
@comment $NetBSD: PLIST,v 1.8 2010/06/04 10:04:39 anielski Exp $
sbin/nginx
share/examples/nginx/conf/fastcgi.conf
share/examples/nginx/conf/fastcgi_params
share/examples/nginx/conf/koi-utf
share/examples/nginx/conf/koi-win

View file

@ -1,6 +1,9 @@
$NetBSD: distinfo,v 1.19 2010/06/01 16:05:05 anielski Exp $
$NetBSD: distinfo,v 1.20 2010/06/04 10:04:39 anielski Exp $
SHA1 (nginx-0.7.65.tar.gz) = f2dcc8e015903ff1277e6fa427f9b7911c4f35ce
RMD160 (nginx-0.7.65.tar.gz) = c03386b135ec4d72d2997b19ea70b28aeaa7a6da
Size (nginx-0.7.65.tar.gz) = 604451 bytes
SHA1 (uwsgi-0.9.4.3.tar.gz) = 8271fe6f612176ce1a75d3363b5a63e395cc6830
RMD160 (uwsgi-0.9.4.3.tar.gz) = d03be633473924239bac1f8861e0c8b293afe635
Size (uwsgi-0.9.4.3.tar.gz) = 82312 bytes
SHA1 (patch-aa) = 1ef1a800f0d7dffe182b8a74f115105ded205f8e

View file

@ -1,7 +1,8 @@
# $NetBSD: options.mk,v 1.6 2010/01/16 22:23:02 anielski Exp $
# $NetBSD: options.mk,v 1.7 2010/06/04 10:04:39 anielski Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.nginx
PKG_SUPPORTED_OPTIONS= ssl pcre dav flv sub gtools mail-proxy memcache realip
PKG_SUPPORTED_OPTIONS= ssl pcre dav flv sub gtools mail-proxy memcache \
realip inet6 uwsgi
PKG_SUGGESTED_OPTIONS= ssl pcre
.include "../../mk/bsd.options.mk"
@ -44,6 +45,16 @@ CONFIGURE_ARGS+= --without-http_memcached_module
.endif
.if !empty(PKG_OPTIONS:Mrealip)
CONFIGURE_ARGS+= --with-http_realip_module
CONFIGURE_ARGS+= --with-http_realip_module
.endif
.if !empty(PKG_OPTIONS:Minet6)
CONFIGURE_ARGS+= --with-ipv6
.endif
.if !empty(PKG_OPTIONS:Muwsgi)
UWSGI= uwsgi-0.9.4.3
DISTFILES+= ${UWSGI}.tar.gz
SITES.${UWSGI}.tar.gz= http://projects.unbit.it/downloads/
CONFIGURE_ARGS+= --add-module=../${UWSGI}/nginx
.endif