- 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

12 files changed, 13 insertions, 11 deletions

diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile
index 33ace8f8d03a..872bc8e8e776 100644
--- a/multimedia/audacious-plugins/Makefile
+++ b/multimedia/audacious-plugins/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	audacious-plugins
 PORTVERSION=	3.3.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://distfiles.audacious-media-player.org/
 
diff --git a/multimedia/cclive/Makefile b/multimedia/cclive/Makefile
index 874ba6bbc71c..c9993c72a054 100644
--- a/multimedia/cclive/Makefile
+++ b/multimedia/cclive/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cclive
 PORTVERSION=	0.7.11
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia net
 MASTER_SITES=	SF/${PORTNAME}/0.7 \
 		GOOGLE_CODE
@@ -14,7 +14,7 @@ COMMENT=	Lightweight command line video extraction tool
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	boost_system:${PORTSDIR}/devel/boost-libs \
-		curl.6:${PORTSDIR}/ftp/curl \
+		curl:${PORTSDIR}/ftp/curl \
 		pcre.3:${PORTSDIR}/devel/pcre \
 		quvi.7:${PORTSDIR}/multimedia/libquvi
 
diff --git a/multimedia/freetuxtv/Makefile b/multimedia/freetuxtv/Makefile
index baf82513e02c..00e54420b2cf 100644
--- a/multimedia/freetuxtv/Makefile
+++ b/multimedia/freetuxtv/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	freetuxtv
 PORTVERSION=	0.6.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia
 MASTER_SITES=	GOOGLE_CODE
 
diff --git a/multimedia/gnome-mplayer/Makefile b/multimedia/gnome-mplayer/Makefile
index 55a9dbf7de9e..6e5039de75d1 100644
--- a/multimedia/gnome-mplayer/Makefile
+++ b/multimedia/gnome-mplayer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gnome-mplayer
 PORTVERSION=	1.0.8
+PORTREVISION=	1
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	GOOGLE_CODE
 
diff --git a/multimedia/libquvi/Makefile b/multimedia/libquvi/Makefile
index 5722a5d64ee4..c2253a001324 100644
--- a/multimedia/libquvi/Makefile
+++ b/multimedia/libquvi/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libquvi
 PORTVERSION=	0.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia devel
 MASTER_SITES=	SF/quvi/${PORTVERSION:R}/${PORTNAME}/ \
 		GOOGLE_CODE
diff --git a/multimedia/mediainfo/Makefile b/multimedia/mediainfo/Makefile
index c9c7b1db0c06..f5cf1b19da7c 100644
--- a/multimedia/mediainfo/Makefile
+++ b/multimedia/mediainfo/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mediainfo
 PORTVERSION=	0.7.52
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/binary/${PORTNAME}/${PORTVERSION}
 DISTNAME=	MediaInfo_CLI_${PORTVERSION}_GNU_FromSource
diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index 1c8266626b16..a4092417b0b1 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mkvtoolnix
 PORTVERSION=	6.3.0
+PORTREVISION=	1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://www.bunkus.org/videotools/mkvtoolnix/sources/ \
 		CRITICAL
diff --git a/multimedia/qmmp/Makefile b/multimedia/qmmp/Makefile
index 8105b2f8fcf3..49dd6e9e711e 100644
--- a/multimedia/qmmp/Makefile
+++ b/multimedia/qmmp/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	qmmp
 PORTVERSION=	0.6.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://qmmp.ylsoftware.com/files/ \
 		${MASTER_SITE_GOOGLE_CODE}
diff --git a/multimedia/quvi/Makefile b/multimedia/quvi/Makefile
index 013dfde7966f..d02655acce33 100644
--- a/multimedia/quvi/Makefile
+++ b/multimedia/quvi/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	quvi
 PORTVERSION=	0.4.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION:R}/${PORTNAME}/ \
 		GOOGLE_CODE
diff --git a/multimedia/xbmc-pvr/Makefile b/multimedia/xbmc-pvr/Makefile
index e6827198181b..3b2d3e5f1496 100644
--- a/multimedia/xbmc-pvr/Makefile
+++ b/multimedia/xbmc-pvr/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xbmc
 PORTVERSION=	70
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	multimedia
 MASTER_SITES=	LOCAL/nox
 PKGNAMESUFFIX=	-pvr-ppa-odk
diff --git a/multimedia/xbmc/Makefile b/multimedia/xbmc/Makefile
index 2ef45e5d2349..1792d6dcb3b1 100644
--- a/multimedia/xbmc/Makefile
+++ b/multimedia/xbmc/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xbmc
 DISTVERSION=	12.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	http://mirrors.xbmc.org/releases/source/
 
diff --git a/multimedia/xine/Makefile b/multimedia/xine/Makefile
index 87a219948a73..de322e5de47b 100644
--- a/multimedia/xine/Makefile
+++ b/multimedia/xine/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xine
 PORTVERSION=	0.99.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-ui/${PORTVERSION}
 DISTNAME=	${PORTNAME}-ui-${PORTVERSION}