Update ftp/curl to 7.12.0 and bump the shared library version in all

dependent ports.

5 files changed, 36 insertions, 38 deletions

diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
index 6dd00da8d155..d6d5fb7df800 100644
--- a/ftp/curl/Makefile
+++ b/ftp/curl/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	curl
-PORTVERSION=	7.11.1
+PORTVERSION=	7.12.0
 CATEGORIES=	ftp ipv6 www
 MASTER_SITES=	http://curl.haxx.se/download/ \
 		${MASTER_SITE_SOURCEFORGE} \
@@ -21,24 +21,27 @@ COMMENT=	Non-interactive tool to get files from FTP, GOPHER, HTTP(S) servers
 MAN1=		curl.1 curl-config.1
 MAN3=		curl_easy_cleanup.3 curl_easy_duphandle.3 curl_easy_getinfo.3 \
 		curl_easy_init.3 curl_easy_perform.3 curl_easy_setopt.3 \
+		curl_easy_strerror.3 \
 		curl_escape.3 curl_unescape.3 \
-		curl_formadd.3 curl_formparse.3 curl_formfree.3 \
+		curl_formadd.3 curl_formfree.3 \
 		curl_free.3 \
 		curl_getdate.3 curl_getenv.3 \
-		curl_global_init.3 curl_global_cleanup.3 \
+		curl_global_init.3 curl_global_init_mem.3 curl_global_cleanup.3 \
 		curl_mprintf.3 \
 		curl_multi_add_handle.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_strerror.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_strnequal.3 \
+		curl_strequal.3 \
 		curl_version.3 curl_version_info.3 \
 		libcurl.3 libcurl-easy.3 libcurl-errors.3 libcurl-multi.3 \
 		libcurl-share.3
 
 INSTALLS_SHLIB=	yes
-SHLIB_VER=	2
+SHLIB_VER=	3
 
 MAKE_ENV=	SHLIB_VER="${SHLIB_VER}"
 PLIST_SUB=	SHLIB_VER="${SHLIB_VER}"
diff --git a/ftp/curl/distinfo b/ftp/curl/distinfo
index 3f0cb1855263..e3dade86e0a2 100644
--- a/ftp/curl/distinfo
+++ b/ftp/curl/distinfo
@@ -1,2 +1,2 @@
-MD5 (curl-7.11.1.tar.bz2) = c2af7c3364a1a8839516f74961b6bd11
-SIZE (curl-7.11.1.tar.bz2) = 1130097
+MD5 (curl-7.12.0.tar.bz2) = d0a717da32b162149004c936a7a2ba08
+SIZE (curl-7.12.0.tar.bz2) = 1193098
diff --git a/ftp/curl/files/patch-lib::hostip.c b/ftp/curl/files/patch-lib::hostip.c
deleted file mode 100644
index 4c15c91a7222..000000000000
--- a/ftp/curl/files/patch-lib::hostip.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- lib/hostip.c.orig	Fri Apr  9 14:28:07 2004
-+++ lib/hostip.c	Fri Apr  9 14:29:12 2004
-@@ -887,11 +887,11 @@
- 
-   /* now, shrink the allocated buffer to the size we actually need, which
-      most often is only a fraction of the original alloc */
--  newbuf=(char *)realloc(*buf, (long)bufptr-(long)(*buf));
-+  newbuf=(char *)realloc(*buf, (long)(bufptr-*buf));
- 
-   /* if the alloc moved, we need to adjust things again */
-   if(newbuf != *buf)
--    hostcache_fixoffset((struct hostent*)newbuf, (long)newbuf-(long)*buf);
-+    hostcache_fixoffset((struct hostent*)newbuf, (long)(newbuf-*buf));
- 
-   /* setup the return */
-   *buf = newbuf;
diff --git a/ftp/curl/files/patch-lib::url.c b/ftp/curl/files/patch-lib::url.c
index af8f7e7cbf36..bc19abd1e208 100644
--- a/ftp/curl/files/patch-lib::url.c
+++ b/ftp/curl/files/patch-lib::url.c
@@ -1,13 +1,13 @@
---- lib/url.c.old	Wed Nov 27 17:22:24 2002
-+++ lib/url.c	Wed Nov 27 17:23:29 2002
-@@ -288,6 +288,10 @@
-   
-   data->set.proxytype = CURLPROXY_HTTP; /* defaults to HTTP proxy */
+--- lib/url.c.orig	Wed Jun  2 14:45:18 2004
++++ lib/url.c	Wed Jun  2 14:45:40 2004
+@@ -329,6 +329,10 @@
+     data->set.httpauth = CURLAUTH_BASIC;  /* defaults to basic */
+     data->set.proxyauth = CURLAUTH_BASIC; /* defaults to basic */
  
 +#if defined(__FreeBSD_version)
