diff options
| -rw-r--r-- | devel/hadoop2/Makefile | 21 | ||||
| -rw-r--r-- | devel/hadoop2/pkg-plist | 2 |
2 files changed, 12 insertions, 11 deletions
diff --git a/devel/hadoop2/Makefile b/devel/hadoop2/Makefile index 010313f07a2d..df91af33c879 100644 --- a/devel/hadoop2/Makefile +++ b/devel/hadoop2/Makefile @@ -3,7 +3,7 @@ PORTNAME= hadoop PORTVERSION= 2.4.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel java MASTER_SITES= ${MASTER_SITE_APACHE} \ LOCAL/demon/:maven \ @@ -39,17 +39,17 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-src TOMCAT_VERSION= 6.0.36 HADOOP_DIST= ${WRKSRC}/hadoop-dist/target/hadoop-${PORTVERSION} -HADOOP_LOGDIR= /var/log/hadoop -HADOOP_RUNDIR= /var/run/hadoop +HADOOP_LOGDIR= /var/log/hadoop +HADOOP_RUNDIR= /var/run/hadoop -HDFS_USER= hdfs -MAPRED_USER= mapred -HADOOP_GROUP= hadoop -USERS= ${HDFS_USER} ${MAPRED_USER} -GROUPS= ${HADOOP_GROUP} +HDFS_USER= hdfs +MAPRED_USER= mapred +HADOOP_GROUP= hadoop +USERS= ${HDFS_USER} ${MAPRED_USER} +GROUPS= ${HADOOP_GROUP} SUB_FILES= hadoop-layout.sh -USE_RC_SUBR= historyserver nodemanager resourcemanager webappproxyserver datanode namenode secondarynamenode +USE_RC_SUBR= historyserver nodemanager resourcemanager webappproxyserver datanode namenode secondarynamenode PLIST_SUB= PORTVERSION="${PORTVERSION}" \ HADOOP_LOGDIR="${HADOOP_LOGDIR}" \ @@ -74,6 +74,7 @@ do-build: post-build: ${RM} ${HADOOP_DIST}/etc/hadoop/*.cmd + ${MV} ${HADOOP_DIST}/bin/rcc ${HADOOP_DIST}/bin/hadoop-rcc # With jetty-6.1.26 tasktracker's threads hung with the following error: # org.mortbay.io.nio.SelectorManager$SelectSet@abdcc1c JVM BUG(s) - injecting delay 59 times # See https://issues.apache.org/jira/browse/MAPREDUCE-2386 @@ -83,7 +84,7 @@ post-build: .endfor do-install: - cd ${HADOOP_DIST}/bin && ${INSTALL_SCRIPT} hadoop hdfs mapred rcc yarn ${STAGEDIR}${PREFIX}/bin/ + cd ${HADOOP_DIST}/bin && ${INSTALL_SCRIPT} hadoop hdfs mapred hadoop-rcc yarn ${STAGEDIR}${PREFIX}/bin/ cd ${HADOOP_DIST} && ${COPYTREE_BIN} "libexec sbin" ${STAGEDIR}${PREFIX}/ "! -name *.cmd" cd ${HADOOP_DIST}/include && ${INSTALL_DATA} *h ${STAGEDIR}${PREFIX}/include/ cd ${HADOOP_DIST}/lib/native && ${INSTALL_DATA} *.a ${STAGEDIR}${PREFIX}/lib/ diff --git a/devel/hadoop2/pkg-plist b/devel/hadoop2/pkg-plist index f4d1097944e2..a20dda906a2d 100644 --- a/devel/hadoop2/pkg-plist +++ b/devel/hadoop2/pkg-plist @@ -1,7 +1,7 @@ bin/hadoop bin/hdfs bin/mapred -bin/rcc +bin/hadoop-rcc bin/yarn include/Pipes.hh include/SerialUtils.hh |