svn commit: r423348 - in branches/2016Q4/www: aws aws-demos

[John Marino]

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>