[Midnightbsd-cvs] mports [23369] trunk/net/ulxmlrpcpp: update patchset

[laffer1 at midnightbsd.org]

Revision: 23369
          http://svnweb.midnightbsd.org/mports/?rev=23369
Author:   laffer1
Date:     2018-05-05 15:56:55 -0400 (Sat, 05 May 2018)
Log Message:
-----------
update patchset

Modified Paths:
--------------
    trunk/net/ulxmlrpcpp/Makefile
    trunk/net/ulxmlrpcpp/distinfo
    trunk/net/ulxmlrpcpp/pkg-plist

Added Paths:
-----------
    trunk/net/ulxmlrpcpp/files/patch-ulxmlrpcpp__contrib__ssl_connection.cpp
    trunk/net/ulxmlrpcpp/files/patch-ulxmlrpcpp__ulxr_ssl_connection.cpp

Modified: trunk/net/ulxmlrpcpp/Makefile
===================================================================
--- trunk/net/ulxmlrpcpp/Makefile	2018-05-05 19:46:11 UTC (rev 23368)
+++ trunk/net/ulxmlrpcpp/Makefile	2018-05-05 19:56:55 UTC (rev 23369)
@@ -6,6 +6,7 @@
 
 PORTNAME=	ulxmlrpcpp
 PORTVERSION=	1.7.5
+PORTREVISION=	1
 CATEGORIES=	net devel
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
@@ -15,7 +16,7 @@
 
 LICENSE=	lgpl
 
-LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
@@ -22,13 +23,12 @@
 USES=		tar:bzip2 pathfix iconv libtool
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
+CONFIGURE_ENV=	PTHREAD_LIBS="-lpthread"
+INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e \

Modified: trunk/net/ulxmlrpcpp/distinfo
===================================================================
--- trunk/net/ulxmlrpcpp/distinfo	2018-05-05 19:46:11 UTC (rev 23368)
+++ trunk/net/ulxmlrpcpp/distinfo	2018-05-05 19:56:55 UTC (rev 23369)
@@ -1,3 +1,2 @@
 SHA256 (ulxmlrpcpp-1.7.5-src.tar.bz2) = 151b7e56cd63625ca1ecd57ad81479d4d51e9f94ca4b2cbd7a8cf4af77d82989
-RMD160 (ulxmlrpcpp-1.7.5-src.tar.bz2) = 4385d5377f134a3c363aa618b6df4ceb590e7018
 SIZE (ulxmlrpcpp-1.7.5-src.tar.bz2) = 669294

Added: trunk/net/ulxmlrpcpp/files/patch-ulxmlrpcpp__contrib__ssl_connection.cpp
===================================================================
--- trunk/net/ulxmlrpcpp/files/patch-ulxmlrpcpp__contrib__ssl_connection.cpp	                        (rev 0)
+++ trunk/net/ulxmlrpcpp/files/patch-ulxmlrpcpp__contrib__ssl_connection.cpp	2018-05-05 19:56:55 UTC (rev 23369)
@@ -0,0 +1,14 @@
+--- ulxmlrpcpp/contrib/ssl_connection.cpp.orig
++++ ulxmlrpcpp/contrib/ssl_connection.cpp
+@@ -227,7 +227,11 @@
+ 	if (ssl_ctx != 0)
+     	    SSL_CTX_free(ssl_ctx);
+ 
++#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L
++	const SSL_METHOD *meth = SSLv23_method();
++#else
+ 	SSL_METHOD *meth = SSLv23_method();
++#endif
+ 
+ 	ssl_ctx = SSL_CTX_new (meth);
+ 


Property changes on: trunk/net/ulxmlrpcpp/files/patch-ulxmlrpcpp__contrib__ssl_connection.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/net/ulxmlrpcpp/files/patch-ulxmlrpcpp__ulxr_ssl_connection.cpp
===================================================================
--- trunk/net/ulxmlrpcpp/files/patch-ulxmlrpcpp__ulxr_ssl_connection.cpp	                        (rev 0)
+++ trunk/net/ulxmlrpcpp/files/patch-ulxmlrpcpp__ulxr_ssl_connection.cpp	2018-05-05 19:56:55 UTC (rev 23369)
@@ -0,0 +1,14 @@
+--- ulxmlrpcpp/ulxr_ssl_connection.cpp.orig
++++ ulxmlrpcpp/ulxr_ssl_connection.cpp
+@@ -95,7 +95,11 @@
+ ULXR_API_IMPL(void) SSLConnection::initializeCTX()
+ {
+   ULXR_TRACE(ULXR_PCHAR("initializeCTX"));
++#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L
++  const SSL_METHOD *meth = SSLv23_method();
++#else
+   SSL_METHOD *meth = SSLv23_method();
++#endif
+   ssl_ctx = SSL_CTX_new (meth);
+   if (!ssl_ctx)
+   {


Property changes on: trunk/net/ulxmlrpcpp/files/patch-ulxmlrpcpp__ulxr_ssl_connection.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/net/ulxmlrpcpp/pkg-plist
===================================================================
--- trunk/net/ulxmlrpcpp/pkg-plist	2018-05-05 19:46:11 UTC (rev 23368)
+++ trunk/net/ulxmlrpcpp/pkg-plist	2018-05-05 19:56:55 UTC (rev 23369)
@@ -42,17 +42,13 @@
 include/ulxmlrpcpp/ulxr_xmlparse.h
 include/ulxmlrpcpp/ulxr_xmlparse_base.h
 lib/libulxmlrpcpp.a
-lib/libulxmlrpcpp.la
 lib/libulxmlrpcpp.so
 lib/libulxmlrpcpp.so.24
+lib/libulxmlrpcpp.so.24.0.1
 lib/libulxmlrpcpp_contrib.a
-lib/libulxmlrpcpp_contrib.la
 lib/libulxmlrpcpp_contrib.so
 lib/libulxmlrpcpp_contrib.so.24
+lib/libulxmlrpcpp_contrib.so.24.0.1
 libdata/pkgconfig/ulxmlrpcpp.pc
 %%DATADIR%%/httpd/index.html
 %%DATADIR%%/httpd/logo-ulxmlrpcpp.png
- at dirrm %%DATADIR%%/httpd
- at dirrm %%DATADIR%%
- at dirrm include/ulxmlrpcpp/contrib
- at dirrm include/ulxmlrpcpp