Changes 1.25.25:

* base.hpp: Fix declarations out of order causing compile failure. Broken since Xmlrpc-c 1.19 (June 2009).
* Make distclean cleans up src/test/blddir and src/test/srcdir.

13 files changed, 69 insertions, 155 deletions

diff --git a/textproc/xmlrpc-c/Makefile b/textproc/xmlrpc-c/Makefile
index 0cc264c8dc6..da408557835 100644
--- a/textproc/xmlrpc-c/Makefile
+++ b/textproc/xmlrpc-c/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2013/02/06 23:21:18 jperkin Exp $
+# $NetBSD: Makefile,v 1.33 2013/09/12 18:52:54 adam Exp $
 
-DISTNAME=	xmlrpc-c-1.16.44
+DISTNAME=	xmlrpc-c-1.25.25
 # the "super stable" branch
 PKGNAME=	${DISTNAME:S/-c-/-c-ss-/}
-PKGREVISION=	2
 CATEGORIES=	textproc devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xmlrpc-c/}
 EXTRACT_SUFX=	.tgz
@@ -17,7 +16,7 @@ CONFLICTS+=	xmlrpc-c-[0-9]*
 SUPERSEDES+=	xmlrpc-c-[0-9]*
 
 # Sometimes can't open ../xmltok/libxmlrpc_xmltok.la
-MAKE_JOBS_SAFE=		no
+#MAKE_JOBS_SAFE=		no
 
 USE_LANGUAGES=		c99 c++
 USE_LIBTOOL=		yes
diff --git a/textproc/xmlrpc-c/PLIST b/textproc/xmlrpc-c/PLIST
index 54dde4f79fd..29b1bea7a41 100644
--- a/textproc/xmlrpc-c/PLIST
+++ b/textproc/xmlrpc-c/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2011/04/06 07:45:47 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2013/09/12 18:52:54 adam Exp $
 bin/xmlrpc-c-config
 include/XmlRpcCpp.h
 include/xmlrpc-c/abyss.h
@@ -16,6 +16,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
@@ -38,69 +39,69 @@ 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
diff --git a/textproc/xmlrpc-c/distinfo b/textproc/xmlrpc-c/distinfo
index 85e549bcd2f..9bc67ba64ca 100644
--- a/textproc/xmlrpc-c/distinfo
+++ b/textproc/xmlrpc-c/distinfo
@@ -1,17 +1,12 @@
-$NetBSD: distinfo,v 1.28 2013/01/05 10:37:56 ryoon Exp $
+$NetBSD: distinfo,v 1.29 2013/09/12 18:52:54 adam Exp $
 
-SHA1 (xmlrpc-c-1.16.44.tgz) = 181c54ac860698ed7cf4e3814c6f3c6dd46b2ce1
-RMD160 (xmlrpc-c-1.16.44.tgz) = c9293bb74bf6298d6dd6529669f86d4cddd1fcf8
-Size (xmlrpc-c-1.16.44.tgz) = 758939 bytes
-SHA1 (patch-GNUmakefile) = 3edcf5ef38c9e94466d0303cb0eb7ce2d5ca39bb
+SHA1 (xmlrpc-c-1.25.25.tgz) = 10112e9c5328de5ce334c3e7ab7c02cd4ad3f8b2
+RMD160 (xmlrpc-c-1.25.25.tgz) = 9b48b6aa70f04d4f8663515b64feb3186e31dd41
+Size (xmlrpc-c-1.25.25.tgz) = 779371 bytes
+SHA1 (patch-GNUmakefile) = e4c6b18adaec74257ae174f64ac680aaf63d31a5
 SHA1 (patch-aa) = 96ca1b0f8550b04e7292d07b4204b5bed841a417
-SHA1 (patch-ac) = e230eb36f812c85521721ead4d080250e61f670f
 SHA1 (patch-ae) = 52f826d292869be44886881c48aa7707a4af2df3
