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

dependent ports.

36 files changed, 98 insertions, 91 deletions

diff --git a/archivers/libcomprex/Makefile b/archivers/libcomprex/Makefile
index 6bd7733f5f0b..17347c94f4a1 100644
--- a/archivers/libcomprex/Makefile
+++ b/archivers/libcomprex/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	libcomprex
 PORTVERSION=	0.3.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gnupdate
@@ -17,7 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Transparently handles automatic compression and decompression of files
 
 LIB_DEPENDS=	ltdl.4:${PORTSDIR}/devel/libltdl \
-		curl.2:${PORTSDIR}/ftp/curl
+		curl.3:${PORTSDIR}/ftp/curl
 .if !exists(/usr/bin/bzip2)
 LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/bzip2
 .endif
diff --git a/audio/grip/Makefile b/audio/grip/Makefile
index 3fbc427c512c..c0b8c54862ab 100644
--- a/audio/grip/Makefile
+++ b/audio/grip/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	grip
 PORTVERSION=	3.2.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,7 +16,7 @@ MAINTAINER=	ahze@ahze.net
 COMMENT=	GTK front-end to external cd rippers and audio encoders
 
 LIB_DEPENDS=	id3-3.8.3:${PORTSDIR}/audio/id3lib \
-		curl.2:${PORTSDIR}/ftp/curl
+		curl.3:${PORTSDIR}/ftp/curl
 PATCH_DEPENDS=	iconv:${PORTSDIR}/converters/libiconv
 
 USE_X_PREFIX=	yes
diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile
index 1c8b5ed5ef6a..ffa541cc0008 100644
--- a/audio/vorbis-tools/Makefile
+++ b/audio/vorbis-tools/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vorbis-tools
 PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://www.vorbis.com/files/1.0.1/unix/
@@ -16,7 +16,7 @@ MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	Play, encode, and manage Ogg Vorbis files
 
 LIB_DEPENDS=	ao.3:${PORTSDIR}/audio/libao \
-		curl.2:${PORTSDIR}/ftp/curl \
+		curl.3:${PORTSDIR}/ftp/curl \
 		FLAC.5:${PORTSDIR}/audio/flac \
 		speex.2:${PORTSDIR}/audio/speex \
 		vorbis.3:${PORTSDIR}/audio/libvorbis
diff --git a/deskutils/drivel/Makefile b/deskutils/drivel/Makefile
index d1ca593d1477..2e716cb81cd9 100644
--- a/deskutils/drivel/Makefile
+++ b/deskutils/drivel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	drivel
 PORTVERSION=	0.9.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	kwm@rainbow-runner.nl
 COMMENT=	The Gnome livejournal client
 
-LIB_DEPENDS=	curl.2:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix gnomehack libgnomeui intlhack
diff --git a/deskutils/logjam/Makefile b/deskutils/logjam/Makefile
index 0ee3a5666f3c..afdc9975a365 100644
--- a/deskutils/logjam/Makefile
+++ b/deskutils/logjam/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	logjam
 PORTVERSION=	4.4.0
+PORTREVISION?=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	http://logjam.danga.com/download/
 
 MAINTAINER=	mike.patterson@unb.ca
 COMMENT=	A GTK2 interface to livejournals, ie www.livejournal.com
 
-LIB_DEPENDS=	curl.2:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl
 
 MAN1=		logjam.1
 
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
diff --git a/ftp/curlpp/Makefile b/ftp/curlpp/Makefile
index e83d032ae8dd..3e1aa987b102 100644
--- a/ftp/curlpp/Makefile
+++ b/ftp/curlpp/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	curlpp
 PORTVERSION=	0.3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	ftp
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	roam@FreeBSD.org
 COMMENT=	A C++ wrapper for libcurl
 
-LIB_DEPENDS=	curl.2:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl
 
 USE_GCC=	3.3
 USE_REINPLACE=	yes
diff --git a/ftp/py-curl/Makefile b/ftp/py-curl/Makefile
index 6c04dc1fe56a..5931d834b8f5 100644
--- a/ftp/py-curl/Makefile
+++ b/ftp/py-curl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	curl
 PORTVERSION=	7.11.0
+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.2:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
diff --git a/ftp/rexx-curl/Makefile b/ftp/rexx-curl/Makefile
index 03bb3dbe7766..ee231136834a 100644
--- a/ftp/rexx-curl/Makefile
+++ b/ftp/rexx-curl/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	curl
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ftp
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	rexx${PORTNAME}
@@ -19,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.2:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl
 RUN_DEPENDS=	rexx:${PORTSDIR}/lang/rexx-regina
 
 GNU_CONFIGURE=	yes
diff --git a/ftp/ruby-curl/Makefile b/ftp/ruby-curl/Makefile
index 6ca9bc8e0af0..e27c688473fe 100644
--- a/ftp/ruby-curl/Makefile
+++ b/ftp/ruby-curl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	curl
 PORTVERSION=	0.0.2.a0
+PORTREVISION?=	1
 CATEGORIES=	ftp www ruby
 MASTER_SITES=	http://www.d1.dion.ne.jp/~matuyuki/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
@@ -19,7 +20,7 @@ COMMENT=	Ruby interface to libcurl
 
 BROKEN=		"Does not compile"
 
-LIB_DEPENDS=	curl.2:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
diff --git a/ftp/urlgfe/Makefile b/ftp/urlgfe/Makefile
index 9d399e573c0e..f9a167e72af8 100644
--- a/ftp/urlgfe/Makefile
+++ b/ftp/urlgfe/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	urlgfe
 PORTVERSION=	0.7.1
+PORTREVISION?=	1
 CATEGORIES=	ftp www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	urlget
@@ -14,7 +15,7 @@ MASTER_SITE_SUBDIR=	urlget
 MAINTAINER=	chip-set@mail.ru
 COMMENT=	A download manager
 
-LIB_DEPENDS=	curl.2:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl
 
 USE_GNOME=	gtk20 lthack
 WANT_GNOME=	yes
diff --git a/ftp/wmget/Makefile b/ftp/wmget/Makefile
index 8b565b0a9892..c889c373dcc3 100644
--- a/ftp/wmget/Makefile
+++ b/ftp/wmget/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	wmget
 PORTVERSION=	0.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ftp
 MASTER_SITES=	http://amtrickey.net/download/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
@@ -14,7 +14,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	q@uni.de
 COMMENT=	Dock app for Window Maker providing wget functionality
 
-LIB_DEPENDS=	curl.2:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/graphics/mapserver/Makefile b/graphics/mapserver/Makefile
index 49066557027f..28fb876e6651 100644
--- a/graphics/mapserver/Makefile
+++ b/graphics/mapserver/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		mapserver
 PORTVERSION=		4.0.2
+PORTREVISION?=	1
 CATEGORIES=		graphics www misc
 MASTER_SITES=		http://cvs.gis.umn.edu/dist/
 
@@ -37,7 +38,7 @@ CONFIGURE_ARGS+=	--with-pdf=${LOCALBASE}
 .endif
 
 .if defined(WITH_WMS)
-LIB_DEPENDS+=		curl.2:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=		curl.3:${PORTSDIR}/ftp/curl
 CONFIGURE_ARGS+=	--wmsclient
 .endif
 
diff --git a/lang/gambas/Makefile b/lang/gambas/Makefile
index 68d52ff05854..908416735de9 100644
--- a/lang/gambas/Makefile
+++ b/lang/gambas/Makefile
@@ -6,13 +6,14 @@
 
 PORTNAME=		gambas
 PORTVERSION=		0.93b
+PORTREVISION?=	1
 CATEGORIES=		lang
 MASTER_SITES=		http://gambas.sourceforge.net/
 
 MAINTAINER=		thierry@FreeBSD.org
 COMMENT=		Gambas Almost Means BASic
 
-LIB_DEPENDS=		curl.2:${PORTSDIR}/ftp/curl			\
+LIB_DEPENDS=		curl.3:${PORTSDIR}/ftp/curl			\
 			ltdl.4:${PORTSDIR}/devel/libltdl
 RUN_DEPENDS=		pgrep:${PORTSDIR}/sysutils/pkill
 
diff --git a/lang/php4/Makefile b/lang/php4/Makefile
index e819f0b45f6a..38be225f0cd0 100644
--- a/lang/php4/Makefile
+++ b/lang/php4/Makefile
@@ -21,6 +21,7 @@
 
 PORTNAME=	php4
 PORTVERSION=	4.3.7
+PORTREVISION?=	1
 CATEGORIES?=	lang devel www
 MASTER_SITES=	${MASTER_SITE_PHP:S,$,:release,} \
 		http://downloads.php.net/ilia/:rc \
@@ -235,7 +236,7 @@ CONFIGURE_ARGS+=--enable-ctype
 .endif
 
 .if defined(WITH_CURL)
-LIB_DEPENDS+=	curl.2:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	curl.3:${PORTSDIR}/ftp/curl
 CONFIGURE_ARGS+=--with-curl=${LOCALBASE}
 .endif
 
diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index 037c5e2ea89f..5c49df49fca5 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -22,7 +22,7 @@
 
 PORTNAME=	php5
 PORTVERSION=	5.0.0.r2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES?=	lang devel www
 MASTER_SITES=	${MASTER_SITE_PHP:S,$,:release,}
 MASTER_SITE_SUBDIR=	distributions/:release
@@ -234,7 +234,7 @@ CONFIGURE_ARGS+=--enable-ctype
 .endif
 
 .if defined(WITH_CURL)
-LIB_DEPENDS+=	curl.2:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	curl.3:${PORTSDIR}/ftp/curl
 CONFIGURE_ARGS+=--with-curl=${LOCALBASE}
 .endif
 
diff --git a/lang/php53/Makefile b/lang/php53/Makefile
index 037c5e2ea89f..5c49df49fca5 100644
--- a/lang/php53/Makefile
+++ b/lang/php53/Makefile
@@ -22,7 +22,7 @@
 
 PORTNAME=	php5
 PORTVERSION=	5.0.0.r2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES?=	lang devel www
 MASTER_SITES=	${MASTER_SITE_PHP:S,$,:release,}
 MASTER_SITE_SUBDIR=	distributions/:release
@@ -234,7 +234,7 @@ CONFIGURE_ARGS+=--enable-ctype
 .endif
 
 .if defined(WITH_CURL)
-LIB_DEPENDS+=	curl.2:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	curl.3:${PORTSDIR}/ftp/curl
 CONFIGURE_ARGS+=--with-curl=${LOCALBASE}
 .endif
 
diff --git a/net-im/jabber-msn/Makefile b/net-im/jabber-msn/Makefile
index a8967d28c7c1..e367c75adcc9 100644
--- a/net-im/jabber-msn/Makefile
+++ b/net-im/jabber-msn/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	jabber-msn
 PORTVERSION=	1.2.8.rc1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://msn-transport.jabberstudio.org/
 DISTNAME=	msn-transport-${PORTVERSION:S/.rc/rc/}
@@ -14,7 +14,7 @@ DISTNAME=	msn-transport-${PORTVERSION:S/.rc/rc/}
 MAINTAINER=	martijn@pacno.net
 COMMENT=	Jabber MSN-Transport module
 
-LIB_DEPENDS=	curl.2:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl
 BUILD_DEPENDS=	${LOCALBASE}/sbin/jabberd:${PORTSDIR}/net/jabber
 
 USE_GMAKE=	yes
diff --git a/net-p2p/amule1/Makefile b/net-p2p/amule1/Makefile
index e98d75f36d97..565b361235a7 100644
--- a/net-p2p/amule1/Makefile
+++ b/net-p2p/amule1/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	aMule
 PORTVERSION=	1.2.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://download.berlios.de/amule/
 
@@ -15,7 +15,7 @@ MAINTAINER=	ganael.laplanche@martymac.com
 COMMENT=	Just another eMule P2P Client
 
 LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 \
-		curl.2:${PORTSDIR}/ftp/curl
+		curl.3:${PORTSDIR}/ftp/curl
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehier gnomehack gnomeprefix
diff --git a/net-p2p/libbt/Makefile b/net-p2p/libbt/Makefile
index 07b82757c97a..6a8a3c8d3148 100644
--- a/net-p2p/libbt/Makefile
+++ b/net-p2p/libbt/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libbt
 PORTVERSION=	1.02
+PORTREVISION?=	1
 CATEGORIES=	net devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,7 +16,7 @@ MAINTAINER=	flz@xbsd.org
 COMMENT=	C library implementing the core BitTorrent protocol
 
 LIB_DEPENDS=	uuid.1:${PORTSDIR}/sysutils/e2fsprogs \
-		curl.2:${PORTSDIR}/ftp/curl
+		curl.3:${PORTSDIR}/ftp/curl
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/net/amule-devel/Makefile b/net/amule-devel/Makefile
index e98d75f36d97..565b361235a7 100644
--- a/net/amule-devel/Makefile
+++ b/net/amule-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	aMule
 PORTVERSION=	1.2.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://download.berlios.de/amule/
 
@@ -15,7 +15,7 @@ MAINTAINER=	ganael.laplanche@martymac.com
 COMMENT=	Just another eMule P2P Client
 
 LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 \
-		curl.2:${PORTSDIR}/ftp/curl
+		curl.3:${PORTSDIR}/ftp/curl
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehier gnomehack gnomeprefix
diff --git a/net/amule/Makefile b/net/amule/Makefile
index e98d75f36d97..565b361235a7 100644
--- a/net/amule/Makefile
+++ b/net/amule/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	aMule
 PORTVERSION=	1.2.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://download.berlios.de/amule/
 
@@ -15,7 +15,7 @@ MAINTAINER=	ganael.laplanche@martymac.com
 COMMENT=	Just another eMule P2P Client
 
 LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 \
-		curl.2:${PORTSDIR}/ftp/curl
+		curl.3:${PORTSDIR}/ftp/curl
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehier gnomehack gnomeprefix
diff --git a/net/amule1/Makefile b/net/amule1/Makefile
index e98d75f36d97..565b361235a7 100644
--- a/net/amule1/Makefile
+++ b/net/amule1/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	aMule
 PORTVERSION=	1.2.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://download.berlios.de/amule/
 
@@ -15,7 +15,7 @@ MAINTAINER=	ganael.laplanche@martymac.com
 COMMENT=	Just another eMule P2P Client
 
 LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 \
-		curl.2:${PORTSDIR}/ftp/curl
+		curl.3:${PORTSDIR}/ftp/curl
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehier gnomehack gnomeprefix
diff --git a/net/jabber-msn/Makefile b/net/jabber-msn/Makefile
index a8967d28c7c1..e367c75adcc9 100644
--- a/net/jabber-msn/Makefile
+++ b/net/jabber-msn/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	jabber-msn
 PORTVERSION=	1.2.8.rc1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://msn-transport.jabberstudio.org/
 DISTNAME=	msn-transport-${PORTVERSION:S/.rc/rc/}
@@ -14,7 +14,7 @@ DISTNAME=	msn-transport-${PORTVERSION:S/.rc/rc/}
 MAINTAINER=	martijn@pacno.net
 COMMENT=	Jabber MSN-Transport module
 
-LIB_DEPENDS=	curl.2:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl
 BUILD_DEPENDS=	${LOCALBASE}/sbin/jabberd:${PORTSDIR}/net/jabber
 
 USE_GMAKE=	yes
diff --git a/net/libbt/Makefile b/net/libbt/Makefile
index 07b82757c97a..6a8a3c8d3148 100644
--- a/net/libbt/Makefile
+++ b/net/libbt/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libbt
 PORTVERSION=	1.02
+PORTREVISION?=	1
 CATEGORIES=	net devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,7 +16,7 @@ MAINTAINER=	flz@xbsd.org
 COMMENT=	C library implementing the core BitTorrent protocol
 
 LIB_DEPENDS=	uuid.1:${PORTSDIR}/sysutils/e2fsprogs \
