Update to 7.15.5, convert to options.mk.

Version 7.15.5 (7 August 2006)

Daniel (2 August 2006)
- Mark Lentczner fixed how libcurl was not properly doing chunked encoding
  if the header "Transfer-Encoding: chunked" was set by the application.
  http://curl.haxx.se/bug/view.cgi?id=1531838

Daniel (1 August 2006)
- Maciej Karpiuk fixed a crash that would occur if we passed Curl_strerror()
  an unknown error number on glibc systems.
  http://curl.haxx.se/bug/view.cgi?id=1532289

Daniel (31 July 2006)
- *ALERT* curl_multi_socket() and curl_multi_socket_all() got modified
  prototypes: they both now provide the number of running handles back to the
  calling function. It makes the functions resemble the good old
  curl_multi_perform() more and provides a nice way to know when the multi
  handle goes empty.

  ALERT2: don't use the curl_multi_socket*() functionality in anything
  production-like until I say it's somewhat settled, as I suspect there might
  be some further API changes before I'm done...

Daniel (28 July 2006)
- Yves Lejeune fixed so that replacing Content-Type: when doing multipart
  formposts work exactly the way you want it (and the way you'd assume it
  works).

Daniel (27 July 2006)
- David McCreedy added --ftp-ssl-reqd which makes curl *require* SSL for both
  control and data connection, as the existing --ftp-ssl option only requests
  it.

- [Hiper-related work] Added a function called curl_multi_assign() that will
  set a private pointer added to the internal libcurl hash table for the
  particular socket passed in to this function:

  CURLMcode curl_multi_assign(CURLM *multi_handle,
                              curl_socket_t sockfd,
                              void *sockp);

  'sockp' being a custom pointer set by the application to be associated with
  this socket. The socket has to be already existing and in-use by libcurl,
  like having already called the callback telling about its existance.

  The set hashp pointer will then be passed on to the callback in upcoming
  calls when this same socket is used (in the brand new 'socketp' argument).

Daniel (26 July 2006)
- Dan Nelson added the CURLOPT_FTP_ALTERNATIVE_TO_USER libcurl option and curl
  tool option named --ftp-alternative-to-user. It provides a mean to send a
  particular command if the normal USER/PASS approach fails.

- Michael Jerris added magic that builds lib/curllib.vcproj automatically for
  newer MSVC.

Daniel (25 July 2006)
- Georg Horn made the transfer timeout error message include more details.

Daniel (20 July 2006)
- David McCreedy fixed a build error when building libcurl with HTTP disabled,
  problem added with the curl_formget() patch.

Daniel (17 July 2006)
- Jari Sundell did some excellent research and bug tracking, figured out that
  we did wrong and patched it: When nodes were removed from the splay tree,
  and we didn't properly remove it from the splay tree when an easy handle was
  removed from a multi stack and thus we could wrongly leave a node in the
  splay tree pointing to (bad) memory.

Daniel (14 July 2006)
- David McCreedy fixed a flaw where the CRLF counter wasn't properly cleared
  for FTP ASCII transfers.

Daniel (8 July 2006)
- Ates Goral pointed out that libcurl's cookie parser did case insensitive
  string comparisons on the path which is incorrect and provided a patch that
  fixes this. I edited test case 8 to include details that test for this.

- Ingmar Runge provided a source snippet that caused a crash. The reason for
  the crash was that libcurl internally was a bit confused about who owned the
  DNS cache at all times so if you created an easy handle that uses a shared
  DNS cache and added that to a multi handle it would crash. Now we keep more
  careful internal track of exactly what kind of DNS cache each easy handle
  uses: None, Private (allocated for and used only by this single handle),
  Shared (points to a cache held by a shared object), Global (points to the
  global cache) or Multi (points to the cache within the multi handle that is
  automatically shared between all easy handles that are added with private
  caches).

Daniel (4 July 2006)
- Toshiyuki Maezawa fixed a problem where you couldn't override the
  Proxy-Connection: header when using a proxy and not doing CONNECT.

Daniel (24 June 2006)
- Michael Wallner added curl_formget(), which allows an application to extract
  (serialise) a previously built formpost (as with curl_formadd()).

Daniel (23 June 2006)
- Arve Knudsen found a flaw in curl_multi_fdset() for systems where
  curl_socket_t is unsigned (like Windows) that could cause it to wrongly
  return a max fd of -1.

Daniel (20 June 2006)
- Peter Silva introduced CURLOPT_MAX_SEND_SPEED_LARGE and
  CURLOPT_MAX_RECV_SPEED_LARGE that limit tha maximum rate libcurl is allowed
  to send or receive data. This kind of adds the the command line tool's
  option --limit-rate to the library.

  The rate limiting logic in the curl app is now removed and is instead
  provided by libcurl itself. Transfer rate limiting will now also work for -d
  and -F, which it didn't before.

Daniel (19 June 2006)
- Made -K on a file that couldn't be read cause a warning to be displayed.

Daniel (13 June 2006)
- Dan Fandrich implemented --enable-hidden-symbols configure option to enable
  -fvisibility=hidden on gcc >= 4.0.  This reduces the size of the libcurl
  binary and speeds up dynamic linking by hiding all the internal symbols from
  the symbol table.

4 files changed, 23 insertions, 13 deletions

diff --git a/www/curl/Makefile b/www/curl/Makefile
index f12839482dd..5bb2bb27237 100644
--- a/www/curl/Makefile
+++ b/www/curl/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.65 2006/07/04 06:30:25 wiz Exp $
+# $NetBSD: Makefile,v 1.66 2006/08/10 14:18:14 wiz Exp $
 
-DISTNAME=	curl-7.15.4
+DISTNAME=	curl-7.15.5
 CATEGORIES=	www
 MASTER_SITES=	http://curl.haxx.se/download/ \
 		ftp://ftp.sunet.se/pub/www/utilities/curl/ \
@@ -26,14 +26,10 @@ CONFIGURE_ENV+=		F77=${FALSE:Q}
 # needs perl
 TEST_TARGET=		check
 
-.include "../../mk/bsd.prefs.mk"
-
-.if empty(USE_INET6:M[yY][eE][sS])
-CONFIGURE_ARGS+=	--disable-ipv6
-.endif
+.include "options.mk"
 
 post-configure:
-	@if ${GREP} '#define HAVE_SYS_SELECT_H 1' ${WRKSRC}/src/config.h \
+	if ${GREP} '#define HAVE_SYS_SELECT_H 1' ${WRKSRC}/src/config.h \
 		>/dev/null; \
 	then \
 	    line='#include <sys/select.h>'; \
diff --git a/www/curl/PLIST b/www/curl/PLIST
index c147d200cb3..34898505eaa 100644
--- a/www/curl/PLIST
+++ b/www/curl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2006/07/03 21:32:09 wiz Exp $
+@comment $NetBSD: PLIST,v 1.21 2006/08/10 14:18:16 wiz Exp $
 bin/curl
 bin/curl-config
 include/curl/curl.h
@@ -25,6 +25,7 @@ man/man3/curl_easy_unescape.3
 man/man3/curl_escape.3
 man/man3/curl_formadd.3
 man/man3/curl_formfree.3
+man/man3/curl_formget.3
 man/man3/curl_free.3
 man/man3/curl_getdate.3
 man/man3/curl_getenv.3
@@ -33,6 +34,7 @@ man/man3/curl_global_init.3
 man/man3/curl_global_init_mem.3
 man/man3/curl_mprintf.3
 man/man3/curl_multi_add_handle.3
+man/man3/curl_multi_assign.3
 man/man3/curl_multi_cleanup.3
 man/man3/curl_multi_fdset.3
 man/man3/curl_multi_info_read.3
diff --git a/www/curl/distinfo b/www/curl/distinfo
index 74a8c29c009..880728844c7 100644
--- a/www/curl/distinfo
+++ b/www/curl/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.45 2006/07/03 21:32:09 wiz Exp $
+$NetBSD: distinfo,v 1.46 2006/08/10 14:18:16 wiz Exp $
 
-SHA1 (curl-7.15.4.tar.bz2) = 74d3ce2060754a2ccc7a7775712e22720f74a662
-RMD160 (curl-7.15.4.tar.bz2) = bbef248926d3935272746f605d91e6f03badff6b
-Size (curl-7.15.4.tar.bz2) = 1519792 bytes
+SHA1 (curl-7.15.5.tar.bz2) = b79ee06d1da58c12c23a1b8aeccdb2b74a692cc7
+RMD160 (curl-7.15.5.tar.bz2) = 4494cffb382c81b7211830c7e6e40ef9ed8f4ef0
+Size (curl-7.15.5.tar.bz2) = 1543007 bytes
diff --git a/www/curl/options.mk b/www/curl/options.mk
new file mode 100644
index 00000000000..60bee6d8405
--- /dev/null
+++ b/www/curl/options.mk
@@ -0,0 +1,12 @@
+# $NetBSD: options.mk,v 1.1 2006/08/10 14:18:16 wiz Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.curl
+PKG_SUPPORTED_OPTIONS=	inet6
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=	--enable-ipv6
+.else
+CONFIGURE_ARGS+=	--disable-ipv6
+.endif