Update to 7.9.8.

For some reason, this segfaults badly on sparc64, or at least on the
only sparc64 machine that I have access to (thanks mike!).  I'll deal
with this later; for the present, let the x86 and Alpha users benefit
from the new cURL features and bugfixes :)

PR:		39873
Submitted by:	Ying-Chih Kuo <yckuo@yckuo.org>

6 files changed, 2 insertions, 84 deletions

diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
index 34d982a5ab17..70c2e7a4c581 100644
--- a/ftp/curl/Makefile
+++ b/ftp/curl/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	curl
-PORTVERSION=	7.9.7
-PORTREVISION=	2
+PORTVERSION=	7.9.8
 CATEGORIES=	ftp ipv6 www
 MASTER_SITES=	http://curl.haxx.se/download/ \
 		http://download.sourceforge.net/curl/ \
diff --git a/ftp/curl/distinfo b/ftp/curl/distinfo
index d591cabb3809..67861a4bf9c4 100644
--- a/ftp/curl/distinfo
+++ b/ftp/curl/distinfo
@@ -1 +1 @@
-MD5 (curl-7.9.7.tar.bz2) = 7dcf405cbac544c5f486620311eafb2b
+MD5 (curl-7.9.8.tar.bz2) = 9f29e398d36050816fc4759d4837eb65
diff --git a/ftp/curl/files/patch-lib::ftp.c b/ftp/curl/files/patch-lib::ftp.c
deleted file mode 100644
index 559b4f1f11c3..000000000000
--- a/ftp/curl/files/patch-lib::ftp.c
+++ /dev/null
@@ -1,27 +0,0 @@
---- lib/ftp.c.orig	Thu Jun  6 17:12:12 2002
-+++ lib/ftp.c	Thu Jun  6 17:13:28 2002
-@@ -1067,13 +1067,13 @@
-   }
-   freeaddrinfo(res);
-   if (portsock < 0) {
--    failf(data, strerror(errno));
-+    failf(data, "%s", strerror(errno));
-     return CURLE_FTP_PORT_FAILED;
-   }
- 
-   sslen = sizeof(ss);
-   if (getsockname(portsock, sa, &sslen) < 0) {
--    failf(data, strerror(errno));
-+    failf(data, "%s", strerror(errno));
-     return CURLE_FTP_PORT_FAILED;
-   }
- 
-@@ -1370,7 +1370,7 @@
-   
-   for (modeoff = (data->set.ftp_use_epsv?0:1);
-        mode[modeoff]; modeoff++) {
--    result = Curl_ftpsendf(conn, mode[modeoff]);
-+    result = Curl_ftpsendf(conn, "%s", mode[modeoff]);
-     if(result)
-       return result;
-     nread = Curl_GetFTPResponse(buf, conn, &ftpcode);
diff --git a/ftp/curl/files/patch-lib::hostip.c b/ftp/curl/files/patch-lib::hostip.c
deleted file mode 100644
index 739718bae9ce..000000000000
--- a/ftp/curl/files/patch-lib::hostip.c
+++ /dev/null
@@ -1,33 +0,0 @@
---- lib/hostip.c.orig	Mon Jun 24 17:05:50 2002
-+++ lib/hostip.c	Mon Jun 24 17:05:54 2002
-@@ -360,7 +360,7 @@
-  *
-  * Keith McGuigan 
-  * 10/3/2001 */
--static struct hostent* pack_hostent(char** buf, struct hostent* orig)
-+static struct hostent* pack_hostent(char** buf, struct hostent* orig, int pass)
- {
-   char* bufptr;
-   struct hostent* copy;
-@@ -427,8 +427,9 @@
-   }
-   copy->h_addr_list[i] = NULL;
- 
--  *buf=(char *)realloc(*buf, (int)bufptr-(int)(*buf));
--  return copy;
-+  if (pass == 0)
-+    *buf=(char *)realloc(*buf, (int)bufptr-(int)(*buf));
-+  return *buf;
- }
- #endif
- 
-@@ -623,7 +624,8 @@
-       /* we make a copy of the hostent right now, right here, as the
-          static one we got a pointer to might get removed when we don't
-          want/expect that */
--      h = pack_hostent(&buf, h);
-+      pack_hostent(&buf, h, 0);
-+      h = pack_hostent(&buf, h, 1);
-       *bufp=(char *)buf;
-     }
- #endif
diff --git a/ftp/curl/files/patch-lib::ldap.c b/ftp/curl/files/patch-lib::ldap.c
deleted file mode 100644
index 567a0ac129bc..000000000000
--- a/ftp/curl/files/patch-lib::ldap.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/ldap.c.orig	Thu Jun  6 17:14:16 2002
-+++ lib/ldap.c	Thu Jun  6 17:14:24 2002
-@@ -147,7 +147,7 @@
-   int ldaptext;
-   struct SessionHandle *data=conn->data;
-   
--  infof(data, "LDAP: %s %s\n", data->change.url);
-+  infof(data, "LDAP: %s\n", data->change.url);
- 
-   DynaOpen();
-   if (libldap == NULL) {
diff --git a/ftp/curl/files/patch-src::writeout.c b/ftp/curl/files/patch-src::writeout.c
deleted file mode 100644
index 265ec61ad448..000000000000
--- a/ftp/curl/files/patch-src::writeout.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/writeout.c.orig	Tue May 21 18:27:28 2002
-+++ src/writeout.c	Tue May 21 18:27:36 2002
-@@ -27,6 +27,7 @@
- #include <string.h>
- 
- #ifdef HAVE_SYS_SELECT_H
-+#include <sys/types.h>
- #include <sys/select.h>
- #endif
-