- 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
svn path=/head/; revision=322783
2025-01-11 07:22:22 +00:00 · 2013-07-11 16:26:26 +00:00 · 2013-07-11 16:26:26 +00:00 · c2d1a14c7c · 2021-03-31 03:12:20 +00:00
commit c2d1a14c7c
parent fcf1af8ef4
252 changed files with 518 additions and 418 deletions
--- a/archivers/epkg/Makefile
+++ b/archivers/epkg/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	epkg
 PORTVERSION=	2.3.9
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	archivers
 MASTER_SITES=	ftp://ftp.feep.net/pub/encap/epkg/

@ -15,7 +15,7 @@ MAINTAINER=	pirzyk@FreeBSD.org
 COMMENT=	Encap Package Manager

 BUILD_DEPENDS=	${LOCALBASE}/lib/libfget.a:${PORTSDIR}/ftp/fget
-LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
 		expat.6:${PORTSDIR}/textproc/expat2

 HAS_CONFIGURE=	YES
--- a/astro/foxtrotgps/Makefile
+++ b/astro/foxtrotgps/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	foxtrotgps
 PORTVERSION=	1.1.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	astro geography
 MASTER_SITES=	http://www.foxtrotgps.org/releases/

--- a/astro/viking/Makefile
+++ b/astro/viking/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	viking
 PORTVERSION=	1.4.1
+PORTREVISION=	1
 CATEGORIES=	astro
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/

--- 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
--- 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}

--- 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}

--- a/audio/fplib/Makefile
+++ b/audio/fplib/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	fplib
 PORTVERSION=	20120911
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	LOCAL/sunpoet

--- 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
--- 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

--- 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

--- 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}

--- 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/
--- 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/ \
--- 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

--- 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
--- 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
--- 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
--- 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

--- 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

--- 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
--- 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
--- 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}/

--- 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
--- 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]*
--- 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/

--- 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}
--- 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
--- 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 \
--- 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
--- 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}
--- a/biology/iolib/Makefile
+++ b/biology/iolib/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	io_lib
 PORTVERSION=	1.13.0
+PORTREVISION=	1
 CATEGORIES=	biology
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	staden/${PORTNAME}/${PORTVERSION}
--- a/chinese/fcitx-cloudpinyin/Makefile
+++ b/chinese/fcitx-cloudpinyin/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	fcitx-cloudpinyin
 PORTVERSION=	0.3.0
+PORTREVISION=	1
 CATEGORIES=	chinese
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 DIST_SUBDIR=	fcitx
--- a/comms/xastir/Makefile
+++ b/comms/xastir/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	xastir
 PORTVERSION=	2.0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-stable/${PORTNAME}-${PORTVERSION}

--- a/converters/bibtexconv/Makefile
+++ b/converters/bibtexconv/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	bibtexconv
 PORTVERSION=	0.9.3
+PORTREVISION=	1
 CATEGORIES=	converters
 MASTER_SITES=	http://www.iem.uni-due.de/~dreibh/bibtexconv/download/ \
 		http://www.exp-math.uni-essen.de/~dreibh/bibtexconv/download/
--- a/databases/couchdb/Makefile
+++ b/databases/couchdb/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	couchdb
 PORTVERSION=	1.2.2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_APACHE}
--- a/deskutils/cairo-dock/Makefile
+++ b/deskutils/cairo-dock/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	cairo-dock
 DISTVERSION=	3.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils
 MASTER_SITES=	https://launchpadlibrarian.net/137290048/ \
 		http://pazzle.otdux.com.ua/
--- a/deskutils/fbreader/Makefile
+++ b/deskutils/fbreader/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	fbreader
 PORTVERSION=	0.12.10
-PORTREVISION=	2
+PORTREVISION=	3
 DISTVERSIONPREFIX=	sources-
 CATEGORIES=	deskutils
 MASTER_SITES=	http://www.fbreader.org/files/sources/ \
@ -17,7 +17,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	Powerful e-book reader

-LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
 		expat.6:${PORTSDIR}/textproc/expat2 \
 		fribidi.3:${PORTSDIR}/converters/fribidi \
 		linebreak.2:${PORTSDIR}/textproc/liblinebreak
--- a/deskutils/google-gadgets/Makefile
+++ b/deskutils/google-gadgets/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	google-gadgets
 PORTVERSION=	0.11.2
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	deskutils
 MASTER_SITES=	http://google-gadgets-for-linux.googlecode.com/files/
 DISTNAME=	${PORTNAME}-for-linux-${PORTVERSION}
@ -21,7 +21,7 @@ BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:${PORTSDIR}/devel/dbus \
 LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo \
 		xml2.5:${PORTSDIR}/textproc/libxml2 \
 		dbus-1.3:${PORTSDIR}/devel/dbus \
-		curl.6:${PORTSDIR}/ftp/curl \
+		curl:${PORTSDIR}/ftp/curl \
 		rsvg-2.2:${PORTSDIR}/graphics/librsvg2 \
 		startup-notification-1.0:${PORTSDIR}/x11/startup-notification
 RUN_DEPENDS=	${LOCALBASE}/bin/update-mime-database:${PORTSDIR}/misc/shared-mime-info
--- a/deskutils/growl-for-linux/Makefile
+++ b/deskutils/growl-for-linux/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	growl-for-linux
 PORTVERSION=	0.6.8
-#PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	deskutils

 MAINTAINER=	nivit@FreeBSD.org
--- a/deskutils/libgcal/Makefile
+++ b/deskutils/libgcal/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	libgcal
 PORTVERSION=	0.9.6
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}

--- a/deskutils/ljit/Makefile
+++ b/deskutils/ljit/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	ljit
 PORTVERSION=	0.2.5
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	deskutils
 MASTER_SITES=	http://kir.vtx.ru/ljit/dl/ \
 		http://freebsd.nsu.ru/distfiles/
@ -17,7 +17,7 @@ COMMENT=	GUI tool to help LiveJournal users post images

 LICENSE=	GPLv2

-LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
 RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick

 GNU_CONFIGURE=	yes
--- a/deskutils/logjam/Makefile
+++ b/deskutils/logjam/Makefile
@ -7,14 +7,14 @@

 PORTNAME=	logjam
 PORTVERSION=	4.6.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils
 MASTER_SITES=	http://andy-shev.github.com/LogJam/download/

 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	A GTK2 interface to livejournals, ie www.livejournal.com

-LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
 	        dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib

 MAN1=		logjam.1
--- a/deskutils/mdh/Makefile
+++ b/deskutils/mdh/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	mdh
 PORTVERSION=	1.9.60
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://www.gozer.org/programs/gtk/files/

@ -31,7 +31,7 @@ LIB_DEPENDS+=	gtop-2.0:${PORTSDIR}/devel/libgtop
 .if defined(WITHOUT_CURL)
 CONFIGURE_ARGS+=	--disable-curl
 .else
-LIB_DEPENDS+=	curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
 .endif

 post-patch:
--- a/deskutils/pinot/Makefile
+++ b/deskutils/pinot/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	pinot
 PORTVERSION=	1.06
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 #MASTER_SITES=	http://colinf.chez.com/pinot/
@ -25,7 +26,7 @@ LIB_DEPENDS=	xapian:${PORTSDIR}/databases/xapian-core	\
 		exiv2.12:${PORTSDIR}/graphics/exiv2		\
 		gmime-2.4:${PORTSDIR}/mail/gmime24		\
 		tag.1:${PORTSDIR}/audio/taglib			\
