- 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

27 files changed, 38 insertions, 31 deletions

diff --git a/audio/amarok-kde4/Makefile b/audio/amarok-kde4/Makefile
index 9efa6e79f7a3..c030e66d82f1 100644
--- a/audio/amarok-kde4/Makefile
+++ b/audio/amarok-kde4/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	amarok
 PORTVERSION=	2.7.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTNAME}/${PORTVERSION}/src
diff --git a/audio/ario/Makefile b/audio/ario/Makefile
index 5f2963d6fe95..76118c7baca7 100644
--- a/audio/ario/Makefile
+++ b/audio/ario/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ario
 PORTVERSION=	1.5.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	audio
 MASTER_SITES=	SF/ario-player/ario-player/${PORTVERSION}
 
diff --git a/audio/deadbeef/Makefile b/audio/deadbeef/Makefile
index ccee5ee6ed6e..ff286b4ba1b1 100644
--- a/audio/deadbeef/Makefile
+++ b/audio/deadbeef/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	deadbeef
 PORTVERSION=	0.5.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}
 
diff --git a/audio/fplib/Makefile b/audio/fplib/Makefile
index 6c8ef8943587..00e77fb81806 100644
--- a/audio/fplib/Makefile
+++ b/audio/fplib/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	fplib
 PORTVERSION=	20120911
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	LOCAL/sunpoet
 
diff --git a/audio/gbemol/Makefile b/audio/gbemol/Makefile
index d0d9b9942e09..02e2124e4152 100644
--- a/audio/gbemol/Makefile
+++ b/audio/gbemol/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gbemol
 PORTVERSION=	0.3.2
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	audio
 MASTER_SITES=	SF
 
@@ -15,7 +15,7 @@ MAINTAINER=	tmh.public@gmail.com
 COMMENT=	Graphical frontend for the Music Player Daemon
 
 LIB_DEPENDS=	mpd.4:${PORTSDIR}/audio/libmpd \
-		curl.6:${PORTSDIR}/ftp/curl \
+		curl:${PORTSDIR}/ftp/curl \
 		xml2.5:${PORTSDIR}/textproc/libxml2
 
 GNU_CONFIGURE=	yes
diff --git a/audio/gogglesmm/Makefile b/audio/gogglesmm/Makefile
index a2d17662f16e..62f3c90ef3a1 100644
--- a/audio/gogglesmm/Makefile
+++ b/audio/gogglesmm/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gogglesmm
 PORTVERSION=	0.12.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	GOOGLE_CODE
 
diff --git a/audio/grip/Makefile b/audio/grip/Makefile
index e538e80f7363..8c228e5d3007 100644
--- a/audio/grip/Makefile
+++ b/audio/grip/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	grip
 PORTVERSION=	3.3.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	audio
 MASTER_SITES=	SF
 
diff --git a/audio/gtkpod/Makefile b/audio/gtkpod/Makefile
index 610aab5560a5..12e74785d21d 100644
--- a/audio/gtkpod/Makefile
+++ b/audio/gtkpod/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gtkpod
 PORTVERSION=	1.0.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
diff --git a/audio/herrie/Makefile b/audio/herrie/Makefile
index 39cafd9b5322..6060e75e9278 100644
--- a/audio/herrie/Makefile
+++ b/audio/herrie/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	herrie
 PORTVERSION=	2.2
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	audio
 MASTER_SITES=	http://herrie.info/distfiles/ \
 		http://www.stack.nl/~ed/projects/herrie/distfiles/
diff --git a/audio/icecast2/Makefile b/audio/icecast2/Makefile
index a0a8c620576c..e13fba779304 100644
--- a/audio/icecast2/Makefile
+++ b/audio/icecast2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	icecast2
 PORTVERSION=	2.3.2
-PORTREVISION=	9
+PORTREVISION=	10
 PORTEPOCH=	1
 CATEGORIES=	audio net ipv6
 MASTER_SITES=	http://downloads.xiph.org/releases/icecast/ \
diff --git a/audio/libofa/Makefile b/audio/libofa/Makefile
index bef9697d14e6..f4fc416e16f4 100644
--- a/audio/libofa/Makefile
+++ b/audio/libofa/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libofa
 PORTVERSION=	0.9.3
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	audio
 MASTER_SITES=	GOOGLE_CODE
 
diff --git a/audio/linnya/Makefile b/audio/linnya/Makefile
index 8a330c207c95..ac695b5e3750 100644
--- a/audio/linnya/Makefile
+++ b/audio/linnya/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	linnya
 PORTVERSION=	2.3.0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 MAINTAINER=	ghw@7axu.com
