net/xmlrpc-c: Update to 1.59.02

While here, remove some unneeded code from post-extract and simplify
DEBUG option change to CFLAGS

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

3 files changed, 45 insertions, 52 deletions

diff --git a/net/xmlrpc-c/Makefile b/net/xmlrpc-c/Makefile
index de92cf37b4af..f9eaee410dfc 100644
--- a/net/xmlrpc-c/Makefile
+++ b/net/xmlrpc-c/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	xmlrpc-c
-PORTVERSION=	1.54.06
-PORTREVISION=	1
+PORTVERSION=	1.59.02
 CATEGORIES=	net
 MASTER_SITES=	SF/${PORTNAME}/Xmlrpc-c%20Super%20Stable/${PORTVERSION}
 
@@ -19,8 +18,8 @@ MAKEFILE=	GNUmakefile
 MAKE_ENV+=	INSTALL_SHLIB="${INSTALL_LIB}" \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 MAKE_JOBS_UNSAFE=	yes
-CFLAGS=		-I${OPENSSLINC}
-LDFLAGS=	-L${OPENSSLLIB} -lm
+CFLAGS+=	-I${OPENSSLINC}
+LDFLAGS+=	-L${OPENSSLLIB} -lm
 
 CONFLICTS=	xmlrpc-epi-0.*
 
@@ -28,22 +27,24 @@ OPTIONS_DEFINE=	DEBUG CURL LIBWWW CPLUSPLUS
 OPTIONS_DEFAULT=CURL LIBWWW CPLUSPLUS
 OPTIONS_SUB=	yes
 
-CPLUSPLUS_DESC=	Build xmlrpc-c c++ libs and tools
-LIBWWW_DESC=	Compile with libwww support
+CPLUSPLUS_DESC=	Build xmlrpc-c C++ wrapper classes and tools
+CURL_DESC=	Build the curl client transport
+LIBWWW_DESC=	Build the libwww client transport
 
 CPLUSPLUS_CONFIGURE_ENABLE=	cplusplus
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CONFIGURE_ENABLE=	curl-client
+DEBUG_CFLAGS=		-DNDEBUG
 LIBWWW_LIB_DEPENDS=	libwwwcore.so:www/libwww \
-		libexpat.so:textproc/expat2
+			libexpat.so:textproc/expat2
 LIBWWW_CONFIGURE_ENABLE=libwww-client
 LIBWWW_CONFIGURE_WITH=	libwww-ssl
 
-.include <bsd.port.pre.mk>
+post-patch:
+	@${REINPLACE_CMD} -e '/define _XOPEN_SOURCE 600/ s,^,//,' \
+		${WRKSRC}/src/xmlrpc_server_abyss.c
 
-.if empty(PORT_OPTIONS:MDEBUG)
-CFLAGS+=	-DNDEBUG
-.endif
+.include <bsd.port.options.mk>
 
 .if empty(PORT_OPTIONS:MLIBWWW) && empty(PORT_OPTIONS:MCURL)
 PLIST_SUB+=	CLIENT="@comment "
@@ -51,12 +52,4 @@ PLIST_SUB+=	CLIENT="@comment "
 PLIST_SUB+=	CLIENT=""
 .endif
 
-post-extract:
-	@${FIND} ${WRKSRC} -type l -name blddir -delete
-	@${FIND} ${WRKSRC} -type l -name srcdir -delete
-
-post-patch:
-	@${REINPLACE_CMD} -e '/define _XOPEN_SOURCE 600/ s,^,//,' \
-		${WRKSRC}/src/xmlrpc_server_abyss.c
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/xmlrpc-c/distinfo b/net/xmlrpc-c/distinfo
index 4c747491e011..86c8f50e2fce 100644
--- a/net/xmlrpc-c/distinfo
+++ b/net/xmlrpc-c/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1665415859
-SHA256 (xmlrpc-c-1.54.06.tgz) = ae6d0fb58f38f1536511360dc0081d3876c1f209d9eaa54357e2bacd690a5640
-SIZE (xmlrpc-c-1.54.06.tgz) = 933199
+TIMESTAMP = 1703681679
+SHA256 (xmlrpc-c-1.59.02.tgz) = e25e45be1bae7e90f1de69be3d6838917ba3839b2f1c7d3fc0e6663d8622a5ab
+SIZE (xmlrpc-c-1.59.02.tgz) = 935325
diff --git a/net/xmlrpc-c/pkg-plist b/net/xmlrpc-c/pkg-plist
index 1f69ccf92ccf..c1c770b56ad2 100644
--- a/net/xmlrpc-c/pkg-plist
+++ b/net/xmlrpc-c/pkg-plist
@@ -44,80 +44,80 @@ include/xmlrpc_server.h
 include/xmlrpc_server_w32httpsys.h
 %%CPLUSPLUS%%lib/libxmlrpc++.a
 %%CPLUSPLUS%%lib/libxmlrpc++.so
-%%CPLUSPLUS%%lib/libxmlrpc++.so.8
-%%CPLUSPLUS%%lib/libxmlrpc++.so.8.54
+%%CPLUSPLUS%%lib/libxmlrpc++.so.9
+%%CPLUSPLUS%%lib/libxmlrpc++.so.9.59
 lib/libxmlrpc.a
 lib/libxmlrpc.so
 lib/libxmlrpc.so.3
-lib/libxmlrpc.so.3.54
+lib/libxmlrpc.so.3.59
 lib/libxmlrpc_abyss.a
 lib/libxmlrpc_abyss.so
 lib/libxmlrpc_abyss.so.3