-		curl.6:${PORTSDIR}/ftp/curl
+		curl:${PORTSDIR}/ftp/curl
 RUN_DEPENDS=	update-mime-database:${PORTSDIR}/misc/shared-mime-info	\
 		antiword:${PORTSDIR}/textproc/antiword			\
 		xdg-open:${PORTSDIR}/devel/xdg-utils			\
--- a/deskutils/xfce4-tumbler/Makefile
+++ b/deskutils/xfce4-tumbler/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	tumbler
 PORTVERSION=	0.1.29
+PORTREVISION=	1
 CATEGORIES=	deskutils xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/xfce/${PORTNAME}/${PORTVERSION:R}
--- a/devel/aegis/Makefile
+++ b/devel/aegis/Makefile
@ -7,13 +7,14 @@

 PORTNAME=	aegis
 PORTVERSION=	4.24.3
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	SF

 MAINTAINER=	aryeh.friedman@gmail.com
 COMMENT=	Transaction-based software configuration management system

-LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
 RUN_DEPENDS=	tkdiff:${PORTSDIR}/textproc/tkdiff

 USES=		gettext
--- a/devel/ecore-file/Makefile
+++ b/devel/ecore-file/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	file
 PORTVERSION=	1.7.7
+PORTREVISION=	1
 CATEGORIES=	devel enlightenment
 MASTER_SITES=	http://download.enlightenment.fr/releases/ \
 		LOCAL/gblach/e17/
--- a/devel/hs-darcs/Makefile
+++ b/devel/hs-darcs/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	darcs
 PORTVERSION=	2.8.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell

 MAINTAINER=	haskell@FreeBSD.org
--- a/devel/libdap/Makefile
+++ b/devel/libdap/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	libdap
 PORTVERSION=	3.11.7
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.opendap.org/pub/source/ \
 		LOCAL/sunpoet
--- a/devel/libgutenfetch/Makefile
+++ b/devel/libgutenfetch/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	libgutenfetch
 PORTVERSION=	1.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	SF

--- a/devel/libopkele/Makefile
+++ b/devel/libopkele/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	libopkele
 PORTVERSION=	2.0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://kin.klever.net/dist/

@ -15,7 +15,7 @@ MAINTAINER=	zhoushuqun@gmail.com
 COMMENT=	A c++ implementation of an OpenID decentralized identity system

 BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
-LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
 		pcre.3:${PORTSDIR}/devel/pcre \
 		expat.6:${PORTSDIR}/textproc/expat2 \
 		tidy:${PORTSDIR}/www/tidy-lib \
--- a/devel/libvirt/Makefile
+++ b/devel/libvirt/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	libvirt
 PORTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://libvirt.org/sources/ \
 		ftp://libvirt.org/libvirt/
--- a/devel/libwfut/Makefile
+++ b/devel/libwfut/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	libwfut
 PORTVERSION=	0.2.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	SF/worldforge/libwfut%20%28updates%20library%29/${PORTVERSION}

@ -10,7 +11,7 @@ MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	WorldForge update library

 LIB_DEPENDS=	sigc-2.0:${PORTSDIR}/devel/libsigc++20 \
-		curl.6:${PORTSDIR}/ftp/curl
+		curl:${PORTSDIR}/ftp/curl

 CONFIGURE_ARGS+=--without-python
 GNU_CONFIGURE=	yes
--- a/devel/mm-common/Makefile
+++ b/devel/mm-common/Makefile
@ -8,14 +8,14 @@

 PORTNAME=	mm-common
 PORTVERSION=	0.9.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME

 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Common build infrastructure for the GNOME C++ binding libraries

-LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl

 USES=	pathfix
 USE_BZIP2=	yes
--- a/devel/xmltooling/Makefile
+++ b/devel/xmltooling/Makefile
@ -3,13 +3,14 @@

 PORTNAME=	xmltooling
 PORTVERSION=	1.5.3
+PORTREVISION=	1
 CATEGORIES=	devel security
 MASTER_SITES=	http://shibboleth.net/downloads/c++-opensaml/2.5.3/

 MAINTAINER=	girgen@FreeBSD.org
 COMMENT=	Low level XML support for SAML

-LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
 		log4shib.1:${PORTSDIR}/devel/log4shib \
 		xerces-c.3:${PORTSDIR}/textproc/xerces-c3 \
 		xml-security-c.17:${PORTSDIR}/security/apache-xml-security-c
--- a/editors/codelite/Makefile
+++ b/editors/codelite/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	codelite
 DISTVERSION=	5.1
+PORTREVISION=	1
 CATEGORIES=	editors devel
 MASTER_SITES=	SF/${PORTNAME}/Releases/${PORTNAME}-${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-gtk.src
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@ -26,7 +26,7 @@ BUILD_DEPENDS=	p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
 LIB_DEPENDS=	icutu:${PORTSDIR}/devel/icu \
 		langtag:${PORTSDIR}/devel/liblangtag \
 		orcus-0.6:${PORTSDIR}/devel/liborcus \
-		curl.6:${PORTSDIR}/ftp/curl \
+		curl:${PORTSDIR}/ftp/curl \
 		cairo.2:${PORTSDIR}/graphics/cairo \
 		graphite2:${PORTSDIR}/graphics/graphite2 \
 		jpeg.11:${PORTSDIR}/graphics/jpeg \
--- a/editors/morla/Makefile
+++ b/editors/morla/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	morla
 PORTVERSION=	0.16.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	editors textproc
 MASTER_SITES=	http://www.morlardf.net/src/ \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/${PORTVERSION}/
@ -14,7 +14,7 @@ COMMENT=	A RDF editor
 LIB_DEPENDS=	nxml.18:${PORTSDIR}/textproc/libnxml \
 		rdf.0:${PORTSDIR}/textproc/redland \
 		raptor2.0:${PORTSDIR}/textproc/raptor2 \
-		curl.6:${PORTSDIR}/ftp/curl
+		curl:${PORTSDIR}/ftp/curl
 BUILD_DEPENDS=	dot:${PORTSDIR}/graphics/graphviz
 RUN_DEPENDS=	dot:${PORTSDIR}/graphics/graphviz

--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	apache-openoffice
 PORTVERSION=	3.4.1
+PORTREVISION=	1
 CATEGORIES=	editors java
 MASTER_SITES=	ftp://ftp.riken.jp/net/apache/incubator/ooo/3.4.1/source/ \
 		${MASTER_SITE_LOCAL:S@%SUBDIR%@maho/openoffice@}:extsrc
@ -111,7 +112,7 @@ CONFIGURE_ENV+=	CC="${OOOCC}" CXX="${OOOCXX}"		\
 LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo \
 		expat.6:${PORTSDIR}/textproc/expat2 \
 		jpeg.11:${PORTSDIR}/graphics/jpeg \
-		curl.6:${PORTSDIR}/ftp/curl \
+		curl:${PORTSDIR}/ftp/curl \
 		hunspell-1.3.0:${PORTSDIR}/textproc/hunspell \
 		poppler-glib.8:${PORTSDIR}/graphics/poppler-glib \
 		rdf.0:${PORTSDIR}/textproc/redland \
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	apache-openoffice
 PORTVERSION=	4.0.${SVNREVISION}
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	editors java
 MASTER_SITES=	${MASTER_SITE_LOCAL}
@ -112,7 +113,7 @@ CONFIGURE_ENV+=	CC="${OOOCC}" CXX="${OOOCXX}"		\
 LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo \
 		expat.6:${PORTSDIR}/textproc/expat2 \
 		jpeg.11:${PORTSDIR}/graphics/jpeg \
-		curl.6:${PORTSDIR}/ftp/curl \
+		curl:${PORTSDIR}/ftp/curl \
 		hunspell-1.3.0:${PORTSDIR}/textproc/hunspell \
 		poppler-glib.8:${PORTSDIR}/graphics/poppler-glib \
 		rdf.0:${PORTSDIR}/textproc/redland \
--- a/editors/textroom/Makefile
+++ b/editors/textroom/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	textroom
 PORTVERSION=	0.8.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	editors
 MASTER_SITES=	SF

@ -12,7 +12,7 @@ COMMENT=	Full screen text editor

 LIB_DEPENDS=	hunspell-1.3:${PORTSDIR}/textproc/hunspell \
 		xml++-2.6.2:${PORTSDIR}/textproc/libxml++26 \
-		curl.6:${PORTSDIR}/ftp/curl
+		curl:${PORTSDIR}/ftp/curl

 USES=	shared-mime-info
 USE_SDL=	mixer
--- a/emulators/qemu-devel/Makefile
+++ b/emulators/qemu-devel/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	qemu
 PORTVERSION=	1.5.1
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://wiki.qemu.org/download/:release \
 		LOCAL/nox:snapshot
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	qemu
 PORTVERSION=	0.11.1
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SAVANNAH} \
 		http://bellard.org/qemu/
