4 files changed, 100 insertions, 90 deletions

diff --git a/net/xmlrpc-c/Makefile b/net/xmlrpc-c/Makefile
index 173dc5672ddf..1491634d166d 100644
--- a/net/xmlrpc-c/Makefile
+++ b/net/xmlrpc-c/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xmlrpc-c
-PORTVERSION=	1.25.30
+PORTVERSION=	1.39.08
 CATEGORIES=	net
 MASTER_SITES=	SF/${PORTNAME}/Xmlrpc-c%20Super%20Stable/${PORTVERSION}
 
@@ -11,24 +11,31 @@ COMMENT=	XML-RPC library for C and C++
 
 LICENSE=	BSD3CLAUSE
 
-OPTIONS_DEFINE=	DEBUG CURL LIBWWW
-OPTIONS_DEFAULT=CURL LIBWWW
+OPTIONS_DEFINE=	DEBUG CURL LIBWWW CPLUSPLUS
+OPTIONS_DEFAULT=CURL LIBWWW CPLUSPLUS
 
 LIBWWW_DESC=	Compile with libwww support
+CPLUSPLUS_DESC=	Build xmlrpc-c c++ libs and tools
 
-CONFLICTS=	xmlrpc-epi-0.* xmlrpc-c-devel-[0-9]*
+CONFLICTS=	xmlrpc-epi-0.*
 
-USES=		gmake perl5 tar:tgz
+USES=		gmake tar:tgz
+OPTIONS_SUB=	yes
 GNU_CONFIGURE=	yes
 MAKEFILE=	GNUmakefile
-MAKE_ARGS=	CFLAGS_COMMON="${CFLAGS}"
 MAKE_JOBS_UNSAFE=	yes
+MAKE_ENV+=	INSTALL_SHLIB="${INSTALL_LIB}" \
+		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 USE_LDCONFIG=	yes
 
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CONFIGURE_ENABLE=	curl-client
 LIBWWW_LIB_DEPENDS=	libwwwcore.so:www/libwww
 LIBWWW_CONFIGURE_ENABLE=libwww-client
+LIBWWW_CONFIGURE_WITH=	libwww-ssl
+CPLUSPLUS_CONFIGURE_ENABLE=	cplusplus
+
+LDFLAGS+=	-lm
 
 .include <bsd.port.pre.mk>
 
@@ -36,19 +43,24 @@ LIBWWW_CONFIGURE_ENABLE=libwww-client
 CFLAGS+=	-DNDEBUG
 .endif
 
+.if empty(PORT_OPTIONS:MLIBWWW) && empty(PORT_OPTIONS:MCURL)
+PLIST_SUB+=	CLIENT="@comment "
+.else
+PLIST_SUB+=	CLIENT=""
+.endif
+
 post-extract:
 	@${FIND} ${WRKSRC} -type l -name blddir -delete
 	@${FIND} ${WRKSRC} -type l -name srcdir -delete
 
 post-patch:
-	@${REINPLACE_CMD} -e '/#include.*features.h/d' \
+	@${REINPLACE_CMD} -e '/#include.*features.h/ s/features.h/sys\/cdefs.h/' \
 		${WRKSRC}/tools/xmlrpc_pstream/xmlrpc_pstream.cpp
