From owner-svn-ports-all@FreeBSD.ORG  Wed Jan 22 22:36:13 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 A85A9188;
 Wed, 22 Jan 2014 22:36:13 +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 952171B02;
 Wed, 22 Jan 2014 22:36:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0MMaDEv098340;
 Wed, 22 Jan 2014 22:36:13 GMT (envelope-from zi@svn.freebsd.org)
Received: (from zi@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0MMaDmx098338;
 Wed, 22 Jan 2014 22:36:13 GMT (envelope-from zi@svn.freebsd.org)
Message-Id: <201401222236.s0MMaDmx098338@svn.freebsd.org>
From: Ryan Steinmetz <zi@FreeBSD.org>
Date: Wed, 22 Jan 2014 22:36:13 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r340742 - 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-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: Wed, 22 Jan 2014 22:36:13 -0000

Author: zi
Date: Wed Jan 22 22:36:13 2014
New Revision: 340742
URL: http://svnweb.freebsd.org/changeset/ports/340742
QAT: https://qat.redports.org/buildarchive/r340742/

Log:
  - Ensure we CONFLICT with the net/freeradius3 port
  - Bump PORTREVISION

Modified:
  head/net/freeradius2/Makefile

Modified: head/net/freeradius2/Makefile
==============================================================================
--- head/net/freeradius2/Makefile	Wed Jan 22 22:18:37 2014	(r340741)
+++ head/net/freeradius2/Makefile	Wed Jan 22 22:36:13 2014	(r340742)
@@ -3,6 +3,7 @@
 
 PORTNAME=	freeradius
 DISTVERSION=	2.2.3
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.freeradius.org/pub/freeradius/%SUBDIR%/ \
 		ftp://ftp.ntua.gr/pub/net/radius/freeradius/%SUBDIR%/ \
@@ -22,7 +23,7 @@ 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-3.*
 
 USE_RC_SUBR=	radiusd