3 files changed, 49 insertions, 50 deletions

diff --git a/net/xmlrpc-c-devel/Makefile b/net/xmlrpc-c-devel/Makefile
index 5bc6ebede377..29547cec4911 100644
--- a/net/xmlrpc-c-devel/Makefile
+++ b/net/xmlrpc-c-devel/Makefile
@@ -7,12 +7,10 @@
 #
 
 PORTNAME=	xmlrpc-c
-PORTVERSION=	1.18.00
-PORTREVISION=	1
+PORTVERSION=	1.20.03
 CATEGORIES=	net
-MASTER_SITES=	LOCAL/chinsan/xmlrpc-c
+MASTER_SITES=	LOCAL/garga/xmlrpc-c
 PKGNAMESUFFIX=	-devel
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	XML-RPC library for C and C++
@@ -26,6 +24,7 @@ CONFLICTS=	xmlrpc-epi-0.* xmlrpc-c-[0-9]*
 USE_GNOME=	gnometarget
 USE_PERL5=	yes
 USE_GMAKE=	yes
+USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool:22:env
 GNU_CONFIGURE=	yes
 MAKEFILE=	GNUmakefile
@@ -40,21 +39,21 @@ USE_LDCONFIG=	yes
 CFLAGS+=	-DNDEBUG
 .endif
 
-.if defined(WITHOUT_CURL)
-CONFIGURE_ARGS+=	--disable-curl-client
-.else
+.if defined(WITH_CURL)
 LIB_DEPENDS+=	curl.5:${PORTSDIR}/ftp/curl
-OPT_CURL=	yes
+CONFIGURE_ARGS+=	--enable-curl-client
+.else
+CONFIGURE_ARGS+=	--disable-curl-client
 .endif
 
 .if defined(WITH_LIBWWW)
 LIB_DEPENDS+=	wwwcore.1:${PORTSDIR}/www/libwww
-OPT_LIBWWW=	yes
+CONFIGURE_ARGS+=	--enable-libwww-client
 .else
 CONFIGURE_ARGS+=	--disable-libwww-client
 .endif
 
-.if !defined(OPT_LIBWWW) && !defined(OPT_CURL)
+.if defined(WITHOUT_LIBWWW) && defined(WITHOUT_CURL)
 PLIST_SUB+=	CLIENT="@comment "
 .else
 PLIST_SUB+=	CLIENT=""
diff --git a/net/xmlrpc-c-devel/distinfo b/net/xmlrpc-c-devel/distinfo
index d82bb44a1c4b..1917c4e05727 100644
--- a/net/xmlrpc-c-devel/distinfo
+++ b/net/xmlrpc-c-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (xmlrpc-c-1.18.00.tgz) = c7c467ba5c06ee9fd1f5716b0c936ecf
-SHA256 (xmlrpc-c-1.18.00.tgz) = 60dfd0a83c6dfa4065857dd7f8cbd2bc62f1dd8c8d0fd5f4d52c48245c3b0582
-SIZE (xmlrpc-c-1.18.00.tgz) = 710570
+MD5 (xmlrpc-c-1.20.03.tar.bz2) = 243f19c95337435085f6a7535d51ce1a
+SHA256 (xmlrpc-c-1.20.03.tar.bz2) = cd328863d2da681a9509cecb5530fa0e3271318322ab493bfe9b86d07d63209d
+SIZE (xmlrpc-c-1.20.03.tar.bz2) = 559581
diff --git a/net/xmlrpc-c-devel/pkg-plist b/net/xmlrpc-c-devel/pkg-plist
index ca1208e30944..62f6fae3eb93 100644
--- a/net/xmlrpc-c-devel/pkg-plist
+++ b/net/xmlrpc-c-devel/pkg-plist
@@ -6,11 +6,11 @@ include/xmlrpc-c/abyss_winsock.h
 include/xmlrpc-c/base.h
 include/xmlrpc-c/base.hpp
 include/xmlrpc-c/c_util.h
-include/xmlrpc-c/client.h
-include/xmlrpc-c/client.hpp
-include/xmlrpc-c/client_global.h
-include/xmlrpc-c/client_simple.hpp
-include/xmlrpc-c/client_transport.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/config.h
 include/xmlrpc-c/girerr.hpp
 include/xmlrpc-c/girmem.hpp
@@ -26,81 +26,81 @@ include/xmlrpc-c/server_cgi.h
 include/xmlrpc-c/server_pstream.hpp
 include/xmlrpc-c/server_w32httpsys.h
 include/xmlrpc-c/timeout.hpp
-include/xmlrpc-c/transport.h
+%%CLIENT%%include/xmlrpc-c/transport.h
 include/xmlrpc-c/util.h
 include/xmlrpc-c/xml.hpp
 include/xmlrpc.h
 include/xmlrpc_abyss.h
 include/xmlrpc_cgi.h
