- Update to 7.31.0

- Bump PORTREVISION for ftp/curl shlib change
- Add TEST_DEPENDS
- Convert to new options framework
- Adjust options:
  - Add COOKIES
  - Add CYASSL, NSS, POLARSSL, THREADED_RESOLVER, TLS_SRP [1]
  - Add GSSAPI and SPNEGO [2]
  - Remove KERBEROS4
  - Rename LIBIDN to IDN
  - Remove TRACKMEMORY [1]
- Sort option handler
- Add SLAVEDIRS: ftp/curl-hiphop
- Cosmetic change
- Cleanup Makefile header
- While I'm here, fix typo (PORTREVSION) in x11-wm/ede/Makefile

Changes:	http://curl.haxx.se/changes.html
PR:		ports/172325 (-exp run), ports/177369 (based on) [1]
Submitted by:	Hirohisa Yamaguchi <umq@ueo.co.jp> [1], hrs (via email) [2]
Exp run by:	miwi

25 files changed, 35 insertions, 21 deletions

diff --git a/www/cas/Makefile b/www/cas/Makefile
index 4351081ca64d..00783b42c0a7 100644
--- a/www/cas/Makefile
+++ b/www/cas/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cas
 PORTVERSION=	3.5.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www devel
 MASTER_SITES=	http://cas.havoc.ru/download/
 
diff --git a/www/castget/Makefile b/www/castget/Makefile
index 2b380d10869f..b2a86cdc8d8d 100644
--- a/www/castget/Makefile
+++ b/www/castget/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	castget
 PORTVERSION=	1.0.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	SAVANNAH CENKES
 
@@ -15,7 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Command-line podcast downloader
 
 LIB_DEPENDS=	id3-3.8.3:${PORTSDIR}/audio/id3lib \
-		curl.6:${PORTSDIR}/ftp/curl
+		curl:${PORTSDIR}/ftp/curl
 
 USE_LDCONFIG=	yes
 USE_GNOME=	glib20 libxml2
diff --git a/www/cplanet/Makefile b/www/cplanet/Makefile
index e34feeebc256..4cd65bb3b9d2 100644
--- a/www/cplanet/Makefile
+++ b/www/cplanet/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	cplanet
 PORTVERSION=	0.9
+PORTREVISION=	1
 CATEGORIES=	www textproc
 MASTER_SITES=	http://files.etoilebsd.net/cplanet/
 
diff --git a/www/flickcurl/Makefile b/www/flickcurl/Makefile
index 17f59a8ae529..b83e5047abec 100644
--- a/www/flickcurl/Makefile
+++ b/www/flickcurl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	flickcurl
 PORTVERSION=	1.24
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://download.dajobe.org/flickcurl/
 
diff --git a/www/gecko-mediaplayer/Makefile b/www/gecko-mediaplayer/Makefile
index a9d9882bb570..af932fa0e6aa 100644
--- a/www/gecko-mediaplayer/Makefile
+++ b/www/gecko-mediaplayer/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gecko-mediaplayer
 PORTVERSION=	1.0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www multimedia gnome
 MASTER_SITES=	GOOGLE_CODE
 
diff --git a/www/mod_auth_cas/Makefile b/www/mod_auth_cas/Makefile
index 4c1161171dbc..12edb3fe0906 100644
--- a/www/mod_auth_cas/Makefile
+++ b/www/mod_auth_cas/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mod_auth_cas
 PORTVERSION=	1.0.9.1
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	https://source.jasig.org/cas-clients/mod_auth_cas/tags/mod_auth_cas-${PORTVERSION}/src/
 # SVN tags only, *sigh*
diff --git a/www/mod_auth_mellon/Makefile b/www/mod_auth_mellon/Makefile
index 415b11fb9d8a..b22cff119952 100644
--- a/www/mod_auth_mellon/Makefile
+++ b/www/mod_auth_mellon/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=		mod_auth_mellon
 PORTVERSION=		0.5.0
+PORTREVISION=	1
 CATEGORIES=		www
 MASTER_SITES=		http://modmellon.googlecode.com/files/
 DIST_SUBDIR=		apache2
@@ -11,7 +12,7 @@ MAINTAINER=		tj@FreeBSD.org
 COMMENT=		Apache auth module for identifying SSO users
 
 LIB_DEPENDS=		lasso.8:${PORTSDIR}/security/lasso \
