- Update to 7.32.0

- Turn COOKIES on by default
- Support STAGEDIR

Note:
- mk-ca-bundle.1 will not be installed. Use http://curl.haxx.se/docs/caextract.html instead

Changes:	http://curl.haxx.se/changes.html
PR:		ports/181510
Exp run by:	drewery

6 files changed, 84 insertions, 72 deletions

diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
index a2e0b769de4c..9b661d5173bc 100644
--- a/ftp/curl/Makefile
+++ b/ftp/curl/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	curl
-PORTVERSION=	7.31.0
-PORTREVISION=	1
+PORTVERSION=	7.32.0
 CATEGORIES=	ftp ipv6 www
 MASTER_SITES=	http://curl.haxx.se/download/ \
 		LOCAL/sunpoet
@@ -20,7 +19,7 @@ OPTIONS_DEFINE=	CA_BUNDLE COOKIES CURL_DEBUG DEBUG DOCS EXAMPLES GSSAPI IDN IPV6
 OPTIONS_RADIO=	RESOLV SSL
 OPTIONS_RADIO_RESOLV=	CARES THREADED_RESOLVER
 OPTIONS_RADIO_SSL=	CYASSL GNUTLS NSS OPENSSL POLARSSL
-OPTIONS_DEFAULT=CA_BUNDLE GSSAPI IPV6 OPENSSL PROXY RESOLV THREADED_RESOLVER SSL TLS_SRP
+OPTIONS_DEFAULT=CA_BUNDLE COOKIES GSSAPI IPV6 OPENSSL PROXY RESOLV THREADED_RESOLVER SSL TLS_SRP
 CA_BUNDLE_DESC=	Install CA bundle for OpenSSL
 COOKIES_DESC=	Cookies support
 CURL_DEBUG_DESC=cURL debug memory tracking
@@ -47,31 +46,10 @@ DOCS=		BINDINGS BUGS CONTRIBUTE DISTRO-DILEMMA FAQ FEATURES HISTORY \
 		MANUAL README.netware README.win32 RESOURCES SSLCERTS THANKS \
 		TODO TheArtOfHttpScripting VERSIONS curl-config.html \
 		curl-config.pdf curl.html curl.pdf index.html
-MAN1=		curl.1 curl-config.1 mk-ca-bundle.1
-MAN3=		curl_easy_cleanup.3 curl_easy_duphandle.3 curl_easy_escape.3 \
-		curl_easy_getinfo.3 curl_easy_init.3 curl_easy_pause.3 \
-		curl_easy_perform.3 curl_easy_recv.3 curl_easy_reset.3 \
-		curl_easy_send.3 curl_easy_setopt.3 curl_easy_strerror.3 \
-		curl_easy_unescape.3 curl_escape.3 curl_formadd.3 \
-		curl_formfree.3 curl_formget.3 curl_free.3 curl_getdate.3 \
-		curl_getenv.3 curl_global_cleanup.3 curl_global_init.3 \
-		curl_global_init_mem.3 curl_mprintf.3 curl_multi_add_handle.3 \
-		curl_multi_assign.3 curl_multi_cleanup.3 curl_multi_fdset.3 \
-		curl_multi_info_read.3 curl_multi_init.3 curl_multi_perform.3 \
-		curl_multi_remove_handle.3 curl_multi_setopt.3 \
-		curl_multi_socket.3 curl_multi_socket_action.3 \
-	 	curl_multi_strerror.3 curl_multi_timeout.3 curl_multi_wait.3 \
-		curl_share_cleanup.3 curl_share_init.3 curl_share_setopt.3 \
-		curl_share_strerror.3 curl_slist_append.3 \
-		curl_slist_free_all.3 curl_strequal.3 curl_unescape.3 \
-		curl_version.3 curl_version_info.3 libcurl.3 libcurl-easy.3 \
-		libcurl-errors.3 libcurl-multi.3 libcurl-share.3 \
-		libcurl-tutorial.3
 .endif
 
 SLAVEDIRS=	ftp/curl-hiphop
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCA_BUNDLE} && !${PORT_OPTIONS:MOPENSSL}
@@ -255,15 +233,15 @@ post-patch:
 
 post-install:
 .if !defined(BUILDING_HIPHOP)
