9 files changed, 151 insertions, 95 deletions

diff --git a/net/xmlrpc-c-devel/Makefile b/net/xmlrpc-c-devel/Makefile
index 098e48007501..4088e192714c 100644
--- a/net/xmlrpc-c-devel/Makefile
+++ b/net/xmlrpc-c-devel/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	xmlrpc-c
-PORTVERSION=	1.29.2
+PORTVERSION=	1.31.04
 CATEGORIES=	net
 MASTER_SITES=	LOCAL/garga/xmlrpc-c
 PKGNAMESUFFIX=	-devel
@@ -17,22 +17,18 @@ COMMENT=	XML-RPC library for C and C++
 
 LICENSE=	BSD
 
-OPTIONS_DEFINE=	DEBUG CURL LIBWWW TOOLS
-OPTIONS_DEFAULT=CURL LIBWWW TOOLS
+OPTIONS_DEFINE=	DEBUG CURL LIBWWW CPLUSPLUS
+OPTIONS_DEFAULT=CURL LIBWWW CPLUSPLUS
 
 LIBWWW_DESC=	 Compile with libwww support
-TOOLS_DESC=	 Build xmlrpc-c tools
+CPLUSPLUS_DESC=	 Build xmlrpc-c c++ libs and tools
 
 CONFLICTS=	xmlrpc-epi-0.* xmlrpc-c-[0-9]*
 
-USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_BZIP2=	yes
-USE_AUTOTOOLS=	libtool:env
 GNU_CONFIGURE=	yes
 MAKEFILE=	GNUmakefile
-MAKE_ARGS=	LIBTOOL="${LIBTOOL}" \
-		CFLAGS_COMMON="${CFLAGS}"
 MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	yes
 
@@ -51,24 +47,20 @@ CONFIGURE_ARGS+=	--disable-curl-client
 
 .if ${PORT_OPTIONS:MLIBWWW}
 LIB_DEPENDS+=	wwwcore:${PORTSDIR}/www/libwww
-CONFIGURE_ARGS+=	--enable-libwww-client
+CONFIGURE_ARGS+=	--enable-libwww-client --with-libwww-ssl
 .else
 CONFIGURE_ARGS+=	--disable-libwww-client
 .endif
 
-.if ${PORT_OPTIONS:MTOOLS}
-CONFIGURE_ARGS+=	--enable-tools
-PLIST_SUB+=		TOOLS=""
-MAN1+=			xml-rpc-api2cpp.1 xml-rpc-api2txt.1
+.if ${PORT_OPTIONS:MCPLUSPLUS}
+CONFIGURE_ARGS+=	--enable-cplusplus
+PLIST_SUB+=	CPLUSPLUS=""
 .else
-CONFIGURE_ARGS+=	--disable-tools
-PLIST_SUB+=		TOOLS="@comment "
+CONFIGURE_ARGS+=	--disable-cplusplus
+PLIST_SUB+=	CPLUSPLUS="@comment "
 .endif
 
 .if empty(PORT_OPTIONS:MLIBWWW) && empty(PORT_OPTIONS:MCURL)
-. if ${PORT_OPTIONS:MTOOLS}
-IGNORE=		xmlrpc-c tools requires CURL or LIBWWW support enabled
-. endif
 PLIST_SUB+=	CLIENT="@comment "
 .else
 PLIST_SUB+=	CLIENT=""
@@ -81,9 +73,7 @@ post-extract:
 post-patch:
 	@${GREP} -lR '\-lpthread' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
 		's|-lpthread|${PTHREAD_LIBS}|g'
