svn commit: r312423 - head/java/springframework31

[Jimmy Olgeni]

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