diff --git a/audio/moc/Makefile b/audio/moc/Makefile
index 1240ce6b8a28..cd95a7dc98d5 100644
--- a/audio/moc/Makefile
+++ b/audio/moc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	moc
 PORTVERSION=	2.4.4
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.daper.net/pub/soft/moc/stable/
 
@@ -105,7 +105,7 @@ CONFIGURE_ARGS+=	--without-samplerate
 .endif
 
 .if ${PORT_OPTIONS:MCURL}
-LIB_DEPENDS+=	curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
 .else
 CONFIGURE_ARGS+=	--without-curl
 .endif
diff --git a/audio/mpdas/Makefile b/audio/mpdas/Makefile
index 966b1bf0f829..6a7122f653ef 100644
--- a/audio/mpdas/Makefile
+++ b/audio/mpdas/Makefile
@@ -3,14 +3,14 @@
 
 PORTNAME=	mpdas
 PORTVERSION=	0.3.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://50hz.ws/mpdas/
 
 MAINTAINER=	hrkfdn@gmail.com
 COMMENT=	MPD AudioScrobbler written in C++ supporting the latest protocol
 
-LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
 		mpd.4:${PORTSDIR}/audio/libmpd
 
 USE_GNOME=	pkgconfig
diff --git a/audio/mpdscribble/Makefile b/audio/mpdscribble/Makefile
index b01086045e1b..ddcda4e5a7e3 100644
--- a/audio/mpdscribble/Makefile
+++ b/audio/mpdscribble/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mpdscribble
 PORTVERSION=	0.22
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	SF/musicpd/${PORTNAME}/${PORTVERSION}
 
@@ -29,7 +30,7 @@ SOUP_DESC=	Use libsoup instead of libcurl
 LIB_DEPENDS+=	soup-2.4.1:${PORTSDIR}/devel/libsoup
 CONFIGURE_ARGS+=	--with-http-client=soup
 .else
-LIB_DEPENDS+=	curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
 CONFIGURE_ARGS+=	--with-http-client=curl
 .endif
 
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index 774bcf64ee43..c16b997e37d0 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	musicpd
 PORTVERSION=	0.17.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio ipv6
 MASTER_SITES=	SF/${PORTNAME}/mpd/${PORTVERSION}
 DISTNAME=	mpd-${PORTVERSION}
@@ -11,7 +11,7 @@ MAINTAINER=	crees@FreeBSD.org
 COMMENT=	A remote-controllable music daemon
 
 LIB_DEPENDS+=	mad.2:${PORTSDIR}/audio/libmad \
-		curl.6:${PORTSDIR}/ftp/curl
+		curl:${PORTSDIR}/ftp/curl
 
 LICENSE=	GPLv2
 
diff --git a/audio/ncmpcpp/Makefile b/audio/ncmpcpp/Makefile
index 8a15129429e5..c5f2c2117304 100644
--- a/audio/ncmpcpp/Makefile
+++ b/audio/ncmpcpp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ncmpcpp
 PORTVERSION=	0.5.10
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://unkart.ovh.org/ncmpcpp/ \
 		http://mirror.mcx2.org/
@@ -44,7 +45,7 @@ PLIST_FILES=	bin/ncmpcpp \
 PLIST_DIRS=	%%DOCSDIR%%
 
 .if ${PORT_OPTIONS:MCURL}
-LIB_DEPENDS+=	curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
 CONFIGURE_ARGS+=	--with-curl
 .else
 CONFIGURE_ARGS+=	--with-curl=no
diff --git a/audio/osd-lyrics/Makefile b/audio/osd-lyrics/Makefile
index 0078865eebf6..9ded90e35fa7 100644
--- a/audio/osd-lyrics/Makefile
+++ b/audio/osd-lyrics/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	osdlyrics
 PORTVERSION=	0.4.3
+PORTREVISION=	1
 CATEGORIES=	audio deskutils
 MASTER_SITES=	GOOGLE_CODE
 PROJECTHOST=	osd-lyrics
diff --git a/audio/rosegarden/Makefile b/audio/rosegarden/Makefile
index e7a5dcf6ab17..743a53ff565c 100644
--- a/audio/rosegarden/Makefile
+++ b/audio/rosegarden/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	rosegarden
 PORTVERSION=	13.04
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/
 
diff --git a/audio/scmpc/Makefile b/audio/scmpc/Makefile
index c5fcad8b82b5..f921ef9a042a 100644
--- a/audio/scmpc/Makefile
+++ b/audio/scmpc/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	scmpc
 PORTVERSION=	0.3.1
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://cloud.github.com/downloads/cmende/${PORTNAME}/
 
@@ -12,7 +13,7 @@ COMMENT=	An Audioscrobbler client for MPD
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	confuse.0:${PORTSDIR}/devel/libconfuse \
-		curl.6:${PORTSDIR}/ftp/curl
+		curl:${PORTSDIR}/ftp/curl
 
 USES=		pkgconfig
 USE_BZIP2=	yes
