6 files changed, 55 insertions, 81 deletions

diff --git a/net/xmlrpc-c-devel/Makefile b/net/xmlrpc-c-devel/Makefile
index d43c8963bdb5..6371e5de5764 100644
--- a/net/xmlrpc-c-devel/Makefile
+++ b/net/xmlrpc-c-devel/Makefile
@@ -7,10 +7,9 @@
 #
 
 PORTNAME=	xmlrpc-c
-PORTVERSION=	1.11.00
-PORTREVISION=	3
+PORTVERSION=	1.18.00
 CATEGORIES=	net
-MASTER_SITES=	SF
+MASTER_SITES=	LOCAL/chinsan/xmlrpc-c
 EXTRACT_SUFX=	.tgz
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 
@@ -68,8 +67,5 @@ 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 9015803d7539..d82bb44a1c4b 100644
--- a/net/xmlrpc-c-devel/distinfo
+++ b/net/xmlrpc-c-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (xmlrpc-c-1.11.00.tgz) = 907ae3d78317fb919c773708ffdb4718
-SHA256 (xmlrpc-c-1.11.00.tgz) = 161c871cf6ef1376459348bff4ef6157f0e7ba26cba8eddb0a5144fc8a47990e
-SIZE (xmlrpc-c-1.11.00.tgz) = 736093
+MD5 (xmlrpc-c-1.18.00.tgz) = c7c467ba5c06ee9fd1f5716b0c936ecf
+SHA256 (xmlrpc-c-1.18.00.tgz) = 60dfd0a83c6dfa4065857dd7f8cbd2bc62f1dd8c8d0fd5f4d52c48245c3b0582
+SIZE (xmlrpc-c-1.18.00.tgz) = 710570
diff --git a/net/xmlrpc-c-devel/files/patch-lib-curl_transport-xmlrpc_curl_transport.c b/net/xmlrpc-c-devel/files/patch-lib-curl_transport-xmlrpc_curl_transport.c
deleted file mode 100644
index 7f2bb710eb40..000000000000
--- a/net/xmlrpc-c-devel/files/patch-lib-curl_transport-xmlrpc_curl_transport.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/curl_transport/xmlrpc_curl_transport.c.old	2008-11-12 13:05:29.000000000 +0200
-+++ lib/curl_transport/xmlrpc_curl_transport.c	2008-11-12 13:05:38.000000000 +0200
-@@ -557,7 +557,7 @@
-             curl_easy_setopt(curlSessionP, CURLOPT_SSLENGINE,
-                              curlSetupP->sslEngine);
-         if (curlSetupP->sslEngineDefault)
--            curl_easy_setopt(curlSessionP, CURLOPT_SSLENGINE_DEFAULT);
-+            curl_easy_setopt(curlSessionP, CURLOPT_SSLENGINE_DEFAULT, 1);
-         if (curlSetupP->sslVersion != XMLRPC_SSLVERSION_DEFAULT)
-             curl_easy_setopt(curlSessionP, CURLOPT_SSLVERSION,
-                              curlSetupP->sslVersion);
diff --git a/net/xmlrpc-c-devel/files/patch-src-Makefile b/net/xmlrpc-c-devel/files/patch-src-Makefile
index 3e779a506f23..2b5b404c6aa4 100644
--- a/net/xmlrpc-c-devel/files/patch-src-Makefile
+++ b/net/xmlrpc-c-devel/files/patch-src-Makefile
@@ -1,11 +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 =
+--- src/Makefile.orig	2009-04-08 09:43:29.000000000 +0800
++++ src/Makefile	2009-04-08 09:43:55.000000000 +0800
+@@ -70,7 +70,7 @@
  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)
+   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
+   XML_PARSER_LIBDEP_DEP = $(LIBXMLRPC_XMLPARSE) $(LIBXMLRPC_XMLTOK)
  endif
