Update the ftp/curl port to 7.16.0.

Bump PORTREVISION of all dependent ports.
Fix the build errors in the few ports that still use the long deprecated,
and now obsoleted, cURL options.

Thanks to everyone who took the time to look over the patch!

Discussed on:	-ports

7 files changed, 43 insertions, 7 deletions

diff --git a/lang/gambas/Makefile b/lang/gambas/Makefile
index e7e065da06bd..9028cf178fd0 100644
--- a/lang/gambas/Makefile
+++ b/lang/gambas/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=		gambas
 PORTVERSION=		1.0.17
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=		thierry@FreeBSD.org
 COMMENT=		Gambas Almost Means BASic
 
-LIB_DEPENDS=		curl.3:${PORTSDIR}/ftp/curl	\
+LIB_DEPENDS=		curl.4:${PORTSDIR}/ftp/curl	\
 			ml.0:${PORTSDIR}/math/ldouble
 
 USE_AUTOTOOLS=		libltdl:15 libtool:15
diff --git a/lang/php4/Makefile.ext b/lang/php4/Makefile.ext
index ca74031fa479..e10df4e186b2 100644
--- a/lang/php4/Makefile.ext
+++ b/lang/php4/Makefile.ext
@@ -44,7 +44,7 @@ CONFIGURE_ARGS+=--enable-ctype
 .endif
 
 .if ${PHP_MODNAME} == "curl"
-LIB_DEPENDS+=	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	curl.4:${PORTSDIR}/ftp/curl
 
 CONFIGURE_ARGS+=--with-curl=${LOCALBASE}
 .endif
diff --git a/lang/php5/Makefile.ext b/lang/php5/Makefile.ext
index cbc91b754f16..77fe93b9c567 100644
--- a/lang/php5/Makefile.ext
+++ b/lang/php5/Makefile.ext
@@ -38,7 +38,7 @@ CONFIGURE_ARGS+=--enable-ctype
 .endif
 
 .if ${PHP_MODNAME} == "curl"
-LIB_DEPENDS+=	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	curl.4:${PORTSDIR}/ftp/curl
 
 CONFIGURE_ARGS+=--with-curl=${LOCALBASE}
 .endif
diff --git a/lang/php53/Makefile.ext b/lang/php53/Makefile.ext
index cbc91b754f16..77fe93b9c567 100644
--- a/lang/php53/Makefile.ext
+++ b/lang/php53/Makefile.ext
@@ -38,7 +38,7 @@ CONFIGURE_ARGS+=--enable-ctype
 .endif
 
 .if ${PHP_MODNAME} == "curl"
-LIB_DEPENDS+=	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	curl.4:${PORTSDIR}/ftp/curl
 
 CONFIGURE_ARGS+=--with-curl=${LOCALBASE}
 .endif
diff --git a/lang/q/Makefile b/lang/q/Makefile
index eec9dc5d373c..61f80e866b03 100644
--- a/lang/q/Makefile
+++ b/lang/q/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	q
 PORTVERSION=	6.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	q-lang
diff --git a/lang/q/files/patch-modules-curl-curl.c b/lang/q/files/patch-modules-curl-curl.c
new file mode 100644
index 000000000000..9e9cf77518ff
--- /dev/null
+++ b/lang/q/files/patch-modules-curl-curl.c
@@ -0,0 +1,35 @@
+--- modules/curl/curl.c.orig	Fri Dec  8 18:58:07 2006
++++ modules/curl/curl.c	Fri Dec  8 18:59:12 2006
+@@ -461,7 +461,9 @@
+   CURLOPT_WRITEFUNCTION,
+   CURLOPT_READFUNCTION,
+   CURLOPT_PROGRESSFUNCTION,
++#if LIBCURL_VERSION_NUM < 0x071000
+   CURLOPT_PASSWDFUNCTION,
++#endif
+   CURLOPT_HEADERFUNCTION,
+   CURLOPT_DEBUGFUNCTION,
+ 
+@@ -660,7 +662,9 @@
+      mkint(CURLOPT_WRITEFUNCTION),
+      mkint(CURLOPT_READFUNCTION),
+      mkint(CURLOPT_PROGRESSFUNCTION),
++#if LIBCURL_VERSION_NUM < 0x071000
+      mkint(CURLOPT_PASSWDFUNCTION),
++#endif
+      mkint(CURLOPT_HEADERFUNCTION),
+      mkint(CURLOPT_DEBUGFUNCTION),
+ 
+@@ -964,10 +968,12 @@
+ 	cb = (int(*)())progress_cb;
+ 	dataopt = CURLOPT_PROGRESSDATA;
+ 	break;
++#if LIBCURL_VERSION_NUM < 0x071000
+       case CURLOPT_PASSWDFUNCTION:
+ 	cb = (int(*)())passwd_cb;
+ 	dataopt = CURLOPT_PASSWDDATA;
+ 	break;
++#endif
+       case CURLOPT_HEADERFUNCTION:
+ 	cb = (int(*)())header_cb;
+ 	dataopt = CURLOPT_WRITEHEADER;
diff --git a/lang/scriba/Makefile b/lang/scriba/Makefile
index 0cf3cea684a9..a17ba5dea03f 100644
--- a/lang/scriba/Makefile
+++ b/lang/scriba/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	scriba
 PORTVERSION=	20b0
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://www.scriptbasic.com/download/
 DISTNAME=	${PORTNAME}-v2.0b0-source
@@ -49,7 +50,7 @@ PLIST_SUB+=	BDB="@comment "
 .endif
 
 .if defined(WITH_CURL)
-LIB_DEPENDS+=	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	curl.4:${PORTSDIR}/ftp/curl
 PLIST_SUB+=	CURL=""
 .else
 PLIST_SUB+=	CURL="@comment "