From umq.876@gmail.com  Mon Mar 25 11:33:23 2013
Return-Path: <umq.876@gmail.com>
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
	by hub.freebsd.org (Postfix) with ESMTP id F09EB338;
	Mon, 25 Mar 2013 11:33:22 +0000 (UTC)
	(envelope-from umq.876@gmail.com)
Received: from mail-pa0-f42.google.com (mail-pa0-f42.google.com [209.85.220.42])
	by mx1.freebsd.org (Postfix) with ESMTP id BE1FA660;
	Mon, 25 Mar 2013 11:33:22 +0000 (UTC)
Received: by mail-pa0-f42.google.com with SMTP id kq13so350190pab.1
        for <multiple recipients>; Mon, 25 Mar 2013 04:33:22 -0700 (PDT)
Received: from nafbsd2.m.nd.to (p057007.dynamic.ppp.asahi-net.or.jp. [221.113.57.7])
        by mx.google.com with ESMTPS id iv3sm13128157pbc.40.2013.03.25.04.33.18
        (version=TLSv1 cipher=RC4-SHA bits=128/128);
        Mon, 25 Mar 2013 04:33:20 -0700 (PDT)
Message-Id: <86ppynhfza.wl%umq@ueo.co.jp>
Date: Mon, 25 Mar 2013 20:32:41 +0900
From: Hirohisa Yamaguchi <umq@ueo.co.jp>
Sender: Hirohisa Yamaguchi <umq.876@gmail.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: portmgr@freebsd.org, sunpoet@freebsd.org, mm@freebsd.org
Subject: [patch] ftp/curl update to 7.29.0
X-Send-Pr-Version: 3.113

>Number:         177369
>Category:       ports
>Synopsis:       [patch] ftp/curl update to 7.29.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    sunpoet
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 25 11:40:00 UTC 2013
>Closed-Date:    Thu Jul 11 16:38:47 UTC 2013
>Last-Modified:  Sat Jul 13 17:00:00 UTC 2013
>Originator:     Hirohisa Yamaguchi
>Release:        FreeBSD 8.3-RELEASE-p3 amd64
>Organization:
<organization of PR author (multiple lines)>
>Environment:
System: FreeBSD **** 8.3-RELEASE-p3 FreeBSD 8.3-RELEASE-p3 #0: Tue Jun 12 00:39:29 UTC 2012 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64

>Description:
	The new version of ftp/curl 7.29.0 is now available
	(as talked in freebsd-ports@)

	This patch is intended to supersede ports/148094,
	ports/166870, ports/169812, and ports/172325.


	1. the configure script recently introduced a sanity check on
	   CFLAGS and CPPFLAGS
	    [1] https://github.com/bagder/curl/commit/c691037517a969891592e9dbae0a6ed615041881
	    [2] https://github.com/bagder/curl/commit/9d1effad0524bcb4763e06659b728ba134464608
	   This cause `make configure` stop:
configure: using CFLAGS: -O2 -pipe -DLDAP_DEPRECATED -fno-strict-aliasing
configure: CFLAGS error: CFLAGS may only be used to specify C compiler flags, not macro definitions. Use CPPFLAGS for: -DLDAP_DEPRECATED
configure: error: Can not continue. Fix errors mentioned immediately above this line.
===>  Script "configure" failed unexpectedly.

	   `sed -e 's/CFLAGS/CPPFLAGS/' Mk/bsd.ldap.mk` worked for me,
	   so I'd like to request portmgr@ to approve it.


	2. this patch shouldn't break slave port ftp/curl-hiphop, but
	   I'm not sure.

	   The build instruction on github says:
		> Note: If you're building a version of cURL older
		> than 7.28.0 (for whatever reason), you'll need to
		> apply the patch in src/third_party to update it
		> prior to the make step.
	    [3] https://github.com/facebook/hiphop-php/wiki/Building-and-installing-HHVM-on-Ubuntu-12.10
	    [4] https://github.com/facebook/hiphop-php/wiki/Building-and-installing-HHVM-on-CentOS-6.3

	   It is 7.29.0, the MAINTAINER might want to drop extra patch.


	3. dependent ports.
	   following (113) ports have LIB_DEPENDS with SHLIB_VER
	   specified need to be updated:
	    archivers/epkg
	    audio/gbemol
	    audio/gogglesmm
	    audio/grip
	    audio/moc
	    audio/mpdas
	    audio/mpdscribble
	    audio/musicpd
	    audio/ncmpcpp
	    audio/scmpc
	    audio/scrobbler
	    audio/vagalume
	    audio/vorbis-tools
	    audio/xmms2-scrobbler
	    biology/iolib
	    deskutils/cairo-dock
	    deskutils/fbreader
	    deskutils/google-gadgets
	    deskutils/ljit
	    deskutils/logjam
	    deskutils/mdh
	    deskutils/pinot
	    devel/aegis
	    devel/libopkele
	    devel/libwfut
	    devel/mm-common
	    devel/xmltooling
	    editors/libreoffice
	    editors/morla
	    editors/openoffice-3
	    editors/openoffice-devel
	    editors/textroom
	    emulators/virtualbox-ose
	    emulators/virtualbox-ose-legacy
	    finance/libofx
	    ftp/ocaml-ocurl
	    ftp/py-curl
	    ftp/rexx-curl
	    ftp/urlgfe
	    ftp/wmget
	    games/alienarena
	    games/crossfire-server
	    games/daimonin
	    games/deng
	    games/evq3
	    games/f1spirit-remake
	    games/ioquake3
	    games/kartofel
	    games/kuklomenos
	    games/meandmyshadow
	    games/mudmagic
	    games/nexuiz
	    games/openlierox
	    games/springlobby
	    games/supertux-devel
	    games/tmw
	    games/xmoto
	    games/xonotic
	    graphics/feh
	    graphics/gimmage
	    graphics/jp2a
	    graphics/osg
	    graphics/osg-devel
	    irc/unreal
	    japanese/mozc-server
	    lang/gambas
	    lang/hiphop-php
	    lang/q
	    misc/gkrellm-helium
	    multimedia/cclive
	    net-im/centericq
	    net-im/centerim
	    net-im/centerim-devel
	    net-im/cli-msn
	    net-p2p/gtorrentviewer
	    net-p2p/libbt
	    net-p2p/rtorrent
	    net-p2p/transmission-cli
	    net/asterisk
	    net/asterisk10
	    net/asterisk11
	    net/asterisk14
	    net/clamz
	    net/linknx
	    net/mediatomb
	    net/nepenthes
	    net/pecl-oauth
	    net/wmlj
	    polish/sms2
	    print/foomatic-db
	    science/netcdf4
	    security/opensaml2
	    security/osslsigncode
	    security/razorback-api
	    sysutils/apt
	    sysutils/fusefs-curlftpfs
	    sysutils/heartbeat
	    textproc/libnxml
	    textproc/raptor
	    textproc/rss2html
	    www/castget
	    www/mod_auth_mellon
	    www/mod_flickr
	    www/netsurf
	    www/newsbeuter
	    www/nspluginwrapper
	    www/openvrml
	    www/p5-WWW-Curl
	    www/pecl-http
	    www/rubygem-passenger
	    www/thundercache
	    www/thundersnarf
	    x11-wm/ede

	   following (49) ports have either LIB_DEPENDS or
	   BUILD_DEPENDS might need revesion bump:
	    astro/viking
	    audio/amarok-kde4
	    audio/ario
	    audio/libofa
	    audio/osd-lyrics
	    audio/streamtranscoder
	    chinese/fcitx-cloudpinyin
	    comms/gpredict
	    databases/couchdb
	    deskutils/google-gadgets
	    devel/git
	    ftp/R-cran-RCurl
	    games/0ad
	    games/klavaro
	    games/pokerth
	    games/supertuxkart
	    games/ufoai
	    games/warmux
	    graphics/darktable
	    graphics/gnash
	    graphics/mapserver
	    mail/claws-mail
	    mail/dovecot2
	    mail/milter-greylist
	    mail/milter-greylist-devel
	    math/octave
	    multimedia/freetuxtv
	    multimedia/gnome-mplayer
	    multimedia/mkvtoolnix
	    multimedia/xbmc
	    multimedia/xbmc-pvr
	    net-p2p/gnunet
	    net-p2p/jigdo
	    net/pecl-oauth
	    print/foomatic-db-engine
	    science/libkml
	    security/ykclient
	    sysutils/abgx360
	    sysutils/afflib
	    sysutils/condor
	    textproc/libkolabxml
	    textproc/liblrdf
	    textproc/zorba
	    www/cplanet
	    www/gecko-mediaplayer
	    www/mod_spdy
	    www/thundercache
	    www/webkit-gtk2
	    www/webkit-gtk3


	4. Options
	   I've tested several combinations of option, and they looks
	   okay.

	   --with-gssapi failed on some environments (where
	   security/krb5 is present), --with-gssapi-includes and
	   --with-gssapi-libs lead it work

	   Check for SSL (found in ports/172325) just didn't work


>How-To-Repeat:
	N/A
>Fix:

	The patch follows:
	  - renaming ftp/curl/files/patch-lib::url.c (as in ports/172325)
	    would be better, kept old name as is to make patch simple
	  - Mk/bsd.ldap.mk needs modification, as mentioned above

Index: ftp/curl/Makefile
===================================================================
--- ftp/curl/Makefile	(revision 315212)
+++ ftp/curl/Makefile	(working copy)
@@ -1,13 +1,8 @@
-# New ports collection makefile for:	curl
-# Date created:		12 December 1998
-# Whom:			Neil Blakey-Milner <nbm@rucus.ru.ac.za>
-#
+# Created by: Neil Blakey-Milner <nbm@rucus.ru.ac.za>
 # $FreeBSD$
-#
 
 PORTNAME=	curl
-PORTVERSION=	7.24.0
-PORTREVISION=	2
+PORTVERSION=	7.29.0
 CATEGORIES=	ftp ipv6 www
 MASTER_SITES=	http://curl.haxx.se/download/ \
 		LOCAL/sunpoet
@@ -18,21 +13,15 @@
 
 LICENSE=	MIT
 
-OPTIONS=	CARES "Asynchronous DNS resolution via c-ares" off \
-		CURL_DEBUG "Enable curl diagnostic output" off \
-		GNUTLS "Use GNU TLS if OPENSSL is OFF" off \
-		IPV6 "IPv6 support" on \
-		KERBEROS4 "Kerberos 4 authentication" off \
-		LDAP "LDAP support" off \
-		LDAPS "LDAPS support (requires LDAP and SSL)" off \
-		LIBIDN "Internationalized Domain Names via libidn" off \
-		LIBSSH2 "SCP/SFTP support via libssh2" off \
-		NTLM "NTLM authentication" off \
-		OPENSSL "OpenSSL support" on \
-		CA_BUNDLE "Install CA bundle for OpenSSL" on \
-		PROXY "Proxy support" on \
-		RTMP "RTMP streams support" off \
-		TRACKMEMORY "Enable curl memory diagnostic output" off
+OPTIONS_DEFINE=	CA_BUNDLE CARES CURL_DEBUG DOCS EXAMPLES GSSAPI IDN IPV6 \
+		KERBEROS4 LDAP LDAPS LIBSSH2 NTLM PROXY RTMP TRACKMEMORY
+OPTIONS_DEFAULT=	CA_BUNDLE IPV6 OPENSSL PROXY
+OPTIONS_SINGLE=		SSL
+OPTIONS_SINGLE_SSL=	GNUTLS OPENSSL
+CA_BUNDLE_DESC=		Install CA bundle for OpenSSL
+CURL_DEBUG_DESC=	cURL diagnostic output
+LIBSSH2_DESC=		SCP/SFTP support via libssh2
+TRACKMEMORY_DESC=	cURL memory diagnostic output
 
 CONFIGURE_ARGS+=--disable-threaded-resolver --disable-werror \
 		--enable-imap --enable-pop3 --enable-rtsp --enable-smtp
@@ -52,7 +41,7 @@
 		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 \
@@ -65,46 +54,46 @@
 		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}"
+PLIST_SUB+=	SHLIB_VER="${SHLIB_VER}"
+PORTDOCS=	*
+PORTEXAMPLES=	*
 
-SHLIB_VER=	6
+SHLIB_VER=	7
 .endif
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_GNUTLS) && defined(WITH_OPENSSL)
-IGNORE=		may only use GNU TLS if OpenSSL support is disabled
+.if ${PORT_OPTIONS:MCA_BUNDLE} && empty(PORT_OPTIONS:MOPENSSL)
+IGNORE=		only supports CA bundle with OpenSSL
 .endif
 
-.if defined(WITH_LIBSSH2) && !defined(WITH_OPENSSL)
+.if ${PORT_OPTIONS:MLIBSSH2} && empty(PORT_OPTIONS:MOPENSSL)
 IGNORE=		only supports LIBSSH2 with OpenSSL
 .endif
 
-.if defined(WITH_NTLM) && !defined(WITH_OPENSSL)
+.if ${PORT_OPTIONS:MNTLM} && empty(PORT_OPTIONS:MOPENSSL)
 IGNORE=		only supports NTLM with OpenSSL
 .endif
 
-.if defined(WITH_LDAPS)
-.if !defined(WITH_LDAP)
+.if ${PORT_OPTIONS:MLDAPS}
+.if empty(PORT_OPTIONS:MLDAP)
 IGNORE=		only supports LDAPS with LDAP
-.else
-.if !defined(WITH_OPENSSL) && !defined(WITH_GNUTLS)
-IGNORE=		only supports LDAPS with SSL (OpenSSL or GNUTLS)
+.elif empty(PORT_OPTIONS:MOPENSSL) && empty(PORT_OPTIONS:MGNUTLS)
+IGNORE=		only supports LDAPS with SSL (OpenSSL or GnuTLS)
 .endif
 .endif
-.endif
 
-.if !defined(WITHOUT_OPENSSL)
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+.if ${PORT_OPTIONS:MOPENSSL}
 CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE}
-.if !defined(WITHOUT_CA_BUNDLE)
+USE_OPENSSL=		yes
+.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
 .else
@@ -112,49 +101,53 @@
 .endif
 .else
 CONFIGURE_ARGS+=	--without-ssl
-.if defined(WITH_CA_BUNDLE)
-IGNORE=			only supports CA bundle with OpenSSL
 .endif
-.endif
 
-.if defined(WITH_CARES)
-LIB_DEPENDS+=	cares.2:${PORTSDIR}/dns/c-ares
+.if ${PORT_OPTIONS:MCARES}
+LIB_DEPENDS+=	cares:${PORTSDIR}/dns/c-ares
 CONFIGURE_ARGS+=	--enable-ares=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--disable-ares
 .endif
 
-.if defined(WITH_GNUTLS)
+.if ${PORT_OPTIONS:MGNUTLS}
 LIB_DEPENDS+=	gnutls:${PORTSDIR}/security/gnutls
 CONFIGURE_ARGS+=--with-gnutls=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=--without-gnutls
 .endif
 
-.if defined(WITH_OPENSSL) || defined(WITH_GNUTLS)
+.if ${PORT_OPTIONS:MOPENSSL} || ${PORT_OPTIONS:MGNUTLS}
 PLIST_SUB+=	SSL=""
 .else
 PLIST_SUB+=	SSL="@comment "
 .endif
 
-.if defined(WITH_IPV6)
+.if ${PORT_OPTIONS:MGSSAPI}
+CONFIGURE_ARGS+=	--with-gssapi-includes=/usr/include \
+			--with-gssapi-libs=/usr/lib
+.else
+CONFIGURE_ARGS+=	--without-gssapi
+.endif
+
+.if ${PORT_OPTIONS:MIPV6}
 CONFIGURE_ARGS+=	--enable-ipv6
 .else
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
-.if exists(/usr/lib/libkrb.a) && defined(WITH_KERBEROS4)
+.if ${PORT_OPTIONS:MKERBEROS4} && exists(/usr/lib/libkrb.a)
 CONFIGURE_ARGS += --with-krb4=/usr
 .else
 CONFIGURE_ARGS += --without-krb4
 .endif
 
-.if defined(WITH_LDAP)
+.if ${PORT_OPTIONS:MLDAP}
 CONFIGURE_ARGS+=	--enable-ldap
 USE_OPENLDAP=	yes
-CFLAGS+=	-I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-.if defined(WITH_LDAPS)
+.if ${PORT_OPTIONS:MLDAPS}
 CONFIGURE_ARGS+=	--enable-ldaps
 .else
 CONFIGURE_ARGS+=	--disable-ldaps
@@ -163,44 +156,44 @@
 CONFIGURE_ARGS+=	--disable-ldap --disable-ldaps
 .endif
 
-.if defined(WITH_LIBIDN)
-LIB_DEPENDS+=	idn.17:${PORTSDIR}/dns/libidn
+.if ${PORT_OPTIONS:MIDN}
+LIB_DEPENDS+=	idn:${PORTSDIR}/dns/libidn
 CONFIGURE_ARGS+=	--with-libidn=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--without-libidn
 .endif
 
-.if defined(WITH_LIBSSH2)
-LIB_DEPENDS+=	ssh2.1:${PORTSDIR}/security/libssh2
+.if ${PORT_OPTIONS:MLIBSSH2}
+LIB_DEPENDS+=	ssh2:${PORTSDIR}/security/libssh2
 CONFIGURE_ARGS+=	--with-libssh2=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--without-libssh2
 .endif
 
-.if defined(WITH_CURL_DEBUG)
+.if ${PORT_OPTIONS:MCURL_DEBUG}
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
-.if defined(WITH_RTMP)
-LIB_DEPENDS+=	rtmp.0:${PORTSDIR}/multimedia/rtmpdump
+.if ${PORT_OPTIONS:MRTMP}
+LIB_DEPENDS+=	rtmp:${PORTSDIR}/multimedia/rtmpdump
 CONFIGURE_ARGS+=	--with-librtmp=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--without-librtmp
 .endif
 
-.if defined(WITH_TRACKMEMORY)
+.if ${PORT_OPTIONS:MTRACKMEMORY}
 CONFIGURE_ARGS+=	--enable-curldebug
 .else
 CONFIGURE_ARGS+=	--disable-curldebug
 .endif
 
-.if defined(WITH_NTLM)
+.if ${PORT_OPTIONS:MNTLM}
 CONFIGURE_ARGS+=	--enable-ntlm
 .else
 CONFIGURE_ARGS+=	--disable-ntlm
 .endif
 
-.if !defined(WITHOUT_PROXY)
+.if ${PORT_OPTIONS:MPROXY}
 CONFIGURE_ARGS+=	--enable-proxy
 .else
 CONFIGURE_ARGS+=	--disable-proxy
@@ -212,28 +205,28 @@
 
 post-install:
 .if !defined(BUILDING_HIPHOP)
-	${INSTALL_DATA} ${WRKSRC}/docs/libcurl/libcurl.m4 ${PREFIX}/share/aclocal
-.if !defined(NOPORTDOCS)
+	${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}/
 	cd ${WRKSRC}/docs/libcurl/ && ${INSTALL_DATA} ABI *.html *.pdf *.m4 ${DOCSDIR}/libcurl/
 .endif
