Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 29 Aug 2020 17:19:04 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r546928 - in head/net/easysoap: . files
Message-ID:  <202008291719.07THJ434085033@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Sat Aug 29 17:19:04 2020
New Revision: 546928
URL: https://svnweb.freebsd.org/changeset/ports/546928

Log:
  - Fix the build against contemporary OpenSSL versions
  - Improve COMMENT wording, convert to USES+=localbase

Modified:
  head/net/easysoap/Makefile
  head/net/easysoap/files/patch-src__SOAPSSLContext.cpp

Modified: head/net/easysoap/Makefile
==============================================================================
--- head/net/easysoap/Makefile	Sat Aug 29 17:15:19 2020	(r546927)
+++ head/net/easysoap/Makefile	Sat Aug 29 17:19:04 2020	(r546928)
@@ -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>

Modified: head/net/easysoap/files/patch-src__SOAPSSLContext.cpp
==============================================================================
--- head/net/easysoap/files/patch-src__SOAPSSLContext.cpp	Sat Aug 29 17:15:19 2020	(r546927)
+++ head/net/easysoap/files/patch-src__SOAPSSLContext.cpp	Sat Aug 29 17:19:04 2020	(r546928)
@@ -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());



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