-		curl.2:${PORTSDIR}/ftp/curl
+		curl.3:${PORTSDIR}/ftp/curl
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/net/wmlj/Makefile b/net/wmlj/Makefile
index 91cb0274fefc..499fe054095c 100644
--- a/net/wmlj/Makefile
+++ b/net/wmlj/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmlj
 PORTVERSION=	0.3.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	sgt@outline.ru
 COMMENT=	A dockapp that monitors your friends list at LiveJournal.com
 
-LIB_DEPENDS=	curl.2:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk12
diff --git a/print/foomatic-db-engine/Makefile b/print/foomatic-db-engine/Makefile
index a2c1df69cb81..45b64427852a 100644
--- a/print/foomatic-db-engine/Makefile
+++ b/print/foomatic-db-engine/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	foomatic-db-engine
 PORTVERSION=	20031213
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	#
 
@@ -16,7 +16,7 @@ COMMENT=	Foomatic database engine
 
 BUILD_DEPENDS=	aclocal:${PORTSDIR}/devel/automake
 LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
-		curl.2:${PORTSDIR}/ftp/curl
+		curl.3:${PORTSDIR}/ftp/curl
 
 USE_GMAKE=	yes
 USE_PERL5=	yes
diff --git a/print/foomatic-db/Makefile b/print/foomatic-db/Makefile
index ce580d0a4b12..2eaf26ecc775 100644
--- a/print/foomatic-db/Makefile
+++ b/print/foomatic-db/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	foomatic-db
 PORTVERSION=	20040107
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 NO_CHECKSUM=	${DISTFILES}
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Foomatic database
 
 LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
-		curl.2:${PORTSDIR}/ftp/curl
+		curl.3:${PORTSDIR}/ftp/curl
 
 USE_GMAKE=	yes
 USE_PERL5=	yes
diff --git a/security/authforce/Makefile b/security/authforce/Makefile
index 3c93cfe3662e..60941d404fa6 100644
--- a/security/authforce/Makefile
+++ b/security/authforce/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	authforce
 PORTVERSION=	0.9.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security www
 MASTER_SITES=	http://kapheine.hypa.net/authforce/
 
 MAINTAINER=	ache@FreeBSD.org
 COMMENT=	HTTP authentication brute forcer
 
-LIB_DEPENDS=	curl.2:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl
 
 USE_BZIP2=	yes
 USE_GETOPT_LONG=yes
diff --git a/textproc/raptor/Makefile b/textproc/raptor/Makefile
index eae0025e8aa8..79a5cb4d55bd 100644
--- a/textproc/raptor/Makefile
+++ b/textproc/raptor/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	raptor
 PORTVERSION=	1.2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.redland.opensource.ac.uk/dist/source/
@@ -17,7 +17,7 @@ MASTER_SITE_SUBDIR=	librdf
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	RDF Parser Toolkit for Redland
 
-LIB_DEPENDS=	curl.2:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl \
 		xmlparse.1:${PORTSDIR}/www/libwww
 
 USE_GETOPT_LONG=	yes
diff --git a/textproc/raptor2/Makefile b/textproc/raptor2/Makefile
index eae0025e8aa8..79a5cb4d55bd 100644
--- a/textproc/raptor2/Makefile
+++ b/textproc/raptor2/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	raptor
 PORTVERSION=	1.2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.redland.opensource.ac.uk/dist/source/
@@ -17,7 +17,7 @@ MASTER_SITE_SUBDIR=	librdf
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	RDF Parser Toolkit for Redland
 
-LIB_DEPENDS=	curl.2:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl \
 		xmlparse.1:${PORTSDIR}/www/libwww
 
 USE_GETOPT_LONG=	yes
diff --git a/www/drivel/Makefile b/www/drivel/Makefile
index d1ca593d1477..2e716cb81cd9 100644
--- a/www/drivel/Makefile
+++ b/www/drivel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	drivel
 PORTVERSION=	0.9.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	kwm@rainbow-runner.nl
 COMMENT=	The Gnome livejournal client
 
-LIB_DEPENDS=	curl.2:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix gnomehack libgnomeui intlhack