From owner-svn-ports-head@FreeBSD.ORG  Fri Jan 16 11:16:21 2015
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.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 8EBEB633;
 Fri, 16 Jan 2015 11:16:21 +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 7B5F110A;
 Fri, 16 Jan 2015 11:16:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0GBGLgq001292;
 Fri, 16 Jan 2015 11:16:21 GMT (envelope-from vsevolod@FreeBSD.org)
Received: (from vsevolod@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0GBGLlj001291;
 Fri, 16 Jan 2015 11:16:21 GMT (envelope-from vsevolod@FreeBSD.org)
Message-Id: <201501161116.t0GBGLlj001291@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: vsevolod set sender to
 vsevolod@FreeBSD.org using -f
From: Vsevolod Stakhov <vsevolod@FreeBSD.org>
Date: Fri, 16 Jan 2015 11:16:21 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r377168 - head/mail/exim
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.18-1
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: Fri, 16 Jan 2015 11:16:21 -0000

Author: vsevolod
Date: Fri Jan 16 11:16:20 2015
New Revision: 377168
URL: https://svnweb.freebsd.org/changeset/ports/377168
QAT: https://qat.redports.org/buildarchive/r377168/

Log:
  Use openssl from the ports for FreeBSD < 10 and DANE option is enabled.
  
  Do not bump portrevision since DANE is not enabled by default.
  
  PR:		196722
  Submitted by:	Gary <freebsd-bugzilla at in-addr.com>

Modified:
  head/mail/exim/Makefile

Modified: head/mail/exim/Makefile
==============================================================================
--- head/mail/exim/Makefile	Fri Jan 16 11:05:12 2015	(r377167)
+++ head/mail/exim/Makefile	Fri Jan 16 11:16:20 2015	(r377168)
@@ -80,8 +80,14 @@ IGNORE=	you cannot enable DMARC without 
 
 # DANE implies DNSSEC
 .if ${PORT_OPTIONS:MDANE}
-.if ! ${PORT_OPTIONS:MDNSSEC}
-IGNORE=	you cannot enable DANE without DNSSEC support
+.if ! ${PORT_OPTIONS:MDNSSEC} || ! ${PORT_OPTIONS:MTLS}
+IGNORE=	you cannot enable DANE without DNSSEC support or without TLS support
+.endif
+# Use Openssl from the ports
+.if ${OSVERSION} < 1000000
+. if ! ${PORT_OPTIONS:MGNUTLS}
+WITH_OPENSSL_PORT=	yes
+. endif
 .endif
 .endif