Date: Thu, 29 Sep 2016 18:51:30 +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: r422937 - in head/www: aws aws-demos Message-ID: <201609291851.u8TIpUtw035005@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Thu Sep 29 18:51:30 2016 New Revision: 422937 URL: https://svnweb.freebsd.org/changeset/ports/422937 Log: www/aws(-demos): remove WITH_OPENSSL_PORT I believe the base SSL libraries are sufficient. Modified: head/www/aws-demos/Makefile head/www/aws/Makefile Modified: head/www/aws-demos/Makefile ============================================================================== --- head/www/aws-demos/Makefile Thu Sep 29 16:50:56 2016 (r422936) +++ head/www/aws-demos/Makefile Thu Sep 29 18:51:30 2016 (r422937) @@ -3,6 +3,7 @@ PORTNAME= aws PORTVERSION= 17.0.0 +PORTREVISION= 1 CATEGORIES= www PKGNAMESUFFIX= -demos @@ -32,6 +33,8 @@ OPTIONS_DEFINE= SSL LDAP OPTIONS_DEFAULT= SSL OPTIONS_SUB= yes +SSL_USES= ssl + DEMO_DIRS+= auth DEMO_DIRS+= autobahn DEMO_DIRS+= cert @@ -69,8 +72,6 @@ DEMO_DIRS+= zdemo .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MSSL} -USES+= ssl -WITH_OPENSSL_PORT= yes CONF_ARGS+= SOCKET=openssl DEMO_DIRS+= agent DEMO_DIRS+= runme Modified: head/www/aws/Makefile ============================================================================== --- head/www/aws/Makefile Thu Sep 29 16:50:56 2016 (r422936) +++ head/www/aws/Makefile Thu Sep 29 18:51:30 2016 (r422937) @@ -3,6 +3,7 @@ PORTNAME= aws PORTVERSION= 17.0.0 +PORTREVISION= 1 CATEGORIES= www MAINTAINER= marino@FreeBSD.org @@ -50,6 +51,10 @@ OPTIONS_SINGLE_Secure-Socket-Layer= SSL SHARED_DESC= Build shared libraries in addition to static ones IP6_DESC= Support IPv6 instead of IPv4 +SSL_USES= ssl +GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls +LDAP_USE= OPENLDAP=yes + CONF_ARGS= PROCESSORS=${MAKE_JOBS_NUMBER} CONF_ARGS+= GCC=ada CONF_ARGS+= PYTHON=python${PYTHON_VER} @@ -69,15 +74,12 @@ CONF_ARGS+= DEFAULT_LIBRARY_TYPE=static ################### .if ${PORT_OPTIONS:MSSL} -WITH_OPENSSL_PORT= yes -USE_OPENSSL= yes CONF_ARGS+= SOCKET=openssl -CONF_ARGS+= LPATH=${PREFIX}/lib +CONF_ARGS+= LPATH=${OPENSSLLIB} LINK_SSL= .endif .if ${PORT_OPTIONS:MGNUTLS} CONF_ARGS+= SOCKET=gnutls -LIB_DEPENDS+= libgnutls.so:security/gnutls LINK_TLS= .endif @@ -86,7 +88,6 @@ LINK_TLS= #################### .if ${PORT_OPTIONS:MLDAP} -USE_OPENLDAP= yes CONF_ARGS+= LDAP=true LINK_LDP= .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609291851.u8TIpUtw035005>