- 
diff --git a/net/xmlrpc-c-devel/files/patch-src-cpp-Makefile b/net/xmlrpc-c-devel/files/patch-src-cpp-Makefile
deleted file mode 100644
index 11ef6216f427..000000000000
--- a/net/xmlrpc-c-devel/files/patch-src-cpp-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/cpp/Makefile.orig	2008-10-12 21:53:42.000000000 +0400
-+++ src/cpp/Makefile	2008-10-12 21:53:51.000000000 +0400
-@@ -139,7 +139,7 @@
- #  RULES TO COMPILE OBJECT MODULES FOR LIBRARIES
- #-----------------------------------------------------------------------------
- 
--CXXFLAGS = $(CXXFLAGS_COMMON) $(CFLAGS_PERSONAL) $(CADD)
-+CXXFLAGS = $(CXXFLAGS_COMMON) $(CFLAGS_PERSONAL) $(CADD) -fPIC
- 
- XmlRpcCpp.o:%.o:%.cpp
- 	$(CXX) -c $(BASIC_INCLUDES) $(CXXFLAGS) $<
diff --git a/net/xmlrpc-c-devel/pkg-plist b/net/xmlrpc-c-devel/pkg-plist
index d62815cb193e..58cfd6a0ddb0 100644
--- a/net/xmlrpc-c-devel/pkg-plist
+++ b/net/xmlrpc-c-devel/pkg-plist
@@ -1,60 +1,60 @@
 bin/xmlrpc-c-config
-include/xmlrpc-c/config.h
-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/base.h
+include/xmlrpc-c/c_util.h
+include/xmlrpc-c/client.h
+include/xmlrpc-c/client_global.h
+include/xmlrpc-c/config.h
+include/xmlrpc-c/inttypes.h
+include/xmlrpc-c/oldxmlrpc.h
 include/xmlrpc-c/server.h
 include/xmlrpc-c/server_abyss.h
+include/xmlrpc-c/server_cgi.h
 include/xmlrpc-c/server_w32httpsys.h
-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-c/util.h
 include/xmlrpc.h
+include/xmlrpc_abyss.h
+include/xmlrpc_cgi.h
 include/xmlrpc_client.h
 include/xmlrpc_server.h
-include/xmlrpc_cgi.h
-include/xmlrpc_server_abyss.h
 include/xmlrpc_server_w32httpsys.h
-include/XmlRpcCpp.h
+lib/libxmlrpc.a
 lib/libxmlrpc.so
-lib/libxmlrpc_util.a
-lib/libxmlrpc_util.so.3.11
-lib/libxmlrpc_util.so.3
-lib/libxmlrpc_util.so
+lib/libxmlrpc.so.3
+lib/libxmlrpc.so.3.18
 lib/libxmlrpc_abyss.a
-lib/libxmlrpc_abyss.so.3.11
-lib/libxmlrpc_abyss.so.3
 lib/libxmlrpc_abyss.so
-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.la
+lib/libxmlrpc_abyss.so.3
+lib/libxmlrpc_abyss.so.3.18
+lib/libxmlrpc_client.a
+lib/libxmlrpc_client.so
+lib/libxmlrpc_client.so.3
+lib/libxmlrpc_client.so.3.18
 lib/libxmlrpc_server.a
-lib/libxmlrpc_server_abyss.so.14
-lib/libxmlrpc_server_abyss.so
-lib/libxmlrpc_server_abyss.la
+lib/libxmlrpc_server.so
+lib/libxmlrpc_server.so.3
+lib/libxmlrpc_server.so.3.18
 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.la
+lib/libxmlrpc_server_abyss.so
+lib/libxmlrpc_server_abyss.so.3
+lib/libxmlrpc_server_abyss.so.3.18
 lib/libxmlrpc_server_cgi.a
+lib/libxmlrpc_server_cgi.so
+lib/libxmlrpc_server_cgi.so.3
+lib/libxmlrpc_server_cgi.so.3.18
+lib/libxmlrpc_util.a
+lib/libxmlrpc_util.so
+lib/libxmlrpc_util.so.3
+lib/libxmlrpc_util.so.3.18
+lib/libxmlrpc_xmlparse.a
+lib/libxmlrpc_xmlparse.so
+lib/libxmlrpc_xmlparse.so.3
+lib/libxmlrpc_xmlparse.so.3.18
+lib/libxmlrpc_xmltok.a
+lib/libxmlrpc_xmltok.so
+lib/libxmlrpc_xmltok.so.3
+lib/libxmlrpc_xmltok.so.3.18
 @dirrm include/xmlrpc-c