-	${INSTALL_DATA} ${WRKSRC}/docs/libcurl/libcurl.m4 ${PREFIX}/share/aclocal/
+	${INSTALL_DATA} ${WRKSRC}/docs/libcurl/libcurl.m4 ${STAGEDIR}${PREFIX}/share/aclocal/
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}/ ${DOCSDIR}/libcurl/
-	cd ${WRKSRC}/docs/ && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}/
-	cd ${WRKSRC}/docs/libcurl/ && ${INSTALL_DATA} ABI *.html *.pdf *.m4 ${DOCSDIR}/libcurl/
+	${MKDIR} ${DOCSDIR}/ ${STAGEDIR}${DOCSDIR}/libcurl/
+	cd ${WRKSRC}/docs/ && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}/
+	cd ${WRKSRC}/docs/libcurl/ && ${INSTALL_DATA} ABI *.html *.pdf *.m4 ${STAGEDIR}${DOCSDIR}/libcurl/
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
-	${MKDIR} ${EXAMPLESDIR}/
-	cd ${WRKSRC}/docs/examples/ && ${INSTALL_DATA} README Makefile.example makefile* *.c *.cpp ${EXAMPLESDIR}/
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
+	cd ${WRKSRC}/docs/examples/ && ${INSTALL_DATA} README Makefile.example makefile* *.c *.cpp ${STAGEDIR}${EXAMPLESDIR}/
 .endif
 .endif
 
diff --git a/ftp/curl/distinfo b/ftp/curl/distinfo
index 4415daa23d82..d3b5545357b1 100644
--- a/ftp/curl/distinfo
+++ b/ftp/curl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (curl-7.31.0.tar.lzma) = f3ff7ae7f642e7f38b0c51ff3563d6f9f4254f5b05d1bfa8a5386fc91c70f7e4
-SIZE (curl-7.31.0.tar.lzma) = 2172148
+SHA256 (curl-7.32.0.tar.lzma) = 839112cfee3c29bc3d6b269b4092f293473ccaf1b9a2b93442850cd3d8717bfe
+SIZE (curl-7.32.0.tar.lzma) = 2221991
diff --git a/ftp/curl/files/patch-configure b/ftp/curl/files/patch-configure
index 836ffde30adb..97aa3eab854a 100644
--- a/ftp/curl/files/patch-configure
+++ b/ftp/curl/files/patch-configure
@@ -22,7 +22,7 @@ Last-Update: 2010-12-19
        -U*)
          xc_bad_var_cflags=yes
          ;;
-@@ -16912,6 +16913,8 @@
+@@ -16922,6 +16923,8 @@
      tmp_CFLAGS="$CFLAGS"
      tmp_CPPFLAGS="$CPPFLAGS"
  
@@ -31,7 +31,7 @@ Last-Update: 2010-12-19
      ac_var_stripped=""
    for word1 in $tmp_CFLAGS; do
      ac_var_strip_word="no"
-@@ -16942,6 +16945,7 @@
+@@ -16952,6 +16955,7 @@
    done
      tmp_CPPFLAGS="$ac_var_stripped"
    squeeze tmp_CPPFLAGS
@@ -39,7 +39,7 @@ Last-Update: 2010-12-19
  
      #
      if test "$want_debug" = "yes"; then
-@@ -17159,6 +17163,8 @@
+@@ -17169,6 +17173,8 @@
      #
      if test "$honor_optimize_option" = "yes"; then
  
@@ -48,7 +48,7 @@ Last-Update: 2010-12-19
      ac_var_stripped=""
    for word1 in $tmp_CFLAGS; do
      ac_var_strip_word="no"
-@@ -17189,6 +17195,7 @@
+@@ -17199,6 +17205,7 @@
    done
      tmp_CPPFLAGS="$ac_var_stripped"
    squeeze tmp_CPPFLAGS