-	@${REINPLACE_CMD} -e '/<curl\/types.h>/d' \
-		${WRKSRC}/lib/curl_transport/curltransaction.c \
-		${WRKSRC}/lib/curl_transport/xmlrpc_curl_transport.c \
-		${WRKSRC}/lib/curl_transport/curlmulti.c
-
-post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libxmlrpc*.so.[37].25
+	@${REINPLACE_CMD} -e '/define _XOPEN_SOURCE 600/ s,^,//,' \
+		${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 7149908ce62e..f24c81e484a9 100644
--- a/net/xmlrpc-c/distinfo
+++ b/net/xmlrpc-c/distinfo
@@ -1,2 +1,3 @@
-SHA256 (xmlrpc-c-1.25.30.tgz) = 8ae6ed4ec57d50ed132b1150fc5258346eef3e291501a564f14fa97586902f98
-SIZE (xmlrpc-c-1.25.30.tgz) = 779934
+TIMESTAMP = 1465667222
+SHA256 (xmlrpc-c-1.39.08.tgz) = eedc028443aaa6bcc9261eb97dd4af77a684a4171be3c86ba96ab7b4de569505
+SIZE (xmlrpc-c-1.39.08.tgz) = 814138
diff --git a/net/xmlrpc-c/files/patch-src-Makefile b/net/xmlrpc-c/files/patch-src-Makefile
deleted file mode 100644
index 262807446f6e..000000000000
--- a/net/xmlrpc-c/files/patch-src-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.orig	2013-03-29 03:38:36.000000000 -0300
-+++ src/Makefile	2013-04-23 16:03:05.000000000 -0300
-@@ -70,7 +70,7 @@
- else
-   XMLRPC_XML_PARSER = xmlrpc_expat
-   XML_PARSER_LIBDEP = \
--    -Lblddir/lib/expat/xmlparse -lxmlrpc_xmlparse \
-+    -Lblddir/lib/expat/xmlparse ../lib/expat/xmlparse/libxmlrpc_xmlparse.so \
-     -Lblddir/lib/expat/xmltok -lxmlrpc_xmltok
-   XML_PARSER_LIBDEP_DEP = $(LIBXMLRPC_XMLPARSE) $(LIBXMLRPC_XMLTOK)
- endif
diff --git a/net/xmlrpc-c/pkg-plist b/net/xmlrpc-c/pkg-plist
index 4adc75976cf9..619e396259ac 100644
--- a/net/xmlrpc-c/pkg-plist
+++ b/net/xmlrpc-c/pkg-plist
@@ -1,107 +1,115 @@
 bin/xmlrpc-c-config
-include/XmlRpcCpp.h
+%%CPLUSPLUS%%include/XmlRpcCpp.h
 include/xmlrpc-c/abyss.h
 include/xmlrpc-c/abyss_unixsock.h
 include/xmlrpc-c/abyss_winsock.h
 include/xmlrpc-c/base.h
-include/xmlrpc-c/base.hpp
-include/xmlrpc-c/base64.hpp
+%%CPLUSPLUS%%include/xmlrpc-c/base.hpp
+%%CPLUSPLUS%%include/xmlrpc-c/base64.hpp
 include/xmlrpc-c/c_util.h
-include/xmlrpc-c/client.h
-include/xmlrpc-c/client.hpp
-include/xmlrpc-c/client_global.h
-include/xmlrpc-c/client_simple.hpp
-include/xmlrpc-c/client_transport.hpp
+%%CLIENT%%include/xmlrpc-c/client.h
+%%CPLUSPLUS%%%%CLIENT%%include/xmlrpc-c/client.hpp
+%%CLIENT%%include/xmlrpc-c/client_global.h
+%%CPLUSPLUS%%%%CLIENT%%include/xmlrpc-c/client_simple.hpp
+%%CPLUSPLUS%%%%CLIENT%%include/xmlrpc-c/client_transport.hpp
 include/xmlrpc-c/config.h
-include/xmlrpc-c/girerr.hpp
-include/xmlrpc-c/girmem.hpp
+%%CPLUSPLUS%%include/xmlrpc-c/girerr.hpp
+%%CPLUSPLUS%%include/xmlrpc-c/girmem.hpp
 include/xmlrpc-c/inttypes.h
 include/xmlrpc-c/json.h
-include/xmlrpc-c/oldcppwrapper.hpp
+%%CPLUSPLUS%%include/xmlrpc-c/oldcppwrapper.hpp
 include/xmlrpc-c/oldxmlrpc.h
-include/xmlrpc-c/packetsocket.hpp
-include/xmlrpc-c/registry.hpp
+%%CPLUSPLUS%%include/xmlrpc-c/packetsocket.hpp
+%%CPLUSPLUS%%include/xmlrpc-c/registry.hpp
 include/xmlrpc-c/server.h
 include/xmlrpc-c/server_abyss.h
-include/xmlrpc-c/server_abyss.hpp
+%%CPLUSPLUS%%include/xmlrpc-c/server_abyss.hpp
 include/xmlrpc-c/server_cgi.h
-include/xmlrpc-c/server_pstream.hpp
+%%CPLUSPLUS%%include/xmlrpc-c/server_pstream.hpp
 include/xmlrpc-c/server_w32httpsys.h
-include/xmlrpc-c/timeout.hpp
-include/xmlrpc-c/transport.h
+%%CPLUSPLUS%%include/xmlrpc-c/timeout.hpp
+%%CLIENT%%include/xmlrpc-c/transport.h
 include/xmlrpc-c/util.h
-include/xmlrpc-c/xml.hpp
+%%CPLUSPLUS%%include/xmlrpc-c/xml.hpp
 include/xmlrpc.h
 include/xmlrpc_abyss.h
 include/xmlrpc_cgi.h
-include/xmlrpc_client.h
+%%CLIENT%%include/xmlrpc_client.h
 include/xmlrpc_server.h
 include/xmlrpc_server_w32httpsys.h
-lib/libxmlrpc++.a
-lib/libxmlrpc++.so
-lib/libxmlrpc++.so.7
-lib/libxmlrpc++.so.7.25
+%%CPLUSPLUS%%lib/libxmlrpc++.a
+%%CPLUSPLUS%%lib/libxmlrpc++.so
+%%CPLUSPLUS%%lib/libxmlrpc++.so.8
+%%CPLUSPLUS%%lib/libxmlrpc++.so.8.39
 lib/libxmlrpc.a
 lib/libxmlrpc.so
 lib/libxmlrpc.so.3
-lib/libxmlrpc.so.3.25
+lib/libxmlrpc.so.3.39
 lib/libxmlrpc_abyss.a
 lib/libxmlrpc_abyss.so
 lib/libxmlrpc_abyss.so.3
-lib/libxmlrpc_abyss.so.3.25
-lib/libxmlrpc_client++.a
-lib/libxmlrpc_client++.so
-lib/libxmlrpc_client++.so.7
-lib/libxmlrpc_client++.so.7.25
-lib/libxmlrpc_client.a
-lib/libxmlrpc_client.so
-lib/libxmlrpc_client.so.3
-lib/libxmlrpc_client.so.3.25
-lib/libxmlrpc_cpp.a
-lib/libxmlrpc_cpp.so
-lib/libxmlrpc_cpp.so.7
-lib/libxmlrpc_cpp.so.7.25
-lib/libxmlrpc_packetsocket.a
-lib/libxmlrpc_packetsocket.so
-lib/libxmlrpc_packetsocket.so.7
-lib/libxmlrpc_packetsocket.so.7.25
-lib/libxmlrpc_server++.a
-lib/libxmlrpc_server++.so
-lib/libxmlrpc_server++.so.7
-lib/libxmlrpc_server++.so.7.25
+lib/libxmlrpc_abyss.so.3.39
+%%CPLUSPLUS%%lib/libxmlrpc_abyss++.a
+%%CPLUSPLUS%%lib/libxmlrpc_abyss++.so
+%%CPLUSPLUS%%lib/libxmlrpc_abyss++.so.8
+%%CPLUSPLUS%%lib/libxmlrpc_abyss++.so.8.39
+%%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
+%%CLIENT%%lib/libxmlrpc_client.a
+%%CLIENT%%lib/libxmlrpc_client.so
+%%CLIENT%%lib/libxmlrpc_client.so.3
+%%CLIENT%%lib/libxmlrpc_client.so.3.39
+%%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_packetsocket.a
+%%CPLUSPLUS%%lib/libxmlrpc_packetsocket.so
+%%CPLUSPLUS%%lib/libxmlrpc_packetsocket.so.8
+%%CPLUSPLUS%%lib/libxmlrpc_packetsocket.so.8.39
+%%CPLUSPLUS%%lib/libxmlrpc_server++.a
+%%CPLUSPLUS%%lib/libxmlrpc_server++.so
+%%CPLUSPLUS%%lib/libxmlrpc_server++.so.8
+%%CPLUSPLUS%%lib/libxmlrpc_server++.so.8.39
 lib/libxmlrpc_server.a
 lib/libxmlrpc_server.so
 lib/libxmlrpc_server.so.3
-lib/libxmlrpc_server.so.3.25
-lib/libxmlrpc_server_abyss++.a
-lib/libxmlrpc_server_abyss++.so
-lib/libxmlrpc_server_abyss++.so.7
-lib/libxmlrpc_server_abyss++.so.7.25
+lib/libxmlrpc_server.so.3.39
+%%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
 lib/libxmlrpc_server_abyss.a
 lib/libxmlrpc_server_abyss.so
 lib/libxmlrpc_server_abyss.so.3
-lib/libxmlrpc_server_abyss.so.3.25
-lib/libxmlrpc_server_cgi++.a
-lib/libxmlrpc_server_cgi++.so
-lib/libxmlrpc_server_cgi++.so.7
-lib/libxmlrpc_server_cgi++.so.7.25
+lib/libxmlrpc_server_abyss.so.3.39
+%%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
 lib/libxmlrpc_server_cgi.a
 lib/libxmlrpc_server_cgi.so
 lib/libxmlrpc_server_cgi.so.3
-lib/libxmlrpc_server_cgi.so.3.25
-lib/libxmlrpc_server_pstream++.a
-lib/libxmlrpc_server_pstream++.so
-lib/libxmlrpc_server_pstream++.so.7
-lib/libxmlrpc_server_pstream++.so.7.25
+lib/libxmlrpc_server_cgi.so.3.39
+%%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
 lib/libxmlrpc_util.a
 lib/libxmlrpc_util.so
 lib/libxmlrpc_util.so.3
-lib/libxmlrpc_util.so.3.25
+lib/libxmlrpc_util.so.3.39
+%%CPLUSPLUS%%lib/libxmlrpc_util++.a
+%%CPLUSPLUS%%lib/libxmlrpc_util++.so
+%%CPLUSPLUS%%lib/libxmlrpc_util++.so.8
+%%CPLUSPLUS%%lib/libxmlrpc_util++.so.8.39
 lib/libxmlrpc_xmlparse.a
 lib/libxmlrpc_xmlparse.so
 lib/libxmlrpc_xmlparse.so.3
-lib/libxmlrpc_xmlparse.so.3.25
+lib/libxmlrpc_xmlparse.so.3.39
 lib/libxmlrpc_xmltok.a
 lib/libxmlrpc_xmltok.so
 lib/libxmlrpc_xmltok.so.3
-lib/libxmlrpc_xmltok.so.3.25
+lib/libxmlrpc_xmltok.so.3.39