Update to curl-7.16.3.

Fix the (still present in 7.16.3) libssh2 problems, at least so that
cURL works with the libssh2 0.17 in our ports tree.

PR:		114215 (the basic update)
Submitted by:	pesho.petrov@gmail.com

7 files changed, 685 insertions, 91 deletions

diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
index d4d61f4..1e2ad56 100644
--- a/ftp/curl/Makefile
+++ b/ftp/curl/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	curl
-PORTVERSION=	7.16.1
-PORTREVISION=	1
+PORTVERSION=	7.16.3
 CATEGORIES=	ftp ipv6 www
 MASTER_SITES=	http://curl.haxx.se/download/ \
 		${MASTER_SITE_SOURCEFORGE} \
@@ -124,7 +123,6 @@ CONFIGURE_ARGS+=	--without-libidn
 .endif
 
 .if defined(WITH_LIBSSH2)
-BROKEN=		does not work with libssh2-0.15
 LIB_DEPENDS+=	ssh2.1:${PORTSDIR}/security/libssh2
 CONFIGURE_ARGS+=	--with-libssh2=${LOCALBASE}
 .else
@@ -148,7 +146,8 @@ post-patch:
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	${CP} -r ${WRKSRC}/docs/* ${DOCSDIR}/
+	(cd ${WRKSRC}/docs && exec ${COPYTREE_SHARE} \* ${DOCSDIR} \
+		"! -name Makefile ! -name Makefile.am ! -name Makefile.in ! -name curl.1 ! -name curl-config.1 ! -name *.3")
 .endif
 
 # Setting LC_ALL=C is a kludge; maybe curl/libcurl shouldn't actually use
diff --git a/ftp/curl/distinfo b/ftp/curl/distinfo
index 4e45511..8694bf8 100644
--- a/ftp/curl/distinfo
+++ b/ftp/curl/distinfo
@@ -1,3 +1,3 @@
-MD5 (curl-7.16.1.tar.bz2) = acdab0b0467c55e10ed02d2afed80575
-SHA256 (curl-7.16.1.tar.bz2) = 257b204acf1d80314694b4cf63cccbc7c70bccee75cb3d9924bbb061ec6bccef
-SIZE (curl-7.16.1.tar.bz2) = 1592074
+MD5 (curl-7.16.3.tar.bz2) = ed55dfa8946ad53f245fae5db3a9d0ca
+SHA256 (curl-7.16.3.tar.bz2) = 7dc1ff9b06686650669befd8884f3dab599de6795f24148c56d67b285211e494
+SIZE (curl-7.16.3.tar.bz2) = 1667847
diff --git a/ftp/curl/files/patch-configure b/ftp/curl/files/patch-configure
index b64829d..f121c24 100644
--- a/ftp/curl/files/patch-configure
+++ b/ftp/curl/files/patch-configure
@@ -1,6 +1,15 @@
---- configure.orig	Thu Jun  8 09:12:53 2006
-+++ configure	Wed Jul 12 16:44:43 2006
-@@ -26690,8 +26690,10 @@
+--- configure.old	Fri Apr 13 18:29:31 2007
++++ configure	Fri Apr 13 18:29:33 2007
+@@ -5497,7 +5497,7 @@
+ { echo "$as_me:$LINENO: checking if arch-OS host is AMD64-linux (to build static libraries with PIC)" >&5
+ echo $ECHO_N "checking if arch-OS host is AMD64-linux (to build static libraries with PIC)... $ECHO_C" >&6; }
+ case $host in
+-  x86_64*linux*)
++  x86_64*linux*|amd64*freebsd*|ia64*freebsd*)
+     { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+     with_pic=yes
+@@ -24467,8 +24467,10 @@
          PKGTEST="no"
      PREFIX_OPENSSL=$OPT_SSL
      LIB_OPENSSL="$PREFIX_OPENSSL/lib$libsuff"
diff --git a/ftp/curl/files/patch-lib::ssh.c b/ftp/curl/files/patch-lib::ssh.c
new file mode 100644
index 0000000..7df1acd
--- /dev/null
+++ b/ftp/curl/files/patch-lib::ssh.c
@@ -0,0 +1,661 @@
+--- lib/ssh.c.old	2007-06-20 23:32:34.000000000 +0300
++++ lib/ssh.c	2007-08-27 14:10:01.000000000 +0300
+@@ -70,6 +70,24 @@
+ #endif
+ #endif /* !WIN32 */
+ 
++#if defined(LIBSSH2_VERSION_NUM)
++# if LIBSSH2_VERSION_NUM >= 0x001000
++#  define HAVE_LIBSSH2_NBLOCK 1
++# else
++#  define HAVE_LIBSSH2_NBLOCK 0
++# endif
++#else /* !defined(LIBSSH2_VERSION_NUM) */
++# if defined(LIBSSH2_APINO)
++#  if LIBSSH2_APINO >= 200706012030
++#   define HAVE_LIBSSH2_NBLOCK 1
++#  else
++#   define HAVE_LIBSSH2_NBLOCK 0
++#  endif
++# else /* !defined(LIBSSH2_APINO) */
++#  define HAVE_LIBSSH2_NBLOCK 0
++# endif /* defined(LIBSSH2_APINO) */
++#endif /* defined(LIBSSH2_VERSION_NUM) */
++
+ #if (defined(NETWARE) && defined(__NOVELL_LIBC__))
+ #undef in_addr_t
+ #define in_addr_t unsigned long
+@@ -239,7 +257,7 @@
+   (void)abstract;
+ }
+ 
+-#if (LIBSSH2_APINO >= 200706012030)
++#if HAVE_LIBSSH2_NBLOCK
+ /*
+  * SSH State machine related code
+  */
+@@ -770,7 +788,7 @@
+ 
+ return result;
+ }
+-#endif /* (LIBSSH2_APINO >= 200706012030) */
++#endif /* HAVE_LIBSSH2_NBLOCK */
+ 
+ /*
+  * SSH setup and connection
+@@ -854,7 +872,7 @@
+   infof(data, "SSH socket: %d\n", sock);
+ #endif /* CURL_LIBSSH2_DEBUG */
+ 
+-#if (LIBSSH2_APINO >= 200706012030)
++#if HAVE_LIBSSH2_NBLOCK
+   state(conn, SSH_S_STARTUP);
+ 
+   if (data->state.used_interface == Curl_if_multi)
+@@ -875,7 +893,7 @@
+   (void)fingerprint; /* not used */
+   (void)i; /* not used */
+ 
+-#else /* !(LIBSSH2_APINO >= 200706012030) */
++#else /* !HAVE_LIBSSH2_NBLOCK */
+ 
+   if (libssh2_session_startup(ssh->ssh_session, sock)) {
+     failf(data, "Failure establishing ssh session");
+@@ -1112,7 +1130,7 @@
+ 
+   *done = TRUE;
+   return CURLE_OK;
+-#endif /* !(LIBSSH2_APINO >= 200706012030) */
++#endif /* !HAVE_LIBSSH2_NBLOCK */
+ }
+ 
+ CURLcode Curl_scp_do(struct connectdata *conn, bool *done)
+@@ -1134,7 +1152,7 @@
+      * the destination file will be named the same name as the last directory
+      * in the path.
+      */
+-#if (LIBSSH2_APINO >= 200706012030)
++#if HAVE_LIBSSH2_NBLOCK
+     do {
+       scp->ssh_channel = libssh2_scp_send_ex(scp->ssh_session, scp->path,
+                                              LIBSSH2_SFTP_S_IRUSR|
+@@ -1148,7 +1166,7 @@
+         return CURLE_FAILED_INIT;
+       }
+     } while (!scp->ssh_channel);
+-#else /* !(LIBSSH2_APINO >= 200706012030) */
++#else /* !HAVE_LIBSSH2_NBLOCK */
+     scp->ssh_channel = libssh2_scp_send_ex(scp->ssh_session, scp->path,
+                                            LIBSSH2_SFTP_S_IRUSR|
+                                            LIBSSH2_SFTP_S_IWUSR|
+@@ -1157,7 +1175,7 @@
+                                            conn->data->set.infilesize, 0, 0);
+     if (!scp->ssh_channel)
+       return CURLE_FAILED_INIT;
+-#endif /* !(LIBSSH2_APINO >= 200706012030) */
++#endif /* !HAVE_LIBSSH2_NBLOCK */
+ 
+     /* upload data */
+     res = Curl_setup_transfer(conn, -1, -1, FALSE, NULL, FIRSTSOCKET, NULL);
+@@ -1169,7 +1187,7 @@
+      */
+     curl_off_t bytecount;
+     memset(&sb, 0, sizeof(struct stat));
+-#if (LIBSSH2_APINO >= 200706012030)
++#if HAVE_LIBSSH2_NBLOCK
+     do {
+       scp->ssh_channel = libssh2_scp_recv(scp->ssh_session, scp->path, &sb);
+       if (!scp->ssh_channel &&
+@@ -1184,7 +1202,7 @@
+           libssh2_session_last_error(scp->ssh_session, NULL, NULL, 0));
+       }
+     } while (!scp->ssh_channel);
+-#else /* !(LIBSSH2_APINO >= 200706012030) */
++#else /* !HAVE_LIBSSH2_NBLOCK */
+     scp->ssh_channel = libssh2_scp_recv(scp->ssh_session, scp->path, &sb);
+     if (!scp->ssh_channel) {
+       if ((sb.st_mode == 0) && (sb.st_atime == 0) && (sb.st_mtime == 0) &&
+@@ -1195,7 +1213,7 @@
+       return libssh2_session_error_to_CURLE(
+         libssh2_session_last_error(scp->ssh_session, NULL, NULL, 0));
+     }
+-#endif /* !(LIBSSH2_APINO >= 200706012030) */
++#endif /* !HAVE_LIBSSH2_NBLOCK */
+     /* download data */
+     bytecount = (curl_off_t) sb.st_size;
+     conn->data->reqdata.maxdownload =  (curl_off_t) sb.st_size;
+@@ -1217,7 +1235,7 @@
+   scp->path = NULL;
+ 
+   if (scp->ssh_channel) {
+-#if (LIBSSH2_APINO >= 200706012030)
++#if HAVE_LIBSSH2_NBLOCK
+     if (conn->data->set.upload) {
+       while ((rc = libssh2_channel_send_eof(scp->ssh_channel)) ==
+              LIBSSH2_ERROR_EAGAIN);
+@@ -1235,7 +1253,7 @@
+         infof(conn->data, "Channel failed to close\n");
+       }
+     }
+-#else /* !(LIBSSH2_APINO >= 200706012030) */
++#else /* !HAVE_LIBSSH2_NBLOCK */
+     if (conn->data->set.upload &&
+         libssh2_channel_send_eof(scp->ssh_channel) < 0) {
+       infof(conn->data, "Failed to send libssh2 channel EOF\n");
+@@ -1243,17 +1261,17 @@
+     if (libssh2_channel_close(scp->ssh_channel) < 0) {
+       infof(conn->data, "Failed to stop libssh2 channel subsystem\n");
+     }
+-#endif /* !(LIBSSH2_APINO >= 200706012030) */
++#endif /* !HAVE_LIBSSH2_NBLOCK */
+     libssh2_channel_free(scp->ssh_channel);
+   }
+ 
+   if (scp->ssh_session) {
+-#if (LIBSSH2_APINO >= 200706012030)
++#if HAVE_LIBSSH2_NBLOCK
+     while (libssh2_session_disconnect(scp->ssh_session, "Shutdown") ==
+            LIBSSH2_ERROR_EAGAIN);
+-#else /* !(LIBSSH2_APINO >= 200706012030) */
++#else /* !HAVE_LIBSSH2_NBLOCK */
+     libssh2_session_disconnect(scp->ssh_session, "Shutdown");
+-#endif /* !(LIBSSH2_APINO >= 200706012030) */
++#endif /* !HAVE_LIBSSH2_NBLOCK */
+     libssh2_session_free(scp->ssh_session);
+     scp->ssh_session = NULL;
+   }
+@@ -1279,7 +1297,7 @@
+    * NOTE: we should not store nor rely on connection-related data to be
+    * in the SessionHandle struct
+    */
+-#if defined(LIBSSH2CHANNEL_EAGAIN) && (LIBSSH2_APINO < 200706012030)
++#if defined(LIBSSH2CHANNEL_EAGAIN) && defined(LIBSSH2_APINO) && (LIBSSH2_APINO < 200706012030)
+   nwrite = (ssize_t)
+     libssh2_channel_writenb(conn->data->reqdata.proto.ssh->ssh_channel,
+                             mem, len);
+@@ -1287,7 +1305,7 @@
+   nwrite = (ssize_t)
+     libssh2_channel_write(conn->data->reqdata.proto.ssh->ssh_channel,
+                           mem, len);
+-#if (LIBSSH2_APINO >= 200706012030)
++#if HAVE_LIBSSH2_NBLOCK
+   if (nwrite == LIBSSH2_ERROR_EAGAIN) {
+     return 0;
+   }
+@@ -1313,7 +1331,7 @@
+    * in the SessionHandle struct
+    */
+ 
+-#if defined(LIBSSH2CHANNEL_EAGAIN) && (LIBSSH2_APINO < 200706012030)
++#if defined(LIBSSH2CHANNEL_EAGAIN) && defined(LIBSSH2_APINO) && (LIBSSH2_APINO < 200706012030)
+   /* we prefer the non-blocking API but that didn't exist previously */
+   nread = (ssize_t)
+     libssh2_channel_readnb(conn->data->reqdata.proto.ssh->ssh_channel,
+@@ -1358,7 +1376,7 @@
+      *          If this is not done the destination file will be named the
+      *          same name as the last directory in the path.
+      */
+-#if (LIBSSH2_APINO >= 200706012030)
++#if HAVE_LIBSSH2_NBLOCK
+     do {
+       sftp->sftp_handle =
+         libssh2_sftp_open(sftp->sftp_session, sftp->path,
+@@ -1402,7 +1420,7 @@
+         }
+       }
+     } while (!sftp->sftp_handle);
+-#else /* !(LIBSSH2_APINO >= 200706012030) */
++#else /* !HAVE_LIBSSH2_NBLOCK */
+     sftp->sftp_handle =
+       libssh2_sftp_open(sftp->sftp_session, sftp->path,
+                         LIBSSH2_FXF_WRITE|LIBSSH2_FXF_CREAT|LIBSSH2_FXF_TRUNC,
+@@ -1431,7 +1449,7 @@
+         return sftp_libssh2_error_to_CURLE(err);
+       }
+     }
+-#endif /* !(LIBSSH2_APINO >= 200706012030) */
++#endif /* !HAVE_LIBSSH2_NBLOCK */
+ 
+     /* upload data */
+     res = Curl_setup_transfer(conn, -1, -1, FALSE, NULL, FIRSTSOCKET, NULL);
+@@ -1450,7 +1468,7 @@
+       int len, totalLen, currLen;
+       char *line;
+ 
+-#if (LIBSSH2_APINO >= 200706012030)
++#if HAVE_LIBSSH2_NBLOCK
+       do {
+         sftp->sftp_handle =
+           libssh2_sftp_opendir(sftp->sftp_session, sftp->path);
+@@ -1463,7 +1481,7 @@
+           return sftp_libssh2_error_to_CURLE(err);
+         }
+       } while (!sftp->sftp_handle);
+-#else /* !(LIBSSH2_APINO >= 200706012030) */
++#else /* !HAVE_LIBSSH2_NBLOCK */
+       sftp->sftp_handle =
+         libssh2_sftp_opendir(sftp->sftp_session, sftp->path);
+       if (!sftp->sftp_handle) {
+@@ -1472,17 +1490,17 @@
+             sftp_libssh2_strerror(err));
+         return sftp_libssh2_error_to_CURLE(err);
+       }
+-#endif /* !(LIBSSH2_APINO >= 200706012030) */
++#endif /* !HAVE_LIBSSH2_NBLOCK */
+ 
+       do {
+-#if (LIBSSH2_APINO >= 200706012030)
++#if HAVE_LIBSSH2_NBLOCK
+         while ((len = libssh2_sftp_readdir(sftp->sftp_handle, filename,
+                                            PATH_MAX, &attrs)) ==
+                LIBSSH2_ERROR_EAGAIN);
+-#else /* !(LIBSSH2_APINO >= 200706012030) */
++#else /* !HAVE_LIBSSH2_NBLOCK */
+         len = libssh2_sftp_readdir(sftp->sftp_handle, filename,
+                                    PATH_MAX, &attrs);
+-#endif /* !(LIBSSH2_APINO >= 200706012030) */
++#endif /* !HAVE_LIBSSH2_NBLOCK */
+         if (len > 0) {
+           filename[len] = '\0';
+ 
+@@ -1590,14 +1608,14 @@
+               char linkPath[PATH_MAX + 1];
+ 
+               snprintf(linkPath, PATH_MAX, "%s%s", sftp->path, filename);
+-#if (LIBSSH2_APINO >= 200706012030)
++#if HAVE_LIBSSH2_NBLOCK
+               while ((len = libssh2_sftp_readlink(sftp->sftp_session, linkPath,
+                                                   filename, PATH_MAX)) ==
+                      LIBSSH2_ERROR_EAGAIN);
+-#else /* !(LIBSSH2_APINO >= 200706012030) */
++#else /* !HAVE_LIBSSH2_NBLOCK */
+               len = libssh2_sftp_readlink(sftp->sftp_session, linkPath,
+                                           filename, PATH_MAX);
+-#endif /* !(LIBSSH2_APINO >= 200706012030) */
++#endif /* !HAVE_LIBSSH2_NBLOCK */
+               line = realloc(line, totalLen + 4 + len);
+               if (!line)
+                 return CURLE_OUT_OF_MEMORY;
+@@ -1615,11 +1633,11 @@
+           break;
+         }
+       } while (1);
+-#if (LIBSSH2_APINO >= 200706012030)
++#if HAVE_LIBSSH2_NBLOCK
+       while (libssh2_sftp_closedir(sftp->sftp_handle) == LIBSSH2_ERROR_EAGAIN);
+-#else /* !(LIBSSH2_APINO >= 200706012030) */
++#else /* !HAVE_LIBSSH2_NBLOCK */
+       libssh2_sftp_closedir(sftp->sftp_handle);
+-#endif /* !(LIBSSH2_APINO >= 200706012030) */
++#endif /* !HAVE_LIBSSH2_NBLOCK */
+       sftp->sftp_handle = NULL;
+ 
+       /* no data to transfer */
+@@ -1629,7 +1647,7 @@
+       /*
+        * Work on getting the specified file
+        */
+-#if (LIBSSH2_APINO >= 200706012030)
++#if HAVE_LIBSSH2_NBLOCK
+       do {
+         sftp->sftp_handle =
+           libssh2_sftp_open(sftp->sftp_session, sftp->path, LIBSSH2_FXF_READ,
+@@ -1644,7 +1662,7 @@
+           return sftp_libssh2_error_to_CURLE(err);
+         }
+       } while (!sftp->sftp_handle);
+-#else /* !(LIBSSH2_APINO >= 200706012030) */
++#else /* !HAVE_LIBSSH2_NBLOCK */
+       sftp->sftp_handle =
+         libssh2_sftp_open(sftp->sftp_session, sftp->path, LIBSSH2_FXF_READ,
+                           LIBSSH2_SFTP_S_IRUSR|LIBSSH2_SFTP_S_IWUSR|
+@@ -1655,14 +1673,14 @@
+             sftp_libssh2_strerror(err));
+         return sftp_libssh2_error_to_CURLE(err);
+       }
+-#endif /* !(LIBSSH2_APINO >= 200706012030) */
++#endif /* !HAVE_LIBSSH2_NBLOCK */
+ 
+-#if (LIBSSH2_APINO >= 200706012030)
++#if HAVE_LIBSSH2_NBLOCK
+       while ((rc = libssh2_sftp_stat(sftp->sftp_session, sftp->path, &attrs))
+              == LIBSSH2_ERROR_EAGAIN);
+-#else /* !(LIBSSH2_APINO >= 200706012030) */
++#else /* !HAVE_LIBSSH2_NBLOCK */
+       rc = libssh2_sftp_stat(sftp->sftp_session, sftp->path, &attrs);
+-#endif /* !(LIBSSH2_APINO >= 200706012030) */
++#endif /* !HAVE_LIBSSH2_NBLOCK */
+       if (rc) {
+         /*
+          * libssh2_sftp_open() didn't return an error, so maybe the server
+@@ -1689,31 +1707,31 @@
+                                 bytecount, FALSE, NULL, -1, NULL);
+ #endif
+       while (res == CURLE_OK) {
+-#if (LIBSSH2_APINO >= 200706012030)
++#if HAVE_LIBSSH2_NBLOCK
+         ssize_t nread;
+ 
+         while ((nread = libssh2_sftp_read(data->reqdata.proto.ssh->sftp_handle,
+                                   buf, BUFSIZE-1)) == LIBSSH2_ERROR_EAGAIN);
+-#else /* !(LIBSSH2_APINO >= 200706012030) */
++#else /* !HAVE_LIBSSH2_NBLOCK */
+         size_t nread;
+         /* NOTE: most *read() functions return ssize_t but this returns size_t
+           which normally is unsigned! */
+         nread = libssh2_sftp_read(data->reqdata.proto.ssh->sftp_handle,
+                                   buf, BUFSIZE-1);
+-#endif /* !(LIBSSH2_APINO >= 200706012030) */
++#endif /* !HAVE_LIBSSH2_NBLOCK */
+ 
+         if (nread > 0)
+           buf[nread] = 0;
+ 
+-#if (LIBSSH2_APINO >= 200706012030)
++#if HAVE_LIBSSH2_NBLOCK
+         if (nread <= 0)
+           break;
+-#else /* !(LIBSSH2_APINO >= 200706012030) */
++#else /* !HAVE_LIBSSH2_NBLOCK */
+         /* this check can be changed to a <= 0 when nread is changed to a
+           signed variable type */
+         if ((nread == 0) || (nread == (size_t)~0))
+           break;
+-#endif /* !(LIBSSH2_APINO >= 200706012030) */
++#endif /* !HAVE_LIBSSH2_NBLOCK */
+ 
+         bytecount += nread;
+ 
+@@ -1756,17 +1774,17 @@
+   sftp->homedir = NULL;
+ 
+   if (sftp->sftp_handle) {
+-#if (LIBSSH2_APINO >= 200706012030)
++#if HAVE_LIBSSH2_NBLOCK
+     while ((ret = libssh2_sftp_close(sftp->sftp_handle)) ==
+            LIBSSH2_ERROR_EAGAIN);
+     if (ret < 0) {
+       infof(conn->data, "Failed to close libssh2 file\n");
+     }
+-#else /* !(LIBSSH2_APINO >= 200706012030) */
++#else /* !HAVE_LIBSSH2_NBLOCK */
+     if (libssh2_sftp_close(sftp->sftp_handle) < 0) {
+       infof(conn->data, "Failed to close libssh2 file\n");
+     }
+-#endif /* !(LIBSSH2_APINO >= 200706012030) */
++#endif /* !HAVE_LIBSSH2_NBLOCK */
+   }
+ 
+   /* Before we shut down, see if there are any post-quote commands to send: */
+@@ -1776,40 +1794,40 @@
+   }
+ 
+   if (sftp->sftp_session) {
+-#if (LIBSSH2_APINO >= 200706012030)
++#if HAVE_LIBSSH2_NBLOCK
+     while ((ret = libssh2_sftp_shutdown(sftp->sftp_session)) ==
+            LIBSSH2_ERROR_EAGAIN);
+     if (ret < 0) {
+       infof(conn->data, "Failed to stop libssh2 sftp subsystem\n");
+     }
+-#else /* !(LIBSSH2_APINO >= 200706012030) */
++#else /* !HAVE_LIBSSH2_NBLOCK */
+     if (libssh2_sftp_shutdown(sftp->sftp_session) < 0) {
+       infof(conn->data, "Failed to stop libssh2 sftp subsystem\n");
+     }
+-#endif /* !(LIBSSH2_APINO >= 200706012030) */
++#endif /* !HAVE_LIBSSH2_NBLOCK */
+   }
+ 
+   if (sftp->ssh_channel) {
+-#if (LIBSSH2_APINO >= 200706012030)
++#if HAVE_LIBSSH2_NBLOCK
+     while ((ret = libssh2_channel_close(sftp->ssh_channel)) ==
+            LIBSSH2_ERROR_EAGAIN);
+     if (ret < 0) {
+       infof(conn->data, "Failed to stop libssh2 channel subsystem\n");
+     }
+-#else /* !(LIBSSH2_APINO >= 200706012030) */
++#else /* !HAVE_LIBSSH2_NBLOCK */
+     if (libssh2_channel_close(sftp->ssh_channel) < 0) {
+       infof(conn->data, "Failed to stop libssh2 channel subsystem\n");
+     }
+-#endif /* !(LIBSSH2_APINO >= 200706012030) */
++#endif /* !HAVE_LIBSSH2_NBLOCK */
+   }
+ 
+   if (sftp->ssh_session) {
+-#if (LIBSSH2_APINO >= 200706012030)
++#if HAVE_LIBSSH2_NBLOCK
+     while (libssh2_session_disconnect(sftp->ssh_session, "Shutdown") ==
+            LIBSSH2_ERROR_EAGAIN);
+-#else /* !(LIBSSH2_APINO >= 200706012030) */
++#else /* !HAVE_LIBSSH2_NBLOCK */
+     libssh2_session_disconnect(sftp->ssh_session, "Shutdown");
+-#endif /* !(LIBSSH2_APINO >= 200706012030) */
++#endif /* !HAVE_LIBSSH2_NBLOCK */
+     libssh2_session_free(sftp->ssh_session);
+     sftp->ssh_session = NULL;
+   }
+@@ -1831,14 +1849,14 @@
+   ssize_t nwrite;   /* libssh2_sftp_write() used to return size_t in 0.14
+                        but is changed to ssize_t in 0.15! */
+ 
+-#if defined(LIBSSH2SFTP_EAGAIN) && (LIBSSH2_APINO < 200706012030)
++#if defined(LIBSSH2SFTP_EAGAIN) && defined(LIBSSH2_APINO) && (LIBSSH2_APINO < 200706012030)
+   /* we prefer the non-blocking API but that didn't exist previously */
+   nwrite = (ssize_t)
+     libssh2_sftp_writenb(conn->data->reqdata.proto.ssh->sftp_handle, mem, len);
+ #else
+   nwrite = (ssize_t)
+     libssh2_sftp_write(conn->data->reqdata.proto.ssh->sftp_handle, mem, len);
+-#if (LIBSSH2_APINO >= 200706012030)
++#if HAVE_LIBSSH2_NBLOCK
+   if (nwrite == LIBSSH2_ERROR_EAGAIN) {
+     return 0;
+   }
+@@ -1860,7 +1878,7 @@
+ 
+   /* libssh2_sftp_read() returns size_t !*/
+ 
+-#if defined(LIBSSH2SFTP_EAGAIN) && (LIBSSH2_APINO < 200706012030)
++#if defined(LIBSSH2SFTP_EAGAIN) && defined(LIBSSH2_APINO) && (LIBSSH2_APINO < 200706012030)
+   /* we prefer the non-blocking API but that didn't exist previously */
+   nread = (ssize_t)
+     libssh2_sftp_readnb(conn->data->reqdata.proto.ssh->sftp_handle, mem, len);
+@@ -2061,7 +2079,7 @@
+           return err;
+         }
+         memset(&attrs, 0, sizeof(LIBSSH2_SFTP_ATTRIBUTES));
+-#if (LIBSSH2_APINO >= 200706012030)
++#if HAVE_LIBSSH2_NBLOCK
+         while ((ret = libssh2_sftp_stat(sftp_session,
+                                         path2, &attrs)) ==
+                LIBSSH2_ERROR_EAGAIN);
+@@ -2073,7 +2091,7 @@
+                 sftp_libssh2_strerror(err));
+           return CURLE_FTP_QUOTE_ERROR;
+         }
+-#else /* !(LIBSSH2_APINO >= 200706012030) */
++#else /* !HAVE_LIBSSH2_NBLOCK */
+         if (libssh2_sftp_stat(sftp_session,
+                               path2, &attrs) != 0) { /* get those attributes */
+           err = libssh2_sftp_last_error(sftp_session);
+@@ -2083,7 +2101,7 @@
+                 sftp_libssh2_strerror(err));
+           return CURLE_FTP_QUOTE_ERROR;
+         }
+-#endif /* !(LIBSSH2_APINO >= 200706012030) */
++#endif /* !HAVE_LIBSSH2_NBLOCK */
+ 
+         /* Now set the new attributes... */
+         if (curl_strnequal(item->data, "chgrp", 5)) {
+@@ -2115,7 +2133,7 @@
+         }
+ 
+         /* Now send the completed structure... */
+-#if (LIBSSH2_APINO >= 200706012030)
++#if HAVE_LIBSSH2_NBLOCK
+         while ((ret = libssh2_sftp_setstat(sftp_session, path2, &attrs)) ==
+                LIBSSH2_ERROR_EAGAIN);
+         if (ret != 0) {
+@@ -2126,7 +2144,7 @@
+                 sftp_libssh2_strerror(err));
+           return CURLE_FTP_QUOTE_ERROR;
+         }
+-#else /* !(LIBSSH2_APINO >= 200706012030) */
++#else /* !HAVE_LIBSSH2_NBLOCK */
+         if (libssh2_sftp_setstat(sftp_session, path2, &attrs) != 0) {
+           err = libssh2_sftp_last_error(sftp_session);
+           free(path1);
+@@ -2135,7 +2153,7 @@
+                 sftp_libssh2_strerror(err));
+           return CURLE_FTP_QUOTE_ERROR;
+         }
+-#endif /* !(LIBSSH2_APINO >= 200706012030) */
++#endif /* !HAVE_LIBSSH2_NBLOCK */
+       }
+       else if (curl_strnequal(item->data, "ln ", 3) ||
+                curl_strnequal(item->data, "symlink ", 8)) {
+@@ -2151,7 +2169,7 @@
+           free(path1);
+           return err;
+         }
+-#if (LIBSSH2_APINO >= 200706012030)
++#if HAVE_LIBSSH2_NBLOCK
+         while ((ret = libssh2_sftp_symlink(sftp_session, path1, path2)) ==
+                LIBSSH2_ERROR_EAGAIN);
+         if (ret != 0) {
+@@ -2162,7 +2180,7 @@
+                 sftp_libssh2_strerror(err));
+           return CURLE_FTP_QUOTE_ERROR;
+         }
+-#else /* !(LIBSSH2_APINO >= 200706012030) */
++#else /* !HAVE_LIBSSH2_NBLOCK */
+         if (libssh2_sftp_symlink(sftp_session, path1, path2) != 0) {
+           err = libssh2_sftp_last_error(sftp_session);
+           free(path1);
+@@ -2171,10 +2189,10 @@
+                 sftp_libssh2_strerror(err));
+           return CURLE_FTP_QUOTE_ERROR;
+         }
+-#endif /* !(LIBSSH2_APINO >= 200706012030) */
++#endif /* !HAVE_LIBSSH2_NBLOCK */
+       }
+       else if (curl_strnequal(item->data, "mkdir ", 6)) { /* create dir */
+-#if (LIBSSH2_APINO >= 200706012030)
++#if HAVE_LIBSSH2_NBLOCK
+         while ((ret = libssh2_sftp_mkdir(sftp_session, path1, 0744)) ==
+                LIBSSH2_ERROR_EAGAIN);
+         if (ret != 0) {
+@@ -2183,7 +2201,7 @@
+           failf(data, "mkdir command failed: %s", sftp_libssh2_strerror(err));
+           return CURLE_FTP_QUOTE_ERROR;
+         }
+-#else /* !(LIBSSH2_APINO >= 200706012030) */
++#else /* !HAVE_LIBSSH2_NBLOCK */
+         if (libssh2_sftp_mkdir(sftp_session, path1, 0744) != 0) {
+           err = libssh2_sftp_last_error(sftp_session);
+           free(path1);
+@@ -2191,7 +2209,7 @@
+                 sftp_libssh2_strerror(err));
+           return CURLE_FTP_QUOTE_ERROR;
+         }
+-#endif /* !(LIBSSH2_APINO >= 200706012030) */
++#endif /* !HAVE_LIBSSH2_NBLOCK */
+       }
+       else if (curl_strnequal(item->data, "rename ", 7)) { /* rename file */
+         /* first param is the source path */
+@@ -2205,7 +2223,7 @@
+           free(path1);
+           return err;
+         }
+-#if (LIBSSH2_APINO >= 200706012030)
++#if HAVE_LIBSSH2_NBLOCK
+         while ((ret = libssh2_sftp_rename(sftp_session, path1, path2)) ==
+                LIBSSH2_ERROR_EAGAIN);
+         if (ret != 0) {
+@@ -2215,7 +2233,7 @@
+           failf(data, "rename command failed: %s", sftp_libssh2_strerror(err));
+           return CURLE_FTP_QUOTE_ERROR;
+         }
+-#else /* !(LIBSSH2_APINO >= 200706012030) */
++#else /* !HAVE_LIBSSH2_NBLOCK */
+         if (libssh2_sftp_rename(sftp_session,
+                                 path1, path2) != 0) {
+           err = libssh2_sftp_last_error(sftp_session);
+@@ -2225,10 +2243,10 @@
+                 sftp_libssh2_strerror(err));
+           return CURLE_FTP_QUOTE_ERROR;
+         }
+-#endif /* !(LIBSSH2_APINO >= 200706012030) */
++#endif /* !HAVE_LIBSSH2_NBLOCK */
+       }
+       else if (curl_strnequal(item->data, "rmdir ", 6)) { /* delete dir */
+-#if (LIBSSH2_APINO >= 200706012030)
++#if HAVE_LIBSSH2_NBLOCK
+         while ((ret = libssh2_sftp_rmdir(sftp_session, path1)) ==
+                LIBSSH2_ERROR_EAGAIN);
+         if (ret != 0) {
+@@ -2237,7 +2255,7 @@
+           failf(data, "rmdir command failed: %s", sftp_libssh2_strerror(err));
+           return CURLE_FTP_QUOTE_ERROR;
+         }
+-#else /* !(LIBSSH2_APINO >= 200706012030) */
++#else /* !HAVE_LIBSSH2_NBLOCK */
+         if (libssh2_sftp_rmdir(sftp_session,
+                                path1) != 0) {
+           err = libssh2_sftp_last_error(sftp_session);
+@@ -2246,10 +2264,10 @@
+                 sftp_libssh2_strerror(err));
+           return CURLE_FTP_QUOTE_ERROR;
+         }
+-#endif /* !(LIBSSH2_APINO >= 200706012030) */
++#endif /* !HAVE_LIBSSH2_NBLOCK */
+       }
+       else if (curl_strnequal(item->data, "rm ", 3)) { /* delete file */
+-#if (LIBSSH2_APINO >= 200706012030)
++#if HAVE_LIBSSH2_NBLOCK
+         while ((ret = libssh2_sftp_unlink(sftp_session, path1)) ==
+                LIBSSH2_ERROR_EAGAIN);
+         if (ret != 0) {
+@@ -2258,7 +2276,7 @@
+           failf(data, "rm command failed: %s", sftp_libssh2_strerror(err));
+           return CURLE_FTP_QUOTE_ERROR;
+         }
+-#else /* !(LIBSSH2_APINO >= 200706012030) */
++#else /* !HAVE_LIBSSH2_NBLOCK */
+         if (libssh2_sftp_unlink(sftp_session, path1) != 0) {
+           err = libssh2_sftp_last_error(sftp_session);
+           free(path1);
+@@ -2266,7 +2284,7 @@
+                 sftp_libssh2_strerror(err));
+           return CURLE_FTP_QUOTE_ERROR;
+         }
+-#endif /* !(LIBSSH2_APINO >= 200706012030) */
++#endif /* !HAVE_LIBSSH2_NBLOCK */
+       }
+ 
+       if (path1)
+@@ -2299,18 +2317,18 @@
+ 
+       infof(conn->data, "Creating directory '%s'\n", sftp->path);
+       /* 'mode' - parameter is preliminary - default to 0644 */
+-#if (LIBSSH2_APINO >= 200706012030)
++#if HAVE_LIBSSH2_NBLOCK
+       while ((rc = libssh2_sftp_mkdir(sftp->sftp_session, sftp->path,
+                                LIBSSH2_SFTP_S_IRWXU |
+                                LIBSSH2_SFTP_S_IRGRP | LIBSSH2_SFTP_S_IXGRP |
+                                LIBSSH2_SFTP_S_IROTH | LIBSSH2_SFTP_S_IXOTH)) ==
+              LIBSSH2_ERROR_EAGAIN);
+-#else /* !(LIBSSH2_APINO >= 200706012030) */
++#else /* !HAVE_LIBSSH2_NBLOCK */
+       rc = libssh2_sftp_mkdir(sftp->sftp_session, sftp->path,
+                                LIBSSH2_SFTP_S_IRWXU |
+                                LIBSSH2_SFTP_S_IRGRP | LIBSSH2_SFTP_S_IXGRP |
+                                LIBSSH2_SFTP_S_IROTH | LIBSSH2_SFTP_S_IXOTH);
+-#endif /* !(LIBSSH2_APINO >= 200706012030) */
++#endif /* !HAVE_LIBSSH2_NBLOCK */
+       *slash_pos = '/';
+       ++slash_pos;
+       if (rc == -1) {
diff --git a/ftp/curl/files/patch-tests::data::test62 b/ftp/curl/files/patch-tests::data::test62
deleted file mode 100644
index 2c2f48b..0000000
--- a/ftp/curl/files/patch-tests::data::test62
+++ /dev/null
@@ -1,15 +0,0 @@
---- tests/data/test62.orig	Fri Mar  9 15:11:24 2007
-+++ tests/data/test62	Fri Mar  9 15:11:45 2007
-@@ -33,9 +33,9 @@
- # http://curlm.haxx.se/rfc/cookie_spec.html
- # This file was generated by libcurl! Edit at your own risk.
- 
--.foo.com	TRUE	/we/want/	FALSE	1170327387	test	yes
--.host.foo.com	TRUE	/we/want/	FALSE	1170327387	test2	yes
--.fake.host.foo.com	TRUE	/we/want/	FALSE	1170327387	test4	yes
-+.foo.com	TRUE	/we/want/	FALSE	2054030187	test	yes
-+.host.foo.com	TRUE	/we/want/	FALSE	2054030187	test2	yes
-+.fake.host.foo.com	TRUE	/we/want/	FALSE	2054030187	test4	yes
- 
- .foo.com	TRUE	/moo	TRUE	0	test3	maybe
- </file>
diff --git a/ftp/curl/files/patch-tests::server::getpart.c b/ftp/curl/files/patch-tests::server::getpart.c
index 4cf3872..2038791 100644
--- a/ftp/curl/files/patch-tests::server::getpart.c
+++ b/ftp/curl/files/patch-tests::server::getpart.c
@@ -1,11 +1,11 @@
---- tests/server/getpart.c.orig	Wed Dec 10 15:15:52 2003
-+++ tests/server/getpart.c	Wed Dec 10 15:17:19 2003
-@@ -21,7 +21,7 @@
-   int len = strlen(buffer);
-   int needed_len = len + *stringlen;
+--- tests/server/getpart.c.orig	Tue Jan 23 13:46:14 2007
++++ tests/server/getpart.c
+@@ -76,7 +76,7 @@
+     needed_len = len + *stringlen + 1; /* recalculate */
+   }
  
 -  if(needed_len >= *stralloc) {
 +  while(needed_len >= *stralloc) {
      char *newptr;
-     long newsize = needed_len*2; /* get twice the needed size */
+     size_t newsize = needed_len*2; /* get twice the needed size */
  
diff --git a/ftp/curl/pkg-plist b/ftp/curl/pkg-plist
index 50e773f..22223f3 100644
--- a/ftp/curl/pkg-plist
+++ b/ftp/curl/pkg-plist
@@ -28,9 +28,6 @@ libdata/pkgconfig/libcurl.pc
 %%PORTDOCS%%%%DOCSDIR%%/KNOWN_BUGS
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE-MIXING
 %%PORTDOCS%%%%DOCSDIR%%/MANUAL
-%%PORTDOCS%%%%DOCSDIR%%/Makefile
-%%PORTDOCS%%%%DOCSDIR%%/Makefile.am
-%%PORTDOCS%%%%DOCSDIR%%/Makefile.in
 %%PORTDOCS%%%%DOCSDIR%%/README.netware
 %%PORTDOCS%%%%DOCSDIR%%/README.win32
 %%PORTDOCS%%%%DOCSDIR%%/RESOURCES
@@ -39,17 +36,12 @@ libdata/pkgconfig/libcurl.pc
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/TheArtOfHttpScripting
 %%PORTDOCS%%%%DOCSDIR%%/VERSIONS
-%%PORTDOCS%%%%DOCSDIR%%/curl-config.1
 %%PORTDOCS%%%%DOCSDIR%%/curl-config.html
 %%PORTDOCS%%%%DOCSDIR%%/curl-config.pdf
-%%PORTDOCS%%%%DOCSDIR%%/curl.1
 %%PORTDOCS%%%%DOCSDIR%%/curl.html
 %%PORTDOCS%%%%DOCSDIR%%/curl.pdf
 %%PORTDOCS%%%%DOCSDIR%%/examples/10-at-a-time.c
-%%PORTDOCS%%%%DOCSDIR%%/examples/Makefile
-%%PORTDOCS%%%%DOCSDIR%%/examples/Makefile.am
 %%PORTDOCS%%%%DOCSDIR%%/examples/Makefile.example
-%%PORTDOCS%%%%DOCSDIR%%/examples/Makefile.in
 %%PORTDOCS%%%%DOCSDIR%%/examples/README
 %%PORTDOCS%%%%DOCSDIR%%/examples/anyauthput.c
 %%PORTDOCS%%%%DOCSDIR%%/examples/cacertinmem.c
@@ -91,155 +83,103 @@ libdata/pkgconfig/libcurl.pc
 %%PORTDOCS%%%%DOCSDIR%%/examples/simplessl.c
 %%PORTDOCS%%%%DOCSDIR%%/examples/synctime.c
 %%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/Makefile
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/Makefile.am
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/Makefile.in
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_cleanup.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_cleanup.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_cleanup.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_duphandle.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_duphandle.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_duphandle.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_escape.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_escape.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_escape.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_getinfo.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_getinfo.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_getinfo.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_init.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_init.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_init.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_perform.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_perform.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_perform.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_reset.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_reset.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_reset.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_setopt.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_setopt.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_setopt.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_strerror.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_strerror.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_strerror.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_unescape.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_unescape.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_unescape.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_escape.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_escape.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_escape.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formadd.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formadd.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formadd.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formfree.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formfree.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formfree.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formget.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formget.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formget.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_free.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_free.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_free.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_getdate.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_getdate.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_getdate.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_getenv.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_getenv.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_getenv.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_cleanup.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_cleanup.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_cleanup.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_init.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_init.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_init.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_init_mem.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_init_mem.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_init_mem.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_mprintf.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_mprintf.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_mprintf.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_add_handle.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_add_handle.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_add_handle.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_assign.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_assign.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_assign.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_cleanup.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_cleanup.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_cleanup.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_fdset.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_fdset.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_fdset.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_info_read.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_info_read.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_info_read.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_init.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_init.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_init.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_perform.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_perform.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_perform.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_remove_handle.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_remove_handle.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_remove_handle.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_setopt.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_setopt.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_setopt.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_socket.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_socket.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_socket.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_strerror.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_strerror.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_strerror.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_timeout.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_timeout.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_timeout.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_cleanup.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_cleanup.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_cleanup.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_init.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_init.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_init.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_setopt.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_setopt.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_setopt.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_strerror.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_strerror.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_strerror.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_slist_append.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_slist_append.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_slist_append.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_slist_free_all.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_slist_free_all.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_slist_free_all.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_strequal.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_strequal.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_strequal.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_unescape.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_unescape.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_unescape.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_version.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_version.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_version.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_version_info.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_version_info.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_version_info.pdf
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/index.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-easy.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-easy.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-easy.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-errors.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-errors.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-errors.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-multi.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-multi.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-multi.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-share.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-share.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-share.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-tutorial.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-tutorial.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-tutorial.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl.m4
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl.pdf