diff --git a/audio/scrobbler/Makefile b/audio/scrobbler/Makefile
index b0129245a2a2..422c76c588fb 100644
--- a/audio/scrobbler/Makefile
+++ b/audio/scrobbler/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME?=	scrobbler
 PORTVERSION=	0.3.8.1
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	audio
 MASTER_SITES=	http://static.audioscrobbler.com/plugins/ \
 		http://www.pipian.com/stuffforchat/
@@ -15,7 +15,7 @@ DISTNAME=	xmms-scrobbler-${PORTVERSION}
 MAINTAINER?=	novel@FreeBSD.org
 COMMENT?=	XMMS/BMP plugin for Audioscrobbler.com
 
-LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
 
 CONFLICTS=	bmp-scrobbler-[0-9]* \
 		xmms-scrobbler-[0-9]*
diff --git a/audio/streamtranscoder/Makefile b/audio/streamtranscoder/Makefile
index 3c394aea15bd..b8a968505e6a 100644
--- a/audio/streamtranscoder/Makefile
+++ b/audio/streamtranscoder/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	streamtranscoder
 PORTVERSION=	1.2.8
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	audio
 MASTER_SITES=	http://www.oddsock.org/tools/streamTranscoder/
 
diff --git a/audio/streamtuner/Makefile b/audio/streamtuner/Makefile
index 53ff6014ea48..8352cc7e3652 100644
--- a/audio/streamtuner/Makefile
+++ b/audio/streamtuner/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	streamtuner
 PORTVERSION=	0.99.99
-PORTREVISION=	19
+PORTREVISION=	20
 CATEGORIES=	audio www
 MASTER_SITES=	SAVANNAH
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/vagalume/Makefile b/audio/vagalume/Makefile
index d1a5726d4e02..da74ede38afe 100644
--- a/audio/vagalume/Makefile
+++ b/audio/vagalume/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	vagalume
 PORTVERSION=	0.8.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://vagalume.igalia.com/files/source/ \
 		${MASTER_SITE_DEBIAN_POOL}
@@ -13,7 +13,7 @@ MAINTAINER=	decke@FreeBSD.org
 COMMENT=	A GTK+-based client for the Last.fm online radio
 
 LIB_DEPENDS=	xml2:${PORTSDIR}/textproc/libxml2 \
-		curl.6:${PORTSDIR}/ftp/curl
+		curl:${PORTSDIR}/ftp/curl
 
 GNU_CONFIGURE=	yes
 USES=		pkgconfig
diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile
index 7df92dc87eb4..0891f55d589e 100644
--- a/audio/vorbis-tools/Makefile
+++ b/audio/vorbis-tools/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	vorbis-tools
 PORTVERSION=	1.4.0
-PORTREVISION=	5
+PORTREVISION=	6
 PORTEPOCH=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://downloads.xiph.org/releases/vorbis/
@@ -12,7 +12,7 @@ MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	Play, encode, and manage Ogg Vorbis files
 
 LIB_DEPENDS=	ao.4:${PORTSDIR}/audio/libao \
-		curl.6:${PORTSDIR}/ftp/curl \
+		curl:${PORTSDIR}/ftp/curl \
 		FLAC:${PORTSDIR}/audio/flac \
 		kate.4:${PORTSDIR}/multimedia/libkate \
 		speex.1:${PORTSDIR}/audio/speex \
diff --git a/audio/xmms2-scrobbler/Makefile b/audio/xmms2-scrobbler/Makefile
index ce813a85222c..3e85cdaf8e9d 100644
--- a/audio/xmms2-scrobbler/Makefile
+++ b/audio/xmms2-scrobbler/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xmms2-scrobbler
 PORTVERSION=	0.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.code-monkey.de/pub/${PORTNAME}/
 
@@ -13,7 +13,7 @@ COMMENT=	Last.fm submission client for XMMS2
 LICENSE=	MIT
 
 LIB_DEPENDS=	xmmsclient.6:${PORTSDIR}/audio/xmms2 \
-		curl.6:${PORTSDIR}/ftp/curl
+		curl:${PORTSDIR}/ftp/curl
 
 USES=		pkgconfig
 USE_GMAKE=	yes
diff --git a/audio/xmms2/Makefile b/audio/xmms2/Makefile
index 8d5ed376a808..db4ba3788ca5 100644
--- a/audio/xmms2/Makefile
+++ b/audio/xmms2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME?=	xmms2
 PORTVERSION=	0.8
-PORTREVISION?=	3
+PORTREVISION?=	4
 DISTVERSIONSUFFIX=DrO_o
 CATEGORIES?=	audio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20${DISTVERSIONSUFFIX}