7 files changed, 24 insertions, 21 deletions

diff --git a/devel/hadoop/Makefile b/devel/hadoop/Makefile
index a2867833c2c4..3febb7c79468 100644
--- a/devel/hadoop/Makefile
+++ b/devel/hadoop/Makefile
@@ -30,9 +30,10 @@ OPTIONS_DEFINE=	DOCS
 HADOOP_LOGDIR=	/var/log/${PORTNAME}
 HADOOP_RUNDIR=	/var/run/${PORTNAME}
 
-HADOOP_USER=	hadoop
+HDFS_USER=	hdfs
+MAPRED_USER=	mapred
 HADOOP_GROUP=	hadoop
-USERS=		${HADOOP_USER}
+USERS=		${HDFS_USER} ${MAPRED_USER}
 GROUPS=		${HADOOP_GROUP}
 
 SUB_FILES=	hadoop 000.java_home.env
@@ -41,9 +42,11 @@ USE_RC_SUBR=	tasktracker jobtracker datanode namenode secondarynamenode
 PLIST_SUB=	PORTVERSION="${PORTVERSION}" \
 		HADOOP_LOGDIR="${HADOOP_LOGDIR}" \
 		HADOOP_RUNDIR="${HADOOP_RUNDIR}" \
-		HADOOP_USER="${HADOOP_USER}" \
+		HDFS_USER="${HDFS_USER}" \
+		MAPRED_USER="${MAPRED_USER}" \
 		HADOOP_GROUP="${HADOOP_GROUP}"
-SUB_LIST=	HADOOP_USER="${HADOOP_USER}" \
+SUB_LIST=	HDFS_USER="${HDFS_USER}" \
+		MAPRED_USER="${MAPRED_USER}" \
 		HADOOP_GROUP="${HADOOP_GROUP}" \
 		JAVA_HOME="${JAVA_HOME}"
 
diff --git a/devel/hadoop/files/datanode.in b/devel/hadoop/files/datanode.in
index 19a158705a95..cee608a8faa5 100644
--- a/devel/hadoop/files/datanode.in
+++ b/devel/hadoop/files/datanode.in
@@ -8,9 +8,9 @@
 #
 # Add the following lines to /etc/rc.conf to enable this service:
 #
-# datanode_enable (bool):     Set to NO by default.
+# datanode_enable (bool):        Set to NO by default.
 #                                Set it to YES to enable datanode.
-# datanode_user (str):        Set to %%HADOOP_USER%% by default.
+# datanode_user (str):           Set to %%HDFS_USER%% by default.
 #                                Set to a valid user to change default 
 #                                datanode user.
 # datanode_java_home (str):	 Unset by default.
@@ -28,7 +28,7 @@ rcvar=datanode_enable
 load_rc_config "${name}"
 
 : ${datanode_enable:=NO}
-: ${datanode_user:=%%HADOOP_USER%%}
+: ${datanode_user:=%%HDFS_USER%%}
 : ${datanode_group:=%%HADOOP_GROUP%%}
 
 command="%%DATADIR%%/bin/hadoop-daemon.sh"
diff --git a/devel/hadoop/files/jobtracker.in b/devel/hadoop/files/jobtracker.in
index 480b0ab55cb8..6a4ed3e5b227 100644
--- a/devel/hadoop/files/jobtracker.in
+++ b/devel/hadoop/files/jobtracker.in
@@ -8,9 +8,9 @@
 #
 # Add the following lines to /etc/rc.conf to enable this service:
 #
-# jobtracker_enable (bool):     Set to NO by default.
+# jobtracker_enable (bool):      Set to NO by default.
 #                                Set it to YES to enable jobtracker.
-# jobtracker_user (str):        Set to %%HADOOP_USER%% by default.
+# jobtracker_user (str):         Set to %%MAPRED_USER%% by default.
 #                                Set to a valid user to change default 
 #                                jobtracker user.
 # jobtracker_java_home (str):	 Unset by default.
@@ -28,7 +28,7 @@ rcvar=jobtracker_enable
 load_rc_config "${name}"
 
 : ${jobtracker_enable:=NO}
-: ${jobtracker_user:=%%HADOOP_USER%%}
+: ${jobtracker_user:=%%MAPRED_USER%%}
 : ${jobtracker_group:=%%HADOOP_GROUP%%}
 
 command="%%DATADIR%%/bin/hadoop-daemon.sh"
diff --git a/devel/hadoop/files/namenode.in b/devel/hadoop/files/namenode.in
index fb835b396682..682c94998633 100644
--- a/devel/hadoop/files/namenode.in
+++ b/devel/hadoop/files/namenode.in
@@ -8,9 +8,9 @@
 #
 # Add the following lines to /etc/rc.conf to enable this service:
 #
-# namenode_enable (bool):     Set to NO by default.
+# namenode_enable (bool):        Set to NO by default.
 #                                Set it to YES to enable namenode.
-# namenode_user (str):        Set to %%HADOOP_USER%% by default.
+# namenode_user (str):           Set to %%HDFS_USER%% by default.
 #                                Set to a valid user to change default 
 #                                namenode user.
 # namenode_java_home (str):	 Unset by default.
@@ -28,7 +28,7 @@ rcvar=namenode_enable
 load_rc_config "${name}"
 
 : ${namenode_enable:=NO}
-: ${namenode_user:=%%HADOOP_USER%%}
+: ${namenode_user:=%%HDFS_USER%%}
 : ${namenode_group:=%%HADOOP_GROUP%%}
 
 command="%%DATADIR%%/bin/hadoop-daemon.sh"
diff --git a/devel/hadoop/files/secondarynamenode.in b/devel/hadoop/files/secondarynamenode.in
index 77661b8701ce..4b09a97e0f10 100644
--- a/devel/hadoop/files/secondarynamenode.in
+++ b/devel/hadoop/files/secondarynamenode.in
@@ -10,7 +10,7 @@
 #
 # secondarynamenode_enable (bool):     Set to NO by default.
 #                                Set it to YES to enable secondarynamenode.
-# secondarynamenode_user (str):        Set to %%HADOOP_USER%% by default.
+# secondarynamenode_user (str):        Set to %%HDFS_USER%% by default.
 #                                Set to a valid user to change default 
 #                                secondarynamenode user.
 # secondarynamenode_java_home (str):	 Unset by default.
@@ -28,7 +28,7 @@ rcvar=secondarynamenode_enable
 load_rc_config "${name}"
 
 : ${secondarynamenode_enable:=NO}
-: ${secondarynamenode_user:=%%HADOOP_USER%%}
+: ${secondarynamenode_user:=%%HDFS_USER%%}
 : ${secondarynamenode_group:=%%HADOOP_GROUP%%}
 
 command="%%DATADIR%%/bin/hadoop-daemon.sh"
diff --git a/devel/hadoop/files/tasktracker.in b/devel/hadoop/files/tasktracker.in
index 9de90fec3db6..ee99429f3698 100644
--- a/devel/hadoop/files/tasktracker.in
+++ b/devel/hadoop/files/tasktracker.in
@@ -10,7 +10,7 @@
 #
 # tasktracker_enable (bool):     Set to NO by default.
 #                                Set it to YES to enable tasktracker.
-# tasktracker_user (str):        Set to %%HADOOP_USER%% by default.
+# tasktracker_user (str):        Set to %%MAPRED_USER%% by default.
 #                                Set to a valid user to change default 
 #                                tasktracker user.
 # tasktracker_java_home (str):	 Unset by default.
@@ -28,7 +28,7 @@ rcvar=tasktracker_enable
 load_rc_config "${name}"
 
 : ${tasktracker_enable:=NO}
-: ${tasktracker_user:=%%HADOOP_USER%%}
+: ${tasktracker_user:=%%MAPRED_USER%%}
 : ${tasktracker_group:=%%HADOOP_GROUP%%}
 
 command="%%DATADIR%%/bin/hadoop-daemon.sh"
diff --git a/devel/hadoop/pkg-plist b/devel/hadoop/pkg-plist
index 9689f0d3067c..17d167847d87 100644
--- a/devel/hadoop/pkg-plist
+++ b/devel/hadoop/pkg-plist
@@ -301,10 +301,10 @@ lib/libhdfs.so
 lib/libhdfs.la
 @exec mkdir -p %D/%%DATADIR%%/webapps/secondary/WEB-INF
 @exec mkdir -p %D/%%DATADIR%%/contrib/hdfsproxy/logs
-@exec install -d -o %%HADOOP_USER%% -g %%HADOOP_GROUP%% -m 0755 %%HADOOP_LOGDIR%%
-@exec install -d -o %%HADOOP_USER%% -g %%HADOOP_GROUP%% -m 0755 %%HADOOP_RUNDIR%%
-@unexec rmdir %%HADOOP_RUNDIR%% 2>/dev/null || true
-@unexec rmdir %%HADOOP_LOGDIR%% 2>/dev/null || true
+@exec install -d -o root -g %%HADOOP_GROUP%% -m 0775 %%HADOOP_LOGDIR%%
+@exec install -d -o root -g %%HADOOP_GROUP%% -m 0775 %%HADOOP_RUNDIR%%
+@unexec rm -d %%HADOOP_RUNDIR%% 2>/dev/null || true
+@unexec rm -d %%HADOOP_LOGDIR%% 2>/dev/null || true
 @dirrm %%EXAMPLESDIR%%/conf
 @dirrm %%EXAMPLESDIR%%
 @dirrm %%DATADIR%%/lib/native/Linux-i386-32