diff options
| -rw-r--r-- | devel/hadoop2/Makefile | 4 | ||||
| -rw-r--r-- | www/yarn/Makefile | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/devel/hadoop2/Makefile b/devel/hadoop2/Makefile index 6526a21d9bd9..53d26f8cf8f8 100644 --- a/devel/hadoop2/Makefile +++ b/devel/hadoop2/Makefile @@ -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}" \ diff --git a/www/yarn/Makefile b/www/yarn/Makefile index 91089459d6c1..2684354b48f7 100644 --- a/www/yarn/Makefile +++ b/www/yarn/Makefile @@ -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 |