net/xmlrpc-c: Update to 1.54.05

While here, make portclippy happy

Sponsored by:	Rubicon Communications, LLC ("Netgate")

3 files changed, 37 insertions, 42 deletions

diff --git a/net/xmlrpc-c/Makefile b/net/xmlrpc-c/Makefile
index f942762d10ca..74d5c8455405 100644
--- a/net/xmlrpc-c/Makefile
+++ b/net/xmlrpc-c/Makefile
@@ -1,7 +1,7 @@
 # Created by: Ying-Chieh Liao <ijliao@FreeBSD.org>
 
 PORTNAME=	xmlrpc-c
-PORTVERSION=	1.51.07
+PORTVERSION=	1.54.05
 CATEGORIES=	net
 MASTER_SITES=	SF/${PORTNAME}/Xmlrpc-c%20Super%20Stable/${PORTVERSION}
 
@@ -11,33 +11,32 @@ COMMENT=	XML-RPC library for C and C++
 LICENSE=	BSD3CLAUSE
 
 USES=		gmake pkgconfig tar:tgz
+USE_LDCONFIG=	yes
+GNU_CONFIGURE=	yes
 
-OPTIONS_DEFINE=	DEBUG CURL LIBWWW CPLUSPLUS
-OPTIONS_DEFAULT=CURL LIBWWW CPLUSPLUS
-
-LIBWWW_DESC=	Compile with libwww support
-CPLUSPLUS_DESC=	Build xmlrpc-c c++ libs and tools
+MAKEFILE=	GNUmakefile
+MAKE_ENV+=	INSTALL_SHLIB="${INSTALL_LIB}" \
+		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
+MAKE_JOBS_UNSAFE=	yes
+LDFLAGS+=	-lm
 
 CONFLICTS=	xmlrpc-epi-0.*
 
+OPTIONS_DEFINE=	DEBUG CURL LIBWWW CPLUSPLUS
+OPTIONS_DEFAULT=CURL LIBWWW CPLUSPLUS
 OPTIONS_SUB=	yes
-GNU_CONFIGURE=	yes
-MAKEFILE=	GNUmakefile
-MAKE_JOBS_UNSAFE=	yes
-MAKE_ENV+=	INSTALL_SHLIB="${INSTALL_LIB}" \
-		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
-USE_LDCONFIG=	yes
 
+CPLUSPLUS_DESC=	Build xmlrpc-c c++ libs and tools
+LIBWWW_DESC=	Compile with libwww support
+
+CPLUSPLUS_CONFIGURE_ENABLE=	cplusplus
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CONFIGURE_ENABLE=	curl-client
-LIBWWW_USES=	ssl
 LIBWWW_LIB_DEPENDS=	libwwwcore.so:www/libwww \
 		libexpat.so:textproc/expat2
+LIBWWW_USES=	ssl
 LIBWWW_CONFIGURE_ENABLE=libwww-client
 LIBWWW_CONFIGURE_WITH=	libwww-ssl
-CPLUSPLUS_CONFIGURE_ENABLE=	cplusplus
-
-LDFLAGS+=	-lm
 
 .include <bsd.port.pre.mk>
 
@@ -56,11 +55,7 @@ post-extract:
 	@${FIND} ${WRKSRC} -type l -name srcdir -delete
 
 post-patch:
-	@${REINPLACE_CMD} -e '/#include.*features.h/ s/features.h/sys\/cdefs.h/' \
-		${WRKSRC}/tools/xmlrpc_pstream/xmlrpc_pstream.cpp
 	@${REINPLACE_CMD} -e '/define _XOPEN_SOURCE 600/ s,^,//,' \
 		${WRKSRC}/src/xmlrpc_server_abyss.c
-	@${REINPLACE_CMD} -e 's,sys/unistd.h,unistd.h,' \
-		${WRKSRC}/test/cpp/server_abyss.cpp
 
 .include <bsd.port.post.mk>