-.if !defined(NOPORTEXAMPLES)
+.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 defined(WITHOUT_PROXY)
+regression-test: build
+.if empty(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>
Index: ftp/curl/distinfo
===================================================================
--- ftp/curl/distinfo	(revision 315212)
+++ ftp/curl/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (curl-7.24.0.tar.lzma) = cd683ee8be137ed8a8e97d42fd3cc94f88f63d478b83d4abe38e31b6281e2268
-SIZE (curl-7.24.0.tar.lzma) = 1973811
+SHA256 (curl-7.29.0.tar.lzma) = 4ae953ef144bc6cb7c8c0a054ce80f93ea174318cf9b18a2e2cc3cbf062d9b21
+SIZE (curl-7.29.0.tar.lzma) = 2100412
Index: ftp/curl/files/patch-configure
===================================================================
--- ftp/curl/files/patch-configure	(revision 315212)
+++ ftp/curl/files/patch-configure	(working copy)
@@ -8,20 +8,7 @@
 
 --- 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 @@
+@@ -16651,6 +16651,9 @@
      tmp_CFLAGS="$CFLAGS"
      tmp_CPPFLAGS="$CPPFLAGS"
  
@@ -31,7 +18,7 @@
      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 @@
  
      #
      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 @@
      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,7 +44,7 @@
  
        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
  
@@ -67,7 +54,7 @@
      { $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"
@@ -92,13 +79,13 @@
 -
    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
Index: ftp/curl/files/patch-lib::url.c
===================================================================
--- ftp/curl/files/patch-lib::url.c	(revision 315212)
+++ ftp/curl/files/patch-lib::url.c	(working copy)
@@ -5,7 +5,7 @@
 
 --- lib/url.c.orig	2012-01-23 23:31:30.000000000 +0800
 +++ lib/url.c	2012-02-26 17:52:21.937920303 +0800
-@@ -797,6 +797,10 @@
+@@ -610,6 +610,10 @@
      data->progress.flags |= PGRS_HIDE;
      data->state.current_speed = -1; /* init to negative == impossible */
  
Index: ftp/curl/files/patch-src-tool_operate.c
===================================================================
--- ftp/curl/files/patch-src-tool_operate.c	(revision 315212)
+++ ftp/curl/files/patch-src-tool_operate.c	(working copy)
@@ -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 @@
+@@ -649,22 +649,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 @@
+@@ -672,6 +660,19 @@
              }
              outs.fopened = TRUE;
              outs.stream = file;
Index: ftp/curl/pkg-plist
===================================================================
--- ftp/curl/pkg-plist	(revision 315212)
+++ ftp/curl/pkg-plist	(working copy)
@@ -10,208 +10,9 @@
 include/curl/stdcheaders.h
 include/curl/typecheck-gcc.h
 share/aclocal/libcurl.m4
-@dirrm include/curl
 lib/libcurl.a
 lib/libcurl.la
 lib/libcurl.so
 lib/libcurl.so.%%SHLIB_VER%%
 libdata/pkgconfig/libcurl.pc
-%%PORTDOCS%%%%DOCSDIR%%/BINDINGS
-%%PORTDOCS%%%%DOCSDIR%%/BUGS
-%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTE
-%%PORTDOCS%%%%DOCSDIR%%/DISTRO-DILEMMA
-%%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/FEATURES
-%%PORTDOCS%%%%DOCSDIR%%/HISTORY
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL.devcpp
-%%PORTDOCS%%%%DOCSDIR%%/INTERNALS
-%%PORTDOCS%%%%DOCSDIR%%/KNOWN_BUGS
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE-MIXING
-%%PORTDOCS%%%%DOCSDIR%%/MANUAL
-%%PORTDOCS%%%%DOCSDIR%%/README.netware
-%%PORTDOCS%%%%DOCSDIR%%/README.win32
-%%PORTDOCS%%%%DOCSDIR%%/RESOURCES
-%%PORTDOCS%%%%DOCSDIR%%/SSLCERTS
-%%PORTDOCS%%%%DOCSDIR%%/THANKS
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/TheArtOfHttpScripting
-%%PORTDOCS%%%%DOCSDIR%%/VERSIONS
-%%PORTDOCS%%%%DOCSDIR%%/curl-config.html
-%%PORTDOCS%%%%DOCSDIR%%/curl-config.pdf
-%%PORTDOCS%%%%DOCSDIR%%/curl.html
-%%PORTDOCS%%%%DOCSDIR%%/curl.pdf
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/ABI
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_cleanup.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_cleanup.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_duphandle.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_duphandle.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_escape.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_escape.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_getinfo.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_getinfo.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_init.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_init.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_pause.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_pause.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_perform.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_perform.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_recv.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_recv.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_reset.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_reset.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_send.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_send.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_setopt.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_setopt.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_strerror.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_strerror.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_unescape.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_unescape.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_escape.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_escape.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formadd.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formadd.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formfree.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formfree.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formget.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formget.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_free.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_free.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_getdate.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_getdate.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_getenv.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_getenv.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_cleanup.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_cleanup.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_init.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_init.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_init_mem.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_init_mem.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_mprintf.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_mprintf.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_add_handle.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_add_handle.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_assign.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_assign.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_cleanup.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_cleanup.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_fdset.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_fdset.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_info_read.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_info_read.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_init.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_init.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_perform.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_perform.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_remove_handle.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_remove_handle.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_setopt.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_setopt.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_socket.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_socket.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_socket_action.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_socket_action.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_strerror.html
-%%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_share_cleanup.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_cleanup.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_init.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_init.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_setopt.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_setopt.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_strerror.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_strerror.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_slist_append.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_slist_append.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_slist_free_all.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_slist_free_all.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_strequal.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_strequal.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_unescape.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_unescape.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_version.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_version.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_version_info.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_version_info.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/index.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-easy.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-easy.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-errors.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-errors.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-multi.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-multi.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-share.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-share.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-tutorial.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-tutorial.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl.m4
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl.pdf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/libcurl
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/10-at-a-time.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.example
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/anyauthput.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cacertinmem.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/certinfo.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/chkspeed.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cookie_interface.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/curlgtk.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/curlx.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/debug.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/evhiperfifo.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/externalsocket.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fileupload.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fopen.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftp-wildcard.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpget.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpgetinfo.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpgetresp.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%%/htmltidy.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/htmltitle.cc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/http-post.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/httpcustomheader.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/httpput.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/https.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/imap.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/makefile.dj
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-app.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-debugcallback.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-double.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-post.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-single.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multithread.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/opensslthreadlock.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/persistant.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pop3s.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pop3slist.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/post-callback.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/postit2.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/progressfunc.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/resolve.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rtsp.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sampleconv.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sepheaders.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sendrecv.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplepost.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplesmtp.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplessl.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smooth-gtk-thread.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smtp-multi.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smtp-tls.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/synctime.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/threaded-ssl.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/url2file.c
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+@dirrm include/curl
Index: Mk/bsd.ldap.mk
===================================================================
--- Mk/bsd.ldap.mk	(revision 315212)
+++ Mk/bsd.ldap.mk	(working copy)
@@ -64,7 +64,7 @@
 .endif
 .endif
 
-CFLAGS+=	-DLDAP_DEPRECATED
+CPPFLAGS+=	-DLDAP_DEPRECATED
 
 _OPENLDAP_CLIENT_PKG!=	${PKG_INFO} -Ex openldap.\*-client 2>/dev/null || ${TRUE}
 _OPENLDAP_FLAVOUR=	${_OPENLDAP_CLIENT_PKG:C/openldap//:C/-client-.*//}

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->sunpoet 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Mar 25 11:40:10 UTC 2013 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177369 

From: Hirohisa Yamaguchi <umq@ueo.co.jp>
To: sunpoet@freebsd.org
Cc: bug-followup@freebsd.org
Subject: Re: ports/177369: [patch] ftp/curl update to 7.29.0
Date: Wed, 27 Mar 2013 05:19:00 +0900

 --Multipart_Wed_Mar_27_05:19:00_2013-1
 Content-Type: text/plain; charset=US-ASCII
 
 Hi,
 
 I attach an updated patch:
  - respect r315271 change
  - add check for security/nss, security/polarssl, and security/yassl
    rather than let them auto-detected
 
 Regards,
 -- 
 
 	Hirohisa Yamaguchi
 	  umq@ueo.co.jp
 
 --Multipart_Wed_Mar_27_05:19:00_2013-1
 Content-Type: application/octet-stream; type=patch
 Content-Disposition: attachment; filename="ftp_curl-7.29.0_177369-1.patch"
 Content-Transfer-Encoding: 7bit
 
 Index: ftp/curl/Makefile
 ===================================================================
 --- ftp/curl/Makefile	(revision 315291)
 +++ ftp/curl/Makefile	(working copy)
 @@ -2,8 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	curl
 -PORTVERSION=	7.24.0
 -PORTREVISION=	2
 +PORTVERSION=	7.29.0
  CATEGORIES=	ftp ipv6 www
  MASTER_SITES=	http://curl.haxx.se/download/ \
  		LOCAL/sunpoet
 @@ -14,19 +13,26 @@
  
  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
 +OPTIONS_DEFINE=	CURL_DEBUG GSSAPI IPV6 KERBEROS4 LDAP LDAPS IDN LIBSSH2 \
 +		METALINK NTLM CA_BUNDLE PROXY RTMP TLS_SRP TRACKMEMORY \
 +		DOCS EXAMPLES
 +OPTIONS_RADIO=		RESOLV SSL
 +OPTIONS_RADIO_RESOLV=	CARES THREADED_RESOLVER
 +OPTIONS_RADIO_SSL=	OPENSSL GNUTLS CYASSL NSS POLARSSL
 +OPTIONS_DEFAULT=	CA_BUNDLE IPV6 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
 +METALINK_DESC=		Metalink(RFC6249) download support
  CA_BUNDLE_DESC=		Install CA bundle for OpenSSL
 +TLS_SRP_DESC=		TLS-SRP(Secure Remote Password) support
  TRACKMEMORY_DESC=	curl memory diagnostic output
 +RESOLV_DESC=		DNS resolution options
 +THREADED_RESOLVER_DESC=	Threaded DNS resolution
 +CYASSL_DESC=		SSL/TLS support via CyaSSL
 +NSS_DESC=		SSL/TLS support via NSS
 +POLARSSL_DESC=		SSL/TLS support via PolarSSL
  
 -CONFIGURE_ARGS+=--disable-threaded-resolver --disable-werror \
 +CONFIGURE_ARGS+=--disable-threaded-resolver --disable-werror --without-axtls \
  		--enable-imap --enable-pop3 --enable-rtsp --enable-smtp
  CONFIGURE_ENV=	LOCALBASE="${LOCALBASE}"
  GNU_CONFIGURE=	yes
 @@ -44,7 +50,7 @@
  		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,7 +63,7 @@
  		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 \
 @@ -65,51 +71,58 @@
  		libcurl-errors.3 libcurl-multi.3 libcurl-share.3 \
  		libcurl-tutorial.3
  PLIST_SUB=	SHLIB_VER="${SHLIB_VER}"
 +PORTDOCS=	*
 +PORTEXAMPLES=	*
  
 -SHLIB_VER=	6
 +SHLIB_VER=	7
  .endif
  
  .include <bsd.port.options.mk>
  
 -.if ${PORT_OPTIONS:MLIBSSH2} && ! ${PORT_OPTIONS:MOPENSSL}
 -IGNORE=		only supports LIBSSH2 with OpenSSL
 +.for S in ${OPTIONS_RADIO_SSL}
 +.if ${PORT_OPTIONS:M${S}}
 +PORT_OPTIONS+=	SSL
  .endif
 +.endfor
  
 -.if ${PORT_OPTIONS:MNTLM} && ! ${PORT_OPTIONS:MOPENSSL}
 -IGNORE=		only supports NTLM with OpenSSL
 +.if ${PORT_OPTIONS:MNTLM} && ! ${PORT_OPTIONS:MSSL}
 +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)
 +.elif ! ${PORT_OPTIONS:MSSL}
 +IGNORE=		only supports LDAPS with SSL
  .endif
  .endif
 +
 +.if ${PORT_OPTIONS:MTLS_SRP} && \
 +	! (${PORT_OPTIONS:MOPENSSL} || ${PORT_OPTIONS:MGNUTLS})
 +IGNORE=		only supports TLS-SRP with either OpenSSL or GnuTLS
  .endif
  
  .if ${PORT_OPTIONS:MOPENSSL}
  USE_OPENSSL=	yes
  CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE}
 +.else
 +CONFIGURE_ARGS+=	--without-ssl
 +.endif
 +
  .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
  .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
 -.endif
  
  .if ${PORT_OPTIONS:MCARES}
 -LIB_DEPENDS+=	cares.2:${PORTSDIR}/dns/c-ares
 -CONFIGURE_ARGS+=	--enable-ares=${LOCALBASE}
 +LIB_DEPENDS+=	cares:${PORTSDIR}/dns/c-ares
 +CONFIGURE_ARGS+=	--enable-ares=${LOCALBASE} --disable-threaded-resolver
 +.elif ${PORT_OPTIONS:MTHREADED_RESOLVER}
 +CONFIGURE_ARGS+=	--enable-threaded-resolver --disable-ares
  .else
 -CONFIGURE_ARGS+=	--disable-ares
 +CONFIGURE_ARGS+=	--disable-threaded-resolver --disable-ares
  .endif
  
  .if ${PORT_OPTIONS:MGNUTLS}
 @@ -119,12 +132,6 @@
  CONFIGURE_ARGS+=--without-gnutls
  .endif
  
 -.if ${PORT_OPTIONS:MOPENSSL} || ${PORT_OPTIONS:MGNUTLS}
 -PLIST_SUB+=	SSL=""
 -.else
 -PLIST_SUB+=	SSL="@comment "
 -.endif
 -
  .if ${PORT_OPTIONS:MIPV6}
  CONFIGURE_ARGS+=	--enable-ipv6
  .else
 @@ -140,7 +147,7 @@
  .if ${PORT_OPTIONS:MLDAP}
  CONFIGURE_ARGS+=	--enable-ldap
  USE_OPENLDAP=	yes
 -CFLAGS+=	-I${LOCALBASE}/include
 +CPPFLAGS+=	-I${LOCALBASE}/include
  LDFLAGS+=	-L${LOCALBASE}/lib
  .if ${PORT_OPTIONS:MLDAPS}
  CONFIGURE_ARGS+=	--enable-ldaps
 @@ -151,15 +158,15 @@
  CONFIGURE_ARGS+=	--disable-ldap --disable-ldaps
  .endif
  
 -.if ${PORT_OPTIONS:MLIBIDN}
 -LIB_DEPENDS+=	idn.17:${PORTSDIR}/dns/libidn
 +.if ${PORT_OPTIONS:MIDN}
 +LIB_DEPENDS+=	idn:${PORTSDIR}/dns/libidn
  CONFIGURE_ARGS+=	--with-libidn=${LOCALBASE}
  .else
  CONFIGURE_ARGS+=	--without-libidn
  .endif
  
  .if ${PORT_OPTIONS:MLIBSSH2}
 -LIB_DEPENDS+=	ssh2.1:${PORTSDIR}/security/libssh2
 +LIB_DEPENDS+=	ssh2:${PORTSDIR}/security/libssh2
  CONFIGURE_ARGS+=	--with-libssh2=${LOCALBASE}
  .else
  CONFIGURE_ARGS+=	--without-libssh2
 @@ -170,12 +177,54 @@
  .endif
  
  .if ${PORT_OPTIONS:MRTMP}
 -LIB_DEPENDS+=	rtmp.0:${PORTSDIR}/multimedia/rtmpdump
 +LIB_DEPENDS+=	rtmp:${PORTSDIR}/multimedia/rtmpdump
  CONFIGURE_ARGS+=	--with-librtmp=${LOCALBASE}
  .else
  CONFIGURE_ARGS+=	--without-librtmp
  .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:MGSSAPI}
 +CONFIGURE_ARGS+=	--with-gssapi-includes=/usr/include \
 +			--with-gssapi-libs=/usr/lib
 +.else
 +CONFIGURE_ARGS+=	--without-gssapi
 +.endif
 +
 +.if ${PORT_OPTIONS:MMETALINK}
 +BROKEN=			libmetalink in ports tree is way too old
 +CONFIGURE_ARGS+=	--with-libmetalink
 +LIB_DEPENDS+=		metalink.3:${PORTSDIR}/misc/libmetalink
 +.else
 +CONFIGURE_ARGS+=	--without-libmetalink
 +.endif
 +
 +.if ${PORT_OPTIONS:MNSS}
 +LIB_DEPENDS+=	nss3:${PORTSDIR}/security/nss
 +CONFIGURE_ARGS+=--with-nss
 +.else
 +CONFIGURE_ARGS+=--without-nss
 +.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:MTLS_SRP}
 +CONFIGURE_ARGS+=	 --enable-tls-srp
 +.else
 +CONFIGURE_ARGS+=	 --disable-tls-srp
 +.endif
 +
  .if ${PORT_OPTIONS:MTRACKMEMORY}
  CONFIGURE_ARGS+=	--enable-curldebug
  .else
 @@ -200,7 +249,7 @@
  
  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,13 +257,13 @@
  .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
 +regression-test: build
  .if ! ${PORT_OPTIONS:MPROXY}
  	@${ECHO_MSG} "******************************************"
  	@${ECHO_MSG} "* You have disabled curl proxy support.  *"
 @@ -222,6 +271,6 @@
  	@${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>
 Index: ftp/curl/distinfo
 ===================================================================
 --- ftp/curl/distinfo	(revision 315291)
 +++ ftp/curl/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (curl-7.24.0.tar.lzma) = cd683ee8be137ed8a8e97d42fd3cc94f88f63d478b83d4abe38e31b6281e2268
 -SIZE (curl-7.24.0.tar.lzma) = 1973811
 +SHA256 (curl-7.29.0.tar.lzma) = 4ae953ef144bc6cb7c8c0a054ce80f93ea174318cf9b18a2e2cc3cbf062d9b21
 +SIZE (curl-7.29.0.tar.lzma) = 2100412
 Index: ftp/curl/files/patch-configure
 ===================================================================
 --- ftp/curl/files/patch-configure	(revision 315291)
 +++ ftp/curl/files/patch-configure	(working copy)
 @@ -8,20 +8,7 @@
  
  --- 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 @@
 +@@ -16651,6 +16651,9 @@
       tmp_CFLAGS="$CFLAGS"
       tmp_CPPFLAGS="$CPPFLAGS"
   
 @@ -31,7 +18,7 @@
       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 @@
   
       #
       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 @@
       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,7 +44,7 @@
   
         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
   
 @@ -67,7 +54,7 @@
       { $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"
 @@ -92,13 +79,13 @@
  -
     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
 Index: ftp/curl/files/patch-lib::url.c
 ===================================================================
 --- ftp/curl/files/patch-lib::url.c	(revision 315291)
 +++ ftp/curl/files/patch-lib::url.c	(working copy)
 @@ -5,7 +5,7 @@
  
  --- lib/url.c.orig	2012-01-23 23:31:30.000000000 +0800
  +++ lib/url.c	2012-02-26 17:52:21.937920303 +0800
 -@@ -797,6 +797,10 @@
 +@@ -610,6 +610,10 @@
       data->progress.flags |= PGRS_HIDE;
       data->state.current_speed = -1; /* init to negative == impossible */
   
 Index: ftp/curl/files/patch-src-tool_operate.c
 ===================================================================
 --- ftp/curl/files/patch-src-tool_operate.c	(revision 315291)
 +++ ftp/curl/files/patch-src-tool_operate.c	(working copy)
 @@ -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 @@
 +@@ -649,22 +649,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 @@
 +@@ -672,6 +660,19 @@
               }
               outs.fopened = TRUE;
               outs.stream = file;
 Index: ftp/curl/pkg-plist
 ===================================================================
 --- ftp/curl/pkg-plist	(revision 315291)
 +++ ftp/curl/pkg-plist	(working copy)
 @@ -10,208 +10,9 @@
  include/curl/stdcheaders.h
  include/curl/typecheck-gcc.h
  share/aclocal/libcurl.m4
 -@dirrm include/curl
  lib/libcurl.a
  lib/libcurl.la
  lib/libcurl.so
  lib/libcurl.so.%%SHLIB_VER%%
  libdata/pkgconfig/libcurl.pc
 -%%PORTDOCS%%%%DOCSDIR%%/BINDINGS
 -%%PORTDOCS%%%%DOCSDIR%%/BUGS
 -%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTE
 -%%PORTDOCS%%%%DOCSDIR%%/DISTRO-DILEMMA
 -%%PORTDOCS%%%%DOCSDIR%%/FAQ
 -%%PORTDOCS%%%%DOCSDIR%%/FEATURES
 -%%PORTDOCS%%%%DOCSDIR%%/HISTORY
 -%%PORTDOCS%%%%DOCSDIR%%/INSTALL
 -%%PORTDOCS%%%%DOCSDIR%%/INSTALL.devcpp
 -%%PORTDOCS%%%%DOCSDIR%%/INTERNALS
 -%%PORTDOCS%%%%DOCSDIR%%/KNOWN_BUGS
 -%%PORTDOCS%%%%DOCSDIR%%/LICENSE-MIXING
 -%%PORTDOCS%%%%DOCSDIR%%/MANUAL
 -%%PORTDOCS%%%%DOCSDIR%%/README.netware
 -%%PORTDOCS%%%%DOCSDIR%%/README.win32
 -%%PORTDOCS%%%%DOCSDIR%%/RESOURCES
 -%%PORTDOCS%%%%DOCSDIR%%/SSLCERTS
 -%%PORTDOCS%%%%DOCSDIR%%/THANKS
 -%%PORTDOCS%%%%DOCSDIR%%/TODO
 -%%PORTDOCS%%%%DOCSDIR%%/TheArtOfHttpScripting
 -%%PORTDOCS%%%%DOCSDIR%%/VERSIONS
 -%%PORTDOCS%%%%DOCSDIR%%/curl-config.html
 -%%PORTDOCS%%%%DOCSDIR%%/curl-config.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/curl.html
 -%%PORTDOCS%%%%DOCSDIR%%/curl.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/index.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/ABI
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_cleanup.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_cleanup.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_duphandle.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_duphandle.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_escape.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_escape.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_getinfo.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_getinfo.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_init.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_init.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_pause.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_pause.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_perform.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_perform.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_recv.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_recv.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_reset.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_reset.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_send.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_send.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_setopt.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_setopt.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_strerror.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_strerror.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_unescape.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_unescape.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_escape.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_escape.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formadd.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formadd.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formfree.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formfree.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formget.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formget.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_free.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_free.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_getdate.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_getdate.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_getenv.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_getenv.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_cleanup.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_cleanup.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_init.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_init.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_init_mem.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_init_mem.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_mprintf.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_mprintf.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_add_handle.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_add_handle.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_assign.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_assign.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_cleanup.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_cleanup.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_fdset.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_fdset.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_info_read.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_info_read.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_init.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_init.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_perform.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_perform.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_remove_handle.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_remove_handle.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_setopt.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_setopt.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_socket.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_socket.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_socket_action.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_socket_action.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_strerror.html
 -%%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_share_cleanup.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_cleanup.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_init.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_init.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_setopt.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_setopt.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_strerror.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_strerror.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_slist_append.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_slist_append.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_slist_free_all.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_slist_free_all.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_strequal.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_strequal.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_unescape.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_unescape.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_version.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_version.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_version_info.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_version_info.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/index.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-easy.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-easy.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-errors.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-errors.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-multi.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-multi.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-share.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-share.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-tutorial.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-tutorial.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl.m4
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl.pdf
 -%%PORTDOCS%%@dirrm %%DOCSDIR%%/libcurl
 -%%PORTDOCS%%@dirrm %%DOCSDIR%%
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/10-at-a-time.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.example
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/anyauthput.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cacertinmem.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/certinfo.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/chkspeed.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cookie_interface.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/curlgtk.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/curlx.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/debug.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/evhiperfifo.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/externalsocket.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fileupload.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fopen.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftp-wildcard.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpget.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpgetinfo.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpgetresp.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%%/htmltidy.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/htmltitle.cc
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/http-post.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/httpcustomheader.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/httpput.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/https.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/imap.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/makefile.dj
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-app.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-debugcallback.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-double.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-post.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-single.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multithread.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/opensslthreadlock.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/persistant.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pop3s.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pop3slist.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/post-callback.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/postit2.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/progressfunc.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/resolve.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rtsp.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sampleconv.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sepheaders.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sendrecv.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplepost.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplesmtp.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplessl.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smooth-gtk-thread.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smtp-multi.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smtp-tls.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/synctime.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/threaded-ssl.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/url2file.c
 -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 +@dirrm include/curl
 
 --Multipart_Wed_Mar_27_05:19:00_2013-1--

From: Hirohisa Yamaguchi <umq@ueo.co.jp>
To: sunpoet@FreeBSD.org, bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/177369: [patch] ftp/curl update to 7.29.0
Date: Wed, 27 Mar 2013 09:53:50 +0900

 I've submitted a PR ports/177401 split from part 1 of the original post.
 
 Regards,
 -- 
 
 	Hirohisa Yamaguchi
 	  umq@ueo.co.jp

From: Hirohisa Yamaguchi <umq@ueo.co.jp>
To: sunpoet@freebsd.org
Cc: bug-followup@freebsd.org
Subject: Re: ports/177369: [patch] ftp/curl update to 7.29.0
Date: Fri, 12 Apr 2013 00:16:44 +0900

 --Multipart_Fri_Apr_12_00:16:44_2013-1
 Content-Type: text/plain; charset=US-ASCII
 
 Hi,
 
 My previous patch had a malformed conditional.
 And the option TLS_SRP is currently on (because of auto detection).
 
 Here's an updated patch.
 
 Regards,
 -- 
 
 	Hirohisa Yamaguchi
 	  umq@ueo.co.jp
 
 --Multipart_Fri_Apr_12_00:16:44_2013-1
 Content-Type: application/octet-stream; type=patch
 Content-Disposition: attachment; filename="ftp_curl-7.29.0_177369-2.patch"
 Content-Transfer-Encoding: 7bit
 
 Index: ftp/curl/Makefile
 ===================================================================
 --- ftp/curl/Makefile	(revision 315291)
 +++ ftp/curl/Makefile	(working copy)
 @@ -2,8 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	curl
 -PORTVERSION=	7.24.0
 -PORTREVISION=	2
 +PORTVERSION=	7.29.0
  CATEGORIES=	ftp ipv6 www
  MASTER_SITES=	http://curl.haxx.se/download/ \
  		LOCAL/sunpoet
 @@ -14,19 +13,26 @@
  
  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
 +OPTIONS_DEFINE=	CURL_DEBUG GSSAPI IPV6 KERBEROS4 LDAP LDAPS IDN LIBSSH2 \
 +		METALINK NTLM CA_BUNDLE PROXY RTMP TLS_SRP TRACKMEMORY \
 +		DOCS EXAMPLES
 +OPTIONS_RADIO=		RESOLV SSL
 +OPTIONS_RADIO_RESOLV=	CARES THREADED_RESOLVER
 +OPTIONS_RADIO_SSL=	OPENSSL GNUTLS CYASSL NSS POLARSSL
 +OPTIONS_DEFAULT=	CA_BUNDLE IPV6 PROXY TLS_SRP 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
 +METALINK_DESC=		Metalink(RFC6249) download support
  CA_BUNDLE_DESC=		Install CA bundle for OpenSSL
 +TLS_SRP_DESC=		TLS-SRP(Secure Remote Password) support
  TRACKMEMORY_DESC=	curl memory diagnostic output
 +RESOLV_DESC=		DNS resolution options
 +THREADED_RESOLVER_DESC=	Threaded DNS resolution
 +CYASSL_DESC=		SSL/TLS support via CyaSSL
 +NSS_DESC=		SSL/TLS support via NSS
 +POLARSSL_DESC=		SSL/TLS support via PolarSSL
  
 -CONFIGURE_ARGS+=--disable-threaded-resolver --disable-werror \
 +CONFIGURE_ARGS+=--disable-threaded-resolver --disable-werror --without-axtls \
  		--enable-imap --enable-pop3 --enable-rtsp --enable-smtp
  CONFIGURE_ENV=	LOCALBASE="${LOCALBASE}"
  GNU_CONFIGURE=	yes
 @@ -44,7 +50,7 @@
  		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,7 +63,7 @@
  		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 \
 @@ -65,51 +71,58 @@
  		libcurl-errors.3 libcurl-multi.3 libcurl-share.3 \
  		libcurl-tutorial.3
  PLIST_SUB=	SHLIB_VER="${SHLIB_VER}"
 +PORTDOCS=	*
 +PORTEXAMPLES=	*
  
 -SHLIB_VER=	6
 +SHLIB_VER=	7
  .endif
  
  .include <bsd.port.options.mk>
  
 -.if ${PORT_OPTIONS:MLIBSSH2} && ! ${PORT_OPTIONS:MOPENSSL}
 -IGNORE=		only supports LIBSSH2 with OpenSSL
 +.for S in ${OPTIONS_RADIO_SSL}
 +.if ${PORT_OPTIONS:M${S}}
 +PORT_OPTIONS+=	SSL
  .endif
 +.endfor
  
 -.if ${PORT_OPTIONS:MNTLM} && ! ${PORT_OPTIONS:MOPENSSL}
 -IGNORE=		only supports NTLM with OpenSSL
 +.if ${PORT_OPTIONS:MNTLM} && ! ${PORT_OPTIONS:MSSL}
 +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)
 +.elif ! ${PORT_OPTIONS:MSSL}
 +IGNORE=		only supports LDAPS with SSL
  .endif
  .endif
 +
 +.if ${PORT_OPTIONS:MTLS_SRP} && \
 +	empty(PORT_OPTIONS:MOPENSSL) && empty(PORT_OPTIONS:MGNUTLS)
 +IGNORE=		only supports TLS-SRP with either OpenSSL or GnuTLS
  .endif
  
  .if ${PORT_OPTIONS:MOPENSSL}
  USE_OPENSSL=	yes
  CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE}
 +.else
 +CONFIGURE_ARGS+=	--without-ssl
 +.endif
 +
  .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
  .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
 -.endif
  
  .if ${PORT_OPTIONS:MCARES}
 -LIB_DEPENDS+=	cares.2:${PORTSDIR}/dns/c-ares
 -CONFIGURE_ARGS+=	--enable-ares=${LOCALBASE}
 +LIB_DEPENDS+=	cares:${PORTSDIR}/dns/c-ares
 +CONFIGURE_ARGS+=	--enable-ares=${LOCALBASE} --disable-threaded-resolver
 +.elif ${PORT_OPTIONS:MTHREADED_RESOLVER}
 +CONFIGURE_ARGS+=	--enable-threaded-resolver --disable-ares
  .else
 -CONFIGURE_ARGS+=	--disable-ares
 +CONFIGURE_ARGS+=	--disable-threaded-resolver --disable-ares
  .endif
  
  .if ${PORT_OPTIONS:MGNUTLS}
 @@ -119,12 +132,6 @@
  CONFIGURE_ARGS+=--without-gnutls
  .endif
  
 -.if ${PORT_OPTIONS:MOPENSSL} || ${PORT_OPTIONS:MGNUTLS}
 -PLIST_SUB+=	SSL=""
 -.else
 -PLIST_SUB+=	SSL="@comment "
 -.endif
 -
  .if ${PORT_OPTIONS:MIPV6}
  CONFIGURE_ARGS+=	--enable-ipv6
  .else
 @@ -140,7 +147,7 @@
  .if ${PORT_OPTIONS:MLDAP}
  CONFIGURE_ARGS+=	--enable-ldap
  USE_OPENLDAP=	yes
 -CFLAGS+=	-I${LOCALBASE}/include
 +CPPFLAGS+=	-I${LOCALBASE}/include
  LDFLAGS+=	-L${LOCALBASE}/lib
  .if ${PORT_OPTIONS:MLDAPS}
  CONFIGURE_ARGS+=	--enable-ldaps
 @@ -151,15 +158,15 @@
  CONFIGURE_ARGS+=	--disable-ldap --disable-ldaps
  .endif
  
 -.if ${PORT_OPTIONS:MLIBIDN}
 -LIB_DEPENDS+=	idn.17:${PORTSDIR}/dns/libidn
 +.if ${PORT_OPTIONS:MIDN}
 +LIB_DEPENDS+=	idn:${PORTSDIR}/dns/libidn
  CONFIGURE_ARGS+=	--with-libidn=${LOCALBASE}
  .else
  CONFIGURE_ARGS+=	--without-libidn
  .endif
  
  .if ${PORT_OPTIONS:MLIBSSH2}
 -LIB_DEPENDS+=	ssh2.1:${PORTSDIR}/security/libssh2
 +LIB_DEPENDS+=	ssh2:${PORTSDIR}/security/libssh2
  CONFIGURE_ARGS+=	--with-libssh2=${LOCALBASE}
  .else
  CONFIGURE_ARGS+=	--without-libssh2
 @@ -170,12 +177,54 @@
  .endif
  
  .if ${PORT_OPTIONS:MRTMP}
 -LIB_DEPENDS+=	rtmp.0:${PORTSDIR}/multimedia/rtmpdump
 +LIB_DEPENDS+=	rtmp:${PORTSDIR}/multimedia/rtmpdump
  CONFIGURE_ARGS+=	--with-librtmp=${LOCALBASE}
  .else
  CONFIGURE_ARGS+=	--without-librtmp
  .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:MGSSAPI}
 +CONFIGURE_ARGS+=	--with-gssapi-includes=/usr/include \
 +			--with-gssapi-libs=/usr/lib
 +.else
 +CONFIGURE_ARGS+=	--without-gssapi
 +.endif
 +
 +.if ${PORT_OPTIONS:MMETALINK}
 +BROKEN=			libmetalink in ports tree is way too old
 +CONFIGURE_ARGS+=	--with-libmetalink
 +LIB_DEPENDS+=		metalink.3:${PORTSDIR}/misc/libmetalink
 +.else
 +CONFIGURE_ARGS+=	--without-libmetalink
 +.endif
 +
 +.if ${PORT_OPTIONS:MNSS}
 +LIB_DEPENDS+=	nss3:${PORTSDIR}/security/nss
 +CONFIGURE_ARGS+=--with-nss
 +.else
 +CONFIGURE_ARGS+=--without-nss
 +.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:MTLS_SRP}
 +CONFIGURE_ARGS+=	 --enable-tls-srp
 +.else
 +CONFIGURE_ARGS+=	 --disable-tls-srp
 +.endif
 +
  .if ${PORT_OPTIONS:MTRACKMEMORY}
  CONFIGURE_ARGS+=	--enable-curldebug
  .else
 @@ -200,7 +249,7 @@
  
  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,13 +257,13 @@
  .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
 +regression-test: build
  .if ! ${PORT_OPTIONS:MPROXY}
  	@${ECHO_MSG} "******************************************"
  	@${ECHO_MSG} "* You have disabled curl proxy support.  *"
 @@ -222,6 +271,6 @@
  	@${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>
 Index: ftp/curl/distinfo
 ===================================================================
 --- ftp/curl/distinfo	(revision 315291)
 +++ ftp/curl/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (curl-7.24.0.tar.lzma) = cd683ee8be137ed8a8e97d42fd3cc94f88f63d478b83d4abe38e31b6281e2268
 -SIZE (curl-7.24.0.tar.lzma) = 1973811
 +SHA256 (curl-7.29.0.tar.lzma) = 4ae953ef144bc6cb7c8c0a054ce80f93ea174318cf9b18a2e2cc3cbf062d9b21
 +SIZE (curl-7.29.0.tar.lzma) = 2100412
 Index: ftp/curl/files/patch-configure
 ===================================================================
 --- ftp/curl/files/patch-configure	(revision 315291)
 +++ ftp/curl/files/patch-configure	(working copy)
 @@ -8,20 +8,7 @@
  
  --- 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 @@
 +@@ -16651,6 +16651,9 @@
       tmp_CFLAGS="$CFLAGS"
       tmp_CPPFLAGS="$CPPFLAGS"
   
 @@ -31,7 +18,7 @@
       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 @@
   
       #
       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 @@
       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,7 +44,7 @@
   
         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
   
 @@ -67,7 +54,7 @@
       { $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"
 @@ -92,13 +79,13 @@
  -
     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
 Index: ftp/curl/files/patch-lib::url.c
 ===================================================================
 --- ftp/curl/files/patch-lib::url.c	(revision 315291)
 +++ ftp/curl/files/patch-lib::url.c	(working copy)
 @@ -5,7 +5,7 @@
  
  --- lib/url.c.orig	2012-01-23 23:31:30.000000000 +0800
  +++ lib/url.c	2012-02-26 17:52:21.937920303 +0800
 -@@ -797,6 +797,10 @@
 +@@ -610,6 +610,10 @@
       data->progress.flags |= PGRS_HIDE;
       data->state.current_speed = -1; /* init to negative == impossible */
   
 Index: ftp/curl/files/patch-src-tool_operate.c
 ===================================================================
 --- ftp/curl/files/patch-src-tool_operate.c	(revision 315291)
 +++ ftp/curl/files/patch-src-tool_operate.c	(working copy)
 @@ -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 @@
 +@@ -649,22 +649,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 @@
 +@@ -672,6 +660,19 @@
               }
               outs.fopened = TRUE;
               outs.stream = file;
 Index: ftp/curl/pkg-plist
 ===================================================================
 --- ftp/curl/pkg-plist	(revision 315291)
 +++ ftp/curl/pkg-plist	(working copy)
 @@ -10,208 +10,9 @@
  include/curl/stdcheaders.h
  include/curl/typecheck-gcc.h
  share/aclocal/libcurl.m4
 -@dirrm include/curl
  lib/libcurl.a
  lib/libcurl.la
  lib/libcurl.so
  lib/libcurl.so.%%SHLIB_VER%%
  libdata/pkgconfig/libcurl.pc
 -%%PORTDOCS%%%%DOCSDIR%%/BINDINGS
 -%%PORTDOCS%%%%DOCSDIR%%/BUGS
 -%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTE
 -%%PORTDOCS%%%%DOCSDIR%%/DISTRO-DILEMMA
 -%%PORTDOCS%%%%DOCSDIR%%/FAQ
 -%%PORTDOCS%%%%DOCSDIR%%/FEATURES
 -%%PORTDOCS%%%%DOCSDIR%%/HISTORY
 -%%PORTDOCS%%%%DOCSDIR%%/INSTALL
 -%%PORTDOCS%%%%DOCSDIR%%/INSTALL.devcpp
 -%%PORTDOCS%%%%DOCSDIR%%/INTERNALS
 -%%PORTDOCS%%%%DOCSDIR%%/KNOWN_BUGS
 -%%PORTDOCS%%%%DOCSDIR%%/LICENSE-MIXING
 -%%PORTDOCS%%%%DOCSDIR%%/MANUAL
 -%%PORTDOCS%%%%DOCSDIR%%/README.netware
 -%%PORTDOCS%%%%DOCSDIR%%/README.win32
 -%%PORTDOCS%%%%DOCSDIR%%/RESOURCES
 -%%PORTDOCS%%%%DOCSDIR%%/SSLCERTS
 -%%PORTDOCS%%%%DOCSDIR%%/THANKS
 -%%PORTDOCS%%%%DOCSDIR%%/TODO
 -%%PORTDOCS%%%%DOCSDIR%%/TheArtOfHttpScripting
 -%%PORTDOCS%%%%DOCSDIR%%/VERSIONS
 -%%PORTDOCS%%%%DOCSDIR%%/curl-config.html
 -%%PORTDOCS%%%%DOCSDIR%%/curl-config.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/curl.html
 -%%PORTDOCS%%%%DOCSDIR%%/curl.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/index.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/ABI
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_cleanup.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_cleanup.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_duphandle.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_duphandle.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_escape.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_escape.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_getinfo.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_getinfo.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_init.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_init.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_pause.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_pause.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_perform.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_perform.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_recv.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_recv.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_reset.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_reset.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_send.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_send.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_setopt.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_setopt.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_strerror.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_strerror.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_unescape.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_unescape.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_escape.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_escape.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formadd.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formadd.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formfree.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formfree.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formget.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formget.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_free.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_free.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_getdate.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_getdate.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_getenv.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_getenv.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_cleanup.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_cleanup.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_init.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_init.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_init_mem.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_init_mem.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_mprintf.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_mprintf.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_add_handle.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_add_handle.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_assign.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_assign.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_cleanup.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_cleanup.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_fdset.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_fdset.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_info_read.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_info_read.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_init.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_init.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_perform.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_perform.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_remove_handle.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_remove_handle.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_setopt.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_setopt.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_socket.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_socket.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_socket_action.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_socket_action.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_strerror.html
 -%%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_share_cleanup.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_cleanup.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_init.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_init.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_setopt.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_setopt.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_strerror.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_strerror.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_slist_append.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_slist_append.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_slist_free_all.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_slist_free_all.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_strequal.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_strequal.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_unescape.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_unescape.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_version.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_version.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_version_info.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_version_info.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/index.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-easy.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-easy.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-errors.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-errors.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-multi.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-multi.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-share.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-share.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-tutorial.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-tutorial.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl.m4
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl.pdf
 -%%PORTDOCS%%@dirrm %%DOCSDIR%%/libcurl
 -%%PORTDOCS%%@dirrm %%DOCSDIR%%
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/10-at-a-time.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.example
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/anyauthput.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cacertinmem.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/certinfo.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/chkspeed.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cookie_interface.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/curlgtk.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/curlx.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/debug.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/evhiperfifo.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/externalsocket.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fileupload.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fopen.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftp-wildcard.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpget.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpgetinfo.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpgetresp.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%%/htmltidy.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/htmltitle.cc
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/http-post.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/httpcustomheader.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/httpput.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/https.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/imap.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/makefile.dj
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-app.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-debugcallback.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-double.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-post.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-single.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multithread.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/opensslthreadlock.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/persistant.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pop3s.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pop3slist.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/post-callback.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/postit2.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/progressfunc.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/resolve.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rtsp.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sampleconv.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sepheaders.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sendrecv.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplepost.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplesmtp.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplessl.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smooth-gtk-thread.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smtp-multi.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smtp-tls.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/synctime.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/threaded-ssl.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/url2file.c
 -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 +@dirrm include/curl
 
 --Multipart_Fri_Apr_12_00:16:44_2013-1--

From: "Mikhail T." <mi+thun@aldan.algebra.com>
To: bug-followup@FreeBSD.org, umq@ueo.co.jp
Cc:  
Subject: Re: ports/177369: [patch] ftp/curl update to 7.29.0
Date: Wed, 08 May 2013 00:30:38 -0400

 This is a multi-part message in MIME format.
 --------------080504060908050903050907
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 Meanwhile, curl got updated to 7.30.0 upstream. I'm attaching the
 updated patch -- it is almost the same as Hirohisa's, except I also
 remove the mangling of runtest.pl in post-patch -- the valgrind.pm is
 really required...
 
 Sunpoet, please, speak on the matter, or I'll have to claim "maintainer
 timeout" as soon as Hirohisa confirms, the update works for him. Thank you!
 
     -mi
 
 
 --------------080504060908050903050907
 Content-Type: text/plain; charset=KOI8-U;
  name="curl-7.30.patch"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="curl-7.30.patch"
 
 Index: Makefile
 ===================================================================
 --- Makefile	(revision 317640)
 +++ Makefile	(working copy)
 @@ -2,8 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	curl
 -PORTVERSION=	7.24.0
 -PORTREVISION=	2
 +PORTVERSION=	7.30.0
  CATEGORIES=	ftp ipv6 www
  MASTER_SITES=	http://curl.haxx.se/download/ \
  		LOCAL/sunpoet
 @@ -14,19 +13,26 @@
  
  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
 +OPTIONS_DEFINE=	CURL_DEBUG GSSAPI IPV6 KERBEROS4 LDAP LDAPS IDN LIBSSH2 \
 +		METALINK NTLM CA_BUNDLE PROXY RTMP TLS_SRP TRACKMEMORY \
 +		DOCS EXAMPLES
 +OPTIONS_RADIO=		RESOLV SSL
 +OPTIONS_RADIO_RESOLV=	CARES THREADED_RESOLVER
 +OPTIONS_RADIO_SSL=	OPENSSL GNUTLS CYASSL NSS POLARSSL
 +OPTIONS_DEFAULT=	CA_BUNDLE IPV6 PROXY TLS_SRP 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
 +METALINK_DESC=		Metalink(RFC6249) download support
  CA_BUNDLE_DESC=		Install CA bundle for OpenSSL
 +TLS_SRP_DESC=		TLS-SRP(Secure Remote Password) support
  TRACKMEMORY_DESC=	curl memory diagnostic output
 +RESOLV_DESC=		DNS resolution options
 +THREADED_RESOLVER_DESC=	Threaded DNS resolution
 +CYASSL_DESC=		SSL/TLS support via CyaSSL
 +NSS_DESC=		SSL/TLS support via NSS
 +POLARSSL_DESC=		SSL/TLS support via PolarSSL
  
 -CONFIGURE_ARGS+=--disable-threaded-resolver --disable-werror \
 +CONFIGURE_ARGS+=--disable-threaded-resolver --disable-werror --without-axtls \
  		--enable-imap --enable-pop3 --enable-rtsp --enable-smtp
  CONFIGURE_ENV=	LOCALBASE="${LOCALBASE}"
  GNU_CONFIGURE=	yes
 @@ -44,7 +50,7 @@
  		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,7 +63,7 @@
  		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 \
 @@ -65,51 +71,58 @@
  		libcurl-errors.3 libcurl-multi.3 libcurl-share.3 \
  		libcurl-tutorial.3
  PLIST_SUB=	SHLIB_VER="${SHLIB_VER}"
 +PORTDOCS=	*
 +PORTEXAMPLES=	*
  
 -SHLIB_VER=	6
 +SHLIB_VER=	7
  .endif
  
  .include <bsd.port.options.mk>
  
 -.if ${PORT_OPTIONS:MLIBSSH2} && ! ${PORT_OPTIONS:MOPENSSL}
 -IGNORE=		only supports LIBSSH2 with OpenSSL
 +.for S in ${OPTIONS_RADIO_SSL}
 +.if ${PORT_OPTIONS:M${S}}
 +PORT_OPTIONS+=	SSL
  .endif
 +.endfor
  
 -.if ${PORT_OPTIONS:MNTLM} && ! ${PORT_OPTIONS:MOPENSSL}
 -IGNORE=		only supports NTLM with OpenSSL
 +.if ${PORT_OPTIONS:MNTLM} && ! ${PORT_OPTIONS:MSSL}
 +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)
 +.elif ! ${PORT_OPTIONS:MSSL}
 +IGNORE=		only supports LDAPS with SSL
  .endif
  .endif
 +
 +.if ${PORT_OPTIONS:MTLS_SRP} && \
 +	empty(PORT_OPTIONS:MOPENSSL) && empty(PORT_OPTIONS:MGNUTLS)
 +IGNORE=		only supports TLS-SRP with either OpenSSL or GnuTLS
  .endif
  
  .if ${PORT_OPTIONS:MOPENSSL}
  USE_OPENSSL=	yes
  CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE}
 +.else
 +CONFIGURE_ARGS+=	--without-ssl
 +.endif
 +
  .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
  .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
 -.endif
  
  .if ${PORT_OPTIONS:MCARES}
 -LIB_DEPENDS+=	cares.2:${PORTSDIR}/dns/c-ares
 -CONFIGURE_ARGS+=	--enable-ares=${LOCALBASE}
 +LIB_DEPENDS+=	cares:${PORTSDIR}/dns/c-ares
 +CONFIGURE_ARGS+=	--enable-ares=${LOCALBASE} --disable-threaded-resolver
 +.elif ${PORT_OPTIONS:MTHREADED_RESOLVER}
 +CONFIGURE_ARGS+=	--enable-threaded-resolver --disable-ares
  .else
 -CONFIGURE_ARGS+=	--disable-ares
 +CONFIGURE_ARGS+=	--disable-threaded-resolver --disable-ares
  .endif
  
  .if ${PORT_OPTIONS:MGNUTLS}
 @@ -119,12 +132,6 @@
  CONFIGURE_ARGS+=--without-gnutls
  .endif
  
 -.if ${PORT_OPTIONS:MOPENSSL} || ${PORT_OPTIONS:MGNUTLS}
 -PLIST_SUB+=	SSL=""
 -.else
 -PLIST_SUB+=	SSL="@comment "
 -.endif
 -
  .if ${PORT_OPTIONS:MIPV6}
  CONFIGURE_ARGS+=	--enable-ipv6
  .else
 @@ -140,7 +147,7 @@
  .if ${PORT_OPTIONS:MLDAP}
  CONFIGURE_ARGS+=	--enable-ldap
  USE_OPENLDAP=	yes
 -CFLAGS+=	-I${LOCALBASE}/include
 +CPPFLAGS+=	-I${LOCALBASE}/include
  LDFLAGS+=	-L${LOCALBASE}/lib
  .if ${PORT_OPTIONS:MLDAPS}
  CONFIGURE_ARGS+=	--enable-ldaps
 @@ -151,15 +158,15 @@
  CONFIGURE_ARGS+=	--disable-ldap --disable-ldaps
  .endif
  
 -.if ${PORT_OPTIONS:MLIBIDN}
 -LIB_DEPENDS+=	idn.17:${PORTSDIR}/dns/libidn
 +.if ${PORT_OPTIONS:MIDN}
 +LIB_DEPENDS+=	idn:${PORTSDIR}/dns/libidn
  CONFIGURE_ARGS+=	--with-libidn=${LOCALBASE}
  .else
  CONFIGURE_ARGS+=	--without-libidn
  .endif
  
  .if ${PORT_OPTIONS:MLIBSSH2}
 -LIB_DEPENDS+=	ssh2.1:${PORTSDIR}/security/libssh2
 +LIB_DEPENDS+=	ssh2:${PORTSDIR}/security/libssh2
  CONFIGURE_ARGS+=	--with-libssh2=${LOCALBASE}
  .else
  CONFIGURE_ARGS+=	--without-libssh2
 @@ -170,12 +177,54 @@
  .endif
  
  .if ${PORT_OPTIONS:MRTMP}
 -LIB_DEPENDS+=	rtmp.0:${PORTSDIR}/multimedia/rtmpdump
 +LIB_DEPENDS+=	rtmp:${PORTSDIR}/multimedia/rtmpdump
  CONFIGURE_ARGS+=	--with-librtmp=${LOCALBASE}
  .else
  CONFIGURE_ARGS+=	--without-librtmp
  .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:MGSSAPI}
 +CONFIGURE_ARGS+=	--with-gssapi-includes=/usr/include \
 +			--with-gssapi-libs=/usr/lib
 +.else
 +CONFIGURE_ARGS+=	--without-gssapi
 +.endif
 +
 +.if ${PORT_OPTIONS:MMETALINK}
 +BROKEN=			libmetalink in ports tree is way too old
 +CONFIGURE_ARGS+=	--with-libmetalink
 +LIB_DEPENDS+=		metalink.3:${PORTSDIR}/misc/libmetalink
 +.else
 +CONFIGURE_ARGS+=	--without-libmetalink
 +.endif
 +
 +.if ${PORT_OPTIONS:MNSS}
 +LIB_DEPENDS+=	nss3:${PORTSDIR}/security/nss
 +CONFIGURE_ARGS+=--with-nss
 +.else
 +CONFIGURE_ARGS+=--without-nss
 +.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:MTLS_SRP}
 +CONFIGURE_ARGS+=	 --enable-tls-srp
 +.else
 +CONFIGURE_ARGS+=	 --disable-tls-srp
 +.endif
 +
  .if ${PORT_OPTIONS:MTRACKMEMORY}
  CONFIGURE_ARGS+=	--enable-curldebug
  .else
 @@ -196,11 +245,10 @@
  
  post-patch:
  	@${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,13 +256,13 @@
  .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
 +regression-test: build
  .if ! ${PORT_OPTIONS:MPROXY}
  	@${ECHO_MSG} "******************************************"
  	@${ECHO_MSG} "* You have disabled curl proxy support.  *"
 @@ -222,6 +270,6 @@
  	@${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>
 Index: distinfo
 ===================================================================
 --- distinfo	(revision 317640)
 +++ distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (curl-7.24.0.tar.lzma) = cd683ee8be137ed8a8e97d42fd3cc94f88f63d478b83d4abe38e31b6281e2268
 -SIZE (curl-7.24.0.tar.lzma) = 1973811
 +SHA256 (curl-7.30.0.tar.lzma) = 2cc427333447208c34d5afab29e4b1617a4f219e5787b74ec7ef6e89f6edac2a
 +SIZE (curl-7.30.0.tar.lzma) = 2145655
 Index: files/patch-configure
 ===================================================================
 --- files/patch-configure	(revision 317640)
 +++ files/patch-configure	(working copy)
 @@ -8,20 +8,7 @@
  
  --- 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 @@
 +@@ -16651,6 +16651,9 @@
       tmp_CFLAGS="$CFLAGS"
       tmp_CPPFLAGS="$CPPFLAGS"
   
 @@ -31,7 +18,7 @@
       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 @@
   
       #
       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 @@
       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,7 +44,7 @@
   
         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
   
 @@ -67,7 +54,7 @@
       { $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"
 @@ -92,13 +79,13 @@
  -
     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
 Index: files/patch-lib::url.c
 ===================================================================
 --- files/patch-lib::url.c	(revision 317640)
 +++ files/patch-lib::url.c	(working copy)
 @@ -5,7 +5,7 @@
  
  --- lib/url.c.orig	2012-01-23 23:31:30.000000000 +0800
  +++ lib/url.c	2012-02-26 17:52:21.937920303 +0800
 -@@ -797,6 +797,10 @@
 +@@ -610,6 +610,10 @@
       data->progress.flags |= PGRS_HIDE;
       data->state.current_speed = -1; /* init to negative == impossible */
   
 Index: files/patch-src-tool_operate.c
 ===================================================================
 --- files/patch-src-tool_operate.c	(revision 317640)
 +++ files/patch-src-tool_operate.c	(working copy)
 @@ -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 @@
 +@@ -649,22 +649,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 @@
 +@@ -672,6 +660,19 @@
               }
               outs.fopened = TRUE;
               outs.stream = file;
 Index: pkg-plist
 ===================================================================
 --- pkg-plist	(revision 317640)
 +++ pkg-plist	(working copy)
 @@ -10,208 +10,9 @@
  include/curl/stdcheaders.h
  include/curl/typecheck-gcc.h
  share/aclocal/libcurl.m4
 -@dirrm include/curl
  lib/libcurl.a
  lib/libcurl.la
  lib/libcurl.so
  lib/libcurl.so.%%SHLIB_VER%%
  libdata/pkgconfig/libcurl.pc
 -%%PORTDOCS%%%%DOCSDIR%%/BINDINGS
 -%%PORTDOCS%%%%DOCSDIR%%/BUGS
 -%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTE
 -%%PORTDOCS%%%%DOCSDIR%%/DISTRO-DILEMMA
 -%%PORTDOCS%%%%DOCSDIR%%/FAQ
 -%%PORTDOCS%%%%DOCSDIR%%/FEATURES
 -%%PORTDOCS%%%%DOCSDIR%%/HISTORY
 -%%PORTDOCS%%%%DOCSDIR%%/INSTALL
 -%%PORTDOCS%%%%DOCSDIR%%/INSTALL.devcpp
 -%%PORTDOCS%%%%DOCSDIR%%/INTERNALS
 -%%PORTDOCS%%%%DOCSDIR%%/KNOWN_BUGS
 -%%PORTDOCS%%%%DOCSDIR%%/LICENSE-MIXING
 -%%PORTDOCS%%%%DOCSDIR%%/MANUAL
 -%%PORTDOCS%%%%DOCSDIR%%/README.netware
 -%%PORTDOCS%%%%DOCSDIR%%/README.win32
 -%%PORTDOCS%%%%DOCSDIR%%/RESOURCES
 -%%PORTDOCS%%%%DOCSDIR%%/SSLCERTS
 -%%PORTDOCS%%%%DOCSDIR%%/THANKS
 -%%PORTDOCS%%%%DOCSDIR%%/TODO
 -%%PORTDOCS%%%%DOCSDIR%%/TheArtOfHttpScripting
 -%%PORTDOCS%%%%DOCSDIR%%/VERSIONS
 -%%PORTDOCS%%%%DOCSDIR%%/curl-config.html
 -%%PORTDOCS%%%%DOCSDIR%%/curl-config.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/curl.html
 -%%PORTDOCS%%%%DOCSDIR%%/curl.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/index.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/ABI
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_cleanup.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_cleanup.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_duphandle.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_duphandle.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_escape.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_escape.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_getinfo.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_getinfo.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_init.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_init.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_pause.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_pause.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_perform.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_perform.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_recv.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_recv.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_reset.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_reset.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_send.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_send.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_setopt.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_setopt.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_strerror.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_strerror.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_unescape.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_unescape.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_escape.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_escape.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formadd.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formadd.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formfree.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formfree.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formget.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formget.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_free.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_free.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_getdate.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_getdate.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_getenv.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_getenv.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_cleanup.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_cleanup.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_init.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_init.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_init_mem.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_init_mem.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_mprintf.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_mprintf.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_add_handle.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_add_handle.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_assign.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_assign.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_cleanup.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_cleanup.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_fdset.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_fdset.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_info_read.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_info_read.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_init.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_init.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_perform.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_perform.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_remove_handle.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_remove_handle.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_setopt.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_setopt.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_socket.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_socket.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_socket_action.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_socket_action.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_strerror.html
 -%%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_share_cleanup.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_cleanup.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_init.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_init.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_setopt.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_setopt.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_strerror.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_strerror.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_slist_append.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_slist_append.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_slist_free_all.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_slist_free_all.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_strequal.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_strequal.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_unescape.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_unescape.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_version.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_version.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_version_info.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_version_info.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/index.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-easy.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-easy.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-errors.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-errors.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-multi.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-multi.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-share.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-share.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-tutorial.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-tutorial.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl.m4
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl.pdf
 -%%PORTDOCS%%@dirrm %%DOCSDIR%%/libcurl
 -%%PORTDOCS%%@dirrm %%DOCSDIR%%
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/10-at-a-time.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.example
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/anyauthput.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cacertinmem.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/certinfo.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/chkspeed.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cookie_interface.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/curlgtk.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/curlx.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/debug.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/evhiperfifo.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/externalsocket.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fileupload.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fopen.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftp-wildcard.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpget.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpgetinfo.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpgetresp.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%%/htmltidy.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/htmltitle.cc
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/http-post.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/httpcustomheader.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/httpput.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/https.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/imap.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/makefile.dj
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-app.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-debugcallback.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-double.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-post.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-single.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multithread.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/opensslthreadlock.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/persistant.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pop3s.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pop3slist.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/post-callback.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/postit2.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/progressfunc.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/resolve.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rtsp.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sampleconv.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sepheaders.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sendrecv.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplepost.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplesmtp.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplessl.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smooth-gtk-thread.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smtp-multi.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smtp-tls.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/synctime.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/threaded-ssl.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/url2file.c
 -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 +@dirrm include/curl
 
 --------------080504060908050903050907--

From: Hirohisa Yamaguchi <umq@ueo.co.jp>
To: mi+thun@aldan.algebra.com, sunpoet@freebsd.org
Cc: bug-followup@freebsd.org
Subject: Re: ports/177369: [patch] ftp/curl update to 7.29.0
Date: Sun, 12 May 2013 20:14:52 +0900

 At Wed, 08 May 2013 00:30:38 -0400,
 Mikhail T. wrote:
 > Meanwhile, curl got updated to 7.30.0 upstream. I'm attaching the
 > updated patch -- it is almost the same as Hirohisa's, except I also
 > remove the mangling of runtest.pl in post-patch -- the valgrind.pm is
 > really required...
 
 > Sunpoet, please, speak on the matter, or I'll have to claim "maintainer
 > timeout" as soon as Hirohisa confirms, the update works for him. Thank you!
 
 The patch for 7.30.0 looks okay for me.
 
 
 Regards,
 -- 
 
 	Hirohisa Yamaguchi
 	  umq@ueo.co.jp

From: Hirohisa Yamaguchi <umq@ueo.co.jp>
To: sunpoet@freebsd.org, bug-followup@freebsd.org
Cc:  
Subject: Re: ports/177369: [patch] ftp/curl update to 7.29.0
Date: Wed, 15 May 2013 03:33:51 +0900

 --Multipart_Wed_May_15_03:33:51_2013-1
 Content-Type: text/plain; charset=US-ASCII
 
 Hi,
 
 I've merged changes from the maintainer's patch (dated 2013-05-08
 15:16:08)[0].
 
 There is a missing file in the tarball[1], which makes python
 dependency not necessary. I've added the file.
 
 I do not see what is the blocker, I would like to know.
 
 
  [0] http://people.freebsd.org/~sunpoet/curl-7.30.0.patch
  [1] http://comments.gmane.org/gmane.comp.web.curl.cvs/15934
 
 Regards,
 -- 
 
 	Hirohisa Yamaguchi
 	  umq@ueo.co.jp
 
 --Multipart_Wed_May_15_03:33:51_2013-1
 Content-Type: application/octet-stream; type=patch
 Content-Disposition: attachment; filename="ftp_curl-7.30.0_177369-4.patch"
 Content-Transfer-Encoding: 7bit
 
 M       ftp/curl/Makefile
 M       ftp/curl/distinfo
 A       ftp/curl/files/http_pipe.py
 M       ftp/curl/files/patch-configure
 M       ftp/curl/files/patch-lib::url.c
 M       ftp/curl/files/patch-src-tool_operate.c
 M       ftp/curl/pkg-plist
 
 Index: ftp/curl/Makefile
 ===================================================================
 --- ftp/curl/Makefile	(revision 318142)
 +++ ftp/curl/Makefile	(working copy)
 @@ -2,8 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	curl
 -PORTVERSION=	7.24.0
 -PORTREVISION=	2
 +PORTVERSION=	7.30.0
  CATEGORIES=	ftp ipv6 www
  MASTER_SITES=	http://curl.haxx.se/download/ \
  		LOCAL/sunpoet
 @@ -14,26 +13,35 @@
  
  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
 +TEST_DEPENDS=	python2:${PORTSDIR}/lang/python27 \
 +		stunnel:${PORTSDIR}/security/stunnel
 +
 +OPTIONS_DEFINE=	CURL_DEBUG GSSAPI IPV6 KERBEROS4 LDAP LDAPS IDN LIBSSH2 \
 +		METALINK NTLM CA_BUNDLE PROXY RTMP TLS_SRP TRACKMEMORY \
 +		DOCS EXAMPLES
 +OPTIONS_RADIO=		RESOLV SSL
 +OPTIONS_RADIO_RESOLV=	CARES THREADED_RESOLVER
 +OPTIONS_RADIO_SSL=	OPENSSL GNUTLS CYASSL NSS POLARSSL
 +OPTIONS_DEFAULT=	CA_BUNDLE IPV6 PROXY TLS_SRP OPENSSL
 +CURL_DEBUG_DESC=	cURL diagnostic output
  LIBSSH2_DESC=		SCP/SFTP support via libssh2
 -NTLM_DESC=		NTLM authentication
 +METALINK_DESC=		Metalink(RFC6249) download support
  CA_BUNDLE_DESC=		Install CA bundle for OpenSSL
 -TRACKMEMORY_DESC=	curl memory diagnostic output
 +TLS_SRP_DESC=		TLS-SRP(Secure Remote Password) support
 +TRACKMEMORY_DESC=	cURL memory diagnostic output
 +RESOLV_DESC=		DNS resolution options
 +THREADED_RESOLVER_DESC=	Threaded DNS resolution
 +CYASSL_DESC=		SSL/TLS support via CyaSSL
 +NSS_DESC=		SSL/TLS support via NSS
 +POLARSSL_DESC=		SSL/TLS support via PolarSSL
  
 -CONFIGURE_ARGS+=--disable-threaded-resolver --disable-werror \
 +CONFIGURE_ARGS+=--disable-threaded-resolver --disable-werror --without-axtls \
  		--enable-imap --enable-pop3 --enable-rtsp --enable-smtp
  CONFIGURE_ENV=	LOCALBASE="${LOCALBASE}"
  GNU_CONFIGURE=	yes
 -MAKE_ENV=	SHLIB_VER="${SHLIB_VER}"
  MAKE_JOBS_SAFE=	yes
 -USES=	pathfix
 -USE_PERL5_BUILD=	yes
 +USES=		pathfix
 +USE_PERL5_BUILD=yes
  USE_XZ=		yes
  
  .if !defined(BUILDING_HIPHOP)
 @@ -44,7 +52,7 @@
  		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 +65,68 @@
  		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}"
 +PLIST_SUB+=	SHLIB_VER="${SHLIB_VER}"
 +PORTDOCS=	*
 +PORTEXAMPLES=	*
  
 -SHLIB_VER=	6
 +SHLIB_VER=	7
  .endif
  
 +SLAVEDIRS=	ftp/curl-hiphop
 +
  .include <bsd.port.options.mk>
  
 -.if ${PORT_OPTIONS:MLIBSSH2} && ! ${PORT_OPTIONS:MOPENSSL}
 -IGNORE=		only supports LIBSSH2 with OpenSSL
 +.for S in ${OPTIONS_RADIO_SSL}
 +.if ${PORT_OPTIONS:M${S}}
 +PORT_OPTIONS+=	SSL
  .endif
 +.endfor
  
 -.if ${PORT_OPTIONS:MNTLM} && ! ${PORT_OPTIONS:MOPENSSL}
 -IGNORE=		only supports NTLM with OpenSSL
 +.if ${PORT_OPTIONS:MNTLM} && empty(PORT_OPTIONS:MSSL)
 +IGNORE=		only supports NTLM with SSL
  .endif
  
  .if ${PORT_OPTIONS:MLDAPS}
 -.if ! ${PORT_OPTIONS:MLDAP}
 +.if empty(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)
 +.elif empty(PORT_OPTIONS:MSSL)
 +IGNORE=		only supports LDAPS with SSL
  .endif
  .endif
 +
 +.if ${PORT_OPTIONS:MTLS_SRP} && \
 +	empty(PORT_OPTIONS:MOPENSSL) && empty(PORT_OPTIONS:MGNUTLS)
 +IGNORE=		only supports TLS-SRP with either OpenSSL or GnuTLS
  .endif
  
  .if ${PORT_OPTIONS:MOPENSSL}
  USE_OPENSSL=	yes
  CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE}
 +.else
 +CONFIGURE_ARGS+=	--without-ssl
 +.endif
 +
  .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
  .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
 -.endif
  
  .if ${PORT_OPTIONS:MCARES}
 -LIB_DEPENDS+=	cares.2:${PORTSDIR}/dns/c-ares
 -CONFIGURE_ARGS+=	--enable-ares=${LOCALBASE}
 +LIB_DEPENDS+=	cares:${PORTSDIR}/dns/c-ares
 +CONFIGURE_ARGS+=	--enable-ares=${LOCALBASE} --disable-threaded-resolver
 +.elif ${PORT_OPTIONS:MTHREADED_RESOLVER}
 +CONFIGURE_ARGS+=	--enable-threaded-resolver --disable-ares
  .else
 -CONFIGURE_ARGS+=	--disable-ares
 +CONFIGURE_ARGS+=	--disable-threaded-resolver --disable-ares
  .endif
  
  .if ${PORT_OPTIONS:MGNUTLS}
 @@ -119,12 +136,6 @@
  CONFIGURE_ARGS+=--without-gnutls
  .endif
  
 -.if ${PORT_OPTIONS:MOPENSSL} || ${PORT_OPTIONS:MGNUTLS}
 -PLIST_SUB+=	SSL=""
 -.else
 -PLIST_SUB+=	SSL="@comment "
 -.endif
 -
  .if ${PORT_OPTIONS:MIPV6}
  CONFIGURE_ARGS+=	--enable-ipv6
  .else
 @@ -140,7 +151,7 @@
  .if ${PORT_OPTIONS:MLDAP}
  CONFIGURE_ARGS+=	--enable-ldap
  USE_OPENLDAP=	yes
 -CFLAGS+=	-I${LOCALBASE}/include
 +CPPFLAGS+=	-I${LOCALBASE}/include
  LDFLAGS+=	-L${LOCALBASE}/lib
  .if ${PORT_OPTIONS:MLDAPS}
  CONFIGURE_ARGS+=	--enable-ldaps
 @@ -151,15 +162,15 @@
  CONFIGURE_ARGS+=	--disable-ldap --disable-ldaps
  .endif
  
 -.if ${PORT_OPTIONS:MLIBIDN}
 -LIB_DEPENDS+=	idn.17:${PORTSDIR}/dns/libidn
 +.if ${PORT_OPTIONS:MIDN}
 +LIB_DEPENDS+=	idn:${PORTSDIR}/dns/libidn
  CONFIGURE_ARGS+=	--with-libidn=${LOCALBASE}
  .else
  CONFIGURE_ARGS+=	--without-libidn
  .endif
  
  .if ${PORT_OPTIONS:MLIBSSH2}
 -LIB_DEPENDS+=	ssh2.1:${PORTSDIR}/security/libssh2
 +LIB_DEPENDS+=	ssh2:${PORTSDIR}/security/libssh2
  CONFIGURE_ARGS+=	--with-libssh2=${LOCALBASE}
  .else
  CONFIGURE_ARGS+=	--without-libssh2
 @@ -170,12 +181,54 @@
  .endif
  
  .if ${PORT_OPTIONS:MRTMP}
 -LIB_DEPENDS+=	rtmp.0:${PORTSDIR}/multimedia/rtmpdump
 +LIB_DEPENDS+=	rtmp:${PORTSDIR}/multimedia/rtmpdump
  CONFIGURE_ARGS+=	--with-librtmp=${LOCALBASE}
  .else
  CONFIGURE_ARGS+=	--without-librtmp
  .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:MGSSAPI}
 +CONFIGURE_ARGS+=	--with-gssapi-includes=/usr/include \
 +			--with-gssapi-libs=/usr/lib
 +.else
 +CONFIGURE_ARGS+=	--without-gssapi
 +.endif
 +
 +.if ${PORT_OPTIONS:MMETALINK}
 +BROKEN=			libmetalink in ports tree is way too old
 +CONFIGURE_ARGS+=	--with-libmetalink
 +LIB_DEPENDS+=		metalink.3:${PORTSDIR}/misc/libmetalink
 +.else
 +CONFIGURE_ARGS+=	--without-libmetalink
 +.endif
 +
 +.if ${PORT_OPTIONS:MNSS}
 +LIB_DEPENDS+=	nss3:${PORTSDIR}/security/nss
 +CONFIGURE_ARGS+=--with-nss
 +.else
 +CONFIGURE_ARGS+=--without-nss
 +.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:MTLS_SRP}
 +CONFIGURE_ARGS+=	 --enable-tls-srp
 +.else
 +CONFIGURE_ARGS+=	 --disable-tls-srp
 +.endif
 +
  .if ${PORT_OPTIONS:MTRACKMEMORY}
  CONFIGURE_ARGS+=	--enable-curldebug
  .else
 @@ -195,12 +248,17 @@
  .endif
  
  post-patch:
 +	@${CP} ${FILESDIR}/http_pipe.py ${WRKSRC}/tests/
  	@${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
 +	@${MKDIR} ${WRKSRC}/tests/log/
 +	@${REINPLACE_CMD} \
 +		-e '/^TEST = / s|$$| -d -k -l -n -p -v|' \
 +		-e 's|python|${LOCALBASE}/bin/&2|' \
 +			${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 +266,20 @@
  .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 empty(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>
 Index: ftp/curl/distinfo
 ===================================================================
 --- ftp/curl/distinfo	(revision 315212)
 +++ ftp/curl/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (curl-7.24.0.tar.lzma) = cd683ee8be137ed8a8e97d42fd3cc94f88f63d478b83d4abe38e31b6281e2268
 -SIZE (curl-7.24.0.tar.lzma) = 1973811
 +SHA256 (curl-7.30.0.tar.lzma) = 2cc427333447208c34d5afab29e4b1617a4f219e5787b74ec7ef6e89f6edac2a
 +SIZE (curl-7.30.0.tar.lzma) = 2145655
 Index: ftp/curl/files/http_pipe.py
 ===================================================================
 --- ftp/curl/files/http_pipe.py	(revision 0)
 +++ ftp/curl/files/http_pipe.py	(working copy)
 @@ -0,0 +1,447 @@
 +#!/usr/bin/python
 +
 +# Copyright 2012 Google Inc. All Rights Reserved.
 +#
 +# Licensed under the Apache License, Version 2.0 (the "License");
 +# you may not use this file except in compliance with the License.
 +# You may obtain a copy of the License at
 +#
 +#    http://www.apache.org/licenses/LICENSE-2.0
 +#
 +# Unless required by applicable law or agreed to in writing, software
 +# distributed under the License is distributed on an "AS IS" BASIS,
 +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 +# See the License for the specific language governing permissions and
 +# limitations under the License.
 +#
 +# Modified by Linus Nielsen Feltzing for inclusion in the libcurl test
 +# framework
 +#
 +import SocketServer
 +import argparse
 +import re
 +import select
 +import socket
 +import time
 +import pprint
 +import os
 +
 +INFO_MESSAGE = '''
 +This is a test server to test the libcurl pipelining functionality.
 +It is a modified version if Google's HTTP pipelining test server. More
 +information can be found here:
 +
 +http://dev.chromium.org/developers/design-documents/network-stack/http-pipelining
 +
 +Source code can be found here:
 +
 +http://code.google.com/p/http-pipelining-test/
 +'''
 +MAX_REQUEST_SIZE = 1024  # bytes
 +MIN_POLL_TIME = 0.01  # seconds. Minimum time to poll, in order to prevent
 +                      # excessive looping because Python refuses to poll for
 +                      # small timeouts.
 +SEND_BUFFER_TIME = 0.5  # seconds
 +TIMEOUT = 30  # seconds
 +
 +
 +class Error(Exception):
 +  pass
 +
 +
 +class RequestTooLargeError(Error):
 +  pass
 +
 +
 +class ServeIndexError(Error):
 +  pass
 +
 +
 +class UnexpectedMethodError(Error):
 +  pass
 +
 +
 +class RequestParser(object):
 +  """Parses an input buffer looking for HTTP GET requests."""
 +
 +  global logfile
 +
 +  LOOKING_FOR_GET = 1
 +  READING_HEADERS = 2
 +
 +  HEADER_RE = re.compile('([^:]+):(.*)\n')
 +  REQUEST_RE = re.compile('([^ ]+) ([^ ]+) HTTP/(\d+)\.(\d+)\n')
 +
 +  def __init__(self):
 +    """Initializer."""
 +    self._buffer = ""
 +    self._pending_headers = {}
 +    self._pending_request = ""
 +    self._state = self.LOOKING_FOR_GET
 +    self._were_all_requests_http_1_1 = True
 +    self._valid_requests = []
 +
 +  def ParseAdditionalData(self, data):
 +    """Finds HTTP requests in |data|.
 +
 +    Args:
 +      data: (String) Newly received input data from the socket.
 +
 +    Returns:
 +      (List of Tuples)
 +        (String) The request path.
 +        (Map of String to String) The header name and value.
 +
 +    Raises:
 +      RequestTooLargeError: If the request exceeds MAX_REQUEST_SIZE.
 +      UnexpectedMethodError: On a non-GET method.
 +      Error: On a programming error.
 +    """
 +    logfile = open('log/server.input', 'a')
 +    logfile.write(data)
 +    logfile.close()
 +    self._buffer += data.replace('\r', '')
 +    should_continue_parsing = True
 +    while should_continue_parsing:
 +      if self._state == self.LOOKING_FOR_GET:
 +        should_continue_parsing = self._DoLookForGet()
 +      elif self._state == self.READING_HEADERS:
 +        should_continue_parsing = self._DoReadHeader()
 +      else:
 +        raise Error('Unexpected state: ' + self._state)
 +    if len(self._buffer) > MAX_REQUEST_SIZE:
 +      raise RequestTooLargeError(
 +          'Request is at least %d bytes' % len(self._buffer))
 +    valid_requests = self._valid_requests
 +    self._valid_requests = []
 +    return valid_requests
 +
 +  @property
 +  def were_all_requests_http_1_1(self):
 +    return self._were_all_requests_http_1_1
 +
 +  def _DoLookForGet(self):
 +    """Tries to parse an HTTTP request line.
 +
 +    Returns:
 +      (Boolean) True if a request was found.
 +
 +    Raises:
 +      UnexpectedMethodError: On a non-GET method.
 +    """
 +    m = self.REQUEST_RE.match(self._buffer)
 +    if not m:
 +      return False
 +    method, path, http_major, http_minor = m.groups()
 +
 +    if method != 'GET':
 +      raise UnexpectedMethodError('Unexpected method: ' + method)
 +    if path in ['/', '/index.htm', '/index.html']:
 +      raise ServeIndexError()
 +
 +    if http_major != '1' or http_minor != '1':
 +      self._were_all_requests_http_1_1 = False
 +
 +#    print method, path
 +
 +    self._pending_request = path
 +    self._buffer = self._buffer[m.end():]
 +    self._state = self.READING_HEADERS
 +    return True
 +
 +  def _DoReadHeader(self):
 +    """Tries to parse a HTTP header.
 +
 +    Returns:
 +      (Boolean) True if it found the end of the request or a HTTP header.
 +    """
 +    if self._buffer.startswith('\n'):
 +      self._buffer = self._buffer[1:]
 +      self._state = self.LOOKING_FOR_GET
 +      self._valid_requests.append((self._pending_request,
 +                                   self._pending_headers))
 +      self._pending_headers = {}
 +      self._pending_request = ""
 +      return True
 +
 +    m = self.HEADER_RE.match(self._buffer)
 +    if not m:
 +      return False
 +
 +    header = m.group(1).lower()
 +    value = m.group(2).strip().lower()
 +    if header not in self._pending_headers:
 +      self._pending_headers[header] = value
 +    self._buffer = self._buffer[m.end():]
 +    return True
 +
 +
 +class ResponseBuilder(object):
 +  """Builds HTTP responses for a list of accumulated requests."""
 +
 +  def __init__(self):
 +    """Initializer."""
 +    self._max_pipeline_depth = 0
 +    self._requested_paths = []
 +    self._processed_end = False
 +    self._were_all_requests_http_1_1 = True
 +
 +  def QueueRequests(self, requested_paths, were_all_requests_http_1_1):
 +    """Adds requests to the queue of requests.
 +
 +    Args:
 +      requested_paths: (List of Strings) Requested paths.
 +    """
 +    self._requested_paths.extend(requested_paths)
 +    self._were_all_requests_http_1_1 = were_all_requests_http_1_1
 +
 +  def Chunkify(self, data, chunksize):
 +    """ Divides a string into chunks
 +    """
 +    return [hex(chunksize)[2:] + "\r\n" + data[i:i+chunksize] + "\r\n" for i in range(0, len(data), chunksize)]
 +
 +  def BuildResponses(self):
 +    """Converts the queue of requests into responses.
 +
 +    Returns:
 +      (String) Buffer containing all of the responses.
 +    """
 +    result = ""
 +    self._max_pipeline_depth = max(self._max_pipeline_depth,
 +                                   len(self._requested_paths))
 +    for path, headers in self._requested_paths:
 +      if path == '/verifiedserver':
 +        body = "WE ROOLZ: {}\r\n".format(os.getpid());
 +        result += self._BuildResponse(
 +            '200 OK', ['Server: Apache',
 +                       'Content-Length: {}'.format(len(body)),
 +                       'Cache-Control: no-store'], body)
 +
 +      elif path == '/alphabet.txt':
 +        body = 'abcdefghijklmnopqrstuvwxyz'
 +        result += self._BuildResponse(
 +            '200 OK', ['Server: Apache',
 +                       'Content-Length: 26',
 +                       'Cache-Control: no-store'], body)
 +
 +      elif path == '/reverse.txt':
 +        body = 'zyxwvutsrqponmlkjihgfedcba'
 +        result += self._BuildResponse(
 +            '200 OK', ['Content-Length: 26', 'Cache-Control: no-store'], body)
 +
 +      elif path == '/chunked.txt':
 +        body = ('7\r\nchunked\r\n'
 +                '8\r\nencoding\r\n'
 +                '2\r\nis\r\n'
 +                '3\r\nfun\r\n'
 +                '0\r\n\r\n')
 +        result += self._BuildResponse(
 +            '200 OK', ['Transfer-Encoding: chunked', 'Cache-Control: no-store'],
 +            body)
 +
 +      elif path == '/cached.txt':
 +        body = 'azbycxdwevfugthsirjqkplomn'
 +        result += self._BuildResponse(
 +            '200 OK', ['Content-Length: 26', 'Cache-Control: max-age=60'], body)
 +
 +      elif path == '/connection_close.txt':
 +        body = 'azbycxdwevfugthsirjqkplomn'
 +        result += self._BuildResponse(
 +            '200 OK', ['Content-Length: 26', 'Cache-Control: max-age=60', 'Connection: close'], body)
 +        self._processed_end = True
 +
 +      elif path == '/1k.txt':
 +        str = '0123456789abcdef'
 +        body = ''.join([str for num in xrange(64)])
 +        result += self._BuildResponse(
 +            '200 OK', ['Server: Apache',
 +                       'Content-Length: 1024',
 +                       'Cache-Control: max-age=60'], body)
 +
 +      elif path == '/10k.txt':
 +        str = '0123456789abcdef'
 +        body = ''.join([str for num in xrange(640)])
 +        result += self._BuildResponse(
 +            '200 OK', ['Server: Apache',
 +                       'Content-Length: 10240',
 +                       'Cache-Control: max-age=60'], body)
 +
 +      elif path == '/100k.txt':
 +        str = '0123456789abcdef'
 +        body = ''.join([str for num in xrange(6400)])
 +        result += self._BuildResponse(
 +            '200 OK',
 +            ['Server: Apache',
 +             'Content-Length: 102400',
 +             'Cache-Control: max-age=60'],
 +            body)
 +
 +      elif path == '/100k_chunked.txt':
 +        str = '0123456789abcdef'
 +        moo = ''.join([str for num in xrange(6400)])
 +        body = self.Chunkify(moo, 20480)
 +        body.append('0\r\n\r\n')
 +        body = ''.join(body)
 +
 +        result += self._BuildResponse(
 +            '200 OK', ['Transfer-Encoding: chunked', 'Cache-Control: no-store'], body)
 +
 +      elif path == '/stats.txt':
 +        results = {
 +            'max_pipeline_depth': self._max_pipeline_depth,
 +            'were_all_requests_http_1_1': int(self._were_all_requests_http_1_1),
 +        }
 +        body = ','.join(['%s:%s' % (k, v) for k, v in results.items()])
 +        result += self._BuildResponse(
 +            '200 OK',
 +            ['Content-Length: %s' % len(body), 'Cache-Control: no-store'], body)
 +        self._processed_end = True
 +
 +      else:
 +        result += self._BuildResponse('404 Not Found', ['Content-Length: 7'], 'Go away')
 +      if self._processed_end:
 +          break
 +    self._requested_paths = []
 +    return result
 +
 +  def WriteError(self, status, error):
 +    """Returns an HTTP response for the specified error.
 +
 +    Args:
 +      status: (String) Response code and descrtion (e.g. "404 Not Found")
 +
 +    Returns:
 +      (String) Text of HTTP response.
 +    """
 +    return self._BuildResponse(
 +        status, ['Connection: close', 'Content-Type: text/plain'], error)
 +
 +  @property
 +  def processed_end(self):
 +    return self._processed_end
 +
 +  def _BuildResponse(self, status, headers, body):
 +    """Builds an HTTP response.
 +
 +    Args:
 +      status: (String) Response code and descrtion (e.g. "200 OK")
 +      headers: (List of Strings) Headers (e.g. "Connection: close")
 +      body: (String) Response body.
 +
 +    Returns:
 +      (String) Text of HTTP response.
 +    """
 +    return ('HTTP/1.1 %s\r\n'
 +            '%s\r\n'
 +            '\r\n'
 +            '%s' % (status, '\r\n'.join(headers), body))
 +
 +
 +class PipelineRequestHandler(SocketServer.BaseRequestHandler):
 +  """Called on an incoming TCP connection."""
 +
 +  def _GetTimeUntilTimeout(self):
 +    return self._start_time + TIMEOUT - time.time()
 +
 +  def _GetTimeUntilNextSend(self):
 +    if not self._last_queued_time:
 +      return TIMEOUT
 +    return self._last_queued_time + SEND_BUFFER_TIME - time.time()
 +
 +  def handle(self):
 +    self._request_parser = RequestParser()
 +    self._response_builder = ResponseBuilder()
 +    self._last_queued_time = 0
 +    self._num_queued = 0
 +    self._num_written = 0
 +    self._send_buffer = ""
 +    self._start_time = time.time()
 +    try:
 +      poller = select.epoll(sizehint=1)
 +      poller.register(self.request.fileno(), select.EPOLLIN)
 +      while not self._response_builder.processed_end or self._send_buffer:
 +
 +        time_left = self._GetTimeUntilTimeout()
 +        time_until_next_send = self._GetTimeUntilNextSend()
 +        max_poll_time = min(time_left, time_until_next_send) + MIN_POLL_TIME
 +
 +        events = None
 +        if max_poll_time > 0:
 +          if self._send_buffer:
 +            poller.modify(self.request.fileno(),
 +                          select.EPOLLIN | select.EPOLLOUT)
 +          else:
 +            poller.modify(self.request.fileno(), select.EPOLLIN)
 +          events = poller.poll(timeout=max_poll_time)
 +
 +        if self._GetTimeUntilTimeout() <= 0:
 +          return
 +
 +        if self._GetTimeUntilNextSend() <= 0:
 +          self._send_buffer += self._response_builder.BuildResponses()
 +          self._num_written = self._num_queued
 +          self._last_queued_time = 0
 +
 +        for fd, mode in events:
 +          if mode & select.EPOLLIN:
 +            new_data = self.request.recv(MAX_REQUEST_SIZE, socket.MSG_DONTWAIT)
 +            if not new_data:
 +              return
 +            new_requests = self._request_parser.ParseAdditionalData(new_data)
 +            self._response_builder.QueueRequests(
 +                new_requests, self._request_parser.were_all_requests_http_1_1)
 +            self._num_queued += len(new_requests)
 +            self._last_queued_time = time.time()
 +          elif mode & select.EPOLLOUT:
 +            num_bytes_sent = self.request.send(self._send_buffer[0:4096])
 +            self._send_buffer = self._send_buffer[num_bytes_sent:]
 +            time.sleep(0.05)
 +          else:
 +            return
 +
 +    except RequestTooLargeError as e:
 +      self.request.send(self._response_builder.WriteError(
 +          '413 Request Entity Too Large', e))
 +      raise
 +    except UnexpectedMethodError as e:
 +      self.request.send(self._response_builder.WriteError(
 +          '405 Method Not Allowed', e))
 +      raise
 +    except ServeIndexError:
 +      self.request.send(self._response_builder.WriteError(
 +          '200 OK', INFO_MESSAGE))
 +    except Exception as e:
 +      print e
 +    self.request.close()
 +
 +
 +class PipelineServer(SocketServer.ForkingMixIn, SocketServer.TCPServer):
 +  pass
 +
 +
 +parser = argparse.ArgumentParser()
 +parser.add_argument("--port", action="store", default=0,
 +                  type=int, help="port to listen on")
 +parser.add_argument("--verbose", action="store", default=0,
 +                  type=int, help="verbose output")
 +parser.add_argument("--pidfile", action="store", default=0,
 +                  help="file name for the PID")
 +parser.add_argument("--logfile", action="store", default=0,
 +                  help="file name for the log")
 +parser.add_argument("--srcdir", action="store", default=0,
 +                  help="test directory")
 +parser.add_argument("--id", action="store", default=0,
 +                  help="server ID")
 +parser.add_argument("--ipv4", action="store_true", default=0,
 +                  help="IPv4 flag")
 +args = parser.parse_args()
 +
 +if args.pidfile:
 +    pid = os.getpid()
 +    f = open(args.pidfile, 'w')
 +    f.write('{}'.format(pid))
 +    f.close()
 +
 +server = PipelineServer(('0.0.0.0', args.port), PipelineRequestHandler)
 +server.allow_reuse_address = True
 +server.serve_forever()
 Index: ftp/curl/files/patch-configure
 ===================================================================
 --- ftp/curl/files/patch-configure	(revision 315212)
 +++ ftp/curl/files/patch-configure	(working copy)
 @@ -8,20 +8,7 @@
  
  --- 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 @@
 +@@ -16842,6 +16842,9 @@
       tmp_CFLAGS="$CFLAGS"
       tmp_CPPFLAGS="$CPPFLAGS"
   
 @@ -31,7 +18,7 @@
       ac_var_stripped=""
     for word1 in $tmp_CFLAGS; do
       ac_var_strip_word="no"
 -@@ -15922,6 +15925,7 @@
 +@@ -16872,6 +16875,7 @@
     done
       tmp_CPPFLAGS="$ac_var_stripped"
     squeeze tmp_CPPFLAGS
 @@ -39,7 +26,7 @@
   
       #
       if test "$want_debug" = "yes"; then
 -@@ -16139,6 +16143,9 @@
 +@@ -17089,6 +17093,9 @@
       #
       if test "$honor_optimize_option" = "yes"; then
   
 @@ -49,7 +36,7 @@
       ac_var_stripped=""
     for word1 in $tmp_CFLAGS; do
       ac_var_strip_word="no"
 -@@ -16169,6 +16176,7 @@
 +@@ -17119,6 +117126,7 @@
     done
       tmp_CPPFLAGS="$ac_var_stripped"
     squeeze tmp_CPPFLAGS
 @@ -57,17 +44,17 @@
   
         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 @@
 +@@ -21544,7 +21552,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 @@
 +@@ -24890,29 +24899,30 @@
       ;;
     off)
           LIB_RTMP="-lrtmp"
 @@ -78,9 +65,9 @@
     *)
           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 @@
  -
     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
 Index: ftp/curl/files/patch-lib::url.c
 ===================================================================
 --- ftp/curl/files/patch-lib::url.c	(revision 315212)
 +++ ftp/curl/files/patch-lib::url.c	(working copy)
 @@ -5,7 +5,7 @@
  
  --- lib/url.c.orig	2012-01-23 23:31:30.000000000 +0800
  +++ lib/url.c	2012-02-26 17:52:21.937920303 +0800
 -@@ -797,6 +797,10 @@
 +@@ -614,6 +614,10 @@
       data->progress.flags |= PGRS_HIDE;
       data->state.current_speed = -1; /* init to negative == impossible */
   
 Index: ftp/curl/files/patch-src-tool_operate.c
 ===================================================================
 --- ftp/curl/files/patch-src-tool_operate.c	(revision 315212)
 +++ ftp/curl/files/patch-src-tool_operate.c	(working copy)
 @@ -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 @@
 +@@ -649,22 +649,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 @@
 +@@ -672,6 +660,19 @@
               }
               outs.fopened = TRUE;
               outs.stream = file;
 Index: ftp/curl/pkg-plist
 ===================================================================
 --- ftp/curl/pkg-plist	(revision 315212)
 +++ ftp/curl/pkg-plist	(working copy)
 @@ -10,208 +10,9 @@
  include/curl/stdcheaders.h
  include/curl/typecheck-gcc.h
  share/aclocal/libcurl.m4
 -@dirrm include/curl
  lib/libcurl.a
  lib/libcurl.la
  lib/libcurl.so
  lib/libcurl.so.%%SHLIB_VER%%
  libdata/pkgconfig/libcurl.pc
 -%%PORTDOCS%%%%DOCSDIR%%/BINDINGS
 -%%PORTDOCS%%%%DOCSDIR%%/BUGS
 -%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTE
 -%%PORTDOCS%%%%DOCSDIR%%/DISTRO-DILEMMA
 -%%PORTDOCS%%%%DOCSDIR%%/FAQ
 -%%PORTDOCS%%%%DOCSDIR%%/FEATURES
 -%%PORTDOCS%%%%DOCSDIR%%/HISTORY
 -%%PORTDOCS%%%%DOCSDIR%%/INSTALL
 -%%PORTDOCS%%%%DOCSDIR%%/INSTALL.devcpp
 -%%PORTDOCS%%%%DOCSDIR%%/INTERNALS
 -%%PORTDOCS%%%%DOCSDIR%%/KNOWN_BUGS
 -%%PORTDOCS%%%%DOCSDIR%%/LICENSE-MIXING
 -%%PORTDOCS%%%%DOCSDIR%%/MANUAL
 -%%PORTDOCS%%%%DOCSDIR%%/README.netware
 -%%PORTDOCS%%%%DOCSDIR%%/README.win32
 -%%PORTDOCS%%%%DOCSDIR%%/RESOURCES
 -%%PORTDOCS%%%%DOCSDIR%%/SSLCERTS
 -%%PORTDOCS%%%%DOCSDIR%%/THANKS
 -%%PORTDOCS%%%%DOCSDIR%%/TODO
 -%%PORTDOCS%%%%DOCSDIR%%/TheArtOfHttpScripting
 -%%PORTDOCS%%%%DOCSDIR%%/VERSIONS
 -%%PORTDOCS%%%%DOCSDIR%%/curl-config.html
 -%%PORTDOCS%%%%DOCSDIR%%/curl-config.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/curl.html
 -%%PORTDOCS%%%%DOCSDIR%%/curl.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/index.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/ABI
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_cleanup.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_cleanup.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_duphandle.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_duphandle.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_escape.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_escape.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_getinfo.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_getinfo.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_init.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_init.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_pause.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_pause.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_perform.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_perform.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_recv.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_recv.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_reset.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_reset.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_send.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_send.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_setopt.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_setopt.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_strerror.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_strerror.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_unescape.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_unescape.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_escape.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_escape.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formadd.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formadd.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formfree.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formfree.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formget.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formget.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_free.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_free.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_getdate.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_getdate.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_getenv.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_getenv.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_cleanup.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_cleanup.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_init.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_init.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_init_mem.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_init_mem.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_mprintf.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_mprintf.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_add_handle.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_add_handle.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_assign.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_assign.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_cleanup.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_cleanup.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_fdset.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_fdset.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_info_read.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_info_read.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_init.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_init.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_perform.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_perform.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_remove_handle.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_remove_handle.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_setopt.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_setopt.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_socket.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_socket.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_socket_action.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_socket_action.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_strerror.html
 -%%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_share_cleanup.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_cleanup.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_init.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_init.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_setopt.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_setopt.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_strerror.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_strerror.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_slist_append.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_slist_append.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_slist_free_all.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_slist_free_all.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_strequal.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_strequal.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_unescape.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_unescape.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_version.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_version.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_version_info.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_version_info.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/index.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-easy.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-easy.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-errors.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-errors.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-multi.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-multi.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-share.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-share.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-tutorial.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-tutorial.pdf
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl.html
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl.m4
 -%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl.pdf
 -%%PORTDOCS%%@dirrm %%DOCSDIR%%/libcurl
 -%%PORTDOCS%%@dirrm %%DOCSDIR%%
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/10-at-a-time.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.example
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/anyauthput.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cacertinmem.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/certinfo.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/chkspeed.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cookie_interface.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/curlgtk.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/curlx.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/debug.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/evhiperfifo.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/externalsocket.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fileupload.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fopen.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftp-wildcard.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpget.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpgetinfo.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpgetresp.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%%/htmltidy.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/htmltitle.cc
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/http-post.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/httpcustomheader.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/httpput.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/https.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/imap.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/makefile.dj
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-app.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-debugcallback.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-double.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-post.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-single.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multithread.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/opensslthreadlock.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/persistant.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pop3s.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pop3slist.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/post-callback.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/postit2.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/progressfunc.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/resolve.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rtsp.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sampleconv.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sepheaders.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sendrecv.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplepost.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplesmtp.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplessl.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smooth-gtk-thread.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smtp-multi.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smtp-tls.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/synctime.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/threaded-ssl.c
 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/url2file.c
 -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 +@dirrm include/curl
 
 --Multipart_Wed_May_15_03:33:51_2013-1--