-+  data->set.no_signal = TRUE; /* different handling of signals and threads */
++    data->set.no_signal = TRUE; /* different handling of signals and threads */
 +#endif /* __FreeBSD_version */
 +
-   /* create an array with connection data struct pointers */
-   data->state.numconnects = 5; /* hard-coded right now */
-   data->state.connects = (struct connectdata **)
+     /* create an array with connection data struct pointers */
+     data->state.numconnects = 5; /* hard-coded right now */
+     data->state.connects = (struct connectdata **)
diff --git a/ftp/curl/pkg-plist b/ftp/curl/pkg-plist
index 76d2bc8761ef..55c96719b4d5 100644
--- a/ftp/curl/pkg-plist
+++ b/ftp/curl/pkg-plist
@@ -1,6 +1,7 @@
 bin/curl
 bin/curl-config
 include/curl/curl.h
+include/curl/curlver.h
 include/curl/easy.h
 include/curl/mprintf.h
 include/curl/multi.h
@@ -21,6 +22,7 @@ lib/libcurl.so.%%SHLIB_VER%%
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/INTERNALS
 %%PORTDOCS%%%%DOCSDIR%%/KNOWN_BUGS
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE-MIXING
 %%PORTDOCS%%%%DOCSDIR%%/MANUAL
 %%PORTDOCS%%%%DOCSDIR%%/Makefile
 %%PORTDOCS%%%%DOCSDIR%%/Makefile.am
@@ -45,6 +47,7 @@ lib/libcurl.so.%%SHLIB_VER%%
 %%PORTDOCS%%%%DOCSDIR%%/examples/README
 %%PORTDOCS%%%%DOCSDIR%%/examples/curlgtk.c
 %%PORTDOCS%%%%DOCSDIR%%/examples/curlx.c
+%%PORTDOCS%%%%DOCSDIR%%/examples/fileupload.c
 %%PORTDOCS%%%%DOCSDIR%%/examples/fopen.c
 %%PORTDOCS%%%%DOCSDIR%%/examples/ftpget.c
 %%PORTDOCS%%%%DOCSDIR%%/examples/ftpgetresp.c
@@ -52,8 +55,10 @@ lib/libcurl.so.%%SHLIB_VER%%
 %%PORTDOCS%%%%DOCSDIR%%/examples/getinmemory.c
 %%PORTDOCS%%%%DOCSDIR%%/examples/http-post.c
 %%PORTDOCS%%%%DOCSDIR%%/examples/httpput.c
+%%PORTDOCS%%%%DOCSDIR%%/examples/https.c
 %%PORTDOCS%%%%DOCSDIR%%/examples/makefile.dj
 %%PORTDOCS%%%%DOCSDIR%%/examples/multi-app.c
+%%PORTDOCS%%%%DOCSDIR%%/examples/multi-debugcallback.c
 %%PORTDOCS%%%%DOCSDIR%%/examples/multi-double.c
 %%PORTDOCS%%%%DOCSDIR%%/examples/multi-post.c
 %%PORTDOCS%%%%DOCSDIR%%/examples/multi-single.c
@@ -88,6 +93,9 @@ lib/libcurl.so.%%SHLIB_VER%%
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_setopt.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_setopt.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_setopt.pdf
+%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_strerror.3
+%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_strerror.html
+%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_strerror.pdf
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_escape.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_escape.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_escape.pdf
@@ -97,9 +105,6 @@ lib/libcurl.so.%%SHLIB_VER%%
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formfree.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formfree.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formfree.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formparse.3
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formparse.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formparse.pdf
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_free.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_free.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_free.pdf
@@ -115,6 +120,9 @@ lib/libcurl.so.%%SHLIB_VER%%
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_init.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_init.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_init.pdf
+%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_init_mem.3
+%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_init_mem.html
+%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_init_mem.pdf
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_mprintf.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_mprintf.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_mprintf.pdf
@@ -139,6 +147,9 @@ lib/libcurl.so.%%SHLIB_VER%%
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_remove_handle.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_remove_handle.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_remove_handle.pdf
+%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_strerror.3
+%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_strerror.html
+%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_strerror.pdf
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_cleanup.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_cleanup.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_cleanup.pdf
@@ -148,6 +159,9 @@ lib/libcurl.so.%%SHLIB_VER%%
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_setopt.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_setopt.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_setopt.pdf
+%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_strerror.3
+%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_strerror.html
+%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_strerror.pdf
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_slist_append.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_slist_append.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_slist_append.pdf
@@ -157,9 +171,6 @@ lib/libcurl.so.%%SHLIB_VER%%
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_strequal.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_strequal.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_strequal.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_strnequal.3
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_strnequal.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_strnequal.pdf
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_unescape.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_unescape.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_unescape.pdf