-include/xmlrpc_client.h
+%%CLIENT%%include/xmlrpc_client.h
 include/xmlrpc_server.h
 include/xmlrpc_server_w32httpsys.h
 lib/libxmlrpc++.a
 lib/libxmlrpc++.so
-lib/libxmlrpc++.so.5
-lib/libxmlrpc++.so.5.18
+lib/libxmlrpc++.so.6
+lib/libxmlrpc++.so.6.20
 lib/libxmlrpc.a
 lib/libxmlrpc.so
 lib/libxmlrpc.so.3
-lib/libxmlrpc.so.3.18
+lib/libxmlrpc.so.3.20
 lib/libxmlrpc_abyss.a
 lib/libxmlrpc_abyss.so
 lib/libxmlrpc_abyss.so.3
-lib/libxmlrpc_abyss.so.3.18
-lib/libxmlrpc_client++.a
-lib/libxmlrpc_client++.so
-lib/libxmlrpc_client++.so.5
-lib/libxmlrpc_client++.so.5.18
-lib/libxmlrpc_client.a
-lib/libxmlrpc_client.so
-lib/libxmlrpc_client.so.3
-lib/libxmlrpc_client.so.3.18
+lib/libxmlrpc_abyss.so.3.20
+%%CLIENT%%lib/libxmlrpc_client++.a
+%%CLIENT%%lib/libxmlrpc_client++.so
+%%CLIENT%%lib/libxmlrpc_client++.so.6
+%%CLIENT%%lib/libxmlrpc_client++.so.6.20
+%%CLIENT%%lib/libxmlrpc_client.a
+%%CLIENT%%lib/libxmlrpc_client.so
+%%CLIENT%%lib/libxmlrpc_client.so.3
+%%CLIENT%%lib/libxmlrpc_client.so.3.20
 lib/libxmlrpc_cpp.a
 lib/libxmlrpc_cpp.so
-lib/libxmlrpc_cpp.so.5
-lib/libxmlrpc_cpp.so.5.18
+lib/libxmlrpc_cpp.so.6
+lib/libxmlrpc_cpp.so.6.20
 lib/libxmlrpc_packetsocket.a
 lib/libxmlrpc_packetsocket.so
-lib/libxmlrpc_packetsocket.so.5
-lib/libxmlrpc_packetsocket.so.5.18
+lib/libxmlrpc_packetsocket.so.6
+lib/libxmlrpc_packetsocket.so.6.20
 lib/libxmlrpc_server++.a
 lib/libxmlrpc_server++.so
-lib/libxmlrpc_server++.so.5
-lib/libxmlrpc_server++.so.5.18
+lib/libxmlrpc_server++.so.6
+lib/libxmlrpc_server++.so.6.20
 lib/libxmlrpc_server.a
 lib/libxmlrpc_server.so
 lib/libxmlrpc_server.so.3
-lib/libxmlrpc_server.so.3.18
+lib/libxmlrpc_server.so.3.20
 lib/libxmlrpc_server_abyss++.a
 lib/libxmlrpc_server_abyss++.so
-lib/libxmlrpc_server_abyss++.so.5
-lib/libxmlrpc_server_abyss++.so.5.18
+lib/libxmlrpc_server_abyss++.so.6
+lib/libxmlrpc_server_abyss++.so.6.20
 lib/libxmlrpc_server_abyss.a
 lib/libxmlrpc_server_abyss.so
 lib/libxmlrpc_server_abyss.so.3
-lib/libxmlrpc_server_abyss.so.3.18
+lib/libxmlrpc_server_abyss.so.3.20
 lib/libxmlrpc_server_cgi++.a
 lib/libxmlrpc_server_cgi++.so
-lib/libxmlrpc_server_cgi++.so.5
-lib/libxmlrpc_server_cgi++.so.5.18
+lib/libxmlrpc_server_cgi++.so.6
+lib/libxmlrpc_server_cgi++.so.6.20
 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_server_cgi.so.3.20
 lib/libxmlrpc_server_pstream++.a
 lib/libxmlrpc_server_pstream++.so
-lib/libxmlrpc_server_pstream++.so.5
-lib/libxmlrpc_server_pstream++.so.5.18
+lib/libxmlrpc_server_pstream++.so.6
+lib/libxmlrpc_server_pstream++.so.6.20
 lib/libxmlrpc_util.a
 lib/libxmlrpc_util.so
 lib/libxmlrpc_util.so.3
-lib/libxmlrpc_util.so.3.18
+lib/libxmlrpc_util.so.3.20
 lib/libxmlrpc_xmlparse.a
 lib/libxmlrpc_xmlparse.so
 lib/libxmlrpc_xmlparse.so.3
-lib/libxmlrpc_xmlparse.so.3.18
+lib/libxmlrpc_xmlparse.so.3.20
 lib/libxmlrpc_xmltok.a
 lib/libxmlrpc_xmltok.so
 lib/libxmlrpc_xmltok.so.3
-lib/libxmlrpc_xmltok.so.3.18
+lib/libxmlrpc_xmltok.so.3.20
 @dirrm include/xmlrpc-c