-			curl.6:${PORTSDIR}/ftp/curl
+			curl:${PORTSDIR}/ftp/curl
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-apxs2=${APXS}
diff --git a/www/mod_flickr/Makefile b/www/mod_flickr/Makefile
index 492499185716..04cb2139242e 100644
--- a/www/mod_flickr/Makefile
+++ b/www/mod_flickr/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	mod_flickr
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://www.vshank.com/modcode/
 
 MAINTAINER=	venkyshankar@yahoo.com
 COMMENT=	Apache module for Flickr API access
 
-LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
 
 MAKE_JOBS_SAFE=	yes
 
diff --git a/www/mod_security/Makefile b/www/mod_security/Makefile
index 7d0cd6be7f2a..d9402525eb6a 100644
--- a/www/mod_security/Makefile
+++ b/www/mod_security/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	mod_security
 PORTVERSION=	2.7.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www security
 MASTER_SITES=	http://www.modsecurity.org/tarball/${PORTVERSION}/
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
diff --git a/www/netsurf/Makefile b/www/netsurf/Makefile
index 8d1a50c980ff..94c2d48f2fef 100644
--- a/www/netsurf/Makefile
+++ b/www/netsurf/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	netsurf
 PORTVERSION=	3.0
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://download.netsurf-browser.org/netsurf/releases/source-full/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-full-src
diff --git a/www/newsbeuter/Makefile b/www/newsbeuter/Makefile
index daaed820b9cf..35a22a2f9024 100644
--- a/www/newsbeuter/Makefile
+++ b/www/newsbeuter/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	newsbeuter
 PORTVERSION=	2.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://newsbeuter.org/downloads/
 
@@ -11,7 +11,7 @@ MAINTAINER=	arved@FreeBSD.org
 COMMENT=	An RSS feed reader for the text console
 
 LIB_DEPENDS=	stfl.1:${PORTSDIR}/devel/stfl \
-		curl.6:${PORTSDIR}/ftp/curl \
+		curl:${PORTSDIR}/ftp/curl \
 		json.0:${PORTSDIR}/devel/json-c
 
 LICENSE=	MIT
diff --git a/www/nspluginwrapper/Makefile b/www/nspluginwrapper/Makefile
index 2d76c70a2520..ed671fc2bee8 100644
--- a/www/nspluginwrapper/Makefile
+++ b/www/nspluginwrapper/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nspluginwrapper
 PORTVERSION=	1.4.4
+PORTREVISION=	1
 CATEGORIES=	www linux emulators
 MASTER_SITES=	http://nspluginwrapper.org/download/ \
 		LOCAL/jkim \
@@ -16,7 +17,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${BINFILE}:binfile
 MAINTAINER=	jkim@FreeBSD.org
 COMMENT=	A compatibility plugin for Mozilla NPAPI plugins
 
-LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
 
 CONFLICTS=	nspluginwrapper-1.3.*
 
diff --git a/www/openvrml/Makefile b/www/openvrml/Makefile
index fe44eb1b83c2..818033d93186 100644
--- a/www/openvrml/Makefile
+++ b/www/openvrml/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	openvrml
 PORTVERSION=	0.18.9
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www graphics
 MASTER_SITES=	SF
 
@@ -17,7 +17,7 @@ LIB_DEPENDS=	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig		\
 		js.1:${PORTSDIR}/lang/spidermonkey17			\
 		jpeg.11:${PORTSDIR}/graphics/jpeg			\
 		png15:${PORTSDIR}/graphics/png				\
-		curl.6:${PORTSDIR}/ftp/curl				\
+		curl:${PORTSDIR}/ftp/curl				\
 		gtkglext-x11-1.0:${PORTSDIR}/x11-toolkits/gtkglext
 
 USE_GL=		yes
diff --git a/www/p5-WWW-Curl/Makefile b/www/p5-WWW-Curl/Makefile
index 191fc4b79b30..beeeca2b72c6 100644
--- a/www/p5-WWW-Curl/Makefile
+++ b/www/p5-WWW-Curl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-Curl
 PORTVERSION=	4.15
+PORTREVISION=	1
 CATEGORIES=	www ftp perl5
 MASTER_SITES=	CPAN \
 		http://curl.haxx.se/libcurl/perl/
@@ -13,7 +14,7 @@ COMMENT=	Perl binding interface for curl
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl:install
 
 PERL_CONFIGURE=	yes
 
diff --git a/www/pecl-http/Makefile b/www/pecl-http/Makefile
index d72c591aa0d7..1a5f1c159361 100644
--- a/www/pecl-http/Makefile
+++ b/www/pecl-http/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	http
 PORTVERSION=	1.7.5
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://pecl.php.net/get/
 PKGNAMEPREFIX=	pecl-
@@ -12,7 +13,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Extended HTTP Support
 
-LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
 
 USE_PHP=	yes
 USE_PHPEXT=	yes
