5 files changed, 47 insertions, 41 deletions

diff --git a/net/xmlrpc-c/Makefile b/net/xmlrpc-c/Makefile
index 7d0e502e990b..5d119719fe28 100644
--- a/net/xmlrpc-c/Makefile
+++ b/net/xmlrpc-c/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xmlrpc-c
-PORTVERSION=	1.39.13
-PORTREVISION=	2
+PORTVERSION=	1.43.08
 CATEGORIES=	net
 MASTER_SITES=	SF/${PORTNAME}/Xmlrpc-c%20Super%20Stable/${PORTVERSION}
 
@@ -12,6 +11,8 @@ COMMENT=	XML-RPC library for C and C++
 
 LICENSE=	BSD3CLAUSE
 
+USES=		gmake pkgconfig tar:tgz
+
 OPTIONS_DEFINE=	DEBUG CURL LIBWWW CPLUSPLUS
 OPTIONS_DEFAULT=CURL LIBWWW CPLUSPLUS
 
@@ -20,7 +21,6 @@ CPLUSPLUS_DESC=	Build xmlrpc-c c++ libs and tools
 
 CONFLICTS=	xmlrpc-epi-0.*
 
-USES=		gmake tar:tgz
 OPTIONS_SUB=	yes
 GNU_CONFIGURE=	yes
 MAKEFILE=	GNUmakefile
@@ -63,7 +63,5 @@ post-patch:
 		${WRKSRC}/src/xmlrpc_server_abyss.c
 	@${REINPLACE_CMD} -e 's,sys/unistd.h,unistd.h,' \
 		${WRKSRC}/test/cpp/server_abyss.cpp
-	@${REINPLACE_CMD} -e '/^INSTALL_/s/=/\?=/' \
-		${WRKSRC}/config.mk.in
 
 .include <bsd.port.post.mk>
diff --git a/net/xmlrpc-c/distinfo b/net/xmlrpc-c/distinfo
index ecff5e5f452e..c55197a189f4 100644
--- a/net/xmlrpc-c/distinfo
+++ b/net/xmlrpc-c/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1530016058
-SHA256 (xmlrpc-c-1.39.13.tgz) = 491e44cae3763d285fc2a75fe6574882964f16451adbb7e6f3293916e120fca9
-SIZE (xmlrpc-c-1.39.13.tgz) = 816439
+TIMESTAMP = 1540838779
+SHA256 (xmlrpc-c-1.43.08.tgz) = c9f5b584a42493877ae0f09ed680d94e035ab389e8fa1873b1ec42118d5cfca3
+SIZE (xmlrpc-c-1.43.08.tgz) = 937532
diff --git a/net/xmlrpc-c/files/patch-examples_cpp_Makefile b/net/xmlrpc-c/files/patch-examples_cpp_Makefile
deleted file mode 100644
index bc0bd873c841..000000000000
--- a/net/xmlrpc-c/files/patch-examples_cpp_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- examples/cpp/Makefile.orig	2013-03-29 06:38:36 UTC
-+++ examples/cpp/Makefile
-@@ -15,7 +15,7 @@ include $(BLDDIR)/config.mk
- 
- default: all
- 
--CXXFLAGS = $(CFLAGS_PERSONAL) $(CADD)
-+CXXFLAGS+= $(CFLAGS_PERSONAL) $(CADD)
- LDFLAGS += $(LADD)
- 
- # If this were a real application, working from an installed copy of
diff --git a/net/xmlrpc-c/files/patch-test_cpp_server__abyss.cpp b/net/xmlrpc-c/files/patch-test_cpp_server__abyss.cpp
index 1c10e8a608c4..ece617ce174e 100644
--- a/net/xmlrpc-c/files/patch-test_cpp_server__abyss.cpp
+++ b/net/xmlrpc-c/files/patch-test_cpp_server__abyss.cpp
@@ -5,8 +5,8 @@ server_abyss.cpp:88:14: error: assigning to 'int' from incompatible type '__bind
         rc = bind(this->fd, (struct sockaddr *)&sockAddr, sizeof(sockAddr));
              ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