-	@${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 's/s6_addr16/s6_addr/g' \
-		${WRKSRC}/lib/abyss/src/socket_unix.c
 
 .include <bsd.port.post.mk>
diff --git a/net/xmlrpc-c-devel/distinfo b/net/xmlrpc-c-devel/distinfo
index 8f6fd9d67fc5..9bea687167af 100644
--- a/net/xmlrpc-c-devel/distinfo
+++ b/net/xmlrpc-c-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xmlrpc-c-1.29.2.tar.bz2) = 9373bd53d54f6cc449a490d3dc0617eb64a20950cdcf69765340c3308bb696b4
-SIZE (xmlrpc-c-1.29.2.tar.bz2) = 598706
+SHA256 (xmlrpc-c-1.31.04.tar.bz2) = 8ab30ee65ab9399f537662527d72ba696258f1779a84d819f8eae75112c2271d
+SIZE (xmlrpc-c-1.31.04.tar.bz2) = 606730
diff --git a/net/xmlrpc-c-devel/files/patch-src-Makefile b/net/xmlrpc-c-devel/files/patch-src-Makefile
deleted file mode 100644
index 280bd3ec3365..000000000000
--- a/net/xmlrpc-c-devel/files/patch-src-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.orig	2011-02-23 09:19:23.000000000 -0300
-+++ src/Makefile	2011-02-23 09:31:43.000000000 -0300
-@@ -70,7 +70,7 @@
- else
-   XMLRPC_XML_PARSER = xmlrpc_expat
-   XML_PARSER_LIBDEP = \
--    -Lblddir/lib/expat/xmlparse -lxmlrpc_xmlparse \
-+    -L$(BLDDIR)/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-devel/files/patch-test__Makefile b/net/xmlrpc-c-devel/files/patch-test__Makefile
new file mode 100644
index 000000000000..8049cee54483
--- /dev/null
+++ b/net/xmlrpc-c-devel/files/patch-test__Makefile
@@ -0,0 +1,23 @@
+--- test/Makefile	(revision 2386)
++++ test/Makefile	(revision 2387)
+@@ -11,8 +11,6 @@
+ 
+ XMLRPC_C_CONFIG = $(BLDDIR)/xmlrpc-c-config.test
+ 
+-LDADD_CLIENT = \
+-  $(shell $(XMLRPC_C_CONFIG) client --ldadd)
+ LDADD_ABYSS_SERVER = \
+   $(shell $(XMLRPC_C_CONFIG) abyss-server --ldadd)
+ LDADD_CGI_SERVER = \
+@@ -43,9 +41,11 @@
+ ifeq ($(MUST_BUILD_CLIENT),yes)
+   TEST_OBJS += client.o
+   LIBXMLRPC_CLIENT_DEP = $(LIBXMLRPC_CLIENT_A)
++  LDADD_CLIENT = $(shell $(XMLRPC_C_CONFIG) client --ldadd)
+ else
+   TEST_OBJS += client_dummy.o
+   LIBXMLRPC_CLIENT_DEP =
++  LDADD_CLIENT =
+ endif
+ 
+ include $(SRCDIR)/common.mk
diff --git a/net/xmlrpc-c-devel/files/patch-test__cpp__Makefile b/net/xmlrpc-c-devel/files/patch-test__cpp__Makefile
new file mode 100644
index 000000000000..4989cda01cb2
--- /dev/null
+++ b/net/xmlrpc-c-devel/files/patch-test__cpp__Makefile
@@ -0,0 +1,21 @@
+--- test/cpp/Makefile	(revision 2386)
++++ test/cpp/Makefile	(revision 2387)
+@@ -16,7 +16,7 @@
+ 
+ XMLRPC_C_CONFIG = $(BLDDIR)/xmlrpc-c-config.test
+ 
+-LIBS := $(shell $(XMLRPC_C_CONFIG) client --ldadd)
++LIBS := 
+ 
+ LIBS += -lpthread
+ 
+@@ -42,6 +42,7 @@
+ ifeq ($(MUST_BUILD_CLIENT),yes)
+   TEST_OBJS += testclient.o
+   CLIENT_LIBS = $(LIBXMLRPC_CLIENTPP_A) $(LIBXMLRPC_CLIENT_A)
++  LIBS += $(shell $(XMLRPC_C_CONFIG) client --ldadd)
+ else
+   TEST_OBJS += testclient_dummy.o
+   CLIENT_LIBS =
+Index: test/Makefile
+===================================================================
diff --git a/net/xmlrpc-c-devel/files/patch-test__cpp__test.cpp b/net/xmlrpc-c-devel/files/patch-test__cpp__test.cpp
new file mode 100644
index 000000000000..590b4b7318dc
--- /dev/null
+++ b/net/xmlrpc-c-devel/files/patch-test__cpp__test.cpp
@@ -0,0 +1,12 @@
+--- test/cpp/test.cpp	(revision 2386)
++++ test/cpp/test.cpp	(revision 2387)
+@@ -9,7 +9,6 @@
+ 
+ #include "xmlrpc-c/girerr.hpp"
+ using girerr::error;
+-#include "transport_config.h"
+ #include "xmlrpc-c/base.hpp"
+ #include "xmlrpc-c/oldcppwrapper.hpp"
+ #include "xmlrpc-c/registry.hpp"
+Index: test/cpp/Makefile
+===================================================================
diff --git a/net/xmlrpc-c-devel/files/patch-test__cpp__value.cpp b/net/xmlrpc-c-devel/files/patch-test__cpp__value.cpp
new file mode 100644
index 000000000000..61ed885062d7
--- /dev/null
+++ b/net/xmlrpc-c-devel/files/patch-test__cpp__value.cpp
@@ -0,0 +1,12 @@
+--- test/cpp/value.cpp	(revision 2386)
++++ test/cpp/value.cpp	(revision 2387)
+@@ -9,7 +9,6 @@
+ 
+ #include "xmlrpc-c/girerr.hpp"
+ using girerr::error;
+-#include "transport_config.h"
+ #include "xmlrpc-c/base.hpp"
+ #include "xmlrpc-c/oldcppwrapper.hpp"
+ #include "xmlrpc-c/registry.hpp"
+Index: test/cpp/test.cpp
+===================================================================
diff --git a/net/xmlrpc-c-devel/files/patch-xmlrpc_config.h.in b/net/xmlrpc-c-devel/files/patch-xmlrpc_config.h.in
new file mode 100644
index 000000000000..1608deeb2874
--- /dev/null
+++ b/net/xmlrpc-c-devel/files/patch-xmlrpc_config.h.in
@@ -0,0 +1,15 @@
+Index: xmlrpc_config.h.in
+===================================================================
+--- xmlrpc_config.h.in	(revision 2387)
++++ xmlrpc_config.h.in	(working copy)
+@@ -26,6 +26,10 @@
+ #ifndef XMLRPC_CONFIG_H_INCLUDED
+ #define XMLRPC_CONFIG_H_INCLUDED
+ 
++#if defined(__FreeBSD__)
++  #include <sys/cdefs.h>
++#endif
++
+ /* We hope to replace xmlrpc_amconfig.h some day with something that 
+    doesn't require a whole special set of software to build, to make
+    Xmlrpc-c approachable by dumber developers.
diff --git a/net/xmlrpc-c-devel/pkg-plist b/net/xmlrpc-c-devel/pkg-plist
index b109c399ca6a..6b3342a8ac03 100644
--- a/net/xmlrpc-c-devel/pkg-plist
+++ b/net/xmlrpc-c-devel/pkg-plist
@@ -1,113 +1,107 @@
 bin/xmlrpc-c-config
-%%TOOLS%%bin/xmlrpc
-%%TOOLS%%bin/xmlrpc_transport
-%%TOOLS%%bin/xml-rpc-api2cpp
-%%TOOLS%%bin/xml-rpc-api2txt
-%%TOOLS%%bin/xmlrpc_cpp_proxy
-%%TOOLS%%bin/xmlrpc_pstream
-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
+%%CPLUSPLUS%%include/xmlrpc-c/base.hpp
 include/xmlrpc-c/c_util.h
 %%CLIENT%%include/xmlrpc-c/client.h
-%%CLIENT%%include/xmlrpc-c/client.hpp
+%%CPLUSPLUS%%%%CLIENT%%include/xmlrpc-c/client.hpp
 %%CLIENT%%include/xmlrpc-c/client_global.h
-%%CLIENT%%include/xmlrpc-c/client_simple.hpp
-%%CLIENT%%include/xmlrpc-c/client_transport.hpp
+%%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
+%%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
 %%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.29
+%%CPLUSPLUS%%lib/libxmlrpc++.a
+%%CPLUSPLUS%%lib/libxmlrpc++.so
+%%CPLUSPLUS%%lib/libxmlrpc++.so.8
+%%CPLUSPLUS%%lib/libxmlrpc++.so.8.31
 lib/libxmlrpc.a
 lib/libxmlrpc.so
 lib/libxmlrpc.so.3
-lib/libxmlrpc.so.3.29
+lib/libxmlrpc.so.3.31
 lib/libxmlrpc_abyss.a
 lib/libxmlrpc_abyss.so
 lib/libxmlrpc_abyss.so.3
-lib/libxmlrpc_abyss.so.3.29
-%%CLIENT%%lib/libxmlrpc_client++.a
-%%CLIENT%%lib/libxmlrpc_client++.so
-%%CLIENT%%lib/libxmlrpc_client++.so.7
-%%CLIENT%%lib/libxmlrpc_client++.so.7.29
+lib/libxmlrpc_abyss.so.3.31
+%%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.31
 %%CLIENT%%lib/libxmlrpc_client.a
 %%CLIENT%%lib/libxmlrpc_client.so
 %%CLIENT%%lib/libxmlrpc_client.so.3
-%%CLIENT%%lib/libxmlrpc_client.so.3.29
-lib/libxmlrpc_cpp.a
-lib/libxmlrpc_cpp.so
-lib/libxmlrpc_cpp.so.7
-lib/libxmlrpc_cpp.so.7.29
-lib/libxmlrpc_packetsocket.a
-lib/libxmlrpc_packetsocket.so
-lib/libxmlrpc_packetsocket.so.7
-lib/libxmlrpc_packetsocket.so.7.29
-lib/libxmlrpc_server++.a
-lib/libxmlrpc_server++.so
-lib/libxmlrpc_server++.so.7
-lib/libxmlrpc_server++.so.7.29
+%%CLIENT%%lib/libxmlrpc_client.so.3.31
+%%CPLUSPLUS%%lib/libxmlrpc_cpp.a
+%%CPLUSPLUS%%lib/libxmlrpc_cpp.so
+%%CPLUSPLUS%%lib/libxmlrpc_cpp.so.8
+%%CPLUSPLUS%%lib/libxmlrpc_cpp.so.8.31
+%%CPLUSPLUS%%lib/libxmlrpc_packetsocket.a
+%%CPLUSPLUS%%lib/libxmlrpc_packetsocket.so
+%%CPLUSPLUS%%lib/libxmlrpc_packetsocket.so.8
+%%CPLUSPLUS%%lib/libxmlrpc_packetsocket.so.8.31
+%%CPLUSPLUS%%lib/libxmlrpc_server++.a
+%%CPLUSPLUS%%lib/libxmlrpc_server++.so
+%%CPLUSPLUS%%lib/libxmlrpc_server++.so.8
+%%CPLUSPLUS%%lib/libxmlrpc_server++.so.8.31
 lib/libxmlrpc_server.a
 lib/libxmlrpc_server.so
 lib/libxmlrpc_server.so.3
-lib/libxmlrpc_server.so.3.29
-lib/libxmlrpc_server_abyss++.a
-lib/libxmlrpc_server_abyss++.so
-lib/libxmlrpc_server_abyss++.so.7
-lib/libxmlrpc_server_abyss++.so.7.29
+lib/libxmlrpc_server.so.3.31
+%%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.31
 lib/libxmlrpc_server_abyss.a
 lib/libxmlrpc_server_abyss.so
 lib/libxmlrpc_server_abyss.so.3
-lib/libxmlrpc_server_abyss.so.3.29
-lib/libxmlrpc_server_cgi++.a
-lib/libxmlrpc_server_cgi++.so
-lib/libxmlrpc_server_cgi++.so.7
-lib/libxmlrpc_server_cgi++.so.7.29
+lib/libxmlrpc_server_abyss.so.3.31
+%%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.31
 lib/libxmlrpc_server_cgi.a
 lib/libxmlrpc_server_cgi.so
 lib/libxmlrpc_server_cgi.so.3
-lib/libxmlrpc_server_cgi.so.3.29
-lib/libxmlrpc_server_pstream++.a
-lib/libxmlrpc_server_pstream++.so
-lib/libxmlrpc_server_pstream++.so.7
-lib/libxmlrpc_server_pstream++.so.7.29
+lib/libxmlrpc_server_cgi.so.3.31
+%%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.31
 lib/libxmlrpc_util.a
 lib/libxmlrpc_util.so
 lib/libxmlrpc_util.so.3
-lib/libxmlrpc_util.so.3.29
+lib/libxmlrpc_util.so.3.31
 lib/libxmlrpc_xmlparse.a
 lib/libxmlrpc_xmlparse.so
 lib/libxmlrpc_xmlparse.so.3
-lib/libxmlrpc_xmlparse.so.3.29
+lib/libxmlrpc_xmlparse.so.3.31
 lib/libxmlrpc_xmltok.a
 lib/libxmlrpc_xmltok.so
 lib/libxmlrpc_xmltok.so.3
-lib/libxmlrpc_xmltok.so.3.29
+lib/libxmlrpc_xmltok.so.3.31
 @dirrm include/xmlrpc-c