diff options
| -rw-r--r-- | www/aws-demos/Makefile | 5 | ||||
| -rw-r--r-- | www/aws/Makefile | 11 |
2 files changed, 9 insertions, 7 deletions
diff --git a/www/aws-demos/Makefile b/www/aws-demos/Makefile index bdbb78ce942a..029ec167e389 100644 --- a/www/aws-demos/Makefile +++ b/www/aws-demos/Makefile @@ -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 diff --git a/www/aws/Makefile b/www/aws/Makefile index 3ac152cfe28b..7f25e8f35a4f 100644 --- a/www/aws/Makefile +++ b/www/aws/Makefile @@ -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 GNUTLS 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 |