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

8 files changed, 15 insertions, 11 deletions

diff --git a/games/bzflag/Makefile b/games/bzflag/Makefile
index 9b13e248db4..93265da6632 100644
--- a/games/bzflag/Makefile
+++ b/games/bzflag/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bzflag
 PORTVERSION=	2.0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	chuck@pkix.net
 COMMENT=	A multiplayer 3D tank battle game
 
-LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	curl.4:${PORTSDIR}/ftp/curl
 
 USE_BZIP2=	yes
 USE_SDL=	yes
diff --git a/games/fgsd/Makefile b/games/fgsd/Makefile
index cd8e7d4cd89..16c996049c2 100644
--- a/games/fgsd/Makefile
+++ b/games/fgsd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fgsd
 DISTVERSION=	0.3.1a
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/mudmagic/Makefile b/games/mudmagic/Makefile
index 9407178c0c3..5fc5c0e3a96 100644
--- a/games/mudmagic/Makefile
+++ b/games/mudmagic/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	mudmagic
 PORTVERSION=	1.9
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.mudmagic.com/mud-client/downloads/
 
 MAINTAINER=	trasz@pin.if.uz.zgora.pl
 COMMENT=	A GTK+ based MUD client
 
-LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS=	curl.4:${PORTSDIR}/ftp/curl \
 		pcre.0:${PORTSDIR}/devel/pcre \
 		png.5:${PORTSDIR}/graphics/png \
 		expat:${PORTSDIR}/textproc/expat2 \
diff --git a/games/planeshift/Makefile b/games/planeshift/Makefile
index 808d4678be2..d2eabe415ba 100644
--- a/games/planeshift/Makefile
+++ b/games/planeshift/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	planeshift
 PORTVERSION=	0.3.017
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://alex.foxybanana.com/freebsd/
 
@@ -18,7 +19,7 @@ BUILD_DEPENDS=	jam:${PORTSDIR}/devel/jam \
 		cel-config:${PORTSDIR}/graphics/crystalentitylayer-devel \
 		${LOCALBASE}/lib/libbfd.a:${PORTSDIR}/devel/libbfd
 LIB_DEPENDS=	cal3d.12:${PORTSDIR}/graphics/cal3d \
-		curl.3:${PORTSDIR}/ftp/curl
+		curl.4:${PORTSDIR}/ftp/curl
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
diff --git a/games/r1q2/Makefile b/games/r1q2/Makefile
index a1dca040109..545b5ff9018 100644
--- a/games/r1q2/Makefile
+++ b/games/r1q2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	r1q2
 PORTVERSION=	6557
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	http://www.r1ch.net/stuff/r1q2/src/
 DISTNAME=	${PORTNAME}-b${PORTVERSION}-src
@@ -93,7 +93,7 @@ PLIST_SUB+=	GLX="@comment "
 .endif
 
 .if !defined(WITHOUT_HTTP)
-LIB_DEPENDS+=	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	curl.4:${PORTSDIR}/ftp/curl
 MAKE_ENV+=	WITH_HTTP_DOWNLOAD_SUPPORT=YES
 .endif
 
diff --git a/games/tmw/Makefile b/games/tmw/Makefile
index c8a420ec932..2421c2a57cc 100644
--- a/games/tmw/Makefile
+++ b/games/tmw/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tmw
 PORTVERSION=	0.0.21.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	themanaworld
@@ -16,7 +17,7 @@ COMMENT=	A free open source 2D MMORPG in development
 
 LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
 		png.5:${PORTSDIR}/graphics/png \
-		curl.3:${PORTSDIR}/ftp/curl \
+		curl.4:${PORTSDIR}/ftp/curl \
 		physfs-1.0.1:${PORTSDIR}/devel/physfs
 BUILD_DEPENDS=	guichan>=0.5.0:${PORTSDIR}/devel/guichan
 RUN_DEPENDS=	guichan>=0.5.0:${PORTSDIR}/devel/guichan
diff --git a/games/warsow/Makefile b/games/warsow/Makefile
index 28d5836f4c8..ff95d816abb 100644
--- a/games/warsow/Makefile
+++ b/games/warsow/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	warsow
 PORTVERSION=	0.12
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	http://warsow.aditsystems.com/ \
 		http://ftp.club-internet.fr/pub/games/nofrag/warsow/ \
@@ -49,7 +49,7 @@ PLIST_SUB+=	ARCHSUFFIX=${ARCHSUFFIX}
 .endif
 
 .if !defined(WITHOUT_CLIENT)
-LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS=	curl.4:${PORTSDIR}/ftp/curl \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 USE_GL=		yes
 USE_SDL=	yes
diff --git a/games/xmoto/Makefile b/games/xmoto/Makefile
index 677e6fc68cf..2ac476acac4 100644
--- a/games/xmoto/Makefile
+++ b/games/xmoto/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmoto
 PORTVERSION=	0.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -47,7 +47,7 @@ MAN6=		xmoto.6 xmoto-edit.6
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_WWW)
-LIB_DEPENDS+=	curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	curl.4:${PORTSDIR}/ftp/curl
 CONFIGURE_ARGS+=	--with-enable-www=1
 .else
 CONFIGURE_ARGS+=	--with-enable-www=0