16 files changed, 159 insertions, 19 deletions

diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
index 755b5f772c9c..732bea073e60 100644
--- a/ftp/curl/Makefile
+++ b/ftp/curl/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	curl
-PORTVERSION=	7.15.5
-PORTREVISION=	1
+PORTVERSION=	7.16.0
 CATEGORIES=	ftp ipv6 www
 MASTER_SITES=	http://curl.haxx.se/download/ \
 		${MASTER_SITE_SOURCEFORGE} \
@@ -40,7 +39,7 @@ MAN3=		curl_easy_cleanup.3 curl_easy_duphandle.3 \
 		libcurl-multi.3 libcurl-share.3 libcurl-tutorial.3
 
 USE_LDCONFIG=	yes
-SHLIB_VER=	3
+SHLIB_VER=	4
 
 MAKE_ENV=	SHLIB_VER="${SHLIB_VER}"
 PLIST_SUB=	SHLIB_VER="${SHLIB_VER}"
diff --git a/ftp/curl/distinfo b/ftp/curl/distinfo
index 56de83f19740..b21da0362fc7 100644
--- a/ftp/curl/distinfo
+++ b/ftp/curl/distinfo
@@ -1,3 +1,3 @@
-MD5 (curl-7.15.5.tar.bz2) = 594142c7d53bbdd988e8cef6354eeeff
-SHA256 (curl-7.15.5.tar.bz2) = 2980815e53f4caeafc5e35d183d9379bcaaec49f759be1a4ac628cfb6c392fe0
-SIZE (curl-7.15.5.tar.bz2) = 1543007
+MD5 (curl-7.16.0.tar.bz2) = 5819f56e93d04cde2992fe88b54cbfad
+SHA256 (curl-7.16.0.tar.bz2) = fc8dcda5a933c370c15c832bf1e7316a0690f473fdd6000454d233edaa33bc23
+SIZE (curl-7.16.0.tar.bz2) = 1566391
diff --git a/ftp/curl/files/patch-lib::url.c b/ftp/curl/files/patch-lib::url.c
index bc19abd1e208..6adc665de34d 100644
--- a/ftp/curl/files/patch-lib::url.c
+++ b/ftp/curl/files/patch-lib::url.c
@@ -1,6 +1,6 @@
---- 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 @@
+--- lib/url.c.orig	Mon Oct 30 00:46:27 2006
++++ lib/url.c	Fri Dec  1 14:04:02 2006
+@@ -542,6 +542,10 @@
      data->set.httpauth = CURLAUTH_BASIC;  /* defaults to basic */
      data->set.proxyauth = CURLAUTH_BASIC; /* defaults to basic */
  
@@ -8,6 +8,6 @@
 +    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 **)
+     /* This no longer creates a connection cache here. It is instead made on
+        the first call to curl_easy_perform() or when the handle is added to a
+        multi stack. */
diff --git a/ftp/curl/pkg-plist b/ftp/curl/pkg-plist
index f95009ea9ffb..50e773f665ba 100644
--- a/ftp/curl/pkg-plist
+++ b/ftp/curl/pkg-plist
@@ -45,6 +45,7 @@ libdata/pkgconfig/libcurl.pc
 %%PORTDOCS%%%%DOCSDIR%%/curl.1
 %%PORTDOCS%%%%DOCSDIR%%/curl.html
 %%PORTDOCS%%%%DOCSDIR%%/curl.pdf
+%%PORTDOCS%%%%DOCSDIR%%/examples/10-at-a-time.c
 %%PORTDOCS%%%%DOCSDIR%%/examples/Makefile
 %%PORTDOCS%%%%DOCSDIR%%/examples/Makefile.am
 %%PORTDOCS%%%%DOCSDIR%%/examples/Makefile.example
@@ -65,6 +66,8 @@ libdata/pkgconfig/libcurl.pc
 %%PORTDOCS%%%%DOCSDIR%%/examples/ftpuploadresume.c
 %%PORTDOCS%%%%DOCSDIR%%/examples/getinfo.c
 %%PORTDOCS%%%%DOCSDIR%%/examples/getinmemory.c
+%%PORTDOCS%%%%DOCSDIR%%/examples/ghiper.c
+%%PORTDOCS%%%%DOCSDIR%%/examples/hiperfifo.c
 %%PORTDOCS%%%%DOCSDIR%%/examples/htmltidy.c
 %%PORTDOCS%%%%DOCSDIR%%/examples/htmltitle.cc
 %%PORTDOCS%%%%DOCSDIR%%/examples/http-post.c
diff --git a/ftp/curlpp/Makefile b/ftp/curlpp/Makefile
index c4a75ca8c9b9..452f2dad462d 100644
--- a/ftp/curlpp/Makefile
+++ b/ftp/curlpp/Makefile
@@ -8,13 +8,14 @@
 
 PORTNAME=	curlpp
 PORTVERSION=	0.6.1
+PORTREVISION=	1
 CATEGORIES=	ftp
 MASTER_SITES=	http://rrette.com/downloads/sources/
 
 MAINTAINER=	roam@FreeBSD.org
 COMMENT=	A C++ wrapper for libcurl
 
-LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	curl.4:${PORTSDIR}/ftp/curl
 
 USE_GCC=	3.4
 GNU_CONFIGURE=	yes
diff --git a/ftp/ocaml-ocurl/Makefile b/ftp/ocaml-ocurl/Makefile
index 1f807c2742d1..1b4ef808797c 100644
--- a/ftp/ocaml-ocurl/Makefile
+++ b/ftp/ocaml-ocurl/Makefile
@@ -5,6 +5,7 @@
 
 PORTNAME=	ocurl
 PORTVERSION=	0.2.1
+PORTREVISION=	1
 CATEGORIES=	ftp
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,7 +18,7 @@ BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml \
 		ocamlfind:${PORTSDIR}/devel/ocaml-findlib
 RUN_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml \
 		ocamlfind:${PORTSDIR}/devel/ocaml-findlib
-LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	curl.4:${PORTSDIR}/ftp/curl
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/ftp/php4-curl/Makefile b/ftp/php4-curl/Makefile
index d41004f301e6..376245d6adad 100644
--- a/ftp/php4-curl/Makefile
+++ b/ftp/php4-curl/Makefile
@@ -11,4 +11,6 @@ MASTERDIR=	${.CURDIR}/../../lang/php4
 
 PKGNAMESUFFIX=	-curl
 
+PORTREVISION=	2
+
 .include "${MASTERDIR}/Makefile"
diff --git a/ftp/php4-curl/files/patch-curl.c b/ftp/php4-curl/files/patch-curl.c
new file mode 100644
index 000000000000..1c703f38578c
--- /dev/null
+++ b/ftp/php4-curl/files/patch-curl.c
@@ -0,0 +1,22 @@
+--- curl.c.orig	Wed Dec  6 11:12:37 2006
++++ curl.c	Wed Dec  6 11:13:27 2006
+@@ -258,7 +258,9 @@
+ 	REGISTER_CURL_CONSTANT(CURLOPT_FTPAPPEND);
+ 	REGISTER_CURL_CONSTANT(CURLOPT_NETRC);
+ 	REGISTER_CURL_CONSTANT(CURLOPT_FOLLOWLOCATION);
++#if CURLOPT_FTPASCII != 0
+ 	REGISTER_CURL_CONSTANT(CURLOPT_FTPASCII);
++#endif
+ 	REGISTER_CURL_CONSTANT(CURLOPT_PUT);
+ #if CURLOPT_MUTE != 0
+ 	REGISTER_CURL_CONSTANT(CURLOPT_MUTE);
+@@ -296,7 +298,9 @@
+ 	REGISTER_CURL_CONSTANT(CURLOPT_FILETIME);
+ 	REGISTER_CURL_CONSTANT(CURLOPT_WRITEFUNCTION);
+ 	REGISTER_CURL_CONSTANT(CURLOPT_READFUNCTION);
++#if CURLOPT_PASSWDFUNCTION != 0
+ 	REGISTER_CURL_CONSTANT(CURLOPT_PASSWDFUNCTION);
++#endif
+ 	REGISTER_CURL_CONSTANT(CURLOPT_HEADERFUNCTION);
+ 	REGISTER_CURL_CONSTANT(CURLOPT_MAXREDIRS);
+ 	REGISTER_CURL_CONSTANT(CURLOPT_MAXCONNECTS);
diff --git a/ftp/php5-curl/Makefile b/ftp/php5-curl/Makefile
index d9da384a99f0..08eed1c64df6 100644
--- a/ftp/php5-curl/Makefile
+++ b/ftp/php5-curl/Makefile
@@ -11,4 +11,6 @@ MASTERDIR=	${.CURDIR}/../../lang/php5
 
 PKGNAMESUFFIX=	-curl
 
