2 files changed, 49 insertions, 2 deletions

diff --git a/net/xmlrpc-c-devel/Makefile b/net/xmlrpc-c-devel/Makefile
index 81f568ff9423..002fde8093eb 100644
--- a/net/xmlrpc-c-devel/Makefile
+++ b/net/xmlrpc-c-devel/Makefile
@@ -14,7 +14,7 @@ PKGNAMESUFFIX=	-devel
 EXTRACT_SUFX=	.tgz
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	garga@FreeBSD.org
 COMMENT=	XML-RPC library for C and C++
 
 OPTIONS=	DEBUG "Compile with debugging information" off \
@@ -32,7 +32,6 @@ GNU_CONFIGURE=	yes
 MAKEFILE=	GNUmakefile
 MAKE_ARGS=	LIBTOOL="${LIBTOOL}" \
 		CFLAGS_COMMON="${CFLAGS}"
-CONFIGURE_ARGS+=--disable-cplusplus
 USE_LDCONFIG=	yes
 
 .include <bsd.port.pre.mk>
@@ -43,8 +42,10 @@ CFLAGS+=	-DNDEBUG
 
 .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)
diff --git a/net/xmlrpc-c-devel/pkg-plist b/net/xmlrpc-c-devel/pkg-plist
index 58cfd6a0ddb0..b9c534223f98 100644
--- a/net/xmlrpc-c-devel/pkg-plist
+++ b/net/xmlrpc-c-devel/pkg-plist
@@ -15,6 +15,20 @@ include/xmlrpc-c/server_cgi.h
 include/xmlrpc-c/server_w32httpsys.h
 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.h
 include/xmlrpc_abyss.h
 include/xmlrpc_cgi.h
@@ -57,4 +71,36 @@ 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