-SHA1 (patch-ai) = e7b981f07d4691bbd63bfa80b34b3e1c050c3ad2
-SHA1 (patch-aj) = e3ca062349eb7c50cf3d3dc1370744987a0f3bde
-SHA1 (patch-ak) = 2d0528260b203965e5237f5ca7f9464215283f5c
-SHA1 (patch-config.mk.in) = 9b85954b7ef5962ff3750ccd78392e5c7bdbd592
-SHA1 (patch-examples_cpp_Makefile) = 3c2ca9b50a587c6a6395aec292ca643605158171
-SHA1 (patch-lib_curl__transport_curlmulti.c) = 1cea4c43b1ed3dcf73827afc14d7bb9267371121
-SHA1 (patch-lib_curl__transport_curltransaction.c) = 1dcf46c0dd1dd8e7fdfbb6c81e00b326f6d0b1f9
-SHA1 (patch-lib_curl__transport_xmlrpc__curl__transport.c) = ea132ebb46ff0ce9893d64e9c9205d5a155220ef
+SHA1 (patch-ai) = 8d7ddc541779129de1e03a3cee81505ffbfb4171
+SHA1 (patch-aj) = e65acd3d49be3486f70cda935a8b2aae3f8af3e8
+SHA1 (patch-ak) = 4525977b51a25f115c1266dccf0e2cc754dc80d3
+SHA1 (patch-config.mk.in) = ddb63b60b40fb739700e3808336199f848c25904
diff --git a/textproc/xmlrpc-c/patches/patch-GNUmakefile b/textproc/xmlrpc-c/patches/patch-GNUmakefile
index 887d61e8232..4725e64d5e6 100644
--- a/textproc/xmlrpc-c/patches/patch-GNUmakefile
+++ b/textproc/xmlrpc-c/patches/patch-GNUmakefile
@@ -1,6 +1,7 @@
-$NetBSD: patch-GNUmakefile,v 1.1 2011/11/22 19:17:19 yyamano Exp $
+$NetBSD: patch-GNUmakefile,v 1.2 2013/09/12 18:52:54 adam Exp $
 
 Make this build with symlinked pkgsrc directory.
+Don't build examples: they are not installed, and give error with libc++.
 
 --- GNUmakefile.orig	2011-03-25 16:27:18.000000000 +0000
 +++ GNUmakefile
@@ -12,3 +13,12 @@ Make this build with symlinked pkgsrc directory.
  SUBDIR =
  
  export SRCDIR
+@@ -8,7 +8,7 @@ export BLDDIR
+ 
+ include $(BLDDIR)/config.mk
+ 
+-SUBDIRS = include lib src tools examples
++SUBDIRS = include lib src tools
+ 
+ # The reason we don't build tools and examples by default is that they
+ # contain executables, which require significantly more from the
diff --git a/textproc/xmlrpc-c/patches/patch-ac b/textproc/xmlrpc-c/patches/patch-ac
deleted file mode 100644
index dbb03609127..00000000000
--- a/textproc/xmlrpc-c/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2011/04/06 07:45:48 adam Exp $
-
---- src/cpp/Makefile.orig	2011-03-25 16:58:35.000000000 +0000
-+++ src/cpp/Makefile
-@@ -283,7 +283,7 @@ $(LIBXMLRPC_PACKETSOCKET_MODS:%=%.o) \
- $(LIBXMLRPC_PACKETSOCKET_MODS:%=%.osh): \
-   INCLUDES = $(BASIC_INCLUDES)
- 
--CXXFLAGS = $(CXXFLAGS_COMMON) $(CFLAGS_PERSONAL) $(CADD)
-+CXXFLAGS = $(CXXFLAGS_COMMON) $(CFLAGS_SHLIB) $(CFLAGS_PERSONAL) $(CADD)
- 
- TRANSPORT_CONFIG_USERS = client curl libwww wininet
- 
diff --git a/textproc/xmlrpc-c/patches/patch-ai b/textproc/xmlrpc-c/patches/patch-ai
index 1111f298189..76dfc063d53 100644
--- a/textproc/xmlrpc-c/patches/patch-ai
+++ b/textproc/xmlrpc-c/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.2 2011/04/06 07:45:48 adam Exp $
+$NetBSD: patch-ai,v 1.3 2013/09/12 18:52:54 adam Exp $
 
---- tools/xmlrpc/Makefile.orig	2011-03-25 16:58:35.000000000 +0000
+--- tools/xmlrpc/Makefile.orig	2013-03-29 06:38:36.000000000 +0000
 +++ tools/xmlrpc/Makefile
-@@ -45,7 +45,7 @@ LIBS = $(LIBXMLRPC_CLIENT) $(LIBXMLRPC) 
+@@ -43,7 +43,7 @@ LIBS = $(LIBXMLRPC_CLIENT) $(LIBXMLRPC) 
  XMLRPC_OBJS = xmlrpc.o $(DUMPVALUE)
  
  xmlrpc: $(XMLRPC_OBJS) $(LIBS) $(UTILS)
@@ -10,4 +10,4 @@ $NetBSD: patch-ai,v 1.2 2011/04/06 07:45:48 adam Exp $
 +	libtool --mode=link $(CCLD) -o $@ $(LDFLAGS) $(XMLRPC_OBJS) $(UTILS) $(CLIENT_LDLIBS)
  
  %.o:%.c $(BLDDIR)/include/xmlrpc-c/config.h
- 	$(CC) -c $(CFLAGS) $<
+ 	$(CC) -c $(CFLAGS_ALL) $<
diff --git a/textproc/xmlrpc-c/patches/patch-aj b/textproc/xmlrpc-c/patches/patch-aj
index a9041686113..7f9d4580291 100644
--- a/textproc/xmlrpc-c/patches/patch-aj
+++ b/textproc/xmlrpc-c/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.2 2011/04/06 07:45:48 adam Exp $
+$NetBSD: patch-aj,v 1.3 2013/09/12 18:52:54 adam Exp $
 
---- tools/xmlrpc_transport/Makefile.orig	2011-03-25 16:58:35.000000000 +0000
+--- tools/xmlrpc_transport/Makefile.orig	2013-03-29 06:38:36.000000000 +0000
 +++ tools/xmlrpc_transport/Makefile
-@@ -45,7 +45,7 @@ UTILS = $(UTIL_OBJS:%=$(UTIL_DIR)/%)
+@@ -36,7 +36,7 @@ UTILS = $(UTIL_OBJS:%=$(UTIL_DIR)/%)
  LIBS = $(LIBXMLRPC_CLIENT) $(LIBXMLRPC) $(LIBXMLRPC_XML) $(LIBXMLRPC_UTIL)
  
  xmlrpc_transport:%:%.o $(LIBS) $(UTILS)
@@ -10,4 +10,4 @@ $NetBSD: patch-aj,v 1.2 2011/04/06 07:45:48 adam Exp $
 +	libtool --mode=link $(CCLD) -o $@ $(LDFLAGS) $< $(CLIENT_LDLIBS) $(UTILS)
  
  %.o:%.c
- 	$(CC) -c $(CFLAGS) $<
+ 	$(CC) -c $(CFLAGS_ALL) $<
diff --git a/textproc/xmlrpc-c/patches/patch-ak b/textproc/xmlrpc-c/patches/patch-ak
index de02aa22dfc..d7f0370986f 100644
--- a/textproc/xmlrpc-c/patches/patch-ak
+++ b/textproc/xmlrpc-c/patches/patch-ak
@@ -1,6 +1,6 @@
-$NetBSD: patch-ak,v 1.2 2011/04/06 07:45:48 adam Exp $
+$NetBSD: patch-ak,v 1.3 2013/09/12 18:52:54 adam Exp $
 
---- tools/xml-rpc-api2cpp/Makefile.orig	2011-03-25 16:58:35.000000000 +0000
+--- tools/xml-rpc-api2cpp/Makefile.orig	2013-03-29 06:38:36.000000000 +0000
 +++ tools/xml-rpc-api2cpp/Makefile
 @@ -44,7 +44,7 @@ xml-rpc-api2cpp: \
    $(LIBXMLRPC) \