--- a/emulators/virtualbox-ose-legacy/Makefile
+++ b/emulators/virtualbox-ose-legacy/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	virtualbox-ose
 DISTVERSION=	4.1.24
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
 		http://tmp.chruetertee.ch/ \
@ -27,7 +28,7 @@ BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm \
 		cdrecord:${PORTSDIR}/sysutils/cdrtools
 LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 		xslt.2:${PORTSDIR}/textproc/libxslt \
-		curl.6:${PORTSDIR}/ftp/curl
+		curl:${PORTSDIR}/ftp/curl
 RUN_DEPENDS=	/boot/modules/vboxdrv.ko:${PORTSDIR}/emulators/virtualbox-ose-kmod-legacy \
 		cdrecord:${PORTSDIR}/sysutils/cdrtools

--- a/emulators/virtualbox-ose/Makefile
+++ b/emulators/virtualbox-ose/Makefile
@ -27,7 +27,7 @@ BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm \
 		cdrecord:${PORTSDIR}/sysutils/cdrtools
 LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 		xslt.2:${PORTSDIR}/textproc/libxslt \
-		curl.6:${PORTSDIR}/ftp/curl
+		curl:${PORTSDIR}/ftp/curl
 RUN_DEPENDS=	${KMODDIR}/vboxdrv.ko:${PORTSDIR}/emulators/virtualbox-ose-kmod \
 		cdrecord:${PORTSDIR}/sysutils/cdrtools

--- a/finance/libofx/Makefile
+++ b/finance/libofx/Makefile
@ -3,13 +3,14 @@

 PORTNAME=	libofx
 PORTVERSION=	0.9.5
+PORTREVISION=	1
 CATEGORIES=	finance
 MASTER_SITES=	SF

 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	OpenSource implementation of the OFX (Open Financial eXchange)

-LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
 		xml\\+\\+-2.6.2:${PORTSDIR}/textproc/libxml++26 \
 		osp.5:${PORTSDIR}/textproc/opensp

--- a/ftp/R-cran-RCurl/Makefile
+++ b/ftp/R-cran-RCurl/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	RCurl
 DISTVERSION=	1.95-4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ftp
 DISTNAME=	${PORTNAME}_${DISTVERSION}

--- a/ftp/curl/Makefile
+++ b/ftp/curl/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	curl
-PORTVERSION=	7.24.0
-PORTREVISION=	4
+PORTVERSION=	7.31.0
 CATEGORIES=	ftp ipv6 www
 MASTER_SITES=	http://curl.haxx.se/download/ \
 		LOCAL/sunpoet
@ -14,27 +13,29 @@ COMMENT?=	Non-interactive tool to get files from FTP, GOPHER, HTTP(S) servers

 LICENSE=	MIT

-OPTIONS_DEFINE=	CARES CURL_DEBUG IPV6 KERBEROS4 LDAP LDAPS LIBIDN LIBSSH2 \
-		NTLM CA_BUNDLE PROXY RTMP TRACKMEMORY DOCS EXAMPLES
-OPTIONS_RADIO=	SSL
-OPTIONS_RADIO_SSL=	OPENSSL GNUTLS
-OPTIONS_DEFAULT=	CA_BUNDLE PROXY OPENSSL
-CURL_DEBUG_DESC=	curl diagnostic output
-LIBIDN_DESC=		Internationalized Domain Names via libidn
-LIBSSH2_DESC=		SCP/SFTP support via libssh2
-NTLM_DESC=		NTLM authentication
-CA_BUNDLE_DESC=		Install CA bundle for OpenSSL
-TRACKMEMORY_DESC=	curl memory diagnostic output
+OPTIONS_DEFINE=	CA_BUNDLE COOKIES CURL_DEBUG DEBUG DOCS EXAMPLES GSSAPI IDN IPV6 LDAP LDAPS LIBSSH2 NTLM PROXY RTMP SPNEGO TLS_SRP
+OPTIONS_RADIO=	RESOLV SSL
+OPTIONS_RADIO_RESOLV=	CARES THREADED_RESOLVER
+OPTIONS_RADIO_SSL=	CYASSL GNUTLS NSS OPENSSL POLARSSL
+OPTIONS_DEFAULT=CA_BUNDLE GSSAPI IPV6 OPENSSL PROXY RESOLV THREADED_RESOLVER SSL TLS_SRP
+CA_BUNDLE_DESC=	Install CA bundle for OpenSSL
+COOKIES_DESC=	Cookies support
+CURL_DEBUG_DESC=cURL debug memory tracking
+LIBSSH2_DESC=	SCP/SFTP support via libssh2
+RESOLV_DESC=	DNS resolving options
+SPNEGO=		SPNEGO (RFC 4178) support
+THREADED_RESOLVER_DESC=	Threaded DNS resolver
+TLS_SRP_DESC=	TLS-SRP (Secure Remote Password) support

 CONFIGURE_ARGS+=--disable-threaded-resolver --disable-werror \
-		--enable-imap --enable-pop3 --enable-rtsp --enable-smtp
+		--enable-imap --enable-pop3 --enable-rtsp --enable-smtp \
+		--without-axtls
 CONFIGURE_ENV=	LOCALBASE="${LOCALBASE}"
 GNU_CONFIGURE=	yes
-MAKE_ENV=	SHLIB_VER="${SHLIB_VER}"
 MAKE_JOBS_SAFE=	yes
-USES=	pathfix
-USE_PERL5_BUILD=	yes
+USE_PERL5_BUILD=yes
 USE_XZ=		yes
+USES=		pathfix

 .if !defined(BUILDING_HIPHOP)
 USE_LDCONFIG=	yes
@ -44,7 +45,7 @@ DOCS=		BINDINGS BUGS CONTRIBUTE DISTRO-DILEMMA FAQ FEATURES HISTORY \
 		MANUAL README.netware README.win32 RESOURCES SSLCERTS THANKS \
 		TODO TheArtOfHttpScripting VERSIONS curl-config.html \
 		curl-config.pdf curl.html curl.pdf index.html
-MAN1=		curl.1 curl-config.1
+MAN1=		curl.1 curl-config.1 mk-ca-bundle.1
 MAN3=		curl_easy_cleanup.3 curl_easy_duphandle.3 curl_easy_escape.3 \
 		curl_easy_getinfo.3 curl_easy_init.3 curl_easy_pause.3 \
 		curl_easy_perform.3 curl_easy_recv.3 curl_easy_reset.3 \
@ -57,59 +58,80 @@ MAN3=		curl_easy_cleanup.3 curl_easy_duphandle.3 curl_easy_escape.3 \
 		curl_multi_info_read.3 curl_multi_init.3 curl_multi_perform.3 \
 		curl_multi_remove_handle.3 curl_multi_setopt.3 \
 		curl_multi_socket.3 curl_multi_socket_action.3 \
-	       	curl_multi_strerror.3 curl_multi_timeout.3 \
+	 	curl_multi_strerror.3 curl_multi_timeout.3 curl_multi_wait.3 \
 		curl_share_cleanup.3 curl_share_init.3 curl_share_setopt.3 \
 		curl_share_strerror.3 curl_slist_append.3 \
 		curl_slist_free_all.3 curl_strequal.3 curl_unescape.3 \
 		curl_version.3 curl_version_info.3 libcurl.3 libcurl-easy.3 \
 		libcurl-errors.3 libcurl-multi.3 libcurl-share.3 \
 		libcurl-tutorial.3
-PLIST_SUB=	SHLIB_VER="${SHLIB_VER}"
-
-SHLIB_VER=	6
 .endif

+SLAVEDIRS=	ftp/curl-hiphop
+
 .include <bsd.port.options.mk>

-.if ${PORT_OPTIONS:MLIBSSH2} && ! ${PORT_OPTIONS:MOPENSSL}
+.if ${PORT_OPTIONS:MCA_BUNDLE} && !${PORT_OPTIONS:MOPENSSL}
+IGNORE=		only supports CA bundle with OpenSSL
+.endif
+
+.if !${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MOPENSSL} && ${PORT_OPTIONS:MTLS_SRP}
+IGNORE=		only supports TLS-SRP with either OpenSSL or GnuTLS
+.endif
+
+.if !${PORT_OPTIONS:MLDAP} && ${PORT_OPTIONS:MLDAPS}
+IGNORE=		only supports LDAPS with LDAP
+.endif
+
+.if ${PORT_OPTIONS:MLDAPS} && !${PORT_OPTIONS:MSSL}
+IGNORE=		only supports LDAPS with SSL
+.endif
+
+.if ${PORT_OPTIONS:MLIBSSH2} && !${PORT_OPTIONS:MOPENSSL}
 IGNORE=		only supports LIBSSH2 with OpenSSL
 .endif

-.if ${PORT_OPTIONS:MNTLM} && ! ${PORT_OPTIONS:MOPENSSL}
-IGNORE=		only supports NTLM with OpenSSL
+.if ${PORT_OPTIONS:MNTLM} && !${PORT_OPTIONS:MCYASSL} && !${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MNSS} && !${PORT_OPTIONS:MOPENSSL} && !${PORT_OPTIONS:MPOLARSSL}
+IGNORE=		only supports NTLM with SSL
 .endif

-.if ${PORT_OPTIONS:MLDAPS}
-.if ! ${PORT_OPTIONS:MLDAP}
-IGNORE=		only supports LDAPS with LDAP
-.else
-.if ! ${PORT_OPTIONS:MOPENSSL} && ! ${PORT_OPTIONS:MGNUTLS}
-IGNORE=		only supports LDAPS with SSL (OpenSSL or GNUTLS)
-.endif
-.endif
-.endif
-
-.if ${PORT_OPTIONS:MOPENSSL}
-USE_OPENSSL=	yes
-CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE}
 .if ${PORT_OPTIONS:MCA_BUNDLE}
 RUN_DEPENDS+=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
-CONFIGURE_ARGS+=	--with-ca-bundle=${LOCALBASE}/share/certs/ca-root-nss.crt
+CONFIGURE_ARGS+=--with-ca-bundle=${LOCALBASE}/share/certs/ca-root-nss.crt
 .else
-CONFIGURE_ARGS+=	--without-ca-bundle
-.endif
-.else
-CONFIGURE_ARGS+=	--without-ssl
-.if ${PORT_OPTIONS:MCA_BUNDLE}
-IGNORE=			only supports CA bundle with OpenSSL
-.endif
+CONFIGURE_ARGS+=--without-ca-bundle
 .endif

 .if ${PORT_OPTIONS:MCARES}
 LIB_DEPENDS+=	cares:${PORTSDIR}/dns/c-ares
-CONFIGURE_ARGS+=	--enable-ares=${LOCALBASE}
+CONFIGURE_ARGS+=--enable-ares=${LOCALBASE}
 .else
-CONFIGURE_ARGS+=	--disable-ares
+CONFIGURE_ARGS+=--disable-ares
+.endif
+
+.if ${PORT_OPTIONS:MCOOKIES}
+CONFIGURE_ARGS+=--enable-cookies
+.else
+CONFIGURE_ARGS+=--disable-cookies
+.endif
+
+.if ${PORT_OPTIONS:MCURL_DEBUG}
+CONFIGURE_ARGS+=--enable-curldebug
+.else
+CONFIGURE_ARGS+=--disable-curldebug
+.endif
+
+.if ${PORT_OPTIONS:MCYASSL}
+LIB_DEPENDS+=	cyassl:${PORTSDIR}/security/yassl
+CONFIGURE_ARGS+=--with-cyassl=${LOCALBASE}
+.else
+CONFIGURE_ARGS+=--without-cyassl
+.endif
+
+.if ${PORT_OPTIONS:MDEBUG}
+CONFIGURE_ARGS+=--enable-debug
+.else
+CONFIGURE_ARGS+=--disable-debug
 .endif

 .if ${PORT_OPTIONS:MGNUTLS}
@ -119,88 +141,116 @@ CONFIGURE_ARGS+=--with-gnutls=${LOCALBASE}
 CONFIGURE_ARGS+=--without-gnutls
 .endif

-.if ${PORT_OPTIONS:MOPENSSL} || ${PORT_OPTIONS:MGNUTLS}
-PLIST_SUB+=	SSL=""
+.if ${PORT_OPTIONS:MGSSAPI}
+CONFIGURE_ARGS+=--with-gssapi \
+		--with-gssapi-includes=${INCLUDEDIR} \
+		--with-gssapi-libs=${LIBDIR}
 .else
