svn commit: r414353 - in head/www: nginx nginx-devel

[Sergey A. Osokin]

Author: osa
Date: Sat Apr 30 18:31:57 2016
New Revision: 414353
URL: https://svnweb.freebsd.org/changeset/ports/414353

Log:
  Do not force WITH_OPENSSL_PORT on 11.x and above.
  Bump PORTREVISION.
  
  PR:	209159

Modified:
  head/www/nginx-devel/Makefile
  head/www/nginx/Makefile

Modified: head/www/nginx-devel/Makefile
==============================================================================
--- head/www/nginx-devel/Makefile	Sat Apr 30 18:18:01 2016	(r414352)
+++ head/www/nginx-devel/Makefile	Sat Apr 30 18:31:57 2016	(r414353)
@@ -3,7 +3,7 @@
 
 PORTNAME=	nginx
 PORTVERSION=	1.10.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://nginx.org/download/
 MASTER_SITES+=	LOCAL/osa
@@ -424,7 +424,6 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_ct
 .endif
 NGINX_OPENSSL=	yes
 USE_HTTP_SSL=	yes
-WITH_OPENSSL_PORT=	yes
 .endif
 
 .if ${PORT_OPTIONS:MECHO}
@@ -991,7 +990,6 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_xs
 NGINX_OPENSSL=	yes
 USE_HTTP_SSL=	yes
 CONFIGURE_ARGS+=--with-http_v2_module
-WITH_OPENSSL_PORT=	yes
 .endif
 
 .if ${PORT_OPTIONS:MNJS}
@@ -1106,6 +1104,9 @@ GROUPS?=${WWWGRP}
 
 .if defined(NGINX_OPENSSL)
 USE_OPENSSL=	yes
+.if ${OSVERSION} < 1100000
+WITH_OPENSSL_PORT=yes
+.endif
 .endif
 
 pre-everything::

Modified: head/www/nginx/Makefile
==============================================================================
--- head/www/nginx/Makefile	Sat Apr 30 18:18:01 2016	(r414352)
+++ head/www/nginx/Makefile	Sat Apr 30 18:31:57 2016	(r414353)
@@ -3,7 +3,7 @@
 
 PORTNAME=	nginx
 PORTVERSION=	1.10.0
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	www
 MASTER_SITES=	http://nginx.org/download/
@@ -424,7 +424,6 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_ct
 .endif
 NGINX_OPENSSL=	yes
 USE_HTTP_SSL=	yes
-WITH_OPENSSL_PORT=	yes
 .endif
 
 .if ${PORT_OPTIONS:MECHO}
@@ -991,7 +990,6 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_xs
 NGINX_OPENSSL=	yes
 USE_HTTP_SSL=	yes
 CONFIGURE_ARGS+=--with-http_v2_module
-WITH_OPENSSL_PORT=	yes
 .endif
 
 .if ${PORT_OPTIONS:MNJS}
@@ -1106,6 +1104,9 @@ GROUPS?=${WWWGRP}
 
 .if defined(NGINX_OPENSSL)
 USE_OPENSSL=	yes
+.if ${OSVERSION} < 1100000
+WITH_OPENSSL_PORT=yes
+.endif
 .endif
 
 pre-everything::