- 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

7 files changed, 9 insertions, 9 deletions

diff --git a/lang/fpc/Makefile b/lang/fpc/Makefile
index 9aee0d56a793..e809e3ed339e 100644
--- a/lang/fpc/Makefile
+++ b/lang/fpc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	fpc
 PORTVERSION=	2.6.2
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	lang
 MASTER_SITES=	ftp://ftp.freepascal.org/pub/fpc/dist/${PORTVERSION}/source/:source \
 		ftp://planetmirror.com/pub/fpc/dist/${PORTVERSION}/source/:source \
diff --git a/lang/fpc/Makefile.units b/lang/fpc/Makefile.units
index 9548ed918dd6..c5c74ec363af 100644
--- a/lang/fpc/Makefile.units
+++ b/lang/fpc/Makefile.units
@@ -167,7 +167,7 @@ USE_OPENLDAP=	yes
 
 .if ${PKGNAMESUFFIX} == "-libcurl"
 .	if defined(WITH_LIBCURL)
-LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
 .	endif
 .endif
 
diff --git a/lang/gambas/Makefile b/lang/gambas/Makefile
index 320a1ec6700c..b8591414dcc5 100644
--- a/lang/gambas/Makefile
+++ b/lang/gambas/Makefile
@@ -6,14 +6,14 @@
 
 PORTNAME=		gambas
 PORTVERSION=		1.0.19
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=		lang
 MASTER_SITES=		SF
 
 MAINTAINER=		thierry@FreeBSD.org
 COMMENT=		Gambas Almost Means BASic
 
-LIB_DEPENDS=		curl.6:${PORTSDIR}/ftp/curl	\
+LIB_DEPENDS=		curl:${PORTSDIR}/ftp/curl	\
 			ml.0:${PORTSDIR}/math/ldouble
 
 USE_AUTOTOOLS=		libltdl libtool
diff --git a/lang/php52/Makefile b/lang/php52/Makefile
index 95aebd4da3f1..35cc6e4a5ac7 100644
--- a/lang/php52/Makefile
+++ b/lang/php52/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	php52
 PORTVERSION=	5.2.17
-PORTREVISION=	14
+PORTREVISION?=	14
 CATEGORIES?=	lang devel www
 MASTER_SITES=	${MASTER_SITE_PHP}
 MASTER_SITE_SUBDIR=	distributions
diff --git a/lang/php52/Makefile.ext b/lang/php52/Makefile.ext
index 7398479b600f..ae1c4a11e001 100644
--- a/lang/php52/Makefile.ext
+++ b/lang/php52/Makefile.ext
@@ -40,7 +40,7 @@ CONFIGURE_ARGS+=--enable-ctype
 .endif
 
 .if ${PHP_MODNAME} == "curl"
-LIB_DEPENDS+=	curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
 
 CONFIGURE_ARGS+=--with-curl=${LOCALBASE}
 .endif
diff --git a/lang/php53/Makefile.ext b/lang/php53/Makefile.ext
index 6e23ebcd06d5..bffe0ed6a8e7 100644
--- a/lang/php53/Makefile.ext
+++ b/lang/php53/Makefile.ext
@@ -32,7 +32,7 @@ CONFIGURE_ARGS+=--enable-ctype
 .endif
 
 .if ${PHP_MODNAME} == "curl"
-LIB_DEPENDS+=	curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
 
 CONFIGURE_ARGS+=--with-curl=${LOCALBASE}
 .endif
diff --git a/lang/q/Makefile b/lang/q/Makefile
index 784f44f2a33a..91affb4562fe 100644
--- a/lang/q/Makefile
+++ b/lang/q/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	q
 PORTVERSION=	7.11
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	lang
 MASTER_SITES=	SF/${PORTNAME}-lang/${PORTNAME}/${PORTVERSION}
 
@@ -14,7 +14,7 @@ DEPRECATED=	Q-Lang is no longer supported. See lang/pure instead
 EXPIRATION_DATE=2013-08-10 
 
 LIB_DEPENDS=	MagickWand:${PORTSDIR}/graphics/ImageMagick \
-    		curl.6:${PORTSDIR}/ftp/curl \
+    		curl:${PORTSDIR}/ftp/curl \
 		freetype.9:${PORTSDIR}/print/freetype2 \
 		gdbm.4:${PORTSDIR}/databases/gdbm \
 		gmp.10:${PORTSDIR}/math/gmp \