From owner-svn-ports-branches@freebsd.org  Wed Oct  5 14:55:03 2016
Return-Path: <owner-svn-ports-branches@freebsd.org>
Delivered-To: svn-ports-branches@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 B894CAF64F3;
 Wed,  5 Oct 2016 14:55:03 +0000 (UTC)
 (envelope-from marino@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 6AF9E75C;
 Wed,  5 Oct 2016 14:55:03 +0000 (UTC)
 (envelope-from marino@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u95Et200066194;
 Wed, 5 Oct 2016 14:55:02 GMT (envelope-from marino@FreeBSD.org)
Received: (from marino@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u95Et2Ij066192;
 Wed, 5 Oct 2016 14:55:02 GMT (envelope-from marino@FreeBSD.org)
Message-Id: <201610051455.u95Et2Ij066192@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: marino set sender to
 marino@FreeBSD.org using -f
From: John Marino <marino@FreeBSD.org>
Date: Wed, 5 Oct 2016 14:55:02 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r423348 - in branches/2016Q4/www: aws aws-demos
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 05 Oct 2016 14:55:03 -0000

Author: marino
Date: Wed Oct  5 14:55:02 2016
New Revision: 423348
URL: https://svnweb.freebsd.org/changeset/ports/423348

Log:
  MFH: r423299
  
  www/aws(-demos): IGNORE FreeBSD 9 using base SSL
  
  Approved by:	ports-secteam

Modified:
  branches/2016Q4/www/aws-demos/Makefile
  branches/2016Q4/www/aws/Makefile
Directory Properties:
  branches/2016Q4/   (props changed)

Modified: branches/2016Q4/www/aws-demos/Makefile
==============================================================================
--- branches/2016Q4/www/aws-demos/Makefile	Wed Oct  5 14:49:19 2016	(r423347)
+++ branches/2016Q4/www/aws-demos/Makefile	Wed Oct  5 14:55:02 2016	(r423348)
@@ -69,7 +69,11 @@ DEMO_DIRS+=	ws
 DEMO_DIRS+=	ws_candy
 DEMO_DIRS+=	zdemo
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
+
+.if ${SSL_DEFAULT} == base
+IGNORE_FreeBSD_9=	Requires newer OpenSSL (set DEFAULT_VERSIONS+=ssl=openssl)
+.endif
 
 .if ${PORT_OPTIONS:MSSL}
 CONF_ARGS+=	SOCKET=openssl
@@ -120,4 +124,4 @@ do-install:
 	${INSTALL_DATA} ${FILESDIR}/templates.tads \
 		${STAGEDIR}${EXAMPLESDIR}/templates
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: branches/2016Q4/www/aws/Makefile
==============================================================================
--- branches/2016Q4/www/aws/Makefile	Wed Oct  5 14:49:19 2016	(r423347)
+++ branches/2016Q4/www/aws/Makefile	Wed Oct  5 14:55:02 2016	(r423348)
@@ -67,7 +67,11 @@ CONF_ARGS+=	ZLIB=true
 CONF_ARGS+=	ASIS=true
 CONF_ARGS+=	DEFAULT_LIBRARY_TYPE=static
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
+
+.if ${SSL_DEFAULT} == base
+IGNORE_FreeBSD_9=	Requires newer OpenSSL (set DEFAULT_VERSIONS+=ssl=openssl)
+.endif
 
 ###################
 ##  SSL Support  ##
@@ -181,4 +185,4 @@ post-install:
 	cd ${WRKSRC}/gps && ${INSTALL_DATA} *.xml aws.py \
 		${STAGEDIR}${PREFIX}/share/gps/plug-ins
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>