10 files changed, 40 insertions, 18 deletions

diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
index a0434af31c0c..f6ef67a98ae4 100644
--- a/ftp/curl/Makefile
+++ b/ftp/curl/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	curl
-PORTVERSION=	7.19.6
-PORTREVISION=	1
+PORTVERSION=	7.19.7
 CATEGORIES=	ftp ipv6 www
 MASTER_SITES=	http://curl.haxx.se/download/ \
 		ftp://ftp.sunet.se/pub/www/utilities/curl/ \
diff --git a/ftp/curl/distinfo b/ftp/curl/distinfo
index 9a2fb98ff243..38ff35770ba6 100644
--- a/ftp/curl/distinfo
+++ b/ftp/curl/distinfo
@@ -1,3 +1,3 @@
-MD5 (curl-7.19.6.tar.bz2) = 8402c1f654c51ad7287aad57c3aa79be
-SHA256 (curl-7.19.6.tar.bz2) = ea88f48c8415f7d3af482e4d241277b2bdbfaffaf285e8001c88c1376cbc1021
-SIZE (curl-7.19.6.tar.bz2) = 2347791
+MD5 (curl-7.19.7.tar.bz2) = 79a8fbb2eed5464b97bdf94bee109380
+SHA256 (curl-7.19.7.tar.bz2) = 1a15f94ae3401e3bd6208ce64155c2577815019824bceae7fd3221a12bc54a70
+SIZE (curl-7.19.7.tar.bz2) = 2355121
diff --git a/ftp/curl/files/patch-Makefile.in b/ftp/curl/files/patch-Makefile.in
index 76ab06ec1583..28e490bcdf22 100644
--- a/ftp/curl/files/patch-Makefile.in
+++ b/ftp/curl/files/patch-Makefile.in
@@ -1,4 +1,7 @@
-Build and install the documentation as usual, no special handling.
+Description: Build and install the documentation as usual, no special handling.
+Forwarded: https://sourceforge.net/tracker/?func=detail&aid=2897155&group_id=976&atid=100976
+Author: Peter Pentchev <roam@FreeBSD.org>
+Last-Update: 2009-11-13
 
 --- a/Makefile.in
 +++ b/Makefile.in
diff --git a/ftp/curl/files/patch-lib::url.c b/ftp/curl/files/patch-lib::url.c
index 510409e91fc2..163c12514c11 100644
--- a/ftp/curl/files/patch-lib::url.c
+++ b/ftp/curl/files/patch-lib::url.c
@@ -1,8 +1,11 @@
-Different handling of signals and threads.
+Description: Different handling of signals and threads.
+Forwarded: not-needed
+Author: Peter Pentchev <roam@FreeBSD.org>
+Last-Update: 2009-11-13
 
 --- a/lib/url.c
 +++ b/lib/url.c
-@@ -792,6 +792,10 @@
+@@ -802,6 +802,10 @@
      data->progress.flags |= PGRS_HIDE;
      data->state.current_speed = -1; /* init to negative == impossible */
  
diff --git a/ftp/curl/files/patch-src::main.c b/ftp/curl/files/patch-src::main.c
index 4ef4937d0211..28f8ba38cbef 100644
--- a/ftp/curl/files/patch-src::main.c
+++ b/ftp/curl/files/patch-src::main.c
@@ -1,10 +1,13 @@
-Use fstat() instead of stat() to avoid a race condition.
+Description: Use fstat() instead of stat() to avoid a race condition.
+Forwarded: not-needed
+Author: Peter Pentchev <roam@FreeBSD.org>
+Last-Update: 2009-11-13
 
 --- a/src/main.c
 +++ b/src/main.c
-@@ -4384,33 +4384,34 @@
- 	    break;
- 	  }
+@@ -4441,33 +4441,34 @@
+             break;
+           }
  
 -          if(config->resume_from_current) {
 -            /* We're told to continue from where we are now. Get the
@@ -33,8 +36,8 @@ Use fstat() instead of stat() to avoid a race condition.
              if (!outs.stream) {
                helpf(config->errors, "Can't open '%s'!\n", outfile);
                free(url);
- 	      res = CURLE_WRITE_ERROR;
- 	      break;
+               res = CURLE_WRITE_ERROR;
+               break;
              }
 +
 +	    if(config->resume_from_current) {
diff --git a/ftp/curl/files/patch-tests::libtest::lib505.c b/ftp/curl/files/patch-tests::libtest::lib505.c
index a4bbdd72edee..693988536f01 100644
--- a/ftp/curl/files/patch-tests::libtest::lib505.c
+++ b/ftp/curl/files/patch-tests::libtest::lib505.c
@@ -1,4 +1,7 @@
-Use fstat() instead of stat() to avoid a race condition.
+Description: Use fstat() instead of stat() to avoid a race condition.
+Forwarded: not-needed
+Author: Peter Pentchev <roam@FreeBSD.org>
+Last-Update: 2009-11-13
 
 --- a/tests/libtest/lib505.c
 +++ b/tests/libtest/lib505.c
diff --git a/ftp/curl/files/patch-tests::libtest::lib541.c b/ftp/curl/files/patch-tests::libtest::lib541.c
index a6157d08da8a..036251f1abd6 100644
--- a/ftp/curl/files/patch-tests::libtest::lib541.c
+++ b/ftp/curl/files/patch-tests::libtest::lib541.c
@@ -1,4 +1,7 @@
-Use fstat() instead of stat() to avoid a race condition.
+Description: Use fstat() instead of stat() to avoid a race condition.
+Forwarded: not-needed
+Author: Peter Pentchev <roam@FreeBSD.org>
+Last-Update: 2009-11-13
 
 --- a/tests/libtest/lib541.c
 +++ b/tests/libtest/lib541.c
diff --git a/ftp/curl/files/patch-tests::runtests.pl b/ftp/curl/files/patch-tests::runtests.pl
index 5dd94891cb9a..091c225ff81b 100644
--- a/ftp/curl/files/patch-tests::runtests.pl
+++ b/ftp/curl/files/patch-tests::runtests.pl
@@ -1,4 +1,7 @@
-Do not use valgrind.
+Description: Do not use valgrind.
+Forwarded: not-needed
+Author: Peter Pentchev <roam@FreeBSD.org>
+Last-Update: 2009-11-13
 
 --- a/tests/runtests.pl
 +++ b/tests/runtests.pl
diff --git a/ftp/curl/files/patch-tests::server::getpart.c b/ftp/curl/files/patch-tests::server::getpart.c
index 1fbb297bb789..383ae6505941 100644
--- a/ftp/curl/files/patch-tests::server::getpart.c
+++ b/ftp/curl/files/patch-tests::server::getpart.c
@@ -1,4 +1,7 @@
-Properly allocate a buffer as large as needed.
+Description: Properly allocate a buffer as large as needed.
+Forwarded: https://sourceforge.net/tracker/?func=detail&aid=2897159&group_id=976&atid=100976
+Author: Peter Pentchev <roam@FreeBSD.org>
+Last-Update: 2009-11-13
 
 --- a/tests/server/getpart.c
 +++ b/tests/server/getpart.c
diff --git a/ftp/curl/pkg-plist b/ftp/curl/pkg-plist
index 461ead9bb637..becd90eb80d1 100644
--- a/ftp/curl/pkg-plist
+++ b/ftp/curl/pkg-plist
@@ -159,6 +159,7 @@ libdata/pkgconfig/libcurl.pc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/anyauthput.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cacertinmem.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/certinfo.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/chkspeed.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cookie_interface.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/curlgtk.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/curlx.c
@@ -167,6 +168,7 @@ libdata/pkgconfig/libcurl.pc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/fileupload.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/fopen.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpget.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpgetinfo.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpgetresp.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpupload.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpuploadresume.c