Update to curl-7.20.1 and specify the MIT license.

7 files changed, 18 insertions, 16 deletions

diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
index 859f7bbddd92..9edc90b6348b 100644
--- a/ftp/curl/Makefile
+++ b/ftp/curl/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	curl
-PORTVERSION=	7.20.0
+PORTVERSION=	7.20.1
 CATEGORIES=	ftp ipv6 www
 MASTER_SITES=	http://curl.haxx.se/download/ \
 		ftp://ftp.sunet.se/pub/www/utilities/curl/ \
@@ -19,6 +19,8 @@ COMMENT=	Non-interactive tool to get files from FTP, GOPHER, HTTP(S) servers
 
 RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
 
+LICENSE=	MIT
+
 PATCH_STRIP=	-p1
 
 MAN1=		curl.1 curl-config.1
diff --git a/ftp/curl/distinfo b/ftp/curl/distinfo
index 737823704d43..b697b7d29e60 100644
--- a/ftp/curl/distinfo
+++ b/ftp/curl/distinfo
@@ -1,3 +1,3 @@
-MD5 (curl-7.20.0.tar.bz2) = 3dda78c4a808d9a779dc3a2ae81b47d8
-SHA256 (curl-7.20.0.tar.bz2) = eb516915da615d8f6b2b855004d5d4b19c468f080e3736d7a73c5599b9acab11
-SIZE (curl-7.20.0.tar.bz2) = 2088522
+MD5 (curl-7.20.1.tar.bz2) = 244b16b2a38c70e47130c8494b7371b9
+SHA256 (curl-7.20.1.tar.bz2) = 70664da8e2a8c84327abd10ed30d5a3fc9fa2151def9ee5b75f27e3538554e56
+SIZE (curl-7.20.1.tar.bz2) = 2097637
diff --git a/ftp/curl/files/patch-Makefile.in b/ftp/curl/files/patch-Makefile.in
index 96f80d9ba281..034a19f3d018 100644
--- a/ftp/curl/files/patch-Makefile.in
+++ b/ftp/curl/files/patch-Makefile.in
@@ -1,11 +1,11 @@
 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: 2010-03-30
+Last-Update: 2010-06-11
 
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -302,9 +302,9 @@
+@@ -301,9 +301,9 @@
   libcurl.pc.in vc6curl.dsw MacOSX-Framework Android.mk $(CMAKE_DIST)
  
  bin_SCRIPTS = curl-config
diff --git a/ftp/curl/files/patch-src::main.c b/ftp/curl/files/patch-src::main.c
index 7f46da604571..fd2dd6fe35d5 100644
--- a/ftp/curl/files/patch-src::main.c
+++ b/ftp/curl/files/patch-src::main.c
@@ -1,11 +1,11 @@
 Description: Use fstat() instead of stat() to avoid a race condition.
 Forwarded: not-needed
 Author: Peter Pentchev <roam@FreeBSD.org>
-Last-Update: 2010-03-30
+Last-Update: 2010-06-11
 
 --- a/src/main.c
 +++ b/src/main.c
-@@ -4596,33 +4596,34 @@
+@@ -4658,33 +4658,34 @@
              break;
            }
  
diff --git a/ftp/curl/files/patch-tests::libtest::lib505.c b/ftp/curl/files/patch-tests::libtest::lib505.c
index 275974c02952..f5d8c0e7bc57 100644
--- a/ftp/curl/files/patch-tests::libtest::lib505.c
+++ b/ftp/curl/files/patch-tests::libtest::lib505.c
@@ -1,11 +1,11 @@
 Description: Use fstat() instead of stat() to avoid a race condition.
 Forwarded: not-needed
 Author: Peter Pentchev <roam@FreeBSD.org>
-Last-Update: 2010-03-30
+Last-Update: 2010-06-11
 
 --- a/tests/libtest/lib505.c
 +++ b/tests/libtest/lib505.c
-@@ -55,12 +55,24 @@
+@@ -54,12 +54,24 @@
      return -1;
    }
  
@@ -32,7 +32,7 @@ Last-Update: 2010-03-30
              error, strerror(error));
      fprintf(stderr, "WARNING: cannot open file %s\n", libtest_arg2);
      return -1;
-@@ -71,18 +83,6 @@
+@@ -70,18 +82,6 @@
      return -4;
    }
  
diff --git a/ftp/curl/files/patch-tests::libtest::lib541.c b/ftp/curl/files/patch-tests::libtest::lib541.c
index 1680725a9421..98d1f3f47b60 100644
--- a/ftp/curl/files/patch-tests::libtest::lib541.c
+++ b/ftp/curl/files/patch-tests::libtest::lib541.c
@@ -1,11 +1,11 @@
 Description: Use fstat() instead of stat() to avoid a race condition.
 Forwarded: not-needed
 Author: Peter Pentchev <roam@FreeBSD.org>
-Last-Update: 2010-03-30
+Last-Update: 2010-06-11
 
 --- a/tests/libtest/lib541.c
 +++ b/tests/libtest/lib541.c
-@@ -47,12 +47,24 @@
+@@ -46,12 +46,24 @@
      return -1;
    }
  
@@ -32,7 +32,7 @@ Last-Update: 2010-03-30
              error, strerror(error));
      fprintf(stderr, "WARNING: cannot open file %s\n", libtest_arg2);
      return -1;
-@@ -63,18 +75,6 @@
+@@ -62,18 +74,6 @@
      return -4;
    }
  
diff --git a/ftp/curl/files/patch-tests::runtests.pl b/ftp/curl/files/patch-tests::runtests.pl
index 6a7727b7f007..bedee759ea0f 100644
--- a/ftp/curl/files/patch-tests::runtests.pl
+++ b/ftp/curl/files/patch-tests::runtests.pl
@@ -1,11 +1,11 @@
 Description: Do not use valgrind.
 Forwarded: not-needed
 Author: Peter Pentchev <roam@FreeBSD.org>
-Last-Update: 2010-03-30
+Last-Update: 2010-06-11
 
 --- a/tests/runtests.pl
 +++ b/tests/runtests.pl
-@@ -105,7 +105,7 @@
+@@ -104,7 +104,7 @@
      );
  
  require "getpart.pm"; # array functions