From owner-svn-ports-head@FreeBSD.ORG  Wed Oct  9 15:49:58 2013
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 ESMTP id 772C294C;
 Wed,  9 Oct 2013 15:49:58 +0000 (UTC) (envelope-from zi@FreeBSD.org)
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 64BFD2066;
 Wed,  9 Oct 2013 15:49:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r99FnwQr060132;
 Wed, 9 Oct 2013 15:49:58 GMT (envelope-from zi@svn.freebsd.org)
Received: (from zi@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r99FnwrN060129;
 Wed, 9 Oct 2013 15:49:58 GMT (envelope-from zi@svn.freebsd.org)
Message-Id: <201310091549.r99FnwrN060129@svn.freebsd.org>
From: Ryan Steinmetz <zi@FreeBSD.org>
Date: Wed, 9 Oct 2013 15:49:58 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r329903 - head/net/freeradius2
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.14
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: Wed, 09 Oct 2013 15:49:58 -0000

Author: zi
Date: Wed Oct  9 15:49:57 2013
New Revision: 329903
URL: http://svnweb.freebsd.org/changeset/ports/329903

Log:
  Note CONFLICT with upcoming net/freeradius3 port

Modified:
  head/net/freeradius2/Makefile

Modified: head/net/freeradius2/Makefile
==============================================================================
--- head/net/freeradius2/Makefile	Wed Oct  9 15:11:32 2013	(r329902)
+++ head/net/freeradius2/Makefile	Wed Oct  9 15:49:57 2013	(r329903)
@@ -24,7 +24,8 @@ LOGDIR?=	/var/log
 KRB5_CONFIG?=	/usr/bin/krb5-config --libs
 
 CONFLICTS=	gnu-radius-[0-9].* openradius-[0-9].* radiusd-cistron-[0-9].* \
-		freeradius-mysql-[0-9].* freeradius-[013-9].*
+		freeradius-mysql-[0-9].* freeradius-[013-9].* \
+		freeradius3-[0-9].*
 
 USE_RC_SUBR=	radiusd