svn commit: r446632 - in head/devel: maven maven3 maven31 maven33

[Matthew Seaman]

Author: matthew
Date: Tue Jul 25 21:45:58 2017
New Revision: 446632
URL: https://svnweb.freebsd.org/changeset/ports/446632

Log:
  Partially revert r446612 -- remove the CONFLICTS_INSTALL lines,
  because these ports do not actually conflict.
  
  PointyHat to: me
  
  Reported by:	jonc at chen.org.nz

Modified:
  head/devel/maven/Makefile
  head/devel/maven3/Makefile
  head/devel/maven31/Makefile
  head/devel/maven33/Makefile

Modified: head/devel/maven/Makefile
==============================================================================
--- head/devel/maven/Makefile	Tue Jul 25 21:44:22 2017	(r446631)
+++ head/devel/maven/Makefile	Tue Jul 25 21:45:58 2017	(r446632)
@@ -14,8 +14,6 @@ LICENSE=	APACHE20
 
 RUN_DEPENDS=	mvn:devel/maven-wrapper
 
-CONFLICTS_INSTALL=	maven3-* maven31-* maven33-*
-
 USES=		cpe
 CPE_PRODUCT=	maven
 CPE_VENDOR=	apache

Modified: head/devel/maven3/Makefile
==============================================================================
--- head/devel/maven3/Makefile	Tue Jul 25 21:44:22 2017	(r446631)
+++ head/devel/maven3/Makefile	Tue Jul 25 21:45:58 2017	(r446632)
@@ -14,8 +14,6 @@ LICENSE=	APACHE20
 
 RUN_DEPENDS=	mvn:devel/maven-wrapper
 
-CONFLICTS_INSTALL=	maven-* maven33-* maven31-*
-
 USES=		cpe
 CPE_PRODUCT=	maven
 CPE_VENDOR=	apache

Modified: head/devel/maven31/Makefile
==============================================================================
--- head/devel/maven31/Makefile	Tue Jul 25 21:44:22 2017	(r446631)
+++ head/devel/maven31/Makefile	Tue Jul 25 21:45:58 2017	(r446632)
@@ -15,8 +15,6 @@ LICENSE=	APACHE20
 
 RUN_DEPENDS=	mvn:devel/maven-wrapper
 
-CONFLICTS_INSTALL=	maven-* maven3-* maven33-*
-
 USES=		cpe
 CPE_PRODUCT=	maven
 CPE_VENDOR=	apache

Modified: head/devel/maven33/Makefile
==============================================================================
--- head/devel/maven33/Makefile	Tue Jul 25 21:44:22 2017	(r446631)
+++ head/devel/maven33/Makefile	Tue Jul 25 21:45:58 2017	(r446632)
@@ -13,8 +13,6 @@ LICENSE=	APACHE20
 
 RUN_DEPENDS=	mvn:devel/maven-wrapper
 
-CONFLICTS_INSTALL=	maven-* maven3-* maven31-*
-
 USES=		cpe
 CPE_PRODUCT=	maven
 CPE_VENDOR=	apache