Updated to curl-7.9.6

- fmt on DESCR
- Regen PLIST
- Remove patch since it was applied


Changes since curl-7.9.5
(Lots of change, here is the recently changes, see CHANGE for more)

- Dirk Manske brought a fix that makes libcurl strip off white
  spaces from the beginning of cookie contents.
- Had to patch include/curl/curl.h since MSVC doesn't set the
  __STDC__ define. Moonesamy pointed out the problem, Bjorn Reese
  the solution.
- Fixed the TIMER_CONNECT to be more accurate for FTP transfers.
  Previously FTP transfers got the "connect done" time set after
  the initial FTP commands and not directly after the TCP/IP connect
  as it should.
- Jean-Philippe Barrette-LaPierre provided his patch that introduces
  CURLOPT_DEBUGFUNCTION and CURLOPT_DEBUGDATA. They allow a program
  to a set a callback to receive debug/information data. That
  includes headers and data that is received and sent. CURLOPT_VERBOSE
  still controls it.
  By default, there is an internal debugfunction that will make
  things look and work as before if not changed.
- Sebastien Willemijns found out that -x didn't use the default
  port number as is documented. It does now.
- libcurl-errors.3 is a new man page attempting to document all
  libcurl error codes

5 files changed, 32 insertions, 33 deletions

diff --git a/www/curl/DESCR b/www/curl/DESCR
index 5da8f0cfaa0..0b9d2b3ea58 100644
--- a/www/curl/DESCR
+++ b/www/curl/DESCR
@@ -1,16 +1,16 @@
-                                  _   _ ____  _     
-                              ___| | | |  _ \| |    
-                             / __| | | | |_) | |    
-                            | (__| |_| |  _ <| |___ 
-                             \___|\___/|_| \_\_____|
+	      _   _ ____  _
+	  ___| | | |  _ \| |    
+	 / __| | | | |_) | |    
+	| (__| |_| |  _ <| |___ 
+	 \___|\___/|_| \_\_____|
 
 README
 
-  Curl is a command line tool for transfering data specified with URL
-  syntax. Find out how to use Curl by reading the curl.1 man page or the
-  MANUAL document. Find out how to install Curl by reading the INSTALL
-  document.
+  Curl is a command line tool for transfering data specified with
+  URL syntax. Find out how to use Curl by reading the curl.1 man
+  page or the MANUAL document. Find out how to install Curl by
+  reading the INSTALL document.
 
-  libcurl is a library that Curl is using to do its job. It is readily
-  available to be used by your software. Read the LIBCURL document to
-  find out how!
+  libcurl is a library that Curl is using to do its job. It is
+  readily available to be used by your software. Read the LIBCURL
+  document to find out how!
diff --git a/www/curl/Makefile b/www/curl/Makefile
index 4e4c3816e68..121082cc416 100644
--- a/www/curl/Makefile
+++ b/www/curl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2002/03/15 12:05:09 seb Exp $
+# $NetBSD: Makefile,v 1.18 2002/04/21 12:07:45 shell Exp $
 
-DISTNAME=	curl-7.9.5
-PKGREVISION=	1
+DISTNAME=	curl-7.9.6
 CATEGORIES=	www
 MASTER_SITES=	http://curl.haxx.se/download/ \
 		ftp://ftp.sunet.se/pub/www/utilities/curl/ \
diff --git a/www/curl/PLIST b/www/curl/PLIST
index 111cd872304..8918864f31f 100644
--- a/www/curl/PLIST
+++ b/www/curl/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2002/03/15 12:05:09 seb Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/04/21 12:07:45 shell Exp $
 bin/curl
 bin/curl-config
 include/curl/curl.h
 include/curl/easy.h
 include/curl/mprintf.h
+include/curl/multi.h
 include/curl/stdcheaders.h
 include/curl/types.h
 lib/libcurl.a
@@ -28,12 +29,21 @@ man/man3/curl_getenv.3
 man/man3/curl_global_cleanup.3
 man/man3/curl_global_init.3
 man/man3/curl_mprintf.3
+man/man3/curl_multi_add_handle.3
+man/man3/curl_multi_cleanup.3
+man/man3/curl_multi_fdset.3
+man/man3/curl_multi_info_read.3
+man/man3/curl_multi_init.3
+man/man3/curl_multi_perform.3
+man/man3/curl_multi_remove_handle.3
 man/man3/curl_slist_append.3
 man/man3/curl_slist_free_all.3
 man/man3/curl_strequal.3
 man/man3/curl_strnequal.3
 man/man3/curl_unescape.3
 man/man3/curl_version.3
+man/man3/libcurl-errors.3
+man/man3/libcurl-multi.3
 man/man3/libcurl.3
 share/doc/curl/FAQ
 share/doc/curl/MANUAL
@@ -46,8 +56,12 @@ share/examples/curl/ftpupload.c
 share/examples/curl/getinmemory.c
 share/examples/curl/http-post.c
 share/examples/curl/httpput.c
+share/examples/curl/multi-app.c
+share/examples/curl/multi-double.c
+share/examples/curl/multi-single.c
 share/examples/curl/multithread.c
 share/examples/curl/persistant.c
+share/examples/curl/post-callback.c
 share/examples/curl/postit2.c
 share/examples/curl/sepheaders.c
 share/examples/curl/simple.c
diff --git a/www/curl/distinfo b/www/curl/distinfo
index 0d71939ad97..53292151496 100644
--- a/www/curl/distinfo
+++ b/www/curl/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.9 2002/03/15 08:18:45 itojun Exp $
+$NetBSD: distinfo,v 1.10 2002/04/21 12:07:45 shell Exp $
 
-SHA1 (curl-7.9.5.tar.gz) = 3c493a59d62c26b1ce9ba5c291b7ba1f244149e5
-Size (curl-7.9.5.tar.gz) = 677596 bytes
-SHA1 (patch-aa) = a8bf65bc0a29b6fa301d46ed1b8fab70930fdc96
+SHA1 (curl-7.9.6.tar.gz) = 33278d881460cd2667cfcf3295f99825b4fe8399
+Size (curl-7.9.6.tar.gz) = 706370 bytes
diff --git a/www/curl/patches/patch-aa b/www/curl/patches/patch-aa
deleted file mode 100644
index 90dc3dceef8..00000000000
--- a/www/curl/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2002/03/15 08:18:46 itojun Exp $
-
---- lib/hostip.c-	Fri Mar 15 17:14:26 2002
-+++ lib/hostip.c	Fri Mar 15 17:14:32 2002
-@@ -293,7 +293,7 @@
-   char sbuf[NI_MAXSERV];
- 
-   memset(&hints, 0, sizeof(hints));
--  hints.ai_family = PF_INET;
-+  hints.ai_family = PF_UNSPEC;
-   hints.ai_socktype = SOCK_STREAM;
-   hints.ai_flags = AI_CANONNAME;
-   snprintf(sbuf, sizeof(sbuf), "%d", port);