Update to 1.31.04

6 files changed, 83 insertions, 11 deletions

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.