From owner-svn-ports-head@FreeBSD.ORG  Sat Feb 15 13:10:03 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 9BF0F347;
 Sat, 15 Feb 2014 13:10:03 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 886A715C6;
 Sat, 15 Feb 2014 13:10:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1FDA3mQ014269;
 Sat, 15 Feb 2014 13:10:03 GMT (envelope-from lev@svn.freebsd.org)
Received: (from lev@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1FDA3q0014243;
 Sat, 15 Feb 2014 13:10:03 GMT (envelope-from lev@svn.freebsd.org)
Message-Id: <201402151310.s1FDA3q0014243@svn.freebsd.org>
From: "Lev A. Serebryakov" <lev@FreeBSD.org>
Date: Sat, 15 Feb 2014 13:10:03 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r344384 - head/www/neon29
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: Sat, 15 Feb 2014 13:10:03 -0000

Author: lev
Date: Sat Feb 15 13:10:03 2014
New Revision: 344384
URL: http://svnweb.freebsd.org/changeset/ports/344384
QAT: https://qat.redports.org/buildarchive/r344384/

Log:
   Use root CA bundle
  
  PR:		ports/185130
  Submitted by:	Anton Yuzhaninov

Modified:
  head/www/neon29/Makefile

Modified: head/www/neon29/Makefile
==============================================================================
--- head/www/neon29/Makefile	Sat Feb 15 13:04:30 2014	(r344383)
+++ head/www/neon29/Makefile	Sat Feb 15 13:10:03 2014	(r344384)
@@ -13,14 +13,15 @@ COMMENT=	An HTTP and WebDAV client libra
 
 CONFLICTS=	neon2[^9]-[0-9]*
 
-OPTIONS_DEFINE=		OPENSSL NLS GSSAPI PROXY DOCS
-OPTIONS_DEFAULT=	EXPAT OPENSSL NLS GSSAPI
+OPTIONS_DEFINE=		CA_BUNDLE DOCS GSSAPI NLS OPENSSL PROXY
+OPTIONS_DEFAULT=	CA_BUNDLE EXPAT GSSAPI NLS OPENSSL
 OPTIONS_SINGLE=		XML
 OPTIONS_SINGLE_XML=	EXPAT LIBXML
 
-XML_DESC=		XML parser library
+CA_BUNDLE_DESC=		Install CA bundle for OpenSSL
 LIBXML_DESC=		libxml2 XML parser support
 PROXY_DESC=		libproxy support
+XML_DESC=		XML parser library
 
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
@@ -31,8 +32,16 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared \
 		--with-libs=${LOCALBASE}:${PREFIX}
 
+CA_BUNDLE_CONFIGURE_ON=	--with-ca-bundle=${LOCALBASE}/share/certs/ca-root-nss.crt
+CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
+
 .include <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MCA_BUNDLE} && !${PORT_OPTIONS:MOPENSSL}
+WARNING+=	"OpenSSL need for CA bundle support"
+WARNING+=	"Enable the OPENSSL option or disable the CA_BUNDLE option"
+.endif
+
 .if ${PORT_OPTIONS:MEXPAT}
 CONFIGURE_ARGS+=--with-expat
 LIB_DEPENDS+=	expat.6:${PORTSDIR}/textproc/expat2