- Following xmlrpc-c port, remove CPLUSPLUS option and build c++ as default.

- Bump PORTREVISION

Feature safe:	yes

2 files changed, 48 insertions, 57 deletions

diff --git a/net/xmlrpc-c-devel/Makefile b/net/xmlrpc-c-devel/Makefile
index 002fde8093eb..309a97c0d18c 100644
--- a/net/xmlrpc-c-devel/Makefile
+++ b/net/xmlrpc-c-devel/Makefile
@@ -8,19 +8,18 @@
 
 PORTNAME=	xmlrpc-c
 PORTVERSION=	1.18.00
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	LOCAL/chinsan/xmlrpc-c
 PKGNAMESUFFIX=	-devel
 EXTRACT_SUFX=	.tgz
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	garga@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" on \
-		CPLUSPLUS "Enable cpp headers and libs" off
+		LIBWWW "Compile with libwww support" on
 
 CONFLICTS=	xmlrpc-epi-0.* xmlrpc-c-[0-9]*
 
@@ -40,14 +39,6 @@ USE_LDCONFIG=	yes
 CFLAGS+=	-DNDEBUG
 .endif
 
-.if defined(WITH_CPLUSPLUS)
-CONFIGURE_ARGS+=	--enable-cplusplus
-PLIST_SUB+=		CPP=""
-.else
-CONFIGURE_ARGS+=	--disable-cplusplus
-PLIST_SUB+=		CPP="@comment "
-.endif
-
 .if defined(WITHOUT_CURL)
 CONFIGURE_ARGS+=	--disable-curl-client
 .else
diff --git a/net/xmlrpc-c-devel/pkg-plist b/net/xmlrpc-c-devel/pkg-plist
index b9c534223f98..ca1208e30944 100644
--- a/net/xmlrpc-c-devel/pkg-plist
+++ b/net/xmlrpc-c-devel/pkg-plist
@@ -1,40 +1,44 @@
 bin/xmlrpc-c-config
+include/XmlRpcCpp.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/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
 include/xmlrpc-c/config.h
+include/xmlrpc-c/girerr.hpp
+include/xmlrpc-c/girmem.hpp
 include/xmlrpc-c/inttypes.h
+include/xmlrpc-c/oldcppwrapper.hpp
 include/xmlrpc-c/oldxmlrpc.h
+include/xmlrpc-c/packetsocket.hpp
+include/xmlrpc-c/registry.hpp
 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_pstream.hpp
 include/xmlrpc-c/server_w32httpsys.h
+include/xmlrpc-c/timeout.hpp
 include/xmlrpc-c/transport.h
 include/xmlrpc-c/util.h
-%%CPP%%include/xmlrpc-c/base.hpp
-%%CPP%%include/xmlrpc-c/client.hpp
-%%CPP%%include/xmlrpc-c/client_simple.hpp
-%%CPP%%include/xmlrpc-c/client_transport.hpp
-%%CPP%%include/xmlrpc-c/girerr.hpp
-%%CPP%%include/xmlrpc-c/girmem.hpp
-%%CPP%%include/xmlrpc-c/oldcppwrapper.hpp
-%%CPP%%include/xmlrpc-c/packetsocket.hpp
-%%CPP%%include/xmlrpc-c/registry.hpp
-%%CPP%%include/xmlrpc-c/server_abyss.hpp
-%%CPP%%include/xmlrpc-c/server_pstream.hpp
-%%CPP%%include/xmlrpc-c/timeout.hpp
-%%CPP%%include/xmlrpc-c/xml.hpp
-%%CPP%%include/XmlRpcCpp.h
+include/xmlrpc-c/xml.hpp
 include/xmlrpc.h
 include/xmlrpc_abyss.h
 include/xmlrpc_cgi.h
 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.a
 lib/libxmlrpc.so
 lib/libxmlrpc.so.3
@@ -43,22 +47,50 @@ 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_cpp.a
+lib/libxmlrpc_cpp.so
+lib/libxmlrpc_cpp.so.5
+lib/libxmlrpc_cpp.so.5.18
+lib/libxmlrpc_packetsocket.a
+lib/libxmlrpc_packetsocket.so
+lib/libxmlrpc_packetsocket.so.5
+lib/libxmlrpc_packetsocket.so.5.18
+lib/libxmlrpc_server++.a
+lib/libxmlrpc_server++.so
+lib/libxmlrpc_server++.so.5
+lib/libxmlrpc_server++.so.5.18
 lib/libxmlrpc_server.a
 lib/libxmlrpc_server.so
 lib/libxmlrpc_server.so.3
 lib/libxmlrpc_server.so.3.18
+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.a
 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.5
+lib/libxmlrpc_server_cgi++.so.5.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_server_pstream++.a
+lib/libxmlrpc_server_pstream++.so
+lib/libxmlrpc_server_pstream++.so.5
+lib/libxmlrpc_server_pstream++.so.5.18
 lib/libxmlrpc_util.a
 lib/libxmlrpc_util.so
 lib/libxmlrpc_util.so.3
@@ -71,36 +103,4 @@ lib/libxmlrpc_xmltok.a
 lib/libxmlrpc_xmltok.so
 lib/libxmlrpc_xmltok.so.3
 lib/libxmlrpc_xmltok.so.3.18
-%%CPP%%lib/libxmlrpc++.a
-%%CPP%%lib/libxmlrpc++.so
-%%CPP%%lib/libxmlrpc++.so.5
-%%CPP%%lib/libxmlrpc++.so.5.18
-%%CPP%%lib/libxmlrpc_client++.a
-%%CPP%%lib/libxmlrpc_client++.so
-%%CPP%%lib/libxmlrpc_client++.so.5
-%%CPP%%lib/libxmlrpc_client++.so.5.18
-%%CPP%%lib/libxmlrpc_cpp.a
-%%CPP%%lib/libxmlrpc_cpp.so
-%%CPP%%lib/libxmlrpc_cpp.so.5
-%%CPP%%lib/libxmlrpc_cpp.so.5.18
-%%CPP%%lib/libxmlrpc_packetsocket.a
-%%CPP%%lib/libxmlrpc_packetsocket.so
-%%CPP%%lib/libxmlrpc_packetsocket.so.5
-%%CPP%%lib/libxmlrpc_packetsocket.so.5.18
-%%CPP%%lib/libxmlrpc_server++.a
-%%CPP%%lib/libxmlrpc_server++.so
-%%CPP%%lib/libxmlrpc_server++.so.5
-%%CPP%%lib/libxmlrpc_server++.so.5.18
-%%CPP%%lib/libxmlrpc_server_abyss++.a
-%%CPP%%lib/libxmlrpc_server_abyss++.so
-%%CPP%%lib/libxmlrpc_server_abyss++.so.5
-%%CPP%%lib/libxmlrpc_server_abyss++.so.5.18
-%%CPP%%lib/libxmlrpc_server_cgi++.a
-%%CPP%%lib/libxmlrpc_server_cgi++.so
-%%CPP%%lib/libxmlrpc_server_cgi++.so.5
-%%CPP%%lib/libxmlrpc_server_cgi++.so.5.18
-%%CPP%%lib/libxmlrpc_server_pstream++.a
-%%CPP%%lib/libxmlrpc_server_pstream++.so
-%%CPP%%lib/libxmlrpc_server_pstream++.so.5
-%%CPP%%lib/libxmlrpc_server_pstream++.so.5.18
 @dirrm include/xmlrpc-c