From owner-svn-ports-head@FreeBSD.ORG  Thu Mar 27 16:22:01 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C053A510;
 Thu, 27 Mar 2014 16:22:01 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id AD0D3608;
 Thu, 27 Mar 2014 16:22:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2RGM1Qw064570;
 Thu, 27 Mar 2014 16:22:01 GMT (envelope-from sunpoet@svn.freebsd.org)
Received: (from sunpoet@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2RGM1eV064569;
 Thu, 27 Mar 2014 16:22:01 GMT (envelope-from sunpoet@svn.freebsd.org)
Message-Id: <201403271622.s2RGM1eV064569@svn.freebsd.org>
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Thu, 27 Mar 2014 16:22:01 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r349343 - head/ftp/curl
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Mar 2014 16:22:01 -0000

Author: sunpoet
Date: Thu Mar 27 16:22:01 2014
New Revision: 349343
URL: http://svnweb.freebsd.org/changeset/ports/349343
QAT: https://qat.redports.org/buildarchive/r349343/

Log:
  - Add HTTP2 option

Modified:
  head/ftp/curl/Makefile

Modified: head/ftp/curl/Makefile
==============================================================================
--- head/ftp/curl/Makefile	Thu Mar 27 16:09:37 2014	(r349342)
+++ head/ftp/curl/Makefile	Thu Mar 27 16:22:01 2014	(r349343)
@@ -12,7 +12,7 @@ COMMENT?=	Non-interactive tool to get fi
 
 LICENSE=	MIT
 
-OPTIONS_DEFINE=	CA_BUNDLE COOKIES CURL_DEBUG DEBUG DOCS EXAMPLES IDN IPV6 LDAP LDAPS LIBSSH2 PROXY RTMP SPNEGO TLS_SRP
+OPTIONS_DEFINE=	CA_BUNDLE COOKIES CURL_DEBUG DEBUG DOCS EXAMPLES HTTP2 IDN IPV6 LDAP LDAPS LIBSSH2 PROXY RTMP SPNEGO TLS_SRP
 OPTIONS_RADIO=	GSSAPI RESOLV SSL
 OPTIONS_RADIO_GSSAPI=	GSSAPI_BASE HEIMDAL_PORT KRB5_PORT
 OPTIONS_RADIO_RESOLV=	CARES THREADED_RESOLVER
@@ -81,6 +81,8 @@ HEIMDAL_PORT_CONFIGURE_ON=	--with-gssapi
 HEIMDAL_PORT_CPPFLAGS=	-I${HEIMDAL_HOME}/include
 HEIMDAL_PORT_LDFLAGS=	-L${HEIMDAL_HOME}/lib
 HEIMDAL_PORT_LIB_DEPENDS=	libgssapi.so:${PORTSDIR}/security/heimdal
+HTTP2_CONFIGURE_OFF=	--without-nghttp2
+HTTP2_CONFIGURE_ON=	--with-nghttp2=${LOCALBASE}
 IDN_CONFIGURE_OFF=	--without-libidn
 IDN_CONFIGURE_ON=	--with-libidn=${LOCALBASE}
 IDN_LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn
@@ -153,7 +155,7 @@ CONFIGURE_ARGS+=--without-gssapi
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|\(flags_dbg_off=\)".*"|\1""|; s|\(flags_opt_off=\)".*"|\1""|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|\(flags_dbg_off=\)".*"|\1""|; s|\(flags_opt_off=\)".*"|\1""|; s|lib/pkgconfig|libdata/pkgconfig|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e '/^SUBDIRS = / s|$$| docs|; /^DIST_SUBDIRS = / s| docs||; /cd docs &&/d' ${WRKSRC}/Makefile.in
 
 post-install: