From owner-svn-ports-all@freebsd.org Sat Apr 30 18:31:58 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 95CF6B22E5F; Sat, 30 Apr 2016 18:31:58 +0000 (UTC) (envelope-from osa@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4CA341C7D; Sat, 30 Apr 2016 18:31:58 +0000 (UTC) (envelope-from osa@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3UIVvVx019802; Sat, 30 Apr 2016 18:31:57 GMT (envelope-from osa@FreeBSD.org) Received: (from osa@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3UIVv7H019800; Sat, 30 Apr 2016 18:31:57 GMT (envelope-from osa@FreeBSD.org) Message-Id: <201604301831.u3UIVv7H019800@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: osa set sender to osa@FreeBSD.org using -f From: "Sergey A. Osokin" Date: Sat, 30 Apr 2016 18:31:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r414353 - in head/www: nginx nginx-devel X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Apr 2016 18:31:58 -0000 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::