@@ -10,4 +10,4 @@ $NetBSD: patch-ak,v 1.2 2011/04/06 07:45:48 adam Exp $
 +	libtool --mode=link $(CXXLD) -o $@ $(LDFLAGS) $(OBJECTS) $(LDLIBS)
  
  %.o:%.cpp
- 	$(CXX) -c $(CXXFLAGS) $<
+ 	$(CXX) -c $(CXXFLAGS_ALL) $<
diff --git a/textproc/xmlrpc-c/patches/patch-config.mk.in b/textproc/xmlrpc-c/patches/patch-config.mk.in
index c5eccd9a2b1..7dd56f4e8b7 100644
--- a/textproc/xmlrpc-c/patches/patch-config.mk.in
+++ b/textproc/xmlrpc-c/patches/patch-config.mk.in
@@ -1,14 +1,14 @@
-$NetBSD: patch-config.mk.in,v 1.2 2013/01/05 10:37:56 ryoon Exp $
+$NetBSD: patch-config.mk.in,v 1.3 2013/09/12 18:52:54 adam Exp $
 
 Do not use -Bdynamic -G when using GCC on Solaris, it creates non-PIC
 libraries.
 
---- config.mk.in.orig	2011-03-25 16:58:35.000000000 +0000
+--- config.mk.in.orig	2013-03-29 06:38:36.000000000 +0000
 +++ config.mk.in
