diff options
| author | Alexey Dokuchaev <danfe@FreeBSD.org> | 2020-08-29 17:19:04 +0000 |
|---|---|---|
| committer | Alexey Dokuchaev <danfe@FreeBSD.org> | 2020-08-29 17:19:04 +0000 |
| commit | cfa54aad37c85deb616ef2897de9ad47bb7fd263 (patch) | |
| tree | 91e6afd486ce4a8c3809a322d295c60eb4db2c1c /net | |
| parent | science/paraview: Fix build with -fno-common (diff) | |
- Fix the build against contemporary OpenSSL versions
- Improve COMMENT wording, convert to USES+=localbase
Notes
Notes:
svn path=/head/; revision=546928
Diffstat (limited to 'net')
| -rw-r--r-- | net/easysoap/Makefile | 16 | ||||
| -rw-r--r-- | net/easysoap/files/patch-src__SOAPSSLContext.cpp | 2 |
2 files changed, 4 insertions, 14 deletions
diff --git a/net/easysoap/Makefile b/net/easysoap/Makefile index c570287cfbb0..214181e95d8f 100644 --- a/net/easysoap/Makefile +++ b/net/easysoap/Makefile @@ -9,26 +9,16 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/SWANSONG DISTNAME= EasySoap++-${PORTVERSION} MAINTAINER= ports@FreeBSD.org -COMMENT= C++ SOAP Library based on expat +COMMENT= C++ SOAP library based on Expat LICENSE= LGPL21 LIB_DEPENDS= libexpat.so:textproc/expat2 -USES= libtool ssl +USES= libtool localbase ssl GNU_CONFIGURE= yes CONFIGURE_ENV= ac_cv_lib_stdcpp_main=no INSTALL_TARGET= install-strip USE_LDCONFIG= yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib - -.include <bsd.port.pre.mk> - -.if ${SSL_DEFAULT} == base -BROKEN_FreeBSD_12= use of undeclared identifier 'SSLv2_client_method' -BROKEN_FreeBSD_13= use of undeclared identifier 'SSLv2_client_method' -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/easysoap/files/patch-src__SOAPSSLContext.cpp b/net/easysoap/files/patch-src__SOAPSSLContext.cpp index 772acddc5b2e..4398e420d786 100644 --- a/net/easysoap/files/patch-src__SOAPSSLContext.cpp +++ b/net/easysoap/files/patch-src__SOAPSSLContext.cpp @@ -4,7 +4,7 @@ switch(methodType) { -+#ifndef OPENSSL_NO_SSL2 ++#if OPENSSL_VERSION_NUMBER < 0x10100000L && !defined(OPENSSL_NO_SSL2) case SOAPSSLContext::SSL_v2: - method = SSLv2_client_method(); + method = const_cast<SSL_METHOD*>(SSLv2_client_method()); |