From owner-svn-ports-all@FreeBSD.ORG  Tue Jan  7 19:56:57 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@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 7160CEE8;
 Tue,  7 Jan 2014 19:56:57 +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 5D4CA1820;
 Tue,  7 Jan 2014 19:56:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s07JuvmB067607;
 Tue, 7 Jan 2014 19:56:57 GMT (envelope-from lx@svn.freebsd.org)
Received: (from lx@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s07JuvEN067606;
 Tue, 7 Jan 2014 19:56:57 GMT (envelope-from lx@svn.freebsd.org)
Message-Id: <201401071956.s07JuvEN067606@svn.freebsd.org>
From: David Thiel <lx@FreeBSD.org>
Date: Tue, 7 Jan 2014 19:56:57 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r339027 - head/dns/djbdns
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Jan 2014 19:56:57 -0000

Author: lx
Date: Tue Jan  7 19:56:56 2014
New Revision: 339027
URL: http://svnweb.freebsd.org/changeset/ports/339027

Log:
  Add conflicts
  
  Submitted by:	ketas

Modified:
  head/dns/djbdns/Makefile

Modified: head/dns/djbdns/Makefile
==============================================================================
--- head/dns/djbdns/Makefile	Tue Jan  7 19:56:34 2014	(r339026)
+++ head/dns/djbdns/Makefile	Tue Jan  7 19:56:56 2014	(r339027)
@@ -16,6 +16,7 @@ COMMENT?=	A collection of secure and rel
 RUN_DEPENDS=	setuidgid:${PORTSDIR}/sysutils/daemontools \
 		tcpserver:${PORTSDIR}/sysutils/ucspi-tcp
 
+CONFLICTS=	djbdns-tools-[0-9]*
 LEGAL_TEXT=	No license -- see http://cr.yp.to/softwarelaw.html
 
 OPTIONS_DEFINE=	DUMPCACHE IP6 IGNOREIP JUMBO MAN PERSISTENT_MMAP SRV DNSCURVE ADD_USERS