diff --git a/www/pecl-solr/Makefile b/www/pecl-solr/Makefile
index a36e979737e2..290de607ab9f 100644
--- a/www/pecl-solr/Makefile
+++ b/www/pecl-solr/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	solr
 PORTVERSION=	1.0.2
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://pecl.php.net/get/
 PKGNAMEPREFIX=	pecl-
diff --git a/www/rubygem-passenger/Makefile b/www/rubygem-passenger/Makefile
index 90e8da5f976a..caa711317c9e 100644
--- a/www/rubygem-passenger/Makefile
+++ b/www/rubygem-passenger/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	passenger
 PORTVERSION=	4.0.8
+PORTREVISION=	1
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 PKGNAMEPREFIX=	rubygem-
diff --git a/www/rubygem-typhoeus/Makefile b/www/rubygem-typhoeus/Makefile
index 9455f3a6c615..6eb640600f74 100644
--- a/www/rubygem-typhoeus/Makefile
+++ b/www/rubygem-typhoeus/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	typhoeus
 PORTVERSION=	0.3.3
+PORTREVISION=	1
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 
diff --git a/www/thundercache/Makefile b/www/thundercache/Makefile
index 18ce14dd8da0..5137d1ee22e7 100644
--- a/www/thundercache/Makefile
+++ b/www/thundercache/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	thundercache
 PORTVERSION=	6.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www
 MASTER_SITES=	http://www.thundercache.com.br/dist/ \
 		http://www.bmsoftware.org/packs/ \
@@ -62,7 +62,7 @@ RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pgsql.so:${PORTSDIR}/databases
 USE_PHP+=	curl pcre bcmath pdo mcrypt mhash session
 .endif
 
-LIB_DEPENDS+=	curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl:install
 
 SUB_FILES=	pkg-message log.sh test-deps.sh
 SUB_LIST=	"GREP=${GREP}"
diff --git a/www/thundersnarf/Makefile b/www/thundersnarf/Makefile
index 48a446b38669..498e2b521ecd 100644
--- a/www/thundersnarf/Makefile
+++ b/www/thundersnarf/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	thundersnarf
 PORTVERSION=	1.3
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.tracanelli.com.br/l/dev/thunder/ \
@@ -42,7 +42,7 @@ RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo_pgsql.so:${PORTSDIR}/datab
 USE_PHP+=	curl pcre bcmath pdo mcrypt mhash session pgsql spl dom xmlrpc ctype openssl simplexml soap json
 .endif
 
-LIB_DEPENDS+=	curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl:install
 
 SUB_FILES=	pkg-message
 
diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile
index 2c6d72d31600..5c0dc7ec8df7 100644
--- a/www/webkit-gtk2/Makefile
+++ b/www/webkit-gtk2/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	webkit
 PORTVERSION=	1.8.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://webkitgtk.org/releases/
 PKGNAMESUFFIX=	-gtk2
diff --git a/www/webkit-gtk3/Makefile b/www/webkit-gtk3/Makefile
index 8e050db752e4..d136d775427f 100644
--- a/www/webkit-gtk3/Makefile
+++ b/www/webkit-gtk3/Makefile
@@ -4,6 +4,7 @@
 
 PORTNAME=	webkit
 PORTVERSION=	1.8.3
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://webkitgtk.org/releases/
 PKGNAMESUFFIX=	-gtk3
diff --git a/www/wsdlpull/Makefile b/www/wsdlpull/Makefile
index 3c679326edf4..66afc6656444 100644
--- a/www/wsdlpull/Makefile
+++ b/www/wsdlpull/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	wsdlpull
 PORTVERSION=	1.24
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
 
diff --git a/www/xshttpd-devel/Makefile b/www/xshttpd-devel/Makefile
index c3bbeba69c74..49f4ceb34f72 100644
--- a/www/xshttpd-devel/Makefile
+++ b/www/xshttpd-devel/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	xshttpd
 DISTVERSION=	3.7b27
+PORTREVISION=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	ftp://ftp.stack.nl/pub/xs-httpd/release/ \
 		ftp://mud.stack.nl/pub/xs-httpd/release/
diff --git a/www/xshttpd/Makefile b/www/xshttpd/Makefile
index c179c1627a80..9e14209be893 100644
--- a/www/xshttpd/Makefile
+++ b/www/xshttpd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xshttpd
 DISTVERSION=	3.6g01
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	www ipv6
 MASTER_SITES=	ftp://ftp.stack.nl/pub/xs-httpd/release/ \
 		ftp://mud.stack.nl/pub/xs-httpd/release/