+PORTREVISION=	1
+
 .include "${MASTERDIR}/Makefile"
diff --git a/ftp/php5-curl/files/patch-interface.c b/ftp/php5-curl/files/patch-interface.c
new file mode 100644
index 000000000000..e645cd481d30
--- /dev/null
+++ b/ftp/php5-curl/files/patch-interface.c
@@ -0,0 +1,48 @@
+--- interface.c.orig	Tue Dec  5 16:50:11 2006
++++ interface.c	Tue Dec  5 16:50:25 2006
+@@ -369,7 +369,9 @@
+ 	REGISTER_CURL_CONSTANT(CURLOPT_FTPAPPEND);
+ 	REGISTER_CURL_CONSTANT(CURLOPT_NETRC);
+ 	REGISTER_CURL_CONSTANT(CURLOPT_FOLLOWLOCATION);
++#if CURLOPT_FTPASCII != 0
+ 	REGISTER_CURL_CONSTANT(CURLOPT_FTPASCII);
++#endif
+ 	REGISTER_CURL_CONSTANT(CURLOPT_PUT);
+ #if CURLOPT_MUTE != 0
+ 	REGISTER_CURL_CONSTANT(CURLOPT_MUTE);
+@@ -409,7 +411,9 @@
+ 	REGISTER_CURL_CONSTANT(CURLOPT_FILETIME);
+ 	REGISTER_CURL_CONSTANT(CURLOPT_WRITEFUNCTION);
+ 	REGISTER_CURL_CONSTANT(CURLOPT_READFUNCTION);
++#if CURLOPT_PASSWDFUNCTION != 0
+ 	REGISTER_CURL_CONSTANT(CURLOPT_PASSWDFUNCTION);
++#endif
+ 	REGISTER_CURL_CONSTANT(CURLOPT_HEADERFUNCTION);
+ 	REGISTER_CURL_CONSTANT(CURLOPT_MAXREDIRS);
+ 	REGISTER_CURL_CONSTANT(CURLOPT_MAXCONNECTS);
+@@ -1158,11 +1162,13 @@
+ 	dupch->handlers->read->fp = ch->handlers->read->fp;
+ 	dupch->handlers->read->fd = ch->handlers->read->fd;
+ 
++#if CURLOPT_PASSWDFUNCTION != 0
+ 	if (ch->handlers->passwd) {
+ 		zval_add_ref(&ch->handlers->passwd);
+ 		dupch->handlers->passwd = ch->handlers->passwd;
+ 		curl_easy_setopt(ch->cp, CURLOPT_PASSWDDATA, (void *) dupch);
+ 	}
++#endif
+ 	if (ch->handlers->write->func_name) {
+ 		zval_add_ref(&ch->handlers->write->func_name);
+ 		dupch->handlers->write->func_name = ch->handlers->write->func_name;
+@@ -1915,9 +1921,11 @@
+ 	if (ch->handlers->write_header->func_name) {
+ 		zval_ptr_dtor(&ch->handlers->write_header->func_name);
+ 	}
++#if CURLOPT_PASSWDFUNCTION != 0
+ 	if (ch->handlers->passwd) {
+ 		zval_ptr_dtor(&ch->handlers->passwd);
+ 	}
++#endif
+ 	if (ch->header.str_len > 0) {
+ 		efree(ch->header.str);
+ 	}
diff --git a/ftp/py-curl/Makefile b/ftp/py-curl/Makefile
index f97278324870..300735971501 100644
--- a/ftp/py-curl/Makefile
+++ b/ftp/py-curl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	curl
 PORTVERSION=	7.15.2
+PORTREVISION=	1
 CATEGORIES=	ftp python
 MASTER_SITES=	http://pycurl.sourceforge.net/download/ \
 		http://pycurl.sourceforge.net/download/00-OLD-VERSIONS/
@@ -16,7 +17,7 @@ DISTNAME=	py${PORTNAME}-${PORTVERSION}
 MAINTAINER=	perky@FreeBSD.org
 COMMENT=	Python interface to libcurl
 
-LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	curl.4:${PORTSDIR}/ftp/curl
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
diff --git a/ftp/py-curl/files/patch-src-pycurl.c b/ftp/py-curl/files/patch-src-pycurl.c
new file mode 100644
index 000000000000..c358c6df71e9
--- /dev/null
+++ b/ftp/py-curl/files/patch-src-pycurl.c
@@ -0,0 +1,48 @@
+--- src/pycurl.c.orig	Tue Dec  5 17:11:38 2006
++++ src/pycurl.c	Tue Dec  5 17:13:03 2006
+@@ -1109,9 +1109,11 @@
+         case CURLOPT_URL:
+         case CURLOPT_USERAGENT:
+         case CURLOPT_USERPWD:
++#if LIBCURL_VERSION_NUM < 0x071000
+         case CURLOPT_SOURCE_HOST:
+         case CURLOPT_SOURCE_USERPWD:
+         case CURLOPT_SOURCE_PATH:
++#endif
+ /* FIXME: check if more of these options allow binary data */
+             str = PyString_AsString_NoNUL(obj);
+             if (str == NULL)
+@@ -1279,12 +1281,14 @@
+         case CURLOPT_PREQUOTE:
+             old_slist = &self->prequote;
+             break;
++#if LIBCURL_VERSION_NUM < 0x071000
+         case CURLOPT_SOURCE_PREQUOTE:
+             old_slist = &self->source_prequote;
+             break;
+         case CURLOPT_SOURCE_POSTQUOTE:
+             old_slist = &self->source_postquote;
+             break;
++#endif
+         case CURLOPT_HTTPPOST:
+             break;
+         default:
+@@ -2689,14 +2693,18 @@
+     insint_c(d, "FTP_SSL", CURLOPT_FTP_SSL);
+     insint_c(d, "POSTFIELDSIZE_LARGE", CURLOPT_POSTFIELDSIZE_LARGE);
+     insint_c(d, "TCP_NODELAY", CURLOPT_TCP_NODELAY);
++#if LIBCURL_VERSION_NUM < 0x071000
+     insint_c(d, "SOURCE_USERPWD", CURLOPT_SOURCE_USERPWD);
+     insint_c(d, "SOURCE_PREQUOTE", CURLOPT_SOURCE_PREQUOTE);
+     insint_c(d, "SOURCE_POSTQUOTE", CURLOPT_SOURCE_POSTQUOTE);
++#endif
+     insint_c(d, "FTPSSLAUTH", CURLOPT_FTPSSLAUTH);
+     insint_c(d, "IOCTLFUNCTION", CURLOPT_IOCTLFUNCTION);
+     insint_c(d, "IOCTLDATA", CURLOPT_IOCTLDATA);
++#if LIBCURL_VERSION_NUM < 0x071000
+     insint_c(d, "SOURCE_URL", CURLOPT_SOURCE_URL);
+     insint_c(d, "SOURCE_QUOTE", CURLOPT_SOURCE_QUOTE);
++#endif
+     insint_c(d, "FTP_ACCOUNT", CURLOPT_FTP_ACCOUNT);
+     insint_c(d, "IGNORE_CONTENT_LENGTH", CURLOPT_IGNORE_CONTENT_LENGTH);
+     insint_c(d, "COOKIELIST", CURLOPT_COOKIELIST);
diff --git a/ftp/rexx-curl/Makefile b/ftp/rexx-curl/Makefile
index 1853ca513eb0..88ec3bfda3a6 100644
--- a/ftp/rexx-curl/Makefile
+++ b/ftp/rexx-curl/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	curl
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	ftp
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	rexx${PORTNAME}
@@ -18,7 +19,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	External function package providing an interface to the cURL package
 
 BUILD_DEPENDS=	rexx:${PORTSDIR}/lang/rexx-regina
-LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	curl.4:${PORTSDIR}/ftp/curl
 RUN_DEPENDS=	rexx:${PORTSDIR}/lang/rexx-regina
 
 USE_GMAKE=	yes
diff --git a/ftp/rexx-curl/files/patch-rexxcurl.c b/ftp/rexx-curl/files/patch-rexxcurl.c
new file mode 100644
index 000000000000..b2832bbbe4b6
--- /dev/null
+++ b/ftp/rexx-curl/files/patch-rexxcurl.c
@@ -0,0 +1,11 @@
+--- rexxcurl.c.orig	Tue Dec  5 16:30:55 2006
++++ rexxcurl.c	Tue Dec  5 16:31:14 2006
+@@ -323,7 +323,7 @@
+    { "RANGE"           ,CURLOPT_RANGE           ,RXCURLOPT_STRING      },
+    { "REFERER"         ,CURLOPT_REFERER         ,RXCURLOPT_STRING      },
+    { "RESUMEFROM"      ,CURLOPT_RESUME_FROM     ,RXCURLOPT_LONGLONG    },
+-#if LIBCURL_VERSION_NUM >= 0x070d00
++#if LIBCURL_VERSION_NUM >= 0x070d00 && LIBCURL_VERSION_NUM < 0x071000
+    { "SOURCEPOSTQUOTE" ,CURLOPT_SOURCE_POSTQUOTE,RXCURLOPT_LIST        },
+    { "SOURCEPREQUOTE"  ,CURLOPT_SOURCE_PREQUOTE ,RXCURLOPT_LIST        },
+    { "SOURCEQUOTE"     ,CURLOPT_SOURCE_QUOTE    ,RXCURLOPT_LIST        },
diff --git a/ftp/urlgfe/Makefile b/ftp/urlgfe/Makefile
index 48f30929121c..d1d91350cfc6 100644
--- a/ftp/urlgfe/Makefile
+++ b/ftp/urlgfe/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	urlgfe
 PORTVERSION=	0.7.1
-PORTREVISION?=	4
+PORTREVISION?=	5
 CATEGORIES=	ftp www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	urlget
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	urlget
 MAINTAINER=	chip-set@mail.ru
 COMMENT=	A download manager
 
-LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	curl.4:${PORTSDIR}/ftp/curl
 
 USE_GNOME=	gtk20 lthack
 WANT_GNOME=	yes
diff --git a/ftp/wmget/Makefile b/ftp/wmget/Makefile
index ad1227636304..e35432789e13 100644
--- a/ftp/wmget/Makefile
+++ b/ftp/wmget/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	wmget
 PORTVERSION=	0.6.0
+PORTREVISION=	1
 CATEGORIES=	ftp
 MASTER_SITES=	http://amtrickey.net/download/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
@@ -13,7 +14,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	uspoerlein@gmail.com
 COMMENT=	Dock app for Window Maker providing wget functionality
 
-LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	curl.4:${PORTSDIR}/ftp/curl
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes