4 files changed, 68 insertions, 67 deletions

diff --git a/net/xmlrpc-c-devel/Makefile b/net/xmlrpc-c-devel/Makefile
index e9e458578d5b..e1ff0fba69ba 100644
--- a/net/xmlrpc-c-devel/Makefile
+++ b/net/xmlrpc-c-devel/Makefile
@@ -7,20 +7,21 @@
 #
 
 PORTNAME=	xmlrpc-c
-PORTVERSION=	1.06.30
+PORTVERSION=	1.11.00
 CATEGORIES=	net
 MASTER_SITES=	SF
 EXTRACT_SUFX=	.tgz
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 
+PKGNAMESUFFIX=	-devel
 MAINTAINER=	chinsan@FreeBSD.org
 COMMENT=	XML-RPC library for C and C++
 
 OPTIONS=	DEBUG "Compile with debugging information" off \
 		CURL "Compile with curl support" on \
-		LIBWWW "Compile with libwww support" off
+		LIBWWW "Compile with libwww support" on
 
-CONFLICTS=	xmlrpc-epi-0.*
+CONFLICTS=	xmlrpc-epi-0.* xmlrpc-c-[0-9]*
 
 USE_GNOME=	gnometarget
 USE_PERL5=	yes
@@ -29,8 +30,8 @@ USE_AUTOTOOLS=	libtool:15:env
 GNU_CONFIGURE=	yes
 MAKEFILE=	GNUmakefile
 MAKE_ARGS=	LIBTOOL="${LIBTOOL}" \
-		CFLAGS_COMMON="${CFLAGS}" \
-		CXXFLAGS_COMMON="${CXXFLAGS}"
+		CFLAGS_COMMON="${CFLAGS}"
+CONFIGURE_ARGS+=--disable-cplusplus
 USE_LDCONFIG=	yes
 
 .include <bsd.port.pre.mk>
@@ -66,5 +67,8 @@ post-extract:
 post-patch:
 	@${GREP} -lR '\-lpthread' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
 		's|-lpthread|${PTHREAD_LIBS}|g'
+	@${REINPLACE_CMD} -e 's|netbsd|freebsd|g' \
+	  	${WRKSRC}/Makefile.config.in
+	${CAT} ${WRKSRC}/Makefile.config.in
 
 .include <bsd.port.post.mk>
diff --git a/net/xmlrpc-c-devel/distinfo b/net/xmlrpc-c-devel/distinfo
index 860b47d38f52..9015803d7539 100644
--- a/net/xmlrpc-c-devel/distinfo
+++ b/net/xmlrpc-c-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (xmlrpc-c-1.06.30.tgz) = 6c07fa0a25db020c746543b146efa12c
-SHA256 (xmlrpc-c-1.06.30.tgz) = 6e86338b1d84af0f80bc05febb0d5c9227f8bd444d3749beff69eb39402a8d87
-SIZE (xmlrpc-c-1.06.30.tgz) = 701298
+MD5 (xmlrpc-c-1.11.00.tgz) = 907ae3d78317fb919c773708ffdb4718
+SHA256 (xmlrpc-c-1.11.00.tgz) = 161c871cf6ef1376459348bff4ef6157f0e7ba26cba8eddb0a5144fc8a47990e
+SIZE (xmlrpc-c-1.11.00.tgz) = 736093
diff --git a/net/xmlrpc-c-devel/files/patch-src-Makefile b/net/xmlrpc-c-devel/files/patch-src-Makefile
new file mode 100644
index 000000000000..3e779a506f23
--- /dev/null
+++ b/net/xmlrpc-c-devel/files/patch-src-Makefile
@@ -0,0 +1,11 @@
+--- src/Makefile.orig	2008-08-25 03:18:42.000000000 +0800
++++ src/Makefile	2008-08-25 03:22:00.000000000 +0800
+@@ -57,7 +57,7 @@
+   XML_PARSER_LIBDEP_DEP =
+ else
+   XMLRPC_XML_PARSER = xmlrpc_expat.lo
+-  XML_PARSER_LIBDEP = -L$(BLDDIR)/lib/expat/xmlparse/.libs -lxmlrpc_xmlparse
++  XML_PARSER_LIBDEP = -L$(BLDDIR)/lib/expat/xmlparse/.libs ../lib/expat/xmlparse/libxmlrpc_xmlparse.so
+   XML_PARSER_LIBDEP_DEP = $(LIBXMLRPC_XMLPARSE)
+ endif
+ 
diff --git a/net/xmlrpc-c-devel/pkg-plist b/net/xmlrpc-c-devel/pkg-plist
index 145ecca64c27..cfd9a3c75858 100644
--- a/net/xmlrpc-c-devel/pkg-plist
+++ b/net/xmlrpc-c-devel/pkg-plist
@@ -1,75 +1,61 @@
-%%CLIENT%%bin/xmlrpc
 bin/xmlrpc-c-config
-%%CLIENT%%bin/xmlrpc_transport
-include/XmlRpcCpp.h
-include/xmlrpc-c/abyss.h
-include/xmlrpc-c/base.h
-include/xmlrpc-c/base.hpp
-%%CLIENT%%include/xmlrpc-c/client.h
-%%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
+include/xmlrpc-c
 include/xmlrpc-c/config.h