From: Chie Taguchi <chaika@nn.iij4u.or.jp>
To: bug-followup@FreeBSD.org, umq@ueo.co.jp
Cc:  
Subject: Re: ports/177369: [patch] ftp/curl update to 7.29.0
Date: Sun, 30 Jun 2013 23:09:42 +0900

 This is a multi-part message in MIME format.
 --------------050103070700010209030707
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 Hi,
 
 i want to build git, depended curl, but security issue for curl 7.24.0 
 cause to fail building curl.
 this problem already reported by 
 http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/180058 and 
 http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/180072.
 i tried to build curl7.31.0 applied *ftp_curl-7.30.0_177369-4.patch 
 <http://www.freebsd.org/cgi/query-pr.cgi?pr=ports%2F177369&getpatch=5>, 
 *and i had only chage "PORTVERSION=7.31.0" in Makefile, i can get curl.
 
 Why *ftp_curl-7.30.0_177369-4.patch 
 <http://www.freebsd.org/cgi/query-pr.cgi?pr=ports%2F177369&getpatch=5> 
 is not commited?
 we need curl 7.31.0 ASAP.
 
 Thanks.
 
 C. Taguchi
 *
 
 --------------050103070700010209030707
 Content-Type: text/html; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 <html>
   <head>
 
     <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
   </head>
   <body text="#000000" bgcolor="#FFFFFF">
     Hi,<br>
     <br>
     i want to build git, depended curl, but security issue for curl
     7.24.0 cause to fail building curl.<br>
     this problem already reported by
     <a class="moz-txt-link-freetext" href="http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/180058">http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/180058</a> and
     <a class="moz-txt-link-freetext" href="http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/180072">http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/180072</a>.<br>
     i tried to build curl7.31.0 applied <b><a
 href="http://www.freebsd.org/cgi/query-pr.cgi?pr=ports%2F177369&amp;getpatch=5">ftp_curl-7.30.0_177369-4.patch</a>,
     </b>and i had only chage "PORTVERSION=7.31.0" in Makefile, i can get
     curl.<br>
     <br>
     Why <b><a
 href="http://www.freebsd.org/cgi/query-pr.cgi?pr=ports%2F177369&amp;getpatch=5">ftp_curl-7.30.0_177369-4.patch</a>
       is not commited?<br>
       we need curl 7.31.0 ASAP.<br>
       <br>
       Thanks.<br>
       <br>
       C. Taguchi<br>
     </b>
   </body>
 </html>
 
 --------------050103070700010209030707--

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/177369: commit references a PR
Date: Thu, 11 Jul 2013 16:27:00 +0000 (UTC)

 Author: sunpoet
 Date: Thu Jul 11 16:26:26 2013
 New Revision: 322783
 URL: http://svnweb.freebsd.org/changeset/ports/322783
 
 Log:
   - 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
 
 Deleted:
   head/ftp/curl/files/patch-CVE-2013-2174
 Modified:
   head/archivers/epkg/Makefile   (contents, props changed)
   head/astro/foxtrotgps/Makefile
   head/astro/viking/Makefile
   head/audio/amarok-kde4/Makefile
   head/audio/ario/Makefile
   head/audio/deadbeef/Makefile
   head/audio/fplib/Makefile
   head/audio/gbemol/Makefile   (contents, props changed)
   head/audio/gogglesmm/Makefile
   head/audio/grip/Makefile   (contents, props changed)
   head/audio/gtkpod/Makefile
   head/audio/herrie/Makefile
   head/audio/icecast2/Makefile   (contents, props changed)
   head/audio/libofa/Makefile   (contents, props changed)
   head/audio/linnya/Makefile
   head/audio/moc/Makefile   (contents, props changed)
   head/audio/mpdas/Makefile   (contents, props changed)
   head/audio/mpdscribble/Makefile   (contents, props changed)
   head/audio/musicpd/Makefile
   head/audio/ncmpcpp/Makefile
   head/audio/osd-lyrics/Makefile
   head/audio/rosegarden/Makefile
   head/audio/scmpc/Makefile   (contents, props changed)
   head/audio/scrobbler/Makefile
   head/audio/streamtranscoder/Makefile   (contents, props changed)
   head/audio/streamtuner/Makefile   (contents, props changed)
   head/audio/vagalume/Makefile
   head/audio/vorbis-tools/Makefile
   head/audio/xmms2-scrobbler/Makefile   (contents, props changed)
   head/audio/xmms2/Makefile
   head/biology/iolib/Makefile
   head/chinese/fcitx-cloudpinyin/Makefile
   head/comms/xastir/Makefile
   head/converters/bibtexconv/Makefile
   head/databases/couchdb/Makefile
   head/deskutils/cairo-dock/Makefile
   head/deskutils/fbreader/Makefile
   head/deskutils/google-gadgets/Makefile
   head/deskutils/growl-for-linux/Makefile
   head/deskutils/libgcal/Makefile
   head/deskutils/ljit/Makefile
   head/deskutils/logjam/Makefile   (contents, props changed)
   head/deskutils/mdh/Makefile   (contents, props changed)
   head/deskutils/pinot/Makefile
   head/deskutils/xfce4-tumbler/Makefile
   head/devel/aegis/Makefile
   head/devel/ecore-file/Makefile   (contents, props changed)
   head/devel/hs-darcs/Makefile   (contents, props changed)
   head/devel/libdap/Makefile
   head/devel/libgutenfetch/Makefile   (contents, props changed)
   head/devel/libopkele/Makefile   (contents, props changed)
   head/devel/libvirt/Makefile
   head/devel/libwfut/Makefile
   head/devel/mm-common/Makefile   (contents, props changed)
   head/devel/xmltooling/Makefile
   head/editors/codelite/Makefile
   head/editors/libreoffice/Makefile
   head/editors/morla/Makefile
   head/editors/openoffice-3/Makefile   (contents, props changed)
   head/editors/openoffice-devel/Makefile   (contents, props changed)
   head/editors/textroom/Makefile   (contents, props changed)
   head/emulators/qemu-devel/Makefile
   head/emulators/qemu/Makefile
   head/emulators/virtualbox-ose-legacy/Makefile
   head/emulators/virtualbox-ose/Makefile
   head/finance/libofx/Makefile
   head/ftp/R-cran-RCurl/Makefile
   head/ftp/curl/Makefile
   head/ftp/curl/distinfo   (contents, props changed)
   head/ftp/curl/files/patch-configure   (contents, props changed)
   head/ftp/curl/files/patch-src-tool_operate.c   (contents, props changed)
   head/ftp/curl/pkg-plist
   head/ftp/curlpp/Makefile
   head/ftp/fpc-libcurl/Makefile
   head/ftp/hs-curl/Makefile   (contents, props changed)
   head/ftp/ocaml-ocurl/Makefile   (contents, props changed)
   head/ftp/php5-curl/Makefile   (contents, props changed)
   head/ftp/php52-curl/Makefile   (contents, props changed)
   head/ftp/php53-curl/Makefile   (contents, props changed)
   head/ftp/py-curl/Makefile   (contents, props changed)
   head/ftp/rexx-curl/Makefile
   head/ftp/wmget/Makefile   (contents, props changed)
   head/games/0ad/Makefile
   head/games/alienarena/Makefile   (contents, props changed)
   head/games/bzflag/Makefile
   head/games/crossfire-client/Makefile   (contents, props changed)
   head/games/crossfire-server/Makefile   (contents, props changed)
   head/games/daimonin/Makefile   (contents, props changed)
   head/games/deng/Makefile
   head/games/evq3/Makefile   (contents, props changed)
   head/games/f1spirit-remake/Makefile   (contents, props changed)
   head/games/frobtads/Makefile
   head/games/ioquake3/Makefile
   head/games/kartofel/Makefile
   head/games/klavaro/Makefile
   head/games/kuklomenos/Makefile   (contents, props changed)
   head/games/meandmyshadow/Makefile
   head/games/megaglest/Makefile
   head/games/mudmagic/Makefile
   head/games/nexuiz/Makefile   (contents, props changed)
   head/games/openlierox/Makefile
   head/games/pokerth/Makefile
   head/games/springlobby/Makefile
   head/games/supertux-devel/Makefile
   head/games/supertuxkart/Makefile
   head/games/tmw/Makefile
   head/games/ufoai/Makefile
   head/games/warmux/Makefile
   head/games/warsow/Makefile   (contents, props changed)
   head/games/worldofpadman/Makefile   (contents, props changed)
   head/games/xmoto/Makefile
   head/games/xonotic/Makefile   (contents, props changed)
   head/graphics/darktable/Makefile
   head/graphics/feh/Makefile   (contents, props changed)
   head/graphics/gdal/Makefile
   head/graphics/gimmage/Makefile
   head/graphics/gimp-app/Makefile
   head/graphics/gnash/Makefile
   head/graphics/jp2a/Makefile   (contents, props changed)
   head/graphics/mapnik/Makefile
   head/graphics/mapserver/Makefile   (contents, props changed)
   head/graphics/osg-devel/Makefile
   head/graphics/osg/Makefile
   head/graphics/telak/Makefile   (contents, props changed)
   head/irc/iroffer-dinoex/Makefile   (contents, props changed)
   head/irc/unreal/Makefile
   head/irc/weechat-devel/Makefile
   head/irc/weechat/Makefile
   head/lang/fpc/Makefile   (contents, props changed)
   head/lang/fpc/Makefile.units   (contents, props changed)
   head/lang/gambas/Makefile
   head/lang/php52/Makefile
   head/lang/php52/Makefile.ext
   head/lang/php53/Makefile.ext
   head/lang/q/Makefile
   head/mail/libetpan/Makefile
   head/math/octave/Makefile
   head/misc/amanda-server/Makefile   (contents, props changed)
   head/misc/amanda26-server/Makefile   (contents, props changed)
   head/misc/amanda32-server/Makefile   (contents, props changed)
   head/misc/esniper/Makefile
   head/misc/gkrellm-helium/Makefile   (contents, props changed)
   head/misc/sword/Makefile   (contents, props changed)
   head/misc/wmweather+/Makefile
   head/multimedia/audacious-plugins/Makefile
   head/multimedia/cclive/Makefile
   head/multimedia/freetuxtv/Makefile
   head/multimedia/gnome-mplayer/Makefile
   head/multimedia/libquvi/Makefile
   head/multimedia/mediainfo/Makefile
   head/multimedia/mkvtoolnix/Makefile
   head/multimedia/qmmp/Makefile
   head/multimedia/quvi/Makefile
   head/multimedia/xbmc-pvr/Makefile
   head/multimedia/xbmc/Makefile
   head/multimedia/xine/Makefile
   head/net-im/centericq/Makefile
   head/net-im/centerim-devel/Makefile
   head/net-im/centerim/Makefile
   head/net-im/cli-msn/Makefile   (contents, props changed)
   head/net-mgmt/collectd/Makefile
   head/net-mgmt/collectd5/Makefile
   head/net-mgmt/sblim-wbemcli/Makefile   (contents, props changed)
   head/net-mgmt/zabbix2-server/Makefile
   head/net-p2p/gnunet/Makefile
   head/net-p2p/gtorrentviewer/Makefile   (contents, props changed)
   head/net-p2p/jigdo/Makefile
   head/net-p2p/libbt/Makefile   (contents, props changed)
   head/net-p2p/rtorrent-devel/Makefile
   head/net-p2p/rtorrent/Makefile
   head/net-p2p/transmission-cli/Makefile
   head/net/asterisk/Makefile
   head/net/asterisk10/Makefile
   head/net/asterisk11/Makefile
   head/net/asterisk14/Makefile   (contents, props changed)
   head/net/boinc-client/Makefile
   head/net/clamz/Makefile   (contents, props changed)
   head/net/ecore-con/Makefile
   head/net/freeswitch-core-devel/Makefile
   head/net/freeswitch-core/Makefile
   head/net/libcmis/Makefile   (contents, props changed)
   head/net/liboauth/Makefile   (contents, props changed)
   head/net/linknx/Makefile   (contents, props changed)
   head/net/mediatomb/Makefile
   head/net/nepenthes/Makefile   (contents, props changed)
   head/net/opennx/Makefile
   head/net/wmlj/Makefile   (contents, props changed)
   head/net/xmlrpc-c-devel/Makefile
   head/net/xmlrpc-c/Makefile   (contents, props changed)
   head/polish/sms2/Makefile   (contents, props changed)
   head/ports-mgmt/fbsdmon/Makefile
   head/ports-mgmt/prhistory/Makefile
   head/print/foomatic-db/Makefile   (contents, props changed)
   head/science/netcdf4/Makefile   (contents, props changed)
   head/security/authforce/Makefile
   head/security/binwalk/Makefile
   head/security/duo/Makefile
   head/security/gnupg/Makefile
   head/security/gnupg1/Makefile
   head/security/opensaml2/Makefile
   head/security/osslsigncode/Makefile   (contents, props changed)
   head/security/p5-Net-SAML/Makefile   (contents, props changed)
   head/security/razorback-api/Makefile   (contents, props changed)
   head/security/squidclamav/Makefile   (contents, props changed)
   head/security/strongswan/Makefile   (contents, props changed)
   head/security/ykclient/Makefile
   head/security/zxid/Makefile   (contents, props changed)
   head/sysutils/afflib/Makefile
   head/sysutils/apt/Makefile
   head/sysutils/ckl/Makefile   (contents, props changed)
   head/sysutils/condor/Makefile
   head/sysutils/conky/Makefile
   head/sysutils/fusefs-curlftpfs/Makefile
   head/sysutils/fusefs-s3fs/Makefile
   head/sysutils/heartbeat/Makefile
   head/sysutils/pacman/Makefile
   head/sysutils/powerman/Makefile   (contents, props changed)
   head/textproc/libkolabxml/Makefile
   head/textproc/liblrdf/Makefile
   head/textproc/libmrss/Makefile   (contents, props changed)
   head/textproc/libnxml/Makefile   (contents, props changed)
   head/textproc/raptor/Makefile   (contents, props changed)
   head/textproc/raptor2/Makefile
   head/textproc/rss2html/Makefile   (contents, props changed)
   head/textproc/zorba/Makefile
   head/www/cas/Makefile
   head/www/castget/Makefile   (contents, props changed)
   head/www/cplanet/Makefile   (contents, props changed)
   head/www/flickcurl/Makefile
   head/www/gecko-mediaplayer/Makefile
   head/www/mod_auth_cas/Makefile
   head/www/mod_auth_mellon/Makefile   (contents, props changed)
   head/www/mod_flickr/Makefile   (contents, props changed)
   head/www/mod_security/Makefile
   head/www/netsurf/Makefile
   head/www/newsbeuter/Makefile
   head/www/nspluginwrapper/Makefile
   head/www/openvrml/Makefile
   head/www/p5-WWW-Curl/Makefile   (contents, props changed)
   head/www/pecl-http/Makefile
   head/www/pecl-solr/Makefile
   head/www/rubygem-passenger/Makefile
   head/www/rubygem-typhoeus/Makefile   (contents, props changed)
   head/www/thundercache/Makefile   (contents, props changed)
   head/www/thundersnarf/Makefile   (contents, props changed)
   head/www/webkit-gtk2/Makefile
   head/www/webkit-gtk3/Makefile
   head/www/wsdlpull/Makefile   (contents, props changed)
   head/www/xshttpd-devel/Makefile   (contents, props changed)
   head/www/xshttpd/Makefile   (contents, props changed)
   head/x11-wm/ede/Makefile
 
 Modified: head/archivers/epkg/Makefile
 ==============================================================================
 --- head/archivers/epkg/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/archivers/epkg/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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
 
 Modified: head/astro/foxtrotgps/Makefile
 ==============================================================================
 --- head/astro/foxtrotgps/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/astro/foxtrotgps/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -3,7 +3,7 @@
  
  PORTNAME=	foxtrotgps
  PORTVERSION=	1.1.1
 -PORTREVISION=	3
 +PORTREVISION=	4
  CATEGORIES=	astro geography
  MASTER_SITES=	http://www.foxtrotgps.org/releases/
  
 
 Modified: head/astro/viking/Makefile
 ==============================================================================
 --- head/astro/viking/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/astro/viking/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -3,6 +3,7 @@
  
  PORTNAME=	viking
  PORTVERSION=	1.4.1
 +PORTREVISION=	1
  CATEGORIES=	astro
  MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/
  
 
 Modified: head/audio/amarok-kde4/Makefile
 ==============================================================================
 --- head/audio/amarok-kde4/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/amarok-kde4/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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
 
 Modified: head/audio/ario/Makefile
 ==============================================================================
 --- head/audio/ario/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/ario/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -3,7 +3,7 @@
  
  PORTNAME=	ario
  PORTVERSION=	1.5.1
 -PORTREVISION=	5
 +PORTREVISION=	6
  CATEGORIES=	audio
  MASTER_SITES=	SF/ario-player/ario-player/${PORTVERSION}
  
 
 Modified: head/audio/deadbeef/Makefile
 ==============================================================================
 --- head/audio/deadbeef/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/deadbeef/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -3,7 +3,7 @@
  
  PORTNAME=	deadbeef
  PORTVERSION=	0.5.5
 -PORTREVISION=	2
 +PORTREVISION=	3
  CATEGORIES=	audio
  MASTER_SITES=	SF/${PORTNAME}
  
 
 Modified: head/audio/fplib/Makefile
 ==============================================================================
 --- head/audio/fplib/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/fplib/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -3,6 +3,7 @@
  
  PORTNAME=	fplib
  PORTVERSION=	20120911
 +PORTREVISION=	1
  CATEGORIES=	audio
  MASTER_SITES=	LOCAL/sunpoet
  
 
 Modified: head/audio/gbemol/Makefile
 ==============================================================================
 --- head/audio/gbemol/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/gbemol/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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
 
 Modified: head/audio/gogglesmm/Makefile
 ==============================================================================
 --- head/audio/gogglesmm/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/gogglesmm/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -3,7 +3,7 @@
  
  PORTNAME=	gogglesmm
  PORTVERSION=	0.12.7
 -PORTREVISION=	2
 +PORTREVISION=	3
  CATEGORIES=	audio
  MASTER_SITES=	GOOGLE_CODE
  
 
 Modified: head/audio/grip/Makefile
 ==============================================================================
 --- head/audio/grip/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/grip/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -4,7 +4,7 @@
  
  PORTNAME=	grip
  PORTVERSION=	3.3.1
 -PORTREVISION=	5
 +PORTREVISION=	6
  CATEGORIES=	audio
  MASTER_SITES=	SF
  
 
 Modified: head/audio/gtkpod/Makefile
 ==============================================================================
 --- head/audio/gtkpod/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/gtkpod/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -3,7 +3,7 @@
  
  PORTNAME=	gtkpod
  PORTVERSION=	1.0.0
 -PORTREVISION=	3
 +PORTREVISION=	4
  CATEGORIES=	audio
  MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
  
 
 Modified: head/audio/herrie/Makefile
 ==============================================================================
 --- head/audio/herrie/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/herrie/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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/
 
 Modified: head/audio/icecast2/Makefile
 ==============================================================================
 --- head/audio/icecast2/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/icecast2/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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/ \
 
 Modified: head/audio/libofa/Makefile
 ==============================================================================
 --- head/audio/libofa/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/libofa/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -7,7 +7,7 @@
  
  PORTNAME=	libofa
  PORTVERSION=	0.9.3
 -PORTREVISION=	7
 +PORTREVISION=	8
  CATEGORIES=	audio
  MASTER_SITES=	GOOGLE_CODE
  
 
 Modified: head/audio/linnya/Makefile
 ==============================================================================
 --- head/audio/linnya/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/linnya/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -2,6 +2,7 @@
  
  PORTNAME=	linnya
  PORTVERSION=	2.3.0
 +PORTREVISION=	1
  CATEGORIES=	audio
  
  MAINTAINER=	ghw@7axu.com
 
 Modified: head/audio/moc/Makefile
 ==============================================================================
 --- head/audio/moc/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/moc/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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
 
 Modified: head/audio/mpdas/Makefile
 ==============================================================================
 --- head/audio/mpdas/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/mpdas/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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
 
 Modified: head/audio/mpdscribble/Makefile
 ==============================================================================
 --- head/audio/mpdscribble/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/mpdscribble/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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 libcur
  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
  
 
 Modified: head/audio/musicpd/Makefile
 ==============================================================================
 --- head/audio/musicpd/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/musicpd/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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
  
 
 Modified: head/audio/ncmpcpp/Makefile
 ==============================================================================
 --- head/audio/ncmpcpp/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/ncmpcpp/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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
 
 Modified: head/audio/osd-lyrics/Makefile
 ==============================================================================
 --- head/audio/osd-lyrics/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/osd-lyrics/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -3,6 +3,7 @@
  
  PORTNAME=	osdlyrics
  PORTVERSION=	0.4.3
 +PORTREVISION=	1
  CATEGORIES=	audio deskutils
  MASTER_SITES=	GOOGLE_CODE
  PROJECTHOST=	osd-lyrics
 
 Modified: head/audio/rosegarden/Makefile
 ==============================================================================
 --- head/audio/rosegarden/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/rosegarden/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -3,6 +3,7 @@
  
  PORTNAME=	rosegarden
  PORTVERSION=	13.04
 +PORTREVISION=	1
  CATEGORIES=	audio
  MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/
  
 
 Modified: head/audio/scmpc/Makefile
 ==============================================================================
 --- head/audio/scmpc/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/scmpc/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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 MP
  LICENSE=	GPLv2
  
  LIB_DEPENDS=	confuse.0:${PORTSDIR}/devel/libconfuse \
 -		curl.6:${PORTSDIR}/ftp/curl
 +		curl:${PORTSDIR}/ftp/curl
  
  USES=		pkgconfig
  USE_BZIP2=	yes
 
 Modified: head/audio/scrobbler/Makefile
 ==============================================================================
 --- head/audio/scrobbler/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/scrobbler/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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]*
 
 Modified: head/audio/streamtranscoder/Makefile
 ==============================================================================
 --- head/audio/streamtranscoder/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/streamtranscoder/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -7,7 +7,7 @@
  
  PORTNAME=	streamtranscoder
  PORTVERSION=	1.2.8
 -PORTREVISION=	9
 +PORTREVISION=	10
  CATEGORIES=	audio
  MASTER_SITES=	http://www.oddsock.org/tools/streamTranscoder/
  
 
 Modified: head/audio/streamtuner/Makefile
 ==============================================================================
 --- head/audio/streamtuner/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/streamtuner/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -3,7 +3,7 @@
  
  PORTNAME=	streamtuner
  PORTVERSION=	0.99.99
 -PORTREVISION=	19
 +PORTREVISION=	20
  CATEGORIES=	audio www
  MASTER_SITES=	SAVANNAH
  MASTER_SITE_SUBDIR=	${PORTNAME}
 
 Modified: head/audio/vagalume/Makefile
 ==============================================================================
 --- head/audio/vagalume/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/vagalume/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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
 
 Modified: head/audio/vorbis-tools/Makefile
 ==============================================================================
 --- head/audio/vorbis-tools/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/vorbis-tools/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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 \
 
 Modified: head/audio/xmms2-scrobbler/Makefile
 ==============================================================================
 --- head/audio/xmms2-scrobbler/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/xmms2-scrobbler/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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 X
  LICENSE=	MIT
  
  LIB_DEPENDS=	xmmsclient.6:${PORTSDIR}/audio/xmms2 \
 -		curl.6:${PORTSDIR}/ftp/curl
 +		curl:${PORTSDIR}/ftp/curl
  
  USES=		pkgconfig
  USE_GMAKE=	yes
 
 Modified: head/audio/xmms2/Makefile
 ==============================================================================
 --- head/audio/xmms2/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/audio/xmms2/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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}
 
 Modified: head/biology/iolib/Makefile
 ==============================================================================
 --- head/biology/iolib/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/biology/iolib/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -3,6 +3,7 @@
  
  PORTNAME=	io_lib
  PORTVERSION=	1.13.0
 +PORTREVISION=	1
  CATEGORIES=	biology
  MASTER_SITES=	SF
  MASTER_SITE_SUBDIR=	staden/${PORTNAME}/${PORTVERSION}
 
 Modified: head/chinese/fcitx-cloudpinyin/Makefile
 ==============================================================================
 --- head/chinese/fcitx-cloudpinyin/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/chinese/fcitx-cloudpinyin/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -7,6 +7,7 @@
  
  PORTNAME=	fcitx-cloudpinyin
  PORTVERSION=	0.3.0
 +PORTREVISION=	1
  CATEGORIES=	chinese
  MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
  DIST_SUBDIR=	fcitx
 
 Modified: head/comms/xastir/Makefile
 ==============================================================================
 --- head/comms/xastir/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/comms/xastir/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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}
  
 
 Modified: head/converters/bibtexconv/Makefile
 ==============================================================================
 --- head/converters/bibtexconv/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/converters/bibtexconv/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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/
 
 Modified: head/databases/couchdb/Makefile
 ==============================================================================
 --- head/databases/couchdb/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/databases/couchdb/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -3,6 +3,7 @@
  
  PORTNAME=	couchdb
  PORTVERSION=	1.2.2
 +PORTREVISION=	1
  PORTEPOCH=	1
  CATEGORIES=	databases
  MASTER_SITES=	${MASTER_SITE_APACHE}
 
 Modified: head/deskutils/cairo-dock/Makefile
 ==============================================================================
 --- head/deskutils/cairo-dock/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/deskutils/cairo-dock/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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/
 
 Modified: head/deskutils/fbreader/Makefile
 ==============================================================================
 --- head/deskutils/fbreader/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/deskutils/fbreader/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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
 
 Modified: head/deskutils/google-gadgets/Makefile
 ==============================================================================
 --- head/deskutils/google-gadgets/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/deskutils/google-gadgets/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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/pkgc
  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
 
 Modified: head/deskutils/growl-for-linux/Makefile
 ==============================================================================
 --- head/deskutils/growl-for-linux/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/deskutils/growl-for-linux/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -2,7 +2,7 @@
  
  PORTNAME=	growl-for-linux
  PORTVERSION=	0.6.8
 -#PORTREVISION=	0
 +PORTREVISION=	1
  CATEGORIES=	deskutils
  
  MAINTAINER=	nivit@FreeBSD.org
 
 Modified: head/deskutils/libgcal/Makefile
 ==============================================================================
 --- head/deskutils/libgcal/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/deskutils/libgcal/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -3,6 +3,7 @@
  
  PORTNAME=	libgcal
  PORTVERSION=	0.9.6
 +PORTREVISION=	1
  CATEGORIES=	deskutils
  MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
  
 
 Modified: head/deskutils/ljit/Makefile
 ==============================================================================
 --- head/deskutils/ljit/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/deskutils/ljit/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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 us
  
  LICENSE=	GPLv2
  
 -LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl
 +LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
  RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
  
  GNU_CONFIGURE=	yes
 
 Modified: head/deskutils/logjam/Makefile
 ==============================================================================
 --- head/deskutils/logjam/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/deskutils/logjam/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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
 
 Modified: head/deskutils/mdh/Makefile
 ==============================================================================
 --- head/deskutils/mdh/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/deskutils/mdh/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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
  .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:
 
 Modified: head/deskutils/pinot/Makefile
 ==============================================================================
 --- head/deskutils/pinot/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/deskutils/pinot/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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}/database
  		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			\
 
 Modified: head/deskutils/xfce4-tumbler/Makefile
 ==============================================================================
 --- head/deskutils/xfce4-tumbler/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/deskutils/xfce4-tumbler/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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}
 
 Modified: head/devel/aegis/Makefile
 ==============================================================================
 --- head/devel/aegis/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/devel/aegis/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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
 
 Modified: head/devel/ecore-file/Makefile
 ==============================================================================
 --- head/devel/ecore-file/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/devel/ecore-file/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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/
 
 Modified: head/devel/hs-darcs/Makefile
 ==============================================================================
 --- head/devel/hs-darcs/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/devel/hs-darcs/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -3,7 +3,7 @@
  
  PORTNAME=	darcs
  PORTVERSION=	2.8.4
 -PORTREVISION=	1
 +PORTREVISION=	2
  CATEGORIES=	devel haskell
  
  MAINTAINER=	haskell@FreeBSD.org
 
 Modified: head/devel/libdap/Makefile
 ==============================================================================
 --- head/devel/libdap/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/devel/libdap/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -3,6 +3,7 @@
  
  PORTNAME=	libdap
  PORTVERSION=	3.11.7
 +PORTREVISION=	1
  CATEGORIES=	devel
  MASTER_SITES=	http://www.opendap.org/pub/source/ \
  		LOCAL/sunpoet
 
 Modified: head/devel/libgutenfetch/Makefile
 ==============================================================================
 --- head/devel/libgutenfetch/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/devel/libgutenfetch/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -3,7 +3,7 @@
  
  PORTNAME=	libgutenfetch
  PORTVERSION=	1.2
 -PORTREVISION=	3
 +PORTREVISION=	4
  CATEGORIES=	devel
  MASTER_SITES=	SF
  
 
 Modified: head/devel/libopkele/Makefile
 ==============================================================================
 --- head/devel/libopkele/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/devel/libopkele/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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 \
 
 Modified: head/devel/libvirt/Makefile
 ==============================================================================
 --- head/devel/libvirt/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/devel/libvirt/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -3,6 +3,7 @@
  
  PORTNAME=	libvirt
  PORTVERSION=	1.1.0
 +PORTREVISION=	1
  CATEGORIES=	devel
  MASTER_SITES=	http://libvirt.org/sources/ \
  		ftp://libvirt.org/libvirt/
 
 Modified: head/devel/libwfut/Makefile
 ==============================================================================
 --- head/devel/libwfut/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/devel/libwfut/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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
 
 Modified: head/devel/mm-common/Makefile
 ==============================================================================
 --- head/devel/mm-common/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/devel/mm-common/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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
 
 Modified: head/devel/xmltooling/Makefile
 ==============================================================================
 --- head/devel/xmltooling/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/devel/xmltooling/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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
 
 Modified: head/editors/codelite/Makefile
 ==============================================================================
 --- head/editors/codelite/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/editors/codelite/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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
 
 Modified: head/editors/libreoffice/Makefile
 ==============================================================================
 --- head/editors/libreoffice/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/editors/libreoffice/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -26,7 +26,7 @@ BUILD_DEPENDS=	p5-Archive-Zip>=0:${PORTS
  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 \
 
 Modified: head/editors/morla/Makefile
 ==============================================================================
 --- head/editors/morla/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/editors/morla/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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
  
 
 Modified: head/editors/openoffice-3/Makefile
 ==============================================================================
 --- head/editors/openoffice-3/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/editors/openoffice-3/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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="${OOO
  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 \
 
 Modified: head/editors/openoffice-devel/Makefile
 ==============================================================================
 --- head/editors/openoffice-devel/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/editors/openoffice-devel/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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="${OOO
  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 \
 
 Modified: head/editors/textroom/Makefile
 ==============================================================================
 --- head/editors/textroom/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/editors/textroom/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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
 
 Modified: head/emulators/qemu-devel/Makefile
 ==============================================================================
 --- head/emulators/qemu-devel/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/emulators/qemu-devel/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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
 
 Modified: head/emulators/qemu/Makefile
 ==============================================================================
 --- head/emulators/qemu/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/emulators/qemu/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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/
 
 Modified: head/emulators/virtualbox-ose-legacy/Makefile
 ==============================================================================
 --- head/emulators/virtualbox-ose-legacy/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/emulators/virtualbox-ose-legacy/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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/ya
  		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
  
 
 Modified: head/emulators/virtualbox-ose/Makefile
 ==============================================================================
 --- head/emulators/virtualbox-ose/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/emulators/virtualbox-ose/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -27,7 +27,7 @@ BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/ya
  		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
  
 
 Modified: head/finance/libofx/Makefile
 ==============================================================================
 --- head/finance/libofx/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/finance/libofx/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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
  
 
 Modified: head/ftp/R-cran-RCurl/Makefile
 ==============================================================================
 --- head/ftp/R-cran-RCurl/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/ftp/R-cran-RCurl/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -3,7 +3,7 @@
  
  PORTNAME=	RCurl
  DISTVERSION=	1.95-4.1
 -PORTREVISION=	1
 +PORTREVISION=	2
  CATEGORIES=	ftp
  DISTNAME=	${PORTNAME}_${DISTVERSION}
  
 
 Modified: head/ftp/curl/Makefile
 ==============================================================================
 --- head/ftp/curl/Makefile	Thu Jul 11 16:03:47 2013	(r322782)
 +++ head/ftp/curl/Makefile	Thu Jul 11 16:26:26 2013	(r322783)
 @@ -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 fi
  
  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
 
 *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: sunpoet 
State-Changed-When: Thu Jul 11 16:38:46 UTC 2013 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177369 

From: geoffroy desvernay <dgeo@centrale-marseille.fr>
To: bug-followup@FreeBSD.org, umq@ueo.co.jp, dfilter@freebsd.org
Cc:  
Subject: Re: ports/177369: [patch] ftp/curl update to 7.29.0
Date: Sat, 13 Jul 2013 18:22:38 +0200

 This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
 ------enig2OPWBJOAVQXOJXTQHNROH
 Content-Type: text/plain; charset=windows-1252
 Content-Transfer-Encoding: quoted-printable
 
 It seems this part of the first patch did not made in =85 and I just had
 the same problem=85 resolved by
 `sed -e 's/CFLAGS/CPPFLAGS/' Mk/bsd.ldap.mk` for the moment.
 
 (ports tree just svn-updated)
 
 Index: Mk/bsd.ldap.mk
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- Mk/bsd.ldap.mk  (revision 315212)
 +++ Mk/bsd.ldap.mk    (working copy)
 @@ -64,7 +64,7 @@
  .endif
  .endif
 
 -CFLAGS+=3D    -DLDAP_DEPRECATED
 +CPPFLAGS+=3D   -DLDAP_DEPRECATED
 
  _OPENLDAP_CLIENT_PKG!=3D     ${PKG_INFO} -Ex openldap.\*-client
 2>/dev/null || ${TRUE}
  _OPENLDAP_FLAVOUR=3D
 ${_OPENLDAP_CLIENT_PKG:C/openldap//:C/-client-.*//}
 --=20
 geoffroy desvernay
 C.R.I - Administration syst=E8mes et r=E9seaux
 Ecole Centrale de Marseille
 
 
 
 ------enig2OPWBJOAVQXOJXTQHNROH
 Content-Type: application/pgp-signature; name="signature.asc"
 Content-Description: OpenPGP digital signature
 Content-Disposition: attachment; filename="signature.asc"
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 Comment: Using GnuPG with Icedove - http://www.enigmail.net/
 
 iQEcBAEBCAAGBQJR4X7SAAoJEC0NWrh8JT1SCmkH/3IqGlqjig57zbA7StB5aRW7
 +1/xGG5huXlIEbJCE1jY625jmbJiaF+Iw4WJ87kwnAOggGF/qhjIsF3f+au70r2d
 rA9KmSj5i4zb7pDkLy4XETSWBqMYToonKPhJsdaS/QVNDImYVYD264ARCGukHcCE
 iQvb9YxSKDBHHzsFUfuuBSNoxrcVJs7E1Dpj94iB7WekPU58EY+qjFR2ivdg1Sit
 xFenvy8IzG4PFnQ24TJDWGxZvB8ygXi/wsCKsPn1QDQKqIVT1YlRgAc8cjoi0xbF
 0RCrMd0syxIV7dyWODIhZmcduZUxKEYC4gQAbvxYRzx9xgxhVtgbFC6I9leZTlU=
 =G+Yz
 -----END PGP SIGNATURE-----
 
 ------enig2OPWBJOAVQXOJXTQHNROH--

From: geoffroy desvernay <dgeo@centrale-marseille.fr>
To: bug-followup@FreeBSD.org, umq@ueo.co.jp, sunpoet@freebsd.org
Cc:  
Subject: Re: ports/177369: [patch] ftp/curl update to 7.29.0
Date: Sat, 13 Jul 2013 18:52:41 +0200

 This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
 ------enig2UGEREFNNRNGLUQOAONWE
 Content-Type: text/plain; charset=windows-1252
 Content-Transfer-Encoding: quoted-printable
 
 Please disregard my last message, I've got to update my svnmirror
 
 Sorry for the noise=85
 --=20
 geoffroy desvernay
 C.R.I - Administration syst=E8mes et r=E9seaux
 Ecole Centrale de Marseille
 
 
 
 ------enig2UGEREFNNRNGLUQOAONWE
 Content-Type: application/pgp-signature; name="signature.asc"
 Content-Description: OpenPGP digital signature
 Content-Disposition: attachment; filename="signature.asc"
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 Comment: Using GnuPG with Icedove - http://www.enigmail.net/
 
 iQEcBAEBCAAGBQJR4YXZAAoJEC0NWrh8JT1SR1wH/2m5hZ2leaGIRMQbxC2pwAju
 tWeP/FD3Qamak4Ix1pmtkYtqvp6uJboDja5bS+dAjErapk91wB0UDDJyZ3UzTyq7
 6ma5IW8uuVlLqjggeseODGtZWSZcVplbfEydsQvv/8BzIaYF1MTjrfM1xynk8Jhg
 XY/rZl+BXuseuiJHZLf6OFMDjVf2qMUJlA/+/kANJXf5tGm5CyQHEM4x9TwcKr0S
 XRbOuVpX90QzHFe7P6yqcu/Xzf53hou+qmtoRp5/h6tmh8CPsRyYgG/nyvdZjEfe
 aGnE2udBvjxeYbf3RFZaYnCsGR/otNsEOCrNm/5aPnI+QsP57bho7pC89L6H1mY=
 =0ieG
 -----END PGP SIGNATURE-----
 
 ------enig2UGEREFNNRNGLUQOAONWE--
>Unformatted:
