- 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

10 files changed, 13 insertions, 8 deletions

diff --git a/sysutils/afflib/Makefile b/sysutils/afflib/Makefile
index 6814e727907f..f9bc3301325a 100644
--- a/sysutils/afflib/Makefile
+++ b/sysutils/afflib/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	afflib
 PORTVERSION=	3.7.1
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://cloud.github.com/downloads/simsong/AFFLIBv3/ \
 		http://www.c-s.li/ports/
diff --git a/sysutils/apt/Makefile b/sysutils/apt/Makefile
index 16904e5fafe0..cfe8a0c25d31 100644
--- a/sysutils/apt/Makefile
+++ b/sysutils/apt/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	apt
 PORTVERSION=	0.6.46.4.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	apt_0.6.46.4-0.1
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
 		dpkg:${PORTSDIR}/archivers/dpkg \
 		gpg:${PORTSDIR}/security/gnupg1
-LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/sysutils/ckl/Makefile b/sysutils/ckl/Makefile
index aae56ad6f743..c4799b9f41a8 100644
--- a/sysutils/ckl/Makefile
+++ b/sysutils/ckl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ckl
 PORTVERSION=	0.9.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils net
 MASTER_SITES=	http://packages.cloudkick.com/releases/ckl/
 DISTNAME=	ckl-${PORTVERSION}
diff --git a/sysutils/condor/Makefile b/sysutils/condor/Makefile
index 838b09c03f41..9f0c8051ca9a 100644
--- a/sysutils/condor/Makefile
+++ b/sysutils/condor/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	condor
 PORTVERSION=	7.8.7
+PORTREVISION=	1
 CATEGORIES=	sysutils net
 MASTER_SITES=	# empty
 DISTNAME=	condor_src-${PORTVERSION}-all-all
diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile
index 4115e9497b23..f7cea733e916 100644
--- a/sysutils/conky/Makefile
+++ b/sysutils/conky/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	conky
 PORTVERSION=	1.9.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	SF
 
diff --git a/sysutils/fusefs-curlftpfs/Makefile b/sysutils/fusefs-curlftpfs/Makefile
index 36dc03318fd0..9cfbc86190ea 100644
--- a/sysutils/fusefs-curlftpfs/Makefile
+++ b/sysutils/fusefs-curlftpfs/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	curlftpfs
 PORTVERSION=	0.9.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	SF
 PKGNAMEPREFIX=	fusefs-
@@ -13,7 +13,7 @@ COMMENT=	Mount remote ftp directories
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
 
 GNU_CONFIGURE=	yes
 USES=		fuse pkgconfig
diff --git a/sysutils/fusefs-s3fs/Makefile b/sysutils/fusefs-s3fs/Makefile
index 519edf46247a..bc91d0904feb 100644
--- a/sysutils/fusefs-s3fs/Makefile
+++ b/sysutils/fusefs-s3fs/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	s3fs
 DISTVERSION=	1.71
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	GOOGLE_CODE
 PKGNAMEPREFIX=	fusefs-
diff --git a/sysutils/heartbeat/Makefile b/sysutils/heartbeat/Makefile
index 711568d15a86..3a5fa1952d34 100644
--- a/sysutils/heartbeat/Makefile
+++ b/sysutils/heartbeat/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	heartbeat
 PORTVERSION=	2.1.4
-PORTREVISION=	18
+PORTREVISION=	19
 CATEGORIES=	sysutils
 #MASTER_SITES=	http://hg.linux-ha.org/lha-2.1/archive/STABLE-2.1.4.tar.bz2
 MASTER_SITES=	${MASTER_SITE_LOCAL}
@@ -99,7 +99,7 @@ PLIST_SUB+=	APCSNMP="@comment "
 
 .if ${PORT_OPTIONS:MDRAC3} || exists (${PREFIX}/lib/libcurl.so)
 USE_CURL=	yes
-LIB_DEPENDS+=	curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
 PLIST_SUB+=	DRAC3=""
 .else
 PLIST_SUB+=	DRAC3="@comment "
diff --git a/sysutils/pacman/Makefile b/sysutils/pacman/Makefile
index 3a630f3011fb..15305723cbad 100644
--- a/sysutils/pacman/Makefile
+++ b/sysutils/pacman/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pacman
 PORTVERSION=	4.0.3
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.archlinux.org/other/pacman/ \
 		http://mirror.amdmi3.ru/distfiles/
diff --git a/sysutils/powerman/Makefile b/sysutils/powerman/Makefile
index 6b5d6e0b770d..9ddcf67dd206 100644
--- a/sysutils/powerman/Makefile
+++ b/sysutils/powerman/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	powerman
 PORTVERSION=	2.3.16
+PORTREVISION=	1
 CATEGORIES=	sysutils parallel
 MASTER_SITES=	GOOGLE_CODE