diff --git a/net/xmlrpc-c/distinfo b/net/xmlrpc-c/distinfo
index f05d4d4c1c14..35d5425c5d3c 100644
--- a/net/xmlrpc-c/distinfo
+++ b/net/xmlrpc-c/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1614079009
-SHA256 (xmlrpc-c-1.51.07.tgz) = 84d20ae33f927582f821d61c0b9194aefbf1d7924590a13fa9da5ae1698aded9
-SIZE (xmlrpc-c-1.51.07.tgz) = 933164
+TIMESTAMP = 1649772875
+SHA256 (xmlrpc-c-1.54.05.tgz) = ae96bf3ea2e9f532f1658ad9581a89639a8ebec6ee023dd72e2b21dd15ce8583
+SIZE (xmlrpc-c-1.54.05.tgz) = 933228
diff --git a/net/xmlrpc-c/pkg-plist b/net/xmlrpc-c/pkg-plist
index bd00a8785ada..1f69ccf92ccf 100644
--- a/net/xmlrpc-c/pkg-plist
+++ b/net/xmlrpc-c/pkg-plist
@@ -45,79 +45,79 @@ include/xmlrpc_server_w32httpsys.h
 %%CPLUSPLUS%%lib/libxmlrpc++.a
 %%CPLUSPLUS%%lib/libxmlrpc++.so
 %%CPLUSPLUS%%lib/libxmlrpc++.so.8
-%%CPLUSPLUS%%lib/libxmlrpc++.so.8.51
+%%CPLUSPLUS%%lib/libxmlrpc++.so.8.54
 lib/libxmlrpc.a
 lib/libxmlrpc.so
 lib/libxmlrpc.so.3
-lib/libxmlrpc.so.3.51
+lib/libxmlrpc.so.3.54
 lib/libxmlrpc_abyss.a
 lib/libxmlrpc_abyss.so
 lib/libxmlrpc_abyss.so.3
-lib/libxmlrpc_abyss.so.3.51
+lib/libxmlrpc_abyss.so.3.54
 %%CPLUSPLUS%%lib/libxmlrpc_abyss++.a
 %%CPLUSPLUS%%lib/libxmlrpc_abyss++.so
 %%CPLUSPLUS%%lib/libxmlrpc_abyss++.so.8
-%%CPLUSPLUS%%lib/libxmlrpc_abyss++.so.8.51
+%%CPLUSPLUS%%lib/libxmlrpc_abyss++.so.8.54
 %%CPLUSPLUS%%%%CLIENT%%lib/libxmlrpc_client++.a
 %%CPLUSPLUS%%%%CLIENT%%lib/libxmlrpc_client++.so
 %%CPLUSPLUS%%%%CLIENT%%lib/libxmlrpc_client++.so.8
-%%CPLUSPLUS%%%%CLIENT%%lib/libxmlrpc_client++.so.8.51
+%%CPLUSPLUS%%%%CLIENT%%lib/libxmlrpc_client++.so.8.54
 %%CLIENT%%lib/libxmlrpc_client.a
 %%CLIENT%%lib/libxmlrpc_client.so
 %%CLIENT%%lib/libxmlrpc_client.so.3
-%%CLIENT%%lib/libxmlrpc_client.so.3.51
+%%CLIENT%%lib/libxmlrpc_client.so.3.54
 %%CPLUSPLUS%%lib/libxmlrpc_cpp.a
 %%CPLUSPLUS%%lib/libxmlrpc_cpp.so
 %%CPLUSPLUS%%lib/libxmlrpc_cpp.so.8
-%%CPLUSPLUS%%lib/libxmlrpc_cpp.so.8.51
+%%CPLUSPLUS%%lib/libxmlrpc_cpp.so.8.54
 %%CPLUSPLUS%%lib/libxmlrpc_packetsocket.a
 %%CPLUSPLUS%%lib/libxmlrpc_packetsocket.so
 %%CPLUSPLUS%%lib/libxmlrpc_packetsocket.so.8
