Index: head/net/xmlrpc-c/Makefile =================================================================== --- head/net/xmlrpc-c/Makefile (revision 483399) +++ head/net/xmlrpc-c/Makefile (revision 483400) @@ -1,69 +1,67 @@ # Created by: Ying-Chieh Liao # $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} MAINTAINER= garga@FreeBSD.org 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 LIBWWW_DESC= Compile with libwww support 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 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_USES= ssl LIBWWW_LIB_DEPENDS= libwwwcore.so:www/libwww \ libexpat.so:textproc/expat2 LIBWWW_CONFIGURE_ENABLE=libwww-client LIBWWW_CONFIGURE_WITH= libwww-ssl CPLUSPLUS_CONFIGURE_ENABLE= cplusplus LDFLAGS+= -lm .include .if empty(PORT_OPTIONS:MDEBUG) 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/ s/features.h/sys\/cdefs.h/' \ ${WRKSRC}/tools/xmlrpc_pstream/xmlrpc_pstream.cpp @${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 Index: head/net/xmlrpc-c/distinfo =================================================================== --- head/net/xmlrpc-c/distinfo (revision 483399) +++ head/net/xmlrpc-c/distinfo (revision 483400) @@ -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 Index: head/net/xmlrpc-c/files/patch-examples_cpp_Makefile =================================================================== --- head/net/xmlrpc-c/files/patch-examples_cpp_Makefile (revision 483399) +++ head/net/xmlrpc-c/files/patch-examples_cpp_Makefile (nonexistent) @@ -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 Property changes on: head/net/xmlrpc-c/files/patch-examples_cpp_Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/xmlrpc-c/files/patch-test_cpp_server__abyss.cpp =================================================================== --- head/net/xmlrpc-c/files/patch-test_cpp_server__abyss.cpp (revision 483399) +++ head/net/xmlrpc-c/files/patch-test_cpp_server__abyss.cpp (revision 483400) @@ -1,18 +1,18 @@ libc++ doesn't like "using namespace std" in C++11 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; - rc = bind(this->fd, (struct sockaddr *)&sockAddr, sizeof(sockAddr)); + rc = ::bind(this->fd, (struct sockaddr *)&sockAddr, sizeof(sockAddr)); if (rc != 0) { closesock(this->fd); Index: head/net/xmlrpc-c/pkg-plist =================================================================== --- head/net/xmlrpc-c/pkg-plist (revision 483399) +++ head/net/xmlrpc-c/pkg-plist (revision 483400) @@ -1,115 +1,134 @@ 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 %%CPLUSPLUS%%include/xmlrpc-c/base.hpp %%CPLUSPLUS%%include/xmlrpc-c/base64.hpp include/xmlrpc-c/c_util.h %%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 %%CPLUSPLUS%%include/xmlrpc-c/girerr.hpp %%CPLUSPLUS%%include/xmlrpc-c/girmem.hpp include/xmlrpc-c/inttypes.h include/xmlrpc-c/json.h %%CPLUSPLUS%%include/xmlrpc-c/oldcppwrapper.hpp include/xmlrpc-c/oldxmlrpc.h %%CPLUSPLUS%%include/xmlrpc-c/packetsocket.hpp %%CPLUSPLUS%%include/xmlrpc-c/registry.hpp include/xmlrpc-c/server.h include/xmlrpc-c/server_abyss.h %%CPLUSPLUS%%include/xmlrpc-c/server_abyss.hpp include/xmlrpc-c/server_cgi.h %%CPLUSPLUS%%include/xmlrpc-c/server_pstream.hpp include/xmlrpc-c/server_w32httpsys.h %%CPLUSPLUS%%include/xmlrpc-c/timeout.hpp %%CLIENT%%include/xmlrpc-c/transport.h include/xmlrpc-c/util.h %%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 %%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