-@@ -187,10 +187,15 @@ ifeq ($(patsubst solaris%,solaris,$(HOST
-   SHLIB_SUFFIX = so
-   shlibfn = $(1:%=%.$(SHLIB_SUFFIX).$(MAJ).$(MIN))
-   shliblefn = $(1:%=%.$(SHLIB_SUFFIX))
+@@ -193,10 +193,15 @@ ifeq ($(patsubst solaris%,solaris,$(HOST
+   # linker, it's even more complicated: we need an rpath option of the
+   # form -Wl,-R .
+ 
 -  # Solaris compiler (Sun C 5.5) can't take multiple ld options as
 -  # -Wl,-a,-b .  Ld sees -a,-b in that case.
 -  LDFLAGS_SHLIB = -Wl,-Bdynamic -Wl,-G -Wl,-h -Wl,$(SONAME)
@@ -22,10 +22,10 @@ libraries.
 +    LDFLAGS_SHLIB = -Wl,-Bdynamic -Wl,-G -Wl,-h -Wl,$(SONAME)
 +    CFLAGS_SHLIB = -Kpic
 +  endif
+   NEED_RPATH=yes
  endif
  
- ifeq ($(patsubst aix%,aix,$(HOST_OS)),aix)
-@@ -235,6 +240,18 @@ ifeq ($(patsubst netbsd%,netbsd,$(HOST_O
+@@ -242,6 +247,18 @@ ifeq ($(patsubst netbsd%,netbsd,$(HOST_O
    NEED_WL_RPATH=yes
  endif
  
diff --git a/textproc/xmlrpc-c/patches/patch-examples_cpp_Makefile b/textproc/xmlrpc-c/patches/patch-examples_cpp_Makefile
deleted file mode 100644
index 6a384d0c9a2..00000000000
--- a/textproc/xmlrpc-c/patches/patch-examples_cpp_Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-examples_cpp_Makefile,v 1.1 2012/04/25 17:52:59 hans Exp $
-
---- examples/cpp/Makefile.orig	2011-03-25 17:58:35.000000000 +0100
-+++ examples/cpp/Makefile	2012-04-25 17:31:34.833338175 +0200
-@@ -75,26 +75,26 @@ LIBS_BASE = \
- all: $(PROGS)
- 
- $(SERVERPROGS_CGI):%.cgi:%_cgi.o
--	$(CXXLD) -o $@ $^ $(LIBS_SERVER_CGI) $(LDFLAGS)
-+	$(CXXLD) -o $@ $(LDFLAGS) $^ $(LIBS_SERVER_CGI)
- 
- $(SERVERPROGS_ABYSS):%:%.o
--	$(CXXLD) -o $@ $^ $(LIBS_SERVER_ABYSS) $(LDFLAGS)
-+	$(CXXLD) -o $@ $(LDFLAGS) $^ $(LIBS_SERVER_ABYSS)
- 
- $(CLIENTPROGS):%:%.o
--	$(CXXLD) -o $@ $^ $(LIBS_CLIENT) $(LDFLAGS)
-+	$(CXXLD) -o $@ $(LDFLAGS) $^ $(LIBS_CLIENT)
- 
- 
- LIBS_PSTREAM_CLIENT = \
-   $(shell $(XMLRPC_C_CONFIG) c++2 client --libs)
- 
- pstream_client:%:%.o
--	$(CXXLD) -o $@ $^ $(LIBS_PSTREAM_CLIENT) $(LDFLAGS)
-+	$(CXXLD) -o $@ $(LDFLAGS) $^ $(LIBS_PSTREAM_CLIENT)
- 
- LIBS_PSTREAM_SERVER = \
-   $(shell $(XMLRPC_C_CONFIG) c++2 pstream-server --libs)
- 
- pstream_inetd_server:%:%.o
--	$(CXXLD) -o $@ $^ $(LIBS_PSTREAM_SERVER) $(LDFLAGS)
-+	$(CXXLD) -o $@ $(LDFLAGS) $^ $(LIBS_PSTREAM_SERVER)
- 
- OBJECTS = $(patsubst %,%.o,$(patsubst %.cgi,%_cgi,$(PROGS)))
- 
diff --git a/textproc/xmlrpc-c/patches/patch-lib_curl__transport_curlmulti.c b/textproc/xmlrpc-c/patches/patch-lib_curl__transport_curlmulti.c
deleted file mode 100644
index b012bbbb1cc..00000000000
--- a/textproc/xmlrpc-c/patches/patch-lib_curl__transport_curlmulti.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-lib_curl__transport_curlmulti.c,v 1.1 2011/06/30 01:03:25 obache Exp $
-
-* curl/types.h is not used (empty) since curl-7.12.0 and removed at curl-7.21.7.
-
---- lib/curl_transport/curlmulti.c.orig	2011-03-25 16:24:54.000000000 +0000
-+++ lib/curl_transport/curlmulti.c
-@@ -17,7 +17,6 @@
- #endif
- 
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- #include <curl/multi.h>
- 
diff --git a/textproc/xmlrpc-c/patches/patch-lib_curl__transport_curltransaction.c b/textproc/xmlrpc-c/patches/patch-lib_curl__transport_curltransaction.c
deleted file mode 100644
index 8b3f9bbf8b8..00000000000
--- a/textproc/xmlrpc-c/patches/patch-lib_curl__transport_curltransaction.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-lib_curl__transport_curltransaction.c,v 1.1 2011/06/30 01:03:26 obache Exp $
-
-* curl/types.h is not used (empty) since curl-7.12.0 and removed at curl-7.21.7.
-
---- lib/curl_transport/curltransaction.c.orig	2011-03-25 16:24:56.000000000 +0000
-+++ lib/curl_transport/curltransaction.c
-@@ -15,7 +15,6 @@
- #include "version.h"
- 
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- 
- #include "curlversion.h"
diff --git a/textproc/xmlrpc-c/patches/patch-lib_curl__transport_xmlrpc__curl__transport.c b/textproc/xmlrpc-c/patches/patch-lib_curl__transport_xmlrpc__curl__transport.c
deleted file mode 100644
index 29e2556c594..00000000000
--- a/textproc/xmlrpc-c/patches/patch-lib_curl__transport_xmlrpc__curl__transport.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-lib_curl__transport_xmlrpc__curl__transport.c,v 1.1 2011/06/30 01:03:26 obache Exp $
-
-* curl/types.h is not used (empty) since curl-7.12.0 and removed at curl-7.21.7.
-
---- lib/curl_transport/xmlrpc_curl_transport.c.orig	2011-03-25 16:24:55.000000000 +0000
-+++ lib/curl_transport/xmlrpc_curl_transport.c
-@@ -83,7 +83,6 @@
- #include "xmlrpc-c/time_int.h"
- 
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- #include <curl/multi.h>
-