Update to 1.25.23

4 files changed, 34 insertions, 33 deletions

diff --git a/net/xmlrpc-c/Makefile b/net/xmlrpc-c/Makefile
index 93e444b51629..d43f749d6910 100644
--- a/net/xmlrpc-c/Makefile
+++ b/net/xmlrpc-c/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xmlrpc-c
-PORTVERSION=	1.16.44
+PORTVERSION=	1.25.23
 CATEGORIES=	net
 MASTER_SITES=	SF/${PORTNAME}/Xmlrpc-c%20Super%20Stable/${PORTVERSION}
 EXTRACT_SUFX=	.tgz
diff --git a/net/xmlrpc-c/distinfo b/net/xmlrpc-c/distinfo
index 63ad13d09b37..05bfd7534f3a 100644
--- a/net/xmlrpc-c/distinfo
+++ b/net/xmlrpc-c/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xmlrpc-c-1.16.44.tgz) = 359e1f41da5c46cb82eecc042ae215f53571189388ee45c563ed40d7e5deb6f7
-SIZE (xmlrpc-c-1.16.44.tgz) = 758939
+SHA256 (xmlrpc-c-1.25.23.tgz) = d9e8f9dd7bb90d3e10f45754353a007cb58a0b54826aa1e0ed5a8e1b76b193bf
+SIZE (xmlrpc-c-1.25.23.tgz) = 779372
diff --git a/net/xmlrpc-c/files/patch-src-Makefile b/net/xmlrpc-c/files/patch-src-Makefile
index 968a34eca874..262807446f6e 100644
--- a/net/xmlrpc-c/files/patch-src-Makefile
+++ b/net/xmlrpc-c/files/patch-src-Makefile
@@ -1,11 +1,11 @@
---- src/Makefile.orig	2011-03-25 13:23:24.000000000 -0300
-+++ src/Makefile	2011-06-29 15:49:47.000000000 -0300
+--- 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 = \
--    -L$(BLDDIR)/lib/expat/xmlparse -lxmlrpc_xmlparse \
-+    -L$(BLDDIR)/lib/expat/xmlparse ../lib/expat/xmlparse/libxmlrpc_xmlparse.so \
-     -L$(BLDDIR)/lib/expat/xmltok -lxmlrpc_xmltok
+-    -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 5cbfb5ed59dd..547a154e3f3a 100644
--- a/net/xmlrpc-c/pkg-plist
+++ b/net/xmlrpc-c/pkg-plist
@@ -15,6 +15,7 @@ include/xmlrpc-c/config.h
 include/xmlrpc-c/girerr.hpp
 include/xmlrpc-c/girmem.hpp
 include/xmlrpc-c/inttypes.h
+include/xmlrpc-c/json.h
 include/xmlrpc-c/oldcppwrapper.hpp
 include/xmlrpc-c/oldxmlrpc.h
 include/xmlrpc-c/packetsocket.hpp
@@ -37,70 +38,70 @@ include/xmlrpc_server.h
 include/xmlrpc_server_w32httpsys.h
 lib/libxmlrpc++.a
 lib/libxmlrpc++.so
-lib/libxmlrpc++.so.4
-lib/libxmlrpc++.so.4.16
+lib/libxmlrpc++.so.7
+lib/libxmlrpc++.so.7.25
 lib/libxmlrpc.a
 lib/libxmlrpc.so
 lib/libxmlrpc.so.3
-lib/libxmlrpc.so.3.16
+lib/libxmlrpc.so.3.25
 lib/libxmlrpc_abyss.a
 lib/libxmlrpc_abyss.so
 lib/libxmlrpc_abyss.so.3
-lib/libxmlrpc_abyss.so.3.16
+lib/libxmlrpc_abyss.so.3.25
 lib/libxmlrpc_client++.a
 lib/libxmlrpc_client++.so
-lib/libxmlrpc_client++.so.4
-lib/libxmlrpc_client++.so.4.16
+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.16
+lib/libxmlrpc_client.so.3.25
 lib/libxmlrpc_cpp.a
 lib/libxmlrpc_cpp.so
-lib/libxmlrpc_cpp.so.4
-lib/libxmlrpc_cpp.so.4.16
+lib/libxmlrpc_cpp.so.7
+lib/libxmlrpc_cpp.so.7.25
 lib/libxmlrpc_packetsocket.a
 lib/libxmlrpc_packetsocket.so
-lib/libxmlrpc_packetsocket.so.4
-lib/libxmlrpc_packetsocket.so.4.16
+lib/libxmlrpc_packetsocket.so.7
+lib/libxmlrpc_packetsocket.so.7.25
 lib/libxmlrpc_server++.a
 lib/libxmlrpc_server++.so
-lib/libxmlrpc_server++.so.4
-lib/libxmlrpc_server++.so.4.16
+lib/libxmlrpc_server++.so.7
+lib/libxmlrpc_server++.so.7.25
 lib/libxmlrpc_server.a
 lib/libxmlrpc_server.so
 lib/libxmlrpc_server.so.3
-lib/libxmlrpc_server.so.3.16
+lib/libxmlrpc_server.so.3.25
 lib/libxmlrpc_server_abyss++.a
 lib/libxmlrpc_server_abyss++.so
-lib/libxmlrpc_server_abyss++.so.4
-lib/libxmlrpc_server_abyss++.so.4.16
+lib/libxmlrpc_server_abyss++.so.7
+lib/libxmlrpc_server_abyss++.so.7.25
 lib/libxmlrpc_server_abyss.a
 lib/libxmlrpc_server_abyss.so
 lib/libxmlrpc_server_abyss.so.3
-lib/libxmlrpc_server_abyss.so.3.16
+lib/libxmlrpc_server_abyss.so.3.25
 lib/libxmlrpc_server_cgi++.a
 lib/libxmlrpc_server_cgi++.so
-lib/libxmlrpc_server_cgi++.so.4
-lib/libxmlrpc_server_cgi++.so.4.16
+lib/libxmlrpc_server_cgi++.so.7
+lib/libxmlrpc_server_cgi++.so.7.25
 lib/libxmlrpc_server_cgi.a
 lib/libxmlrpc_server_cgi.so
 lib/libxmlrpc_server_cgi.so.3
-lib/libxmlrpc_server_cgi.so.3.16
+lib/libxmlrpc_server_cgi.so.3.25
 lib/libxmlrpc_server_pstream++.a
 lib/libxmlrpc_server_pstream++.so
-lib/libxmlrpc_server_pstream++.so.4
-lib/libxmlrpc_server_pstream++.so.4.16
+lib/libxmlrpc_server_pstream++.so.7
+lib/libxmlrpc_server_pstream++.so.7.25
 lib/libxmlrpc_util.a
 lib/libxmlrpc_util.so
 lib/libxmlrpc_util.so.3
-lib/libxmlrpc_util.so.3.16
+lib/libxmlrpc_util.so.3.25
 lib/libxmlrpc_xmlparse.a
 lib/libxmlrpc_xmlparse.so
 lib/libxmlrpc_xmlparse.so.3
-lib/libxmlrpc_xmlparse.so.3.16
+lib/libxmlrpc_xmlparse.so.3.25
 lib/libxmlrpc_xmltok.a
 lib/libxmlrpc_xmltok.so
 lib/libxmlrpc_xmltok.so.3
-lib/libxmlrpc_xmltok.so.3.16
+lib/libxmlrpc_xmltok.so.3.25
 @dirrm include/xmlrpc-c