-PLIST_SUB+=	SSL="@comment "
+CONFIGURE_ARGS+=--without-gssapi
+.endif
+
+.if ${PORT_OPTIONS:MIDN}
+LIB_DEPENDS+=	idn:${PORTSDIR}/dns/libidn
+CONFIGURE_ARGS+=--with-libidn=${LOCALBASE}
+.else
+CONFIGURE_ARGS+=--without-libidn
 .endif

 .if ${PORT_OPTIONS:MIPV6}
-CONFIGURE_ARGS+=	--enable-ipv6
+CONFIGURE_ARGS+=--enable-ipv6
 .else
-CONFIGURE_ARGS+=	--disable-ipv6
-.endif
-
-.if exists(/usr/lib/libkrb.a) && ${PORT_OPTIONS:MKERBEROS4}
-CONFIGURE_ARGS += --with-krb4=/usr
-.else
-CONFIGURE_ARGS += --without-krb4
+CONFIGURE_ARGS+=--disable-ipv6
 .endif

 .if ${PORT_OPTIONS:MLDAP}
-CONFIGURE_ARGS+=	--enable-ldap
-USE_OPENLDAP=	yes
-CFLAGS+=	-I${LOCALBASE}/include
+CONFIGURE_ARGS+=--enable-ldap
+CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-.if ${PORT_OPTIONS:MLDAPS}
-CONFIGURE_ARGS+=	--enable-ldaps
+USE_OPENLDAP=	yes
 .else
-CONFIGURE_ARGS+=	--disable-ldaps
-.endif
-.else
-CONFIGURE_ARGS+=	--disable-ldap --disable-ldaps
+CONFIGURE_ARGS+=--disable-ldap
 .endif

-.if ${PORT_OPTIONS:MLIBIDN}
-LIB_DEPENDS+=	idn.17:${PORTSDIR}/dns/libidn
-CONFIGURE_ARGS+=	--with-libidn=${LOCALBASE}
+.if ${PORT_OPTIONS:MLDAPS}
+CONFIGURE_ARGS+=--enable-ldaps
 .else
-CONFIGURE_ARGS+=	--without-libidn
+CONFIGURE_ARGS+=--disable-ldaps
 .endif

 .if ${PORT_OPTIONS:MLIBSSH2}
-LIB_DEPENDS+=	ssh2.1:${PORTSDIR}/security/libssh2
-CONFIGURE_ARGS+=	--with-libssh2=${LOCALBASE}
+LIB_DEPENDS+=	ssh2:${PORTSDIR}/security/libssh2
+CONFIGURE_ARGS+=--with-libssh2=${LOCALBASE}
 .else
-CONFIGURE_ARGS+=	--without-libssh2
+CONFIGURE_ARGS+=--without-libssh2
 .endif

-.if ${PORT_OPTIONS:MCURL_DEBUG}
-CONFIGURE_ARGS+=	--enable-debug
-.endif
-
-.if ${PORT_OPTIONS:MRTMP}
-LIB_DEPENDS+=	rtmp.0:${PORTSDIR}/multimedia/rtmpdump
-CONFIGURE_ARGS+=	--with-librtmp=${LOCALBASE}
+.if ${PORT_OPTIONS:MNSS}
+LIB_DEPENDS+=	nss3:${PORTSDIR}/security/nss
+CONFIGURE_ARGS+=--with-nss=${LOCALBASE}
 .else
-CONFIGURE_ARGS+=	--without-librtmp
-.endif
-
-.if ${PORT_OPTIONS:MTRACKMEMORY}
-CONFIGURE_ARGS+=	--enable-curldebug
-.else
-CONFIGURE_ARGS+=	--disable-curldebug
+CONFIGURE_ARGS+=--without-nss
 .endif

 .if ${PORT_OPTIONS:MNTLM}
-CONFIGURE_ARGS+=	--enable-ntlm
+CONFIGURE_ARGS+=--enable-ntlm
 .else
-CONFIGURE_ARGS+=	--disable-ntlm
+CONFIGURE_ARGS+=--disable-ntlm
+.endif
+
+.if ${PORT_OPTIONS:MOPENSSL}
+USE_OPENSSL=	yes
+CONFIGURE_ARGS+=--with-ssl=${OPENSSLBASE}
+.else
+CONFIGURE_ARGS+=--without-ssl
+.endif
+
+.if ${PORT_OPTIONS:MPOLARSSL}
+LIB_DEPENDS+=	polarssl:${PORTSDIR}/security/polarssl
+CONFIGURE_ARGS+=--with-polarssl=${LOCALBASE}
+.else
+CONFIGURE_ARGS+=--without-polarssl
 .endif

 .if ${PORT_OPTIONS:MPROXY}
-CONFIGURE_ARGS+=	--enable-proxy
+CONFIGURE_ARGS+=--enable-proxy
 .else
-CONFIGURE_ARGS+=	--disable-proxy
+CONFIGURE_ARGS+=--disable-proxy
+.endif
+
+.if ${PORT_OPTIONS:MRTMP}
+LIB_DEPENDS+=	rtmp:${PORTSDIR}/multimedia/rtmpdump
+CONFIGURE_ARGS+=--with-librtmp=${LOCALBASE}
+.else
+CONFIGURE_ARGS+=--without-librtmp
+.endif
+
+.if ${PORT_OPTIONS:MSPNEGO}
+LIB_DEPENDS+=	fbopenssl:${PORTSDIR}/security/fbopenssl
+CPPFLAGS+=	-I${LOCALBASE}/include/fbopenssl
+CONFIGURE_ARGS+=--with-spnego=${LOCALBASE}/lib
+.else
+CONFIGURE_ARGS+=--without-spnego
+.endif
+
+.if ${PORT_OPTIONS:MTHREADED_RESOLVER}
+CONFIGURE_ARGS+=--enable-threaded-resolver
+.else
+CONFIGURE_ARGS+=--disable-threaded-resolver
+.endif
+
+.if ${PORT_OPTIONS:MTLS_SRP}
+CONFIGURE_ARGS+= --enable-tls-srp
+.else
+CONFIGURE_ARGS+= --disable-tls-srp
 .endif

 post-patch:
+	@${REINPLACE_CMD} -e 's|\(flags_dbg_off=\)".*"|\1""|; s|\(flags_opt_off=\)".*"|\1""|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e '/^SUBDIRS = / s|$$| docs|; /^DIST_SUBDIRS = / s| docs||; /cd docs &&/d' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e '/require "valgrind.pm";/d' ${WRKSRC}/tests/runtests.pl

 post-install:
 .if !defined(BUILDING_HIPHOP)
-	${INSTALL_DATA} ${WRKSRC}/docs/libcurl/libcurl.m4 ${PREFIX}/share/aclocal
+	${INSTALL_DATA} ${WRKSRC}/docs/libcurl/libcurl.m4 ${PREFIX}/share/aclocal/
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}/ ${DOCSDIR}/libcurl/
 	cd ${WRKSRC}/docs/ && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}/
@ -208,20 +258,20 @@ post-install:
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${EXAMPLESDIR}/
-	cd ${WRKSRC}/docs/examples/ && ${INSTALL_DATA} README Makefile.example makefile* *.c *.cc ${EXAMPLESDIR}/
+	cd ${WRKSRC}/docs/examples/ && ${INSTALL_DATA} README Makefile.example makefile* *.c *.cpp ${EXAMPLESDIR}/
 .endif
 .endif

 # Setting LC_ALL=C is a kludge; maybe curl/libcurl shouldn't actually use
 # the user's locale when dates are sent to the server.
-test:	build
-.if ! ${PORT_OPTIONS:MPROXY}
+regression-test test: build
+.if !${PORT_OPTIONS:MPROXY}
 	@${ECHO_MSG} "******************************************"
 	@${ECHO_MSG} "* You have disabled curl proxy support.  *"
 	@${ECHO_MSG} "* Some tests SHALL FAIL!                 *"
 	@${ECHO_MSG} "* This is being addressed.               *"
 	@${ECHO_MSG} "******************************************"
 .endif
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} LC_ALL=C ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test
+	cd ${WRKSRC}/ && ${SETENV} ${MAKE_ENV} LC_ALL=C ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test

 .include <bsd.port.mk>
--- a/ftp/curl/distinfo
+++ b/ftp/curl/distinfo
@ -1,2 +1,2 @@
-SHA256 (curl-7.24.0.tar.lzma) = cd683ee8be137ed8a8e97d42fd3cc94f88f63d478b83d4abe38e31b6281e2268
-SIZE (curl-7.24.0.tar.lzma) = 1973811
+SHA256 (curl-7.31.0.tar.lzma) = f3ff7ae7f642e7f38b0c51ff3563d6f9f4254f5b05d1bfa8a5386fc91c70f7e4
+SIZE (curl-7.31.0.tar.lzma) = 2172148
--- a/ftp/curl/files/patch-CVE-2013-2174
+++ b/ftp/curl/files/patch-CVE-2013-2174
@ -1,38 +0,0 @@
-From 6032f0ff672f09babf69d9d42bcde6eb9eeb5bea Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Sun, 19 May 2013 23:24:29 +0200
-Subject: [PATCH] Curl_urldecode: no peeking beyond end of input buffer
-
-Security problem: CVE-2013-2174
-
-If a program would give a string like "%" to curl_easy_unescape(), it
-would still consider the % as start of an encoded character. The
-function then not only read beyond the buffer but it would also deduct
-the *unsigned* counter variable for how many more bytes there's left to
-read in the buffer by two, making the counter wrap. Continuing this, the
-function would go on reading beyond the buffer and soon writing beyond
-the allocated target buffer...
-
-Bug: http://curl.haxx.se/docs/adv_20130622.html
-Reported-by: Timo Sirainen
---
- lib/escape.c |    5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git lib/escape.c lib/escape.c
-index 6a26cf8..aa7db2c 100644
--- lib/escape.c
-+++ lib/escape.c
-@@ -159,7 +159,8 @@ CURLcode Curl_urldecode(struct SessionHandle *data,
- 
-   while(--alloc > 0) {
-     in = *string;
-    if(('%' == in) && ISXDIGIT(string[1]) && ISXDIGIT(string[2])) {
-+    if(('%' == in) && (alloc > 2) &&
-+       ISXDIGIT(string[1]) && ISXDIGIT(string[2])) {
-       /* this is two hexadecimal digits following a '%' */
-       char hexstr[3];
-       char *ptr;
-- 
-1.7.10.4
-
--- a/ftp/curl/files/patch-configure
+++ b/ftp/curl/files/patch-configure
@ -6,22 +6,9 @@ Forwarded: not-needed
 Author: Peter Pentchev <roam@FreeBSD.org>
 Last-Update: 2010-12-19

--- configure.orig	2012-02-26 17:52:21.904908587 +0800
-+++ configure	2012-02-26 17:52:21.929909948 +0800
-@@ -15049,10 +15049,10 @@
-     flags_dbg_all="$flags_dbg_all -gdwarf-2"
-     flags_dbg_all="$flags_dbg_all -gvms"
-     flags_dbg_yes="-g"
-    flags_dbg_off="-g0"
-+    flags_dbg_off=""
-     flags_opt_all="-O -O0 -O1 -O2 -O3 -Os"
-     flags_opt_yes="-O2"
-    flags_opt_off="-O0"
-+    flags_opt_off=""
-   else
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-@@ -15892,6 +15892,9 @@
+--- configure.orig	2013-02-06 17:47:26.000000000 +0800
+++ configure	2013-02-18 18:25:16.000000000 +0800
+@@ -16651,6 +16651,9 @@
     tmp_CFLAGS="$CFLAGS"
     tmp_CPPFLAGS="$CPPFLAGS"
 
@ -31,7 +18,7 @@ Last-Update: 2010-12-19
     ac_var_stripped=""
   for word1 in $tmp_CFLAGS; do
     ac_var_strip_word="no"
-@@ -15922,6 +15925,7 @@
+@@ -16681,6 +16684,7 @@
   done
     tmp_CPPFLAGS="$ac_var_stripped"
   squeeze tmp_CPPFLAGS
@ -39,7 +26,7 @@ Last-Update: 2010-12-19
 
     #
     if test "$want_debug" = "yes"; then
-@@ -16139,6 +16143,9 @@
+@@ -16898,6 +16902,9 @@
     #
     if test "$honor_optimize_option" = "yes"; then
 
@ -49,7 +36,7 @@ Last-Update: 2010-12-19
     ac_var_stripped=""
   for word1 in $tmp_CFLAGS; do
     ac_var_strip_word="no"
-@@ -16169,6 +16176,7 @@
+@@ -16928,6 +16935,7 @@
   done
     tmp_CPPFLAGS="$ac_var_stripped"
   squeeze tmp_CPPFLAGS
@ -57,17 +44,17 @@ Last-Update: 2010-12-19
 
       if test "$want_optimize" = "yes"; then
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts optimizer enabling options" >&5
-@@ -20137,7 +20145,8 @@
+@@ -21379,7 +21387,8 @@
         PKGTEST="no"
     PREFIX_OPENSSL=$OPT_SSL
 
 -                OPENSSL_PCDIR="$OPT_SSL/lib/pkgconfig"
-+                # Use the FreeBSD location of the pkg-config libdir
+                # Use the FreeBSD location of the pkgconf libdir
 +                OPENSSL_PCDIR="$LOCALBASE/libdata/pkgconfig"
     { $as_echo "$as_me:${as_lineno-$LINENO}: PKG_CONFIG_LIBDIR will be set to \"$OPENSSL_PCDIR\"" >&5
 $as_echo "$as_me: PKG_CONFIG_LIBDIR will be set to \"$OPENSSL_PCDIR\"" >&6;}
     if test -f "$OPENSSL_PCDIR/openssl.pc"; then
-@@ -23231,29 +23240,30 @@
+@@ -24725,29 +24734,30 @@
     ;;
   off)
         LIB_RTMP="-lrtmp"
@ -78,9 +65,9 @@ Last-Update: 2010-12-19
   *)
         PREFIX_RTMP=$OPT_LIBRTMP
 +        LIB_RTMP="-lrtmp"
-+        LD_RTMP=-L${PREFIX_RTMP}/lib$libsuff
-+        CPP_RTMP=-I${PREFIX_RTMP}/include
-+        DIR_RTMP=${PREFIX_RTMP}/lib$libsuff
+        LD_RTMP="-L${PREFIX_RTMP}/lib$libsuff"
+        CPP_RTMP="-I${PREFIX_RTMP}/include"
+        DIR_RTMP="${PREFIX_RTMP}/lib$libsuff"
     ;;
   esac
 
@ -92,13 +79,13 @@ Last-Update: 2010-12-19
 -
   LDFLAGS="$LDFLAGS $LD_RTMP"
   CPPFLAGS="$CPPFLAGS $CPP_RTMP"
-   LIBS="$LIBS $LIB_RTMP"
+   LIBS="$LIB_RTMP $LIBS"
 
 -  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RTMP_Init in -lrtmp" >&5
 -$as_echo_n "checking for RTMP_Init in -lrtmp... " >&6; }
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RTMP_Init in $LIB_RTMP" >&5
 +$as_echo_n "checking for RTMP_Init in $LIB_RTMP... " >&6; }
- if test "${ac_cv_lib_rtmp_RTMP_Init+set}" = set; then :
+ if ${ac_cv_lib_rtmp_RTMP_Init+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
--- a/ftp/curl/files/patch-src-tool_operate.c
+++ b/ftp/curl/files/patch-src-tool_operate.c
@ -1,6 +1,6 @@
--- src/tool_operate.c.orig	2012-01-23 23:31:30.000000000 +0800
-+++ src/tool_operate.c	2012-02-26 17:40:00.117907281 +0800
-@@ -580,22 +580,10 @@
+--- src/tool_operate.c.orig	2012-07-24 01:59:20.000000000 +0800
+++ src/tool_operate.c	2012-09-22 20:54:44.439408357 +0800
+@@ -653,22 +653,10 @@
             DEBUGASSERT(!outs.filename);
           }
 
@ -26,7 +26,7 @@
             if(!file) {
               helpf(config->errors, "Can't open '%s'!\n", outfile);
               res = CURLE_WRITE_ERROR;
-@@ -603,6 +591,19 @@
+@@ -676,6 +664,19 @@
             }
             outs.fopened = TRUE;
             outs.stream = file;
--- a/ftp/curl/pkg-plist
+++ b/ftp/curl/pkg-plist
@ -14,7 +14,7 @@ share/aclocal/libcurl.m4
 lib/libcurl.a
 lib/libcurl.la
 lib/libcurl.so
-lib/libcurl.so.%%SHLIB_VER%%
+lib/libcurl.so.7
 libdata/pkgconfig/libcurl.pc
 %%PORTDOCS%%%%DOCSDIR%%/BINDINGS
 %%PORTDOCS%%%%DOCSDIR%%/BUGS
@ -117,6 +117,8 @@ libdata/pkgconfig/libcurl.pc
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_strerror.pdf
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_timeout.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_timeout.pdf
+%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_wait.html
+%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_wait.pdf
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_cleanup.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_cleanup.pdf
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_init.html
@ -157,6 +159,7 @@ libdata/pkgconfig/libcurl.pc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.example
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/anyauthput.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/asiohiper.cpp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cacertinmem.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/certinfo.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/chkspeed.c
@ -172,14 +175,16 @@ libdata/pkgconfig/libcurl.pc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpget.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpgetinfo.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpgetresp.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpsget.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpupload.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpuploadresume.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/getinfo.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/getinmemory.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ghiper.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hiperfifo.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/href_extractor.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/htmltidy.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/htmltitle.cc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/htmltitle.cpp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/http-post.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/httpcustomheader.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/httpput.c
@ -191,6 +196,7 @@ libdata/pkgconfig/libcurl.pc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-double.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-post.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-single.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-uv.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/multithread.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/opensslthreadlock.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/persistant.c
@ -204,6 +210,7 @@ libdata/pkgconfig/libcurl.pc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sampleconv.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sepheaders.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sendrecv.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sftpget.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplepost.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplesmtp.c
@ -214,4 +221,6 @@ libdata/pkgconfig/libcurl.pc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/synctime.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/threaded-ssl.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/url2file.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/usercertinmem.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xmlstream.c
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
--- a/ftp/curlpp/Makefile
+++ b/ftp/curlpp/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	curlpp
 PORTVERSION=	0.7.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ftp
 MASTER_SITES=	GOOGLE_CODE

--- a/ftp/fpc-libcurl/Makefile
+++ b/ftp/fpc-libcurl/Makefile
@ -1,7 +1,7 @@
 # Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$

-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	ftp lang
 PKGNAMESUFFIX=	-libcurl

--- a/ftp/hs-curl/Makefile
+++ b/ftp/hs-curl/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	curl
 PORTVERSION=	1.3.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	ftp haskell

 MAINTAINER=	haskell@FreeBSD.org
--- a/ftp/ocaml-ocurl/Makefile
+++ b/ftp/ocaml-ocurl/Makefile
@ -5,7 +5,7 @@

 PORTNAME=	ocurl
 PORTVERSION=	0.5.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ftp
 MASTER_SITES=	SF
 PKGNAMEPREFIX=	ocaml-
@ -18,7 +18,7 @@ BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml \
 		ocamlfind:${PORTSDIR}/devel/ocaml-findlib
 RUN_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml \
 		ocamlfind:${PORTSDIR}/devel/ocaml-findlib
-LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl

 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_GMAKE=	yes
--- a/ftp/php5-curl/Makefile
+++ b/ftp/php5-curl/Makefile
@ -6,6 +6,7 @@
 #

 CATEGORIES=	ftp
+PORTREVISION=	1

 MASTERDIR=	${.CURDIR}/../../lang/php5

--- a/ftp/php52-curl/Makefile
+++ b/ftp/php52-curl/Makefile
@ -6,6 +6,7 @@
 #

 CATEGORIES=	ftp
+PORTREVISION=	15

 MASTERDIR=	${.CURDIR}/../../lang/php52

--- a/ftp/php53-curl/Makefile
+++ b/ftp/php53-curl/Makefile
@ -6,6 +6,7 @@
 #

 CATEGORIES=	ftp
+PORTREVISION=	1

 MASTERDIR=	${.CURDIR}/../../lang/php53

--- a/ftp/py-curl/Makefile
+++ b/ftp/py-curl/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	curl
 PORTVERSION=	7.19.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ftp python
 MASTER_SITES=	http://pycurl.sourceforge.net/download/ \
 		http://pycurl.sourceforge.net/download/00-OLD-VERSIONS/
@ -17,7 +17,7 @@ DISTNAME=	py${PORTNAME}-${PORTVERSION}
 MAINTAINER=	wenheping@gmail.com
 COMMENT=	Python interface to libcurl

-LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl

 DOCSDIR=	${PREFIX}/share/doc/py-curl
 EXAMPLESDIR=	${PREFIX}/share/examples/py-curl
--- a/ftp/rexx-curl/Makefile
+++ b/ftp/rexx-curl/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	curl
 PORTVERSION=	1.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	ftp
 MASTER_SITES=	SF/rexx${PORTNAME}/rexx${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	rexx-
--- a/ftp/wmget/Makefile
+++ b/ftp/wmget/Makefile
@ -6,7 +6,7 @@

 PORTNAME=	wmget
 PORTVERSION=	0.6.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	ftp
 MASTER_SITES=	http://amtrickey.net/download/ \
 		${MASTER_SITE_LOCAL}
@ -16,7 +16,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	uqs@FreeBSD.org
 COMMENT=	Dock app for Window Maker providing wget functionality

-LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl

 USE_XORG=	x11 xpm
 USE_GMAKE=	yes
--- a/games/0ad/Makefile
+++ b/games/0ad/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	0ad
 PORTVERSION=	0.0.13
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF/zero-ad/releases
 DISTFILES=	${PORTNAME}-${PORTVERSION}-alpha-unix-build.tar.xz \
--- a/games/alienarena/Makefile
+++ b/games/alienarena/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	alienarena
 PORTVERSION=	2011.753
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.linux.kiev.ua/pub/Linux/Gentoo/distfiles/ \
 		http://ftp.jeuxlinux.fr/files/ \
@ -51,7 +51,7 @@ LIBDIR=		${PREFIX}/lib/${PORTNAME}

 .if ${PORT_OPTIONS:MCLIENT}
 USES+=		pkgconfig
-LIB_DEPENDS+=	curl.6:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl \
 		freetype.9:${PORTSDIR}/print/freetype2 \
 		jpeg.11:${PORTSDIR}/graphics/jpeg \
 		png15:${PORTSDIR}/graphics/png \
--- a/games/bzflag/Makefile
+++ b/games/bzflag/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	bzflag
 PORTVERSION=	2.4.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20source/${PORTVERSION}

--- a/games/crossfire-client/Makefile
+++ b/games/crossfire-client/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	crossfire-client
 PORTVERSION=	1.70.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	SF/crossfire/crossfire-${PORTVERSION}

--- a/games/crossfire-server/Makefile
+++ b/games/crossfire-server/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	crossfire
 PORTVERSION=	1.70.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 PKGNAMESUFFIX=	-server
@ -14,7 +14,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Server for multiplayer graphical arcade and adventure game

 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
-LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
 		png15:${PORTSDIR}/graphics/png

 LICENSE=	GPLv2 GPLv3
--- a/games/daimonin/Makefile
+++ b/games/daimonin/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	daimonin
 PORTVERSION=	0.10.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://daimonin.svn.sourceforge.net/viewvc/daimonin/main/client/?view=tar&pathrev=${SVN_REVISION}&file=
 DIST_SUBDIR=	${PORTNAME}
@ -12,7 +12,7 @@ MAINTAINER=	fbsd@opal.com
 COMMENT=	Free open source Massively Multiplayer On-line Role-playing Game (MMORPG)

 LIB_DEPENDS=	physfs.1:${PORTSDIR}/devel/physfs \
-		curl.6:${PORTSDIR}/ftp/curl
+		curl:${PORTSDIR}/ftp/curl

 SVN_REVISION=	6021
 FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}
--- a/games/deng/Makefile
+++ b/games/deng/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	deng
 PORTVERSION=	1.9.0b6.9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/Doomsday%20Engine/1.9.0-beta6.9
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/b/-beta/}
@ -12,7 +12,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Enhanced Doom, Heretic, and Hexen source port

 BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
-LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
 		png15:${PORTSDIR}/graphics/png
 RUN_DEPENDS=	timidity:${PORTSDIR}/audio/timidity

--- a/games/evq3/Makefile
+++ b/games/evq3/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	evq3
 PORTVERSION=	1.3.20080810
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_LOCAL:S|$|alepulver/|}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
@ -64,7 +64,7 @@ MAKE_ENV+=	HAVE_VM_COMPILED=true
 .if ${PORT_OPTIONS:MCLIENT} || !empty(PORT_OPTIONS:MSMP)
 # curl
 .   if ${PORT_OPTIONS:MCURL}
-LIB_DEPENDS+=	curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
 MAKE_ENV+=	USE_CURL=1
 .       if ${PORT_OPTIONS:MCURL_DLOPEN}
 MAKE_ENV+=	USE_CURL_DLOPEN=1
--- a/games/f1spirit-remake/Makefile
+++ b/games/f1spirit-remake/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	f1spirit-remake
 PORTVERSION=	1.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	games
 # Original braingames site is really slow
 MASTER_SITES=	http://mirror.amdmi3.ru/distfiles/ \
--- a/games/frobtads/Makefile
+++ b/games/frobtads/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	frobtads
 PORTVERSION=	1.2.2
+PORTREVISION=	1
 CATEGORIES=	games lang
 MASTER_SITES=	http://www.tads.org/${PORTNAME}/ \
 		http://www.ifarchive.org/if-archive/programming/tads3/source/
--- a/games/ioquake3/Makefile
+++ b/games/ioquake3/Makefile
@ -3,7 +3,7 @@

 PORTNAME?=	ioquake3
 DISTVERSION?=	1.36
-PORTREVISION?=	12
+PORTREVISION?=	13
 CATEGORIES=	games
 MASTER_SITES?=	http://ioquake3.org/files/${DISTVERSION}/
 # Using zip this way enables slaves to override it.
@ -117,7 +117,7 @@ IGNORE=		needs at least one of CLIENT, DEDICATED and SMP options
 .if ${PORT_OPTIONS:MCLIENT} || ${PORT_OPTIONS:MSMP}
 # cURL
 .if ${PORT_OPTIONS:MCURL}
-LIB_DEPENDS+=	curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
 MAKE_ARGS+=	USE_CURL=1 USE_CURL_DLOPEN=0
 .else
 MAKE_ARGS+=	USE_CURL=0
--- a/games/kartofel/Makefile
+++ b/games/kartofel/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	kartofel
 PORTVERSION=	1.2
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	games
 MASTER_SITES=	http://kartofel.jfedor.org/downloads/ \
 		http://mirror.amdmi3.ru/distfiles/
--- a/games/klavaro/Makefile
+++ b/games/klavaro/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	klavaro
 PORTVERSION=	1.9.6
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/

--- a/games/kuklomenos/Makefile
+++ b/games/kuklomenos/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	kuklomenos
 PORTVERSION=	0.4.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://mbays.freeshell.org/kuklomenos/src/

@ -16,7 +16,7 @@ COMMENT=	Simple but challenging abstract shoot-em-up game

 LICENSE=	GPLv3

-LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl

 OPTIONS_DEFINE=	VORBIS
 OPTIONS_DEFAULT=	VORBIS
--- a/games/meandmyshadow/Makefile
+++ b/games/meandmyshadow/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	meandmyshadow
 PORTVERSION=	0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
--- a/games/megaglest/Makefile
+++ b/games/megaglest/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	megaglest
 PORTVERSION=	3.7.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}_${PORTVERSION}/
 DISTNAME=	${PORTNAME}-source-${PORTVERSION}
--- a/games/mudmagic/Makefile
+++ b/games/mudmagic/Makefile
@ -3,14 +3,14 @@

 PORTNAME=	mudmagic
 PORTVERSION=	1.9
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	games
 MASTER_SITES=	http://www.mudmagic.com/mud-client/downloads/

 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A GTK+ based MUD client

-LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
 		pcre.3:${PORTSDIR}/devel/pcre \
 		png15:${PORTSDIR}/graphics/png \
 		expat:${PORTSDIR}/textproc/expat2 \
--- a/Show More
+++ b/Show More