-lib/libxmlrpc_abyss.so.3.54
+lib/libxmlrpc_abyss.so.3.59
 %%CPLUSPLUS%%lib/libxmlrpc_abyss++.a
 %%CPLUSPLUS%%lib/libxmlrpc_abyss++.so
-%%CPLUSPLUS%%lib/libxmlrpc_abyss++.so.8
-%%CPLUSPLUS%%lib/libxmlrpc_abyss++.so.8.54
+%%CPLUSPLUS%%lib/libxmlrpc_abyss++.so.9
+%%CPLUSPLUS%%lib/libxmlrpc_abyss++.so.9.59
 %%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.54
+%%CPLUSPLUS%%%%CLIENT%%lib/libxmlrpc_client++.so.9
+%%CPLUSPLUS%%%%CLIENT%%lib/libxmlrpc_client++.so.9.59
 %%CLIENT%%lib/libxmlrpc_client.a
 %%CLIENT%%lib/libxmlrpc_client.so
 %%CLIENT%%lib/libxmlrpc_client.so.3
-%%CLIENT%%lib/libxmlrpc_client.so.3.54
+%%CLIENT%%lib/libxmlrpc_client.so.3.59
 %%CPLUSPLUS%%lib/libxmlrpc_cpp.a
 %%CPLUSPLUS%%lib/libxmlrpc_cpp.so
-%%CPLUSPLUS%%lib/libxmlrpc_cpp.so.8
-%%CPLUSPLUS%%lib/libxmlrpc_cpp.so.8.54
+%%CPLUSPLUS%%lib/libxmlrpc_cpp.so.9
+%%CPLUSPLUS%%lib/libxmlrpc_cpp.so.9.59
 %%CPLUSPLUS%%lib/libxmlrpc_packetsocket.a
 %%CPLUSPLUS%%lib/libxmlrpc_packetsocket.so
-%%CPLUSPLUS%%lib/libxmlrpc_packetsocket.so.8
-%%CPLUSPLUS%%lib/libxmlrpc_packetsocket.so.8.54
+%%CPLUSPLUS%%lib/libxmlrpc_packetsocket.so.9
+%%CPLUSPLUS%%lib/libxmlrpc_packetsocket.so.9.59
 %%CPLUSPLUS%%lib/libxmlrpc_server++.a
 %%CPLUSPLUS%%lib/libxmlrpc_server++.so
-%%CPLUSPLUS%%lib/libxmlrpc_server++.so.8
-%%CPLUSPLUS%%lib/libxmlrpc_server++.so.8.54
+%%CPLUSPLUS%%lib/libxmlrpc_server++.so.9
+%%CPLUSPLUS%%lib/libxmlrpc_server++.so.9.59
 lib/libxmlrpc_server.a
 lib/libxmlrpc_server.so
 lib/libxmlrpc_server.so.3
-lib/libxmlrpc_server.so.3.54
+lib/libxmlrpc_server.so.3.59
 %%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.54
+%%CPLUSPLUS%%lib/libxmlrpc_server_abyss++.so.9
+%%CPLUSPLUS%%lib/libxmlrpc_server_abyss++.so.9.59
 lib/libxmlrpc_server_abyss.a
 lib/libxmlrpc_server_abyss.so
 lib/libxmlrpc_server_abyss.so.3
-lib/libxmlrpc_server_abyss.so.3.54
+lib/libxmlrpc_server_abyss.so.3.59
 %%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.54
+%%CPLUSPLUS%%lib/libxmlrpc_server_cgi++.so.9
+%%CPLUSPLUS%%lib/libxmlrpc_server_cgi++.so.9.59
 lib/libxmlrpc_server_cgi.a
 lib/libxmlrpc_server_cgi.so
 lib/libxmlrpc_server_cgi.so.3
-lib/libxmlrpc_server_cgi.so.3.54
+lib/libxmlrpc_server_cgi.so.3.59
 %%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.54
+%%CPLUSPLUS%%lib/libxmlrpc_server_pstream++.so.9
+%%CPLUSPLUS%%lib/libxmlrpc_server_pstream++.so.9.59
 lib/libxmlrpc_util.a
 lib/libxmlrpc_util.so
 lib/libxmlrpc_util.so.4
-lib/libxmlrpc_util.so.4.54
+lib/libxmlrpc_util.so.4.59
 %%CPLUSPLUS%%lib/libxmlrpc_util++.a
 %%CPLUSPLUS%%lib/libxmlrpc_util++.so
-%%CPLUSPLUS%%lib/libxmlrpc_util++.so.8
-%%CPLUSPLUS%%lib/libxmlrpc_util++.so.8.54
+%%CPLUSPLUS%%lib/libxmlrpc_util++.so.9
+%%CPLUSPLUS%%lib/libxmlrpc_util++.so.9.59
 lib/libxmlrpc_xmlparse.a
 lib/libxmlrpc_xmlparse.so
 lib/libxmlrpc_xmlparse.so.3
-lib/libxmlrpc_xmlparse.so.3.54
+lib/libxmlrpc_xmlparse.so.3.59
 lib/libxmlrpc_xmltok.a
 lib/libxmlrpc_xmltok.so
 lib/libxmlrpc_xmltok.so.3
-lib/libxmlrpc_xmltok.so.3.54
+lib/libxmlrpc_xmltok.so.3.59
 %%CPLUSPLUS%%libdata/pkgconfig/xmlrpc++.pc
 libdata/pkgconfig/xmlrpc.pc
 %%CPLUSPLUS%%libdata/pkgconfig/xmlrpc_abyss++.pc