-%%CPLUSPLUS%%lib/libxmlrpc_packetsocket.so.8.51
+%%CPLUSPLUS%%lib/libxmlrpc_packetsocket.so.8.54
 %%CPLUSPLUS%%lib/libxmlrpc_server++.a
 %%CPLUSPLUS%%lib/libxmlrpc_server++.so
 %%CPLUSPLUS%%lib/libxmlrpc_server++.so.8
-%%CPLUSPLUS%%lib/libxmlrpc_server++.so.8.51
+%%CPLUSPLUS%%lib/libxmlrpc_server++.so.8.54
 lib/libxmlrpc_server.a
 lib/libxmlrpc_server.so
 lib/libxmlrpc_server.so.3
-lib/libxmlrpc_server.so.3.51
+lib/libxmlrpc_server.so.3.54
 %%CPLUSPLUS%%lib/libxmlrpc_server_abyss++.a
 %%CPLUSPLUS%%lib/libxmlrpc_server_abyss++.so
 %%CPLUSPLUS%%lib/libxmlrpc_server_abyss++.so.8
-%%CPLUSPLUS%%lib/libxmlrpc_server_abyss++.so.8.51
+%%CPLUSPLUS%%lib/libxmlrpc_server_abyss++.so.8.54
 lib/libxmlrpc_server_abyss.a
 lib/libxmlrpc_server_abyss.so
 lib/libxmlrpc_server_abyss.so.3
-lib/libxmlrpc_server_abyss.so.3.51
+lib/libxmlrpc_server_abyss.so.3.54
 %%CPLUSPLUS%%lib/libxmlrpc_server_cgi++.a
 %%CPLUSPLUS%%lib/libxmlrpc_server_cgi++.so
 %%CPLUSPLUS%%lib/libxmlrpc_server_cgi++.so.8
-%%CPLUSPLUS%%lib/libxmlrpc_server_cgi++.so.8.51
+%%CPLUSPLUS%%lib/libxmlrpc_server_cgi++.so.8.54
 lib/libxmlrpc_server_cgi.a
 lib/libxmlrpc_server_cgi.so
 lib/libxmlrpc_server_cgi.so.3
-lib/libxmlrpc_server_cgi.so.3.51
+lib/libxmlrpc_server_cgi.so.3.54
 %%CPLUSPLUS%%lib/libxmlrpc_server_pstream++.a
 %%CPLUSPLUS%%lib/libxmlrpc_server_pstream++.so
 %%CPLUSPLUS%%lib/libxmlrpc_server_pstream++.so.8
-%%CPLUSPLUS%%lib/libxmlrpc_server_pstream++.so.8.51
+%%CPLUSPLUS%%lib/libxmlrpc_server_pstream++.so.8.54
 lib/libxmlrpc_util.a
 lib/libxmlrpc_util.so
 lib/libxmlrpc_util.so.4
-lib/libxmlrpc_util.so.4.51
+lib/libxmlrpc_util.so.4.54
 %%CPLUSPLUS%%lib/libxmlrpc_util++.a
 %%CPLUSPLUS%%lib/libxmlrpc_util++.so
 %%CPLUSPLUS%%lib/libxmlrpc_util++.so.8
-%%CPLUSPLUS%%lib/libxmlrpc_util++.so.8.51
+%%CPLUSPLUS%%lib/libxmlrpc_util++.so.8.54
 lib/libxmlrpc_xmlparse.a
 lib/libxmlrpc_xmlparse.so
 lib/libxmlrpc_xmlparse.so.3
-lib/libxmlrpc_xmlparse.so.3.51
+lib/libxmlrpc_xmlparse.so.3.54
 lib/libxmlrpc_xmltok.a
 lib/libxmlrpc_xmltok.so
 lib/libxmlrpc_xmltok.so.3
-lib/libxmlrpc_xmltok.so.3.51
+lib/libxmlrpc_xmltok.so.3.54
 %%CPLUSPLUS%%libdata/pkgconfig/xmlrpc++.pc
 libdata/pkgconfig/xmlrpc.pc
 %%CPLUSPLUS%%libdata/pkgconfig/xmlrpc_abyss++.pc