cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

committing on behalf of william@ (co-MAINTAINER):

Browse Source 
- fix pre-patch target to allow multiple FLAVORs (thanks ajacoutot@ and phessler@)

- add 'mailproxy' FLAVOR to enable mail_pop3_module, mail_imap_module,
  and mail_smtp_module (requested by Lyndon Nerenberg)

- sort the FLAVORs alphabetically in the README

ok ajacoutot@ robert@
This commit is contained in:
jasper 2016-08-14 10:52:07 +00:00
parent 8d3bd51acf
commit 8e95b33acd
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
www/nginx/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.98 2016/06/02 13:22:52 robert Exp $
# $OpenBSD: Makefile,v 1.99 2016/08/14 10:52:07 jasper Exp $
BROKEN-arm= src/core/ngx_rwlock.c:116:2: error: \#error ngx_atomic_cmp_set() is not defined!
BROKEN-hppa= src/core/ngx_rwlock.c:116:2: error: \#error ngx_atomic_cmp_set() is not defined!
@ -7,6 +7,7 @@ COMMENT= robust and small HTTP server and mail proxy server
VERSION= 1.10.1
DISTNAME= nginx-${VERSION}
REVISION= 0
CATEGORIES= www
MASTER_SITES= http://nginx.org/download/
@ -31,7 +32,7 @@ NGINX_DIR= /var/www
SUBST_VARS= NGINX_DIR
CFLAGS+= -Wall -Wpointer-arith
FLAVORS= lua naxsi passenger
FLAVORS= lua mailproxy naxsi passenger
FLAVOR?=
.if !${FLAVOR:Mpassenger}
@ -73,10 +74,13 @@ CONFIGURE_ARGS+= --prefix=${NGINX_DIR} \
--with-mail \
--with-mail_ssl_module \
--with-ipv6 \
--with-stream \
--without-mail_pop3_module \
--with-stream
.if !${FLAVOR:Mmailproxy}
CONFIGURE_ARGS+= --without-mail_pop3_module \
--without-mail_imap_module \
--without-mail_smtp_module
.endif
DISTFILES+= ${DISTNAME}${EXTRACT_SUFX}
PATCHFILES+= nginx-${VERSION}-chroot.patch:3
@ -115,19 +119,15 @@ SUPDISTFILES+= ${LUADISTFILES}
NO_TEST= Yes
ALL_TARGET=
.if ${FLAVOR:Mnaxsi}
pre-patch:
.if ${FLAVOR:Mnaxsi}
cd ${WRKSRC} && \
mv ../naxsi-* naxsi
.endif
.if ${FLAVOR:Mlua}
pre-patch:
cd ${WRKSRC} && \
mv ../ngx_devel_kit-* ngx_devel_kit && \
mv ../lua-nginx-module-${LUAV} lua-nginx-module
.endif
pre-configure:

8
www/nginx/pkg/DESCR
View File

@ -18,10 +18,14 @@ Available FLAVORs:
into the nginx core and integrates the powerful Lua threads (aka Lua
coroutines) into the nginx event model by means of nginx subrequests.
mailproxy - enables the mail proxy features of nginx (specifically
the mail_pop3_module, the mail_imap_module, and the mail_smtp_module).
naxsi - This Nginx module embeds Naxsi into nginx core. Naxsi is
a high performance, low rules maintenance, Web Application Firewall module.
passenger - Phusion Passenger(R) a.k.a. mod_rails or mod_rack makes
deployment of Ruby web applications, such as those built on the revolutionary
Ruby on Rails web framework, a breeze. It follows the usual Ruby on Rails
conventions, such as "Don't-Repeat-Yourself".
naxsi - This Nginx module embeds Naxsi into nginx core. Naxsi is
a high performance, low rules maintenance, Web Application Firewall module.