---- test/cpp/server_abyss.cpp~	2018-01-05 09:20:59.546269035 +0000
-+++ test/cpp/server_abyss.cpp	2018-01-05 09:23:10.542713023 +0000
+--- test/cpp/server_abyss.cpp.orig	2014-08-29 18:59:00 UTC
++++ test/cpp/server_abyss.cpp
 @@ -85,7 +85,7 @@ class boundSocket { (public)
          sockAddr.sin_port   = htons(portNumber);
          sockAddr.sin_addr.s_addr = 0;
diff --git a/net/xmlrpc-c/pkg-plist b/net/xmlrpc-c/pkg-plist
index 619e396259ac..aa71003f54c5 100644
--- a/net/xmlrpc-c/pkg-plist
+++ b/net/xmlrpc-c/pkg-plist
@@ -1,6 +1,11 @@
 bin/xmlrpc-c-config
 %%CPLUSPLUS%%include/XmlRpcCpp.h
+%%CPLUSPLUS%%include/xmlrpc-c/AbyssChanSwitch.hpp
+%%CPLUSPLUS%%include/xmlrpc-c/AbyssChanSwitchUnix.hpp
+%%CPLUSPLUS%%include/xmlrpc-c/AbyssEnvironment.hpp
+%%CPLUSPLUS%%include/xmlrpc-c/AbyssServer.hpp
 include/xmlrpc-c/abyss.h
+%%CPLUSPLUS%%include/xmlrpc-c/abyss_reqhandler_xmlrpc.hpp
 include/xmlrpc-c/abyss_unixsock.h
 include/xmlrpc-c/abyss_winsock.h
 include/xmlrpc-c/base.h
@@ -40,76 +45,90 @@ include/xmlrpc_server_w32httpsys.h
 %%CPLUSPLUS%%lib/libxmlrpc++.a
 %%CPLUSPLUS%%lib/libxmlrpc++.so
 %%CPLUSPLUS%%lib/libxmlrpc++.so.8
-%%CPLUSPLUS%%lib/libxmlrpc++.so.8.39
+%%CPLUSPLUS%%lib/libxmlrpc++.so.8.52
 lib/libxmlrpc.a
 lib/libxmlrpc.so
 lib/libxmlrpc.so.3
-lib/libxmlrpc.so.3.39
+lib/libxmlrpc.so.3.52
 lib/libxmlrpc_abyss.a
 lib/libxmlrpc_abyss.so
 lib/libxmlrpc_abyss.so.3
-lib/libxmlrpc_abyss.so.3.39
+lib/libxmlrpc_abyss.so.3.52
 %%CPLUSPLUS%%lib/libxmlrpc_abyss++.a
 %%CPLUSPLUS%%lib/libxmlrpc_abyss++.so
 %%CPLUSPLUS%%lib/libxmlrpc_abyss++.so.8
-%%CPLUSPLUS%%lib/libxmlrpc_abyss++.so.8.39
+%%CPLUSPLUS%%lib/libxmlrpc_abyss++.so.8.52
 %%CPLUSPLUS%%%%CLIENT%%lib/libxmlrpc_client++.a
 %%CPLUSPLUS%%%%CLIENT%%lib/libxmlrpc_client++.so
 %%CPLUSPLUS%%%%CLIENT%%lib/libxmlrpc_client++.so.8
-%%CPLUSPLUS%%%%CLIENT%%lib/libxmlrpc_client++.so.8.39
+%%CPLUSPLUS%%%%CLIENT%%lib/libxmlrpc_client++.so.8.52
 %%CLIENT%%lib/libxmlrpc_client.a
 %%CLIENT%%lib/libxmlrpc_client.so
 %%CLIENT%%lib/libxmlrpc_client.so.3
-%%CLIENT%%lib/libxmlrpc_client.so.3.39
+%%CLIENT%%lib/libxmlrpc_client.so.3.52
 %%CPLUSPLUS%%lib/libxmlrpc_cpp.a
 %%CPLUSPLUS%%lib/libxmlrpc_cpp.so
 %%CPLUSPLUS%%lib/libxmlrpc_cpp.so.8
-%%CPLUSPLUS%%lib/libxmlrpc_cpp.so.8.39
+%%CPLUSPLUS%%lib/libxmlrpc_cpp.so.8.52
 %%CPLUSPLUS%%lib/libxmlrpc_packetsocket.a
 %%CPLUSPLUS%%lib/libxmlrpc_packetsocket.so
 %%CPLUSPLUS%%lib/libxmlrpc_packetsocket.so.8
-%%CPLUSPLUS%%lib/libxmlrpc_packetsocket.so.8.39
+%%CPLUSPLUS%%lib/libxmlrpc_packetsocket.so.8.52
 %%CPLUSPLUS%%lib/libxmlrpc_server++.a
 %%CPLUSPLUS%%lib/libxmlrpc_server++.so
 %%CPLUSPLUS%%lib/libxmlrpc_server++.so.8
-%%CPLUSPLUS%%lib/libxmlrpc_server++.so.8.39
+%%CPLUSPLUS%%lib/libxmlrpc_server++.so.8.52
 lib/libxmlrpc_server.a
 lib/libxmlrpc_server.so
 lib/libxmlrpc_server.so.3
-lib/libxmlrpc_server.so.3.39
+lib/libxmlrpc_server.so.3.52
 %%CPLUSPLUS%%lib/libxmlrpc_server_abyss++.a
 %%CPLUSPLUS%%lib/libxmlrpc_server_abyss++.so
 %%CPLUSPLUS%%lib/libxmlrpc_server_abyss++.so.8
-%%CPLUSPLUS%%lib/libxmlrpc_server_abyss++.so.8.39
+%%CPLUSPLUS%%lib/libxmlrpc_server_abyss++.so.8.52
 lib/libxmlrpc_server_abyss.a
 lib/libxmlrpc_server_abyss.so
 lib/libxmlrpc_server_abyss.so.3
-lib/libxmlrpc_server_abyss.so.3.39
+lib/libxmlrpc_server_abyss.so.3.52
 %%CPLUSPLUS%%lib/libxmlrpc_server_cgi++.a
 %%CPLUSPLUS%%lib/libxmlrpc_server_cgi++.so
 %%CPLUSPLUS%%lib/libxmlrpc_server_cgi++.so.8
-%%CPLUSPLUS%%lib/libxmlrpc_server_cgi++.so.8.39
+%%CPLUSPLUS%%lib/libxmlrpc_server_cgi++.so.8.52
 lib/libxmlrpc_server_cgi.a
 lib/libxmlrpc_server_cgi.so
 lib/libxmlrpc_server_cgi.so.3
-lib/libxmlrpc_server_cgi.so.3.39
+lib/libxmlrpc_server_cgi.so.3.52
 %%CPLUSPLUS%%lib/libxmlrpc_server_pstream++.a
 %%CPLUSPLUS%%lib/libxmlrpc_server_pstream++.so
 %%CPLUSPLUS%%lib/libxmlrpc_server_pstream++.so.8
-%%CPLUSPLUS%%lib/libxmlrpc_server_pstream++.so.8.39
+%%CPLUSPLUS%%lib/libxmlrpc_server_pstream++.so.8.52
 lib/libxmlrpc_util.a
 lib/libxmlrpc_util.so
-lib/libxmlrpc_util.so.3
-lib/libxmlrpc_util.so.3.39
+lib/libxmlrpc_util.so.4
+lib/libxmlrpc_util.so.4.52
 %%CPLUSPLUS%%lib/libxmlrpc_util++.a
 %%CPLUSPLUS%%lib/libxmlrpc_util++.so
 %%CPLUSPLUS%%lib/libxmlrpc_util++.so.8
-%%CPLUSPLUS%%lib/libxmlrpc_util++.so.8.39
+%%CPLUSPLUS%%lib/libxmlrpc_util++.so.8.52
 lib/libxmlrpc_xmlparse.a
 lib/libxmlrpc_xmlparse.so
 lib/libxmlrpc_xmlparse.so.3
-lib/libxmlrpc_xmlparse.so.3.39
+lib/libxmlrpc_xmlparse.so.3.52
 lib/libxmlrpc_xmltok.a
 lib/libxmlrpc_xmltok.so
 lib/libxmlrpc_xmltok.so.3
-lib/libxmlrpc_xmltok.so.3.39
+lib/libxmlrpc_xmltok.so.3.52
+%%CPLUSPLUS%%libdata/pkgconfig/xmlrpc++.pc
+libdata/pkgconfig/xmlrpc.pc
+%%CPLUSPLUS%%libdata/pkgconfig/xmlrpc_abyss++.pc
+libdata/pkgconfig/xmlrpc_abyss.pc
+%%CPLUSPLUS%%libdata/pkgconfig/xmlrpc_client++.pc
+libdata/pkgconfig/xmlrpc_client.pc
+libdata/pkgconfig/xmlrpc_expat.pc
+%%CPLUSPLUS%%libdata/pkgconfig/xmlrpc_server++.pc
+libdata/pkgconfig/xmlrpc_server.pc
+libdata/pkgconfig/xmlrpc_server_abyss.pc
+libdata/pkgconfig/xmlrpc_server_cgi.pc
+%%CPLUSPLUS%%libdata/pkgconfig/xmlrpc_server_pstream++.pc
+%%CPLUSPLUS%%libdata/pkgconfig/xmlrpc_util++.pc
+libdata/pkgconfig/xmlrpc_util.pc