Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 4 Oct 2016 20:04:02 +0000 (UTC)
From:      John Marino <marino@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r423299 - in head/www: aws aws-demos
Message-ID:  <201610042004.u94K42SF032914@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marino
Date: Tue Oct  4 20:04:01 2016
New Revision: 423299
URL: https://svnweb.freebsd.org/changeset/ports/423299

Log:
  www/aws(-demos): IGNORE FreeBSD 9 using base SSL
  
  MFH:	2016Q4

Modified:
  head/www/aws-demos/Makefile
  head/www/aws/Makefile

Modified: head/www/aws-demos/Makefile
==============================================================================
--- head/www/aws-demos/Makefile	Tue Oct  4 20:00:27 2016	(r423298)
+++ head/www/aws-demos/Makefile	Tue Oct  4 20:04:01 2016	(r423299)
@@ -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: head/www/aws/Makefile
==============================================================================
--- head/www/aws/Makefile	Tue Oct  4 20:00:27 2016	(r423298)
+++ head/www/aws/Makefile	Tue Oct  4 20:04:01 2016	(r423299)
@@ -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>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610042004.u94K42SF032914>