From owner-svn-ports-all@FreeBSD.ORG  Thu Dec 19 17:31:05 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 2D80FFE;
 Thu, 19 Dec 2013 17:31:05 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 19F7E160D;
 Thu, 19 Dec 2013 17:31:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBJHV4ex027838;
 Thu, 19 Dec 2013 17:31:04 GMT (envelope-from osa@svn.freebsd.org)
Received: (from osa@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBJHV495027836;
 Thu, 19 Dec 2013 17:31:04 GMT (envelope-from osa@svn.freebsd.org)
Message-Id: <201312191731.rBJHV495027836@svn.freebsd.org>
From: "Sergey A. Osokin" <osa@FreeBSD.org>
Date: Thu, 19 Dec 2013 17:31:04 +0000 (UTC)
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
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.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Dec 2013 17:31:05 -0000

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::