@@ -56,7 +56,7 @@ Last-Update: 2010-12-19
  
        if test "$want_optimize" = "yes"; then
          { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts optimizer enabling options" >&5
-@@ -21614,7 +21621,8 @@
+@@ -21624,7 +21631,8 @@
          PKGTEST="no"
      PREFIX_OPENSSL=$OPT_SSL
  
@@ -66,7 +66,7 @@ Last-Update: 2010-12-19
      { $as_echo "$as_me:${as_lineno-$LINENO}: PKG_CONFIG_LIBDIR will be set to \"$OPENSSL_PCDIR\"" >&5
  $as_echo "$as_me: PKG_CONFIG_LIBDIR will be set to \"$OPENSSL_PCDIR\"" >&6;}
      if test -f "$OPENSSL_PCDIR/openssl.pc"; then
-@@ -24962,29 +24970,30 @@
+@@ -24972,29 +24980,30 @@
      ;;
    off)
          LIB_RTMP="-lrtmp"
@@ -106,7 +106,7 @@ Last-Update: 2010-12-19
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -39256,9 +39265,10 @@
+@@ -39266,9 +39275,10 @@
    xc_bad_var_cflags=no
    for xc_word in $CFLAGS; do
      case "$xc_word" in
diff --git a/ftp/curl/files/patch-lib-ssluse.c b/ftp/curl/files/patch-lib-ssluse.c
deleted file mode 100644
index 7b6d65772865..000000000000
--- a/ftp/curl/files/patch-lib-ssluse.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- lib/ssluse.c.orig
-+++ lib/ssluse.c
-@@ -2608,13 +2608,19 @@ static ssize_t ossl_recv(struct connectdata *conn, /* connection data */
-       *curlcode = CURLE_AGAIN;
-       return -1;
-     default:
--      /* openssl/ssl.h says "look at error stack/return value/errno" */
-+      /* openssl/ssl.h for SSL_ERROR_SYSCALL says "look at error stack/return
-+         value/errno" */
-+      /* http://www.openssl.org/docs/crypto/ERR_get_error.html */
-       sslerror = ERR_get_error();
--      failf(conn->data, "SSL read: %s, errno %d",
--            ERR_error_string(sslerror, error_buffer),
--            SOCKERRNO);
--      *curlcode = CURLE_RECV_ERROR;
--      return -1;
-+      if((nread < 0) || sslerror) {
-+        /* If the return code was negative or there actually is an error in the
-+           queue */
-+        failf(conn->data, "SSL read: %s, errno %d",
-+              ERR_error_string(sslerror, error_buffer),
-+              SOCKERRNO);
-+        *curlcode = CURLE_RECV_ERROR;
-+        return -1;
-+      }
-     }
-   }
-   return nread;
diff --git a/ftp/curl/files/patch-src-tool_operate.c b/ftp/curl/files/patch-src-tool_operate.c
index 01c92c9beeed..34aca86c5537 100644
--- a/ftp/curl/files/patch-src-tool_operate.c
+++ b/ftp/curl/files/patch-src-tool_operate.c
@@ -1,6 +1,6 @@
---- src/tool_operate.c.orig	2012-07-24 01:59:20.000000000 +0800
-+++ src/tool_operate.c	2012-09-22 20:54:44.439408357 +0800
-@@ -653,22 +653,10 @@
+--- src/tool_operate.c.orig	2013-08-01 04:53:34.000000000 +0800
++++ src/tool_operate.c	2013-08-17 18:25:00.139780776 +0800
+@@ -709,20 +709,7 @@
              DEBUGASSERT(!outs.filename);
            }
  
