kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

www/aws(-demos): remove WITH_OPENSSL_PORT

Browse source 
I believe the base SSL libraries are sufficient.
This commit is contained in:
John Marino 2016-09-29 18:51:30 +00:00
parent 5de02f2208
commit c6e7f6d028
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=422937
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
www/aws-demos/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= aws PORTNAME= aws
PORTVERSION= 17.0.0 PORTVERSION= 17.0.0
PORTREVISION= 1
CATEGORIES= www CATEGORIES= www
PKGNAMESUFFIX= -demos PKGNAMESUFFIX= -demos
@ -32,6 +33,8 @@ OPTIONS_DEFINE= SSL LDAP
OPTIONS_DEFAULT= SSL OPTIONS_DEFAULT= SSL
OPTIONS_SUB= yes OPTIONS_SUB= yes
SSL_USES= ssl
DEMO_DIRS+= auth DEMO_DIRS+= auth
DEMO_DIRS+= autobahn DEMO_DIRS+= autobahn
DEMO_DIRS+= cert DEMO_DIRS+= cert
@ -69,8 +72,6 @@ DEMO_DIRS+= zdemo
.include <bsd.port.options.mk> .include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MSSL} .if ${PORT_OPTIONS:MSSL}
USES+= ssl
WITH_OPENSSL_PORT= yes
CONF_ARGS+= SOCKET=openssl CONF_ARGS+= SOCKET=openssl
DEMO_DIRS+= agent DEMO_DIRS+= agent
DEMO_DIRS+= runme DEMO_DIRS+= runme

11
www/aws/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= aws PORTNAME= aws
PORTVERSION= 17.0.0 PORTVERSION= 17.0.0
PORTREVISION= 1
CATEGORIES= www CATEGORIES= www
MAINTAINER= marino@FreeBSD.org 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 SHARED_DESC= Build shared libraries in addition to static ones
IP6_DESC= Support IPv6 instead of IPv4 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= PROCESSORS=${MAKE_JOBS_NUMBER}
CONF_ARGS+= GCC=ada CONF_ARGS+= GCC=ada
CONF_ARGS+= PYTHON=python${PYTHON_VER} CONF_ARGS+= PYTHON=python${PYTHON_VER}
@ -69,15 +74,12 @@ CONF_ARGS+= DEFAULT_LIBRARY_TYPE=static
################### ###################
.if ${PORT_OPTIONS:MSSL} .if ${PORT_OPTIONS:MSSL}
WITH_OPENSSL_PORT= yes
USE_OPENSSL= yes
CONF_ARGS+= SOCKET=openssl CONF_ARGS+= SOCKET=openssl
CONF_ARGS+= LPATH=${PREFIX}/lib CONF_ARGS+= LPATH=${OPENSSLLIB}
LINK_SSL= LINK_SSL=
.endif .endif
.if ${PORT_OPTIONS:MGNUTLS} .if ${PORT_OPTIONS:MGNUTLS}
CONF_ARGS+= SOCKET=gnutls CONF_ARGS+= SOCKET=gnutls
LIB_DEPENDS+= libgnutls.so:security/gnutls
LINK_TLS= LINK_TLS=
.endif .endif
@ -86,7 +88,6 @@ LINK_TLS=
#################### ####################
.if ${PORT_OPTIONS:MLDAP} .if ${PORT_OPTIONS:MLDAP}
USE_OPENLDAP= yes
CONF_ARGS+= LDAP=true CONF_ARGS+= LDAP=true
LINK_LDP= LINK_LDP=
.endif .endif