From owner-svn-ports-head@FreeBSD.ORG  Sun Feb 17 16:15:32 2013
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])
 by hub.freebsd.org (Postfix) with ESMTP id 6A626767;
 Sun, 17 Feb 2013 16:15:32 +0000 (UTC)
 (envelope-from olgeni@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 5CE98DD4;
 Sun, 17 Feb 2013 16:15:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1HGFWvo086736;
 Sun, 17 Feb 2013 16:15:32 GMT (envelope-from olgeni@svn.freebsd.org)
Received: (from olgeni@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1HGFWrX086735;
 Sun, 17 Feb 2013 16:15:32 GMT (envelope-from olgeni@svn.freebsd.org)
Message-Id: <201302171615.r1HGFWrX086735@svn.freebsd.org>
From: Jimmy Olgeni <olgeni@FreeBSD.org>
Date: Sun, 17 Feb 2013 16:15:32 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r312423 - head/java/springframework31
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: Sun, 17 Feb 2013 16:15:32 -0000

Author: olgeni
Date: Sun Feb 17 16:15:31 2013
New Revision: 312423
URL: http://svnweb.freebsd.org/changeset/ports/312423

Log:
  Register conflict with springframework-3.2.

Modified:
  head/java/springframework31/Makefile

Modified: head/java/springframework31/Makefile
==============================================================================
--- head/java/springframework31/Makefile	Sun Feb 17 16:14:54 2013	(r312422)
+++ head/java/springframework31/Makefile	Sun Feb 17 16:15:31 2013	(r312423)
@@ -12,6 +12,8 @@ COMMENT=	The Spring Framework for Java
 
 WRKSRC=		${WRKDIR}/spring-framework-${PORTVERSION}.RELEASE
 
+CONFLICTS=	springframework-3.2.*
+
 NO_BUILD=	yes
 USE_JAVA=	yes
 USE_ZIP=	yes