Date: Thu, 19 Dec 2013 17:31:04 +0000 (UTC) From: "Sergey A. Osokin" <osa@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336939 - in head/www: nginx nginx-devel Message-ID: <201312191731.rBJHV495027836@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: osa Date: Thu Dec 19 17:31:04 2013 New Revision: 336939 URL: http://svnweb.freebsd.org/changeset/ports/336939 Log: Be more correct with openssl on modern FreeBSD10. Do not bump PORTREVISION cause SPDY module disable by default. Modified: head/www/nginx-devel/Makefile head/www/nginx/Makefile Modified: head/www/nginx-devel/Makefile ============================================================================== --- head/www/nginx-devel/Makefile Thu Dec 19 17:22:10 2013 (r336938) +++ head/www/nginx-devel/Makefile Thu Dec 19 17:31:04 2013 (r336939) @@ -793,7 +793,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/a .endif .if ${PORT_OPTIONS:MSPDY} -USE_OPENSSL_PORT= yes +NGINX_OPENSSL= yes USE_HTTP_SSL= yes CONFIGURE_ARGS+=--with-http_spdy_module .endif @@ -867,6 +867,13 @@ GROUPS?=${WWWGRP} .if defined(NGINX_OPENSSL) USE_OPENSSL= yes +.if ${PORT_OPTIONS:MSPDY} +.if ${OSVERSION} < 1000028 +WITH_OPENSSL_PORT= yes +.else +WITH_OPENSSL_BASE= yes +.endif +.endif .endif pre-everything:: Modified: head/www/nginx/Makefile ============================================================================== --- head/www/nginx/Makefile Thu Dec 19 17:22:10 2013 (r336938) +++ head/www/nginx/Makefile Thu Dec 19 17:31:04 2013 (r336939) @@ -792,7 +792,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/a .endif .if ${PORT_OPTIONS:MSPDY} -USE_OPENSSL_PORT= yes +NGINX_OPENSSL= yes USE_HTTP_SSL= yes CONFIGURE_ARGS+=--with-http_spdy_module .endif @@ -866,6 +866,13 @@ GROUPS?=${WWWGRP} .if defined(NGINX_OPENSSL) USE_OPENSSL= yes +.if ${PORT_OPTIONS:MSPDY} +.if ${OSVERSION} < 1000028 +WITH_OPENSSL_PORT= yes +.else +WITH_OPENSSL_BASE= yes +.endif +.endif .endif pre-everything::
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312191731.rBJHV495027836>