On Sun, Dec 30, 2007 at 12:40:47PM -0500, Mike Erdely wrote:
> On Sat, Dec 29, 2007 at 05:19:52PM -0700, Darrin Chandler wrote:
> > This brings nginx up to 0.5.34, the latest stable version. Change log is
> > at http://nginx.net/CHANGES-0.5 includes several bugfixes as well as
> > some new features.
> >
> > I have also made this a flavored port, with only the most common
> > features enabled by default (http server & proxy, mod_ssl).
>
> I'm not sure about the flavors. To me if feels like you're adding
> complexity where none is needed. nginx is not a large binary with all
> options compiled in. The options do not include a large number of
> dependencies which one might want to leave out.
>
> Anyone else with opinions on this?
>
> > Tested by me on i386, amd64, sparc64.
> >
> > Diff attached. Tarball available at
> > http://phxbsd.com/OpenBSD/nginx.tar.gz
> >
> > Please test and commit. Feedback appreciated.
Thanks Mike, Bernd, Okan, and you too Joachim :)
Unflavored diff attached.
--
Darrin Chandler | Phoenix BSD User Group | MetaBUG
[EMAIL PROTECTED] | http://phxbug.org/ | http://metabug.org/
http://www.stilyagin.com/ | Daemons in the Desert | Global BUG Federation
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile 8 Oct 2007 19:23:43 -0000 1.3
+++ Makefile 29 Dec 2007 22:56:50 -0000
@@ -2,7 +2,7 @@
COMMENT= robust and small HTTP server and IMAP/POP3 proxy server
-DISTNAME= nginx-0.5.32
+DISTNAME= nginx-0.5.34
PKGNAME= ${DISTNAME}
CATEGORIES= www
@@ -28,11 +28,17 @@ SUBST_VARS+= NGINX_DIR
CONFIGURE_STYLE= simple
+FLAVORS= mail_proxy mod_status mod_perl no_http_proxy no_ssl
+FLAVOR?=
+
# Some conf files are relative to --prefix and
# have no --xxx-path of their own. Set this so
# all runtime configs live in the same place.
CONFIGURE_ARGS+= --prefix=${SYSCONFDIR}/nginx
+# Get rid of '#include <malloc.h>' which caused many warnings
+CONFIGURE_ARGS+= --with-cc-opt="-DNGX_HAVE_MALLOC_H=0"
+
CONFIGURE_ARGS+= --conf-path=${SYSCONFDIR}/nginx/nginx.conf \
--sbin-path=${PREFIX}/sbin/nginx \
--pid-path=/var/run/nginx.pid \
@@ -43,13 +49,26 @@ CONFIGURE_ARGS+= --conf-path=${SYSCONFDI
--http-log-path=/var/log/nginx/access.log \
--error-log-path=/var/log/nginx/error.log \
--user=_nginx \
- --group=_nginx \
- --with-cc-opt="-I ${LOCALBASE}/include" \
- --with-ld-opt="-L ${LOCALBASE}/lib" \
- --with-http_ssl_module \
- --with-http_stub_status_module \
- --with-imap \
- --with-imap_ssl_module
+ --group=_nginx
+
+.if ${FLAVOR:L:Mno_http_proxy}
+CONFIGURE_ARGS+= --without-http_proxy_module
+.endif
+.if ${FLAVOR:L:Mmail_proxy}
+CONFIGURE_ARGS+= --with-mail
+.endif
+.if !${FLAVOR:L:Mno_ssl}
+CONFIGURE_ARGS+= --with-http_ssl_module
+.endif
+.if ${FLAVOR:L:Mmail_proxy} && !${FLAVOR:L:Mno_ssl}
+CONFIGURE_ARGS+= --with-mail_ssl_module
+.endif
+.if ${FLAVOR:L:Mmod_perl}
+CONFIGURE_ARGS+= --with-http_perl_module
+.endif
+.if ${FLAVOR:L:Mmod_status}
+CONFIGURE_ARGS+= --with-http_stub_status_module
+.endif
NO_REGRESS= Yes
ALL_TARGET=
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/nginx/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 8 Oct 2007 19:23:43 -0000 1.2
+++ distinfo 29 Dec 2007 22:56:50 -0000
@@ -1,5 +1,5 @@
-MD5 (nginx-0.5.32.tar.gz) = AIgmm4pZoUawupye4phTuw==
-RMD160 (nginx-0.5.32.tar.gz) = ZxF7YuJr8P8oQwQoZ630OI+k0aE=
-SHA1 (nginx-0.5.32.tar.gz) = PLS8CXZ15cGpDlm/UfSiS5habfo=
-SHA256 (nginx-0.5.32.tar.gz) = jLlcxhuv7HsP4+kfBvLnruexLxKmr4IA1gA4+NXlLKw=
-SIZE (nginx-0.5.32.tar.gz) = 479982
+MD5 (nginx-0.5.34.tar.gz) = j30+/NfKrx8G5Nld+urCOA==
+RMD160 (nginx-0.5.34.tar.gz) = oFdlHrkGWx5JHOOMc7yeSJfJgsc=
+SHA1 (nginx-0.5.34.tar.gz) = 929ssawKMW8glYv33GoDcj+1jt8=
+SHA256 (nginx-0.5.34.tar.gz) = ZOJVu3avoczitluisztNHP8DRlT/IPZLTChdFD8Fmjo=
+SIZE (nginx-0.5.34.tar.gz) = 487815