-include/xmlrpc-c/girerr.hpp
-include/xmlrpc-c/girmem.hpp
-include/xmlrpc-c/oldcppwrapper.hpp
-include/xmlrpc-c/oldxmlrpc.h
-include/xmlrpc-c/registry.hpp
+include/xmlrpc-c/c_util.h
+include/xmlrpc-c/util.h
+include/xmlrpc-c/base.h
+include/xmlrpc-c/abyss.h
+include/xmlrpc-c/abyss_unixsock.h
+include/xmlrpc-c/abyss_winsock.h
 include/xmlrpc-c/server.h
 include/xmlrpc-c/server_abyss.h
-include/xmlrpc-c/server_abyss.hpp
-include/xmlrpc-c/server_cgi.h
 include/xmlrpc-c/server_w32httpsys.h
-include/xmlrpc-c/timeout.hpp
-%%CLIENT%%include/xmlrpc-c/transport.h
-include/xmlrpc-c/util.h
-include/xmlrpc-c/xml.hpp
+include/xmlrpc-c/oldxmlrpc.h
+include/xmlrpc-c/client.h
+include/xmlrpc-c/transport.h
+include/xmlrpc-c/client_global.h
+include/xmlrpc-c/server_cgi.h
 include/xmlrpc.h
-include/xmlrpc_cgi.h
 include/xmlrpc_client.h
 include/xmlrpc_server.h
-include/xmlrpc_abyss.h
+include/xmlrpc_cgi.h
+include/xmlrpc_server_abyss.h
 include/xmlrpc_server_w32httpsys.h
-lib/libxmlrpc++.a
-lib/libxmlrpc.a
-lib/libxmlrpc.la
+include/XmlRpcCpp.h
 lib/libxmlrpc.so
-lib/libxmlrpc.so.9
+lib/libxmlrpc_util.a
+lib/libxmlrpc_util.so.3.11
+lib/libxmlrpc_util.so.3
+lib/libxmlrpc_util.so
 lib/libxmlrpc_abyss.a
-lib/libxmlrpc_abyss.la
+lib/libxmlrpc_abyss.so.3.11
+lib/libxmlrpc_abyss.so.3
 lib/libxmlrpc_abyss.so
-lib/libxmlrpc_abyss.so.9
-%%CLIENT%%lib/libxmlrpc_client++.a
-%%CLIENT%%lib/libxmlrpc_client.a
-%%CLIENT%%lib/libxmlrpc_client.la
-%%CLIENT%%lib/libxmlrpc_client.so
-%%CLIENT%%lib/libxmlrpc_client.so.9
-lib/libxmlrpc_cpp.a
-lib/libxmlrpc_server++.a
-lib/libxmlrpc_server.a
-lib/libxmlrpc_server.la
+lib/libxmlrpc_xmltok.a
+lib/libxmlrpc_xmltok.so.3.11
+lib/libxmlrpc_xmltok.so.3
+lib/libxmlrpc_xmltok.so
+lib/libxmlrpc_xmlparse.a
+lib/libxmlrpc_xmlparse.so.3.11
+lib/libxmlrpc_xmlparse.so.3
+lib/libxmlrpc_xmlparse.so
+lib/libxmlrpc.so.14
+lib/libxmlrpc.la
+lib/libxmlrpc.a
+lib/libxmlrpc_server.so.14
 lib/libxmlrpc_server.so
-lib/libxmlrpc_server.so.9
-lib/libxmlrpc_server_abyss++.a
-lib/libxmlrpc_server_abyss.a
-lib/libxmlrpc_server_abyss.la
+lib/libxmlrpc_server.la
+lib/libxmlrpc_server.a
+lib/libxmlrpc_server_abyss.so.14
 lib/libxmlrpc_server_abyss.so
-lib/libxmlrpc_server_abyss.so.9
-lib/libxmlrpc_server_cgi.a
-lib/libxmlrpc_server_cgi.la
+lib/libxmlrpc_server_abyss.la
+lib/libxmlrpc_server_abyss.a
+lib/libxmlrpc_client.so.14
+lib/libxmlrpc_client.so
+lib/libxmlrpc_client.la
+lib/libxmlrpc_client.a
+lib/libxmlrpc_server_cgi.so.14
 lib/libxmlrpc_server_cgi.so
-lib/libxmlrpc_server_cgi.so.9
-lib/libxmlrpc_util.a
-lib/libxmlrpc_util.la
-lib/libxmlrpc_util.so
-lib/libxmlrpc_util.so.9
-lib/libxmlrpc_xmlparse.a
-lib/libxmlrpc_xmlparse.la
-lib/libxmlrpc_xmlparse.so
-lib/libxmlrpc_xmlparse.so.9
-lib/libxmlrpc_xmltok.a
-lib/libxmlrpc_xmltok.la
-lib/libxmlrpc_xmltok.so
-lib/libxmlrpc_xmltok.so.9
+lib/libxmlrpc_server_cgi.la
+lib/libxmlrpc_server_cgi.a
 @dirrm include/xmlrpc-c