@@ -19,14 +19,20 @@
 -
 -          if(config->resume_from) {
 +          if(config->resume_from || config->resume_from_current) {
+ #ifdef __VMS
+             /* open file for output, forcing VMS output format into stream
+                mode which is needed for stat() call above to always work. */
+@@ -730,7 +717,8 @@
+                                "ctx=stm", "rfm=stmlf", "rat=cr", "mrs=0");
+ #else
              /* open file for output: */
 -            FILE *file = fopen(outfile, config->resume_from?"ab":"wb");
 +            /* (always open for appending, it has no effect on new files) */
 +            FILE *file = fopen(outfile, "ab");
+ #endif
              if(!file) {
                helpf(config->errors, "Can't open '%s'!\n", outfile);
-               res = CURLE_WRITE_ERROR;
-@@ -676,6 +664,19 @@
+@@ -739,6 +727,19 @@
              }
              outs.fopened = TRUE;
              outs.stream = file;
diff --git a/ftp/curl/pkg-plist b/ftp/curl/pkg-plist
index e32aa696c598..808b2df34ac4 100644
--- a/ftp/curl/pkg-plist
+++ b/ftp/curl/pkg-plist
@@ -16,6 +16,62 @@ lib/libcurl.la
 lib/libcurl.so
 lib/libcurl.so.7
 libdata/pkgconfig/libcurl.pc
+man/man1/curl-config.1.gz
+man/man1/curl.1.gz
+man/man3/curl_easy_cleanup.3.gz
+man/man3/curl_easy_duphandle.3.gz
+man/man3/curl_easy_escape.3.gz
+man/man3/curl_easy_getinfo.3.gz
+man/man3/curl_easy_init.3.gz
+man/man3/curl_easy_pause.3.gz
+man/man3/curl_easy_perform.3.gz
+man/man3/curl_easy_recv.3.gz
+man/man3/curl_easy_reset.3.gz
+man/man3/curl_easy_send.3.gz
+man/man3/curl_easy_setopt.3.gz
+man/man3/curl_easy_strerror.3.gz
+man/man3/curl_easy_unescape.3.gz
+man/man3/curl_escape.3.gz
+man/man3/curl_formadd.3.gz
+man/man3/curl_formfree.3.gz
+man/man3/curl_formget.3.gz
+man/man3/curl_free.3.gz
+man/man3/curl_getdate.3.gz
+man/man3/curl_getenv.3.gz
+man/man3/curl_global_cleanup.3.gz
+man/man3/curl_global_init.3.gz
+man/man3/curl_global_init_mem.3.gz
+man/man3/curl_mprintf.3.gz
+man/man3/curl_multi_add_handle.3.gz
+man/man3/curl_multi_assign.3.gz
+man/man3/curl_multi_cleanup.3.gz
+man/man3/curl_multi_fdset.3.gz
+man/man3/curl_multi_info_read.3.gz
+man/man3/curl_multi_init.3.gz
+man/man3/curl_multi_perform.3.gz
+man/man3/curl_multi_remove_handle.3.gz
+man/man3/curl_multi_setopt.3.gz
+man/man3/curl_multi_socket.3.gz
+man/man3/curl_multi_socket_action.3.gz
+man/man3/curl_multi_strerror.3.gz
+man/man3/curl_multi_timeout.3.gz
+man/man3/curl_multi_wait.3.gz
+man/man3/curl_share_cleanup.3.gz
+man/man3/curl_share_init.3.gz
+man/man3/curl_share_setopt.3.gz
+man/man3/curl_share_strerror.3.gz
+man/man3/curl_slist_append.3.gz
+man/man3/curl_slist_free_all.3.gz
+man/man3/curl_strequal.3.gz
+man/man3/curl_unescape.3.gz
+man/man3/curl_version.3.gz
+man/man3/curl_version_info.3.gz
+man/man3/libcurl-easy.3.gz
+man/man3/libcurl-errors.3.gz
+man/man3/libcurl-multi.3.gz
+man/man3/libcurl-share.3.gz
+man/man3/libcurl-tutorial.3.gz
+man/man3/libcurl.3.gz
 %%PORTDOCS%%%%DOCSDIR%%/BINDINGS
 %%PORTDOCS%%%%DOCSDIR%%/BUGS
 %%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTE