ftp/rexx-curl: Update to 2.1.1

Add pkgconfig to USES.
Switch to DISTVERSION.
Remove obsolote patches.
Pet portfmt.

PR:		279775
Approved by:	Bob Eager <bob@eager.cx> (maintainer)

4 files changed, 10 insertions, 140 deletions

diff --git a/ftp/rexx-curl/Makefile b/ftp/rexx-curl/Makefile
index 1e80b1056999..e25a95c560df 100644
--- a/ftp/rexx-curl/Makefile
+++ b/ftp/rexx-curl/Makefile
@@ -1,9 +1,9 @@
 PORTNAME=	curl
-PORTVERSION=	2.1.0
+DISTVERSION=	2.1.1
 CATEGORIES=	ftp
-MASTER_SITES=	SF/rexx${PORTNAME}/rexx${PORTNAME}/${PORTVERSION}
+MASTER_SITES=	SF/rexx${PORTNAME}/rexx${PORTNAME}/${DISTVERSION}
 PKGNAMEPREFIX=	rexx-
-DISTNAME=	RexxCURL-${PORTVERSION}
+DISTNAME=	rexxcurl-${DISTVERSION}
 
 MAINTAINER=	bob@eager.cx
 COMMENT=	External function package providing an interface to the cURL package
@@ -19,18 +19,18 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libregina.so:lang/rexx-regina
 RUN_DEPENDS=	rexx:lang/rexx-regina
 
-USES=		gmake
+USES=		gmake pkgconfig
+USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-rexx=regina LDFLAGS=-L/usr/lib
-USE_LDCONFIG=	yes
-
-OPTIONS_DEFINE=	DOCS EXAMPLES
 
 DATADIR=	${PREFIX}/share/rexx${PORTNAME}
 DOCSDIR=	${PREFIX}/share/doc/rexx${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/rexx${PORTNAME}
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 DOCFILES=	getright.rexx getmail-pop3.rexx httppost.rexx scp.rexx \
 		sendmail-smtp.rexx testcurl.rexx upload.rexx README.txt
 do-install:
diff --git a/ftp/rexx-curl/distinfo b/ftp/rexx-curl/distinfo
index a02c37621d6f..55a49c7abf3e 100644
--- a/ftp/rexx-curl/distinfo
+++ b/ftp/rexx-curl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1554585945
-SHA256 (RexxCURL-2.1.0.tar.gz) = 734b7d733ceda0f2c189f99b54f0a86e98cb5f04269c726a4b6873c94f1a46a5
-SIZE (RexxCURL-2.1.0.tar.gz) = 461774
+TIMESTAMP = 1725394061
+SHA256 (rexxcurl-2.1.1.tar.gz) = f95566a3236a2e42d677be5abf2047e057b1c089ae01aa98fbcff9b4181dc0c5
+SIZE (rexxcurl-2.1.1.tar.gz) = 941256
diff --git a/ftp/rexx-curl/files/patch-Makefile.in b/ftp/rexx-curl/files/patch-Makefile.in
deleted file mode 100644
index 3b625ec4b999..000000000000
--- a/ftp/rexx-curl/files/patch-Makefile.in
+++ /dev/null
@@ -1,78 +0,0 @@
---- Makefile.in.orig	2019-02-10 22:01:43 UTC
-+++ Makefile.in
-@@ -123,7 +123,6 @@ $(PACKAGE_DIR)/makefile.* $(PACKAGE_DIR)
- $(PACKAGE_DIR)/config.guess $(PACKAGE_DIR)/config.sub $(PACKAGE_DIR)/install-sh $(PACKAGE_DIR)/preinst.rexx \
- $(PACKAGE_DIR)/aclocal.m4 $(PACKAGE_DIR)/configure.in $(PACKAGE_DIR)/def2exp.rexx \
- $(PACKAGE_DIR)/demo/*.rexx $(PACKAGE_DIR)/demo/README.txt $(PACKAGE_DIR)/makew32.rex \
--$(PACKAGE_DIR)/doc/*.html $(PACKAGE_DIR)/doc/images/*.png \
- $(PACKAGE_DIR)/RexxCURL.spec \
- $(PACKAGE_DIR)/debian/control.rexxtrans $(PACKAGE_DIR)/debian/control.regina $(PACKAGE_DIR)/debian/control.oorexx $(PACKAGE_DIR)/debian/copyright $(PACKAGE_DIR)/debian/compat $(PACKAGE_DIR)/debian/rules.in
- 
-@@ -243,7 +242,6 @@ zip:
- 	zip rexxcurl$(VER) config.guess config.sub install-sh preinst.rexx
- 	zip rexxcurl$(VER) aclocal.m4 configure.in def2exp.rexx
- 	zip rexxcurl$(VER) demo/*.rexx demo/README.txt makew32.rex
--	zip rexxcurl$(VER) doc/*.html doc/images/*.png
- 	zip rexxcurl$(VER) debian/*.regina debian/*.oorexx debian/copyright debian/compat
- 	zip rexxcurl$(VER) RexxCURL.spec
- 
-@@ -331,8 +329,6 @@ beosinstall: all
- 	$(INSTALL) -c -m 644 $(srcdir)/demo/README.txt /boot/home/config/bin/rexx/README-rexxcurl.txt
- #
- # where to put doc for BeOS ?
--#	$(INSTALL) -c -m 644 $(docdir)/index.html $(DESTDIR)$(sharedir)/index.html
--#	$(INSTALL) -c -m 644 $(docdir)/images/rxcurl64.png $(DESTDIR)$(sharedir)/images/rxcurl64.png
- #
- 
- binary: $(BASE_BINARY)
-@@ -342,7 +338,6 @@ binarybase: all
- 	-mkdir -p ./tmpdir/bin
- 	-mkdir -p ./tmpdir/lib
- 	-mkdir -p ./tmpdir/share/$(PACKAGE_NAME)
--	-mkdir -p ./tmpdir/share/doc/rexxcurl/images
- 	cp $(PACKAGE_NAME)$(binarybitprefix)$(EXE) ./tmpdir/bin
- 	cp $(PACKAGE_NAME)-config ./tmpdir/bin
- 	cp $(SHLPRE)$(PACKAGE_NAME)$(SHLPST) ./tmpdir/lib
-@@ -352,8 +347,6 @@ binarybase: all
- 	cp $(srcdir)/INSTALL ./tmpdir/share/doc/rexxcurl
- 	cp $(srcdir)/README ./tmpdir/share/doc/rexxcurl
- 	cp $(srcdir)/TODO ./tmpdir/share/doc/rexxcurl
--	cp $(srcdir)/doc/index.html ./tmpdir/share/doc/rexxcurl
--	cp $(srcdir)/doc/images/*.png ./tmpdir/share/doc/rexxcurl/images
- 	cp $(srcdir)/demo/testcurl.rexx ./tmpdir/share/$(PACKAGE_NAME)/testcurl.rexx
- 	cp $(srcdir)/demo/httppost.rexx ./tmpdir/share/$(PACKAGE_NAME)/httppost.rexx
- 	cp $(srcdir)/demo/getmail-pop3.rexx ./tmpdir/share/$(PACKAGE_NAME)/getmail-pop3.rexx
-@@ -371,7 +364,6 @@ cygwinbinary: all
- 	-mkdir -p ./tmpdir/lib
- 	-mkdir -p ./tmpdir/rexx
- 	-mkdir -p ./tmpdir/doc/rexxcurl
--	-mkdir -p ./tmpdir/doc/rexxcurl/images
- 	cp $(PACKAGE_NAME)$(binarybitprefix)$(EXE) ./tmpdir/bin
- 	cp $(SHLPRE)$(PACKAGE_NAME)$(SHLPST) ./tmpdir/bin
- 	cp $(LIBPRE)$(PACKAGE_NAME)$(LIBPST) ./tmpdir/lib
-@@ -380,8 +372,6 @@ cygwinbinary: all
- 	cp $(srcdir)/INSTALL ./tmpdir/doc/rexxcurl
- 	cp $(srcdir)/README ./tmpdir/doc/rexxcurl
- 	cp $(srcdir)/TODO ./tmpdir/doc/rexxcurl
--	cp $(srcdir)/doc/index.html ./tmpdir/doc/rexxcurl
--	cp $(srcdir)/doc/images/*.png ./tmpdir/doc/rexxcurl/images
- 	cp $(srcdir)/demo/testcurl.rexx ./tmpdir/rexx/testcurl.rexx
- 	cp $(srcdir)/demo/httppost.rexx ./tmpdir/rexx/httppost.rexx
- 	cp $(srcdir)/demo/getmail-pop3.rexx ./tmpdir/rexx/getmail-pop3.rexx
-@@ -399,7 +389,6 @@ beosbinary: all
- 	-mkdir -p ./tmpdir/lib
- 	-mkdir -p ./tmpdir/add-ons/rexx
- 	-mkdir -p ./tmpdir/doc/rexxcurl
--	-mkdir -p ./tmpdir/doc/rexxcurl/images
- 	cp $(PACKAGE_NAME)$(binarybitprefix)$(EXE) ./tmpdir/bin
- 	cp $(SHLPRE)$(PACKAGE_NAME)$(SHLPST) ./tmpdir/add-ons/rexx
- 	cp $(LIBPRE)$(PACKAGE_NAME)$(LIBPST) ./tmpdir/lib
-@@ -408,8 +397,6 @@ beosbinary: all
- 	cp $(srcdir)/INSTALL ./tmpdir/doc/rexxcurl
- 	cp $(srcdir)/README ./tmpdir/doc/rexxcurl
- 	cp $(srcdir)/TODO ./tmpdir/doc/rexxcurl
--	cp $(srcdir)/doc/index.html ./tmpdir/doc/rexxcurl
--	cp $(srcdir)/doc/images/*.png ./tmpdir/doc/rexxcurl/images
- 	cp $(srcdir)/demo/testcurl.rexx ./tmpdir/rexx/testcurl.rexx
- 	cp $(srcdir)/demo/httppost.rexx ./tmpdir/rexx/httppost.rexx
- 	cp $(srcdir)/demo/getmail-pop3.rexx ./tmpdir/rexx/getmail-pop3.rexx
diff --git a/ftp/rexx-curl/files/patch-rexxcurl.c b/ftp/rexx-curl/files/patch-rexxcurl.c
deleted file mode 100644
index c709be7477b9..000000000000
--- a/ftp/rexx-curl/files/patch-rexxcurl.c
+++ /dev/null
@@ -1,52 +0,0 @@
---- rexxcurl.c.orig	2019-02-10 22:51:41 UTC
-+++ rexxcurl.c
-@@ -52,6 +52,8 @@
-  * internal error                   set                 N/A
-  * cURL runtime errors              -1                  set
-  */
-+#pragma clang diagnostic ignored "-Wincompatible-pointer-types-discards-qualifiers"
-+
- #ifdef HAVE_CONFIG_H
- # include "config.h"
- #else
-@@ -480,8 +482,13 @@ static curl_options RexxCurlOptions[] =
-    { "FTPLISTONLY"     ,CURLOPT_FTPLISTONLY     ,RXCURLOPT_BOOL        , NULL },
- #endif
-    { "FTPPORT"         ,CURLOPT_FTPPORT         ,RXCURLOPT_STRING      , NULL },
-+#if LIBCURL_VERSION_NUM >= 0x075500
-+   { "FTPRESPONSETIMEOUT", CURLOPT_SERVER_RESPONSE_TIMEOUT, RXCURLOPT_LONG, NULL },
-+#endif
- #if LIBCURL_VERSION_NUM >= 0x070a08
-+# if LIBCURL_VERSION_NUM < 0x075500
-    { "FTPRESPONSETIMEOUT", CURLOPT_FTP_RESPONSE_TIMEOUT, RXCURLOPT_LONG, NULL },
-+# endif
- #endif
- #if LIBCURL_VERSION_NUM >= 0x070e00
-    { "FTPSKIPPASVIP"   ,CURLOPT_FTP_SKIP_PASV_IP,RXCURLOPT_BOOL        , NULL },
-@@ -1879,9 +1886,9 @@ int rexxcurl_sshkey_callback( CURL *easy,     /* easy 
-       if ( argv == NULL )
-          return -1;
- 
--      rx_knownkeylength_len = sprintf( rx_knownkeylength, "%lu", knownkey->len );
-+      rx_knownkeylength_len = sprintf( rx_knownkeylength, "%lu", (unsigned long) knownkey->len );
-       rx_knownkeytype_len = sprintf( rx_knownkeytype, "%u", knownkey->keytype );
--      rx_foundkeylength_len = sprintf( rx_foundkeylength, "%lu", foundkey->len );
-+      rx_foundkeylength_len = sprintf( rx_foundkeylength, "%lu", (unsigned long) foundkey->len );
-       rx_foundkeytype_len = sprintf( rx_foundkeytype, "%u", foundkey->keytype );
-       rx_libcurlviewofkey_len = sprintf( rx_libcurlviewofkey, "%u", match );
- 
-@@ -1964,11 +1971,11 @@ int debug_function( CURL *handle, curl_infotype type, 
-    int c;
-    char *prefix = "*<><><>";
-    if ( type == CURLINFO_TEXT )
--      fprintf( fp, "text: %c %.*s", prefix[type],size, data );
-+      fprintf( fp, "text: %c %.*s", prefix[type],(int)size, data );
-    if ( type == CURLINFO_HEADER_IN )
--      fprintf( fp, "header_in: %c %.*s", prefix[type],size, data );
-+      fprintf( fp, "header_in: %c %.*s", prefix[type],(int)size, data );
-    if ( type == CURLINFO_HEADER_OUT )
--      fprintf( fp, "header_out:%c %.*s", prefix[type],size, data );
-+      fprintf( fp, "header_out:%c %.*s", prefix[type],(int)size, data );
-    if ( type == CURLINFO_SSL_DATA_IN )
-    {
-       fprintf( fp, "ssl_data_in: " );