svn commit: r444916 - in head: devel/hadoop2 www/yarn

[Dmitry Sivachenko]

Author: demon
Date: Mon Jul  3 07:40:16 2017
New Revision: 444916
URL: https://svnweb.freebsd.org/changeset/ports/444916

Log:
  Register conflict with hadoop2 and www/yarn because of bin/yarn binary until
  better solution is found.
  
  PR:		220337
  Submitted by:	hakan at siktas.com

Modified:
  head/devel/hadoop2/Makefile
  head/www/yarn/Makefile

Modified: head/devel/hadoop2/Makefile
==============================================================================
--- head/devel/hadoop2/Makefile	Mon Jul  3 06:30:29 2017	(r444915)
+++ head/devel/hadoop2/Makefile	Mon Jul  3 07:40:16 2017	(r444916)
@@ -31,7 +31,7 @@ LIB_DEPENDS=	libsnappy.so:archivers/snappy
 RUN_DEPENDS=	bash:shells/bash \
 		ssid:sysutils/ssid
 
-CONFLICTS_INSTALL=	hadoop-1*
+CONFLICTS_INSTALL=	hadoop-1* yarn
 
 USES=		cpe shebangfix
 CPE_VENDOR=	apache
@@ -55,7 +55,7 @@ HADOOP_GROUP=	hadoop
 USERS=		${HDFS_USER} ${MAPRED_USER}
 GROUPS=		${HADOOP_GROUP}
 
-SUB_FILES=	hadoop-layout.sh httpfs-env.sh kms-env.sh 
+SUB_FILES=	hadoop-layout.sh httpfs-env.sh kms-env.sh
 USE_RC_SUBR=	historyserver nodemanager resourcemanager webappproxyserver datanode namenode secondarynamenode journalnode zkfc
 
 PLIST_SUB=	PORTVERSION="${PORTVERSION}" \

Modified: head/www/yarn/Makefile
==============================================================================
--- head/www/yarn/Makefile	Mon Jul  3 06:30:29 2017	(r444915)
+++ head/www/yarn/Makefile	Mon Jul  3 07:40:16 2017	(r444916)
@@ -25,6 +25,8 @@ NODE_RUN_DEPENDS=	node>=0.8.0:www/node
 NODE6_RUN_DEPENDS=	node6>=0.8.0:www/node6
 NODE4_RUN_DEPENDS=	node4>=0.8.0:www/node4
 
+CONFLICTS_INSTALL=	hadoop-2*
+
 NO_ARCH=	yes
 NO_BUILD=	yes