Update to 7.21.2:

Changes:

    * curl -T: ignore file size of special files
    * Added GOPHER protocol support
    * Added mk-ca-bundle.vbs script
    * c-ares build now requires c-ares >= 1.6.0

Bugfixes:

    * --remote-header-name security vulnerability fixed
    * multi: support the timeouts correctly, fixes known bug #62
    * multi: use timeouts properly for MAX_RECV/SEND_SPEED
    * negotiation: Wrong proxy authorization
    * multi: avoid sending multiple complete messages
    * cmdline: make -F type= accept ;charset=
    * RESUME_FROM: clarify what ftp uploads do
    * http: handle trailer headers in all chunked responses
    * Curl_is_connected: use correct errno
    * Added SSPI build to Watcom makefile
    * progress: callback for POSTs less than MAX_INITIAL_POST_SIZE
    * linking problem on Fedora 13
    * Link curl and the test apps with -lrt explicitly when necessary
    * chunky parser: only rewind stream internally if needed
    * remote-header-name: don't output filename when NULL
    * Curl_timeleft: avoid returning "no timeout" by mistake
    * timeout: use the correct start value as offset
    * FTP: fix wrong timeout trigger
    * buildconf got better output on failures
    * rtsp: avoid SIGSEGV on malformed header
    * LDAP: Support for tunnelling queries through HTTP proxy
    * configure's --enable-werror had a bashism
    * test565: Don't hardcode IP:PORT
    * configure: check for gcrypt if using GnuTLS
    * configure: don't enable RTMP if the lib detect fails
    * curl_easy_duphandle: clone the c-ares handle correctly
    * MacOSX-Framework: updates for Snowleopard
    * support URL containing colon without trailing port number
    * parsedate: allow time specified without seconds
    * curl_easy_escape: don't escape "unreserved" characters
    * SFTP: avoid downloading negative sizes
    * Lots of GSS/KRB FTP fixes
    * TFTP: Work around tftpd-hpa upload bug
    * libcurl.m4: several fixes
    * HTTP: remove special case for 416
    * examples: use example.com in example URLs
    * globbing: fix crash on unballanced open brace
    * cmake: build fixed

3 files changed, 13 insertions, 22 deletions

diff --git a/www/curl/Makefile b/www/curl/Makefile
index 16bf1e4730b..f720413ddd1 100644
--- a/www/curl/Makefile
+++ b/www/curl/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.99 2010/08/15 11:14:36 drochner Exp $
+# $NetBSD: Makefile,v 1.100 2010/10/16 23:58:04 wiz Exp $
 
-DISTNAME=	curl-7.21.1
+DISTNAME=	curl-7.21.2
 CATEGORIES=	www
 MASTER_SITES=	http://curl.haxx.se/download/ \
 		ftp://ftp.sunet.se/pub/www/utilities/curl/
@@ -25,6 +25,8 @@ CONFIGURE_ARGS+=	--with-ca-path=${SSLCERTS}
 CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib}
 PKGCONFIG_OVERRIDE=	libcurl.pc.in
 
+INSTALLATION_DIRS=	share/doc/curl share/examples/curl
+
 .include "../../mk/bsd.prefs.mk"
 
 .if !empty(PKGSRC_RUN_TEST:M[Yy][Ee][Ss])
@@ -39,13 +41,11 @@ PRIVILEGED_STAGES+=	clean
 .include "options.mk"
 
 post-install:
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/curl
 	for _f in MANUAL TheArtOfHttpScripting FAQ			\
 		curl-config.pdf curl.pdf; do				\
 		${INSTALL_DATA} ${WRKSRC}/docs/$${_f}			\
 			 ${DESTDIR}${PREFIX}/share/doc/curl/${_f};	\
 	done
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/curl
 	for _f in ${WRKSRC}/docs/examples/*.c				\
 		${WRKSRC}/docs/examples/README; do			\
 		${INSTALL_DATA} $${_f} 					\
diff --git a/www/curl/distinfo b/www/curl/distinfo
index ee248b42375..b094a849dc6 100644
--- a/www/curl/distinfo
+++ b/www/curl/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.66 2010/08/15 11:14:36 drochner Exp $
+$NetBSD: distinfo,v 1.67 2010/10/16 23:58:04 wiz Exp $
 
-SHA1 (curl-7.21.1.tar.bz2) = d6ad8d7caf6e15f318e7b9f69dee8f67c807b1a0
-RMD160 (curl-7.21.1.tar.bz2) = 3acc531f70adf68ce64bf8ccd198cbc33b6d5246
-Size (curl-7.21.1.tar.bz2) = 2150291 bytes
-SHA1 (patch-aa) = 02dbbc3d4c84cc1d112c5df424f3f2cc71448cbe
+SHA1 (curl-7.21.2.tar.bz2) = f729552a905033dbd0d2cf56e40c7048f2d8331e
+RMD160 (curl-7.21.2.tar.bz2) = fcb1302f79741bc3e488fcee1206284f4cb9e6ca
+Size (curl-7.21.2.tar.bz2) = 2167919 bytes
+SHA1 (patch-aa) = 14a1854429e12d0f7d0da040a09ef6d173a6dff2
diff --git a/www/curl/patches/patch-aa b/www/curl/patches/patch-aa
index f945c1ff889..9d69a0396de 100644
--- a/www/curl/patches/patch-aa
+++ b/www/curl/patches/patch-aa
@@ -1,17 +1,8 @@
-$NetBSD: patch-aa,v 1.16 2010/08/15 11:14:37 drochner Exp $
+$NetBSD: patch-aa,v 1.17 2010/10/16 23:58:04 wiz Exp $
 
---- configure.orig	2010-08-11 17:03:30.000000000 +0000
+--- configure.orig	2010-10-01 20:49:17.000000000 +0000
 +++ configure
-@@ -2992,7 +2992,7 @@ CONFIGURE_OPTIONS="\"$ac_configure_args\
- 
- 
- CURL_CFLAG_EXTRAS=""
--if test X"$want_werror" == Xyes; then
-+if test X"$want_werror" = Xyes; then
-   CURL_CFLAG_EXTRAS="-Werror"
- fi
- 
-@@ -14762,7 +14762,7 @@ squeeze() {
+@@ -14766,7 +14766,7 @@ squeeze() {
  
  
        #
@@ -20,7 +11,7 @@ $NetBSD: patch-aa,v 1.16 2010/08/15 11:14:37 drochner Exp $
      #
      if test "$compiler_id" = "GNU_C" ||
        test "$compiler_id" = "CLANG"; then
-@@ -19144,15 +19144,15 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd
+@@ -19176,15 +19176,15 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd
             LIBS="$LIBS $gss_libs"
          elif test "$GSSAPI_ROOT" != "yes"; then
             LDFLAGS="$LDFLAGS -L$GSSAPI_ROOT/lib$libsuff"