svn commit: r361077 - head/devel/hadoop2

[Dmitry Sivachenko]

Author: demon
Date: Mon Jul  7 12:55:41 2014
New Revision: 361077
URL: http://svnweb.freebsd.org/changeset/ports/361077
QAT: https://qat.redports.org/buildarchive/r361077/

Log:
  Rename rcc --> hadoop-rcc to avoid conflict with qt4-rcc port.
  Replace spaces with tabs.
  Bump PORTREVISION.
  
  PR:		191655
  Submitted by:	Radim Kolar <hsn at sendmail.cz>

Modified:
  head/devel/hadoop2/Makefile
  head/devel/hadoop2/pkg-plist

Modified: head/devel/hadoop2/Makefile
==============================================================================
--- head/devel/hadoop2/Makefile	Mon Jul  7 12:52:14 2014	(r361076)
+++ head/devel/hadoop2/Makefile	Mon Jul  7 12:55:41 2014	(r361077)
@@ -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}-${PORTVER
 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 at 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/

Modified: head/devel/hadoop2/pkg-plist
==============================================================================
--- head/devel/hadoop2/pkg-plist	Mon Jul  7 12:52:14 2014	(r361076)
+++ head/devel/hadoop2/pkg-plist	Mon Jul  7 12:55:41 2014	(r361077)
@@ -1,7 +1,7 @@
 bin/hadoop
 bin/hdfs
 bin/mapred
-bin/rcc
+bin/hadoop-rcc
 bin/yarn
 include/Pipes.hh
 include/SerialUtils.hh