- Update Apache Hadoop to version 1.2.1.

- Hand maintainership to submitter.
- Replace HADOOP_HOME with DATADIR and HADOOP_ETC with ETCDIR.
- Replace pkg-install and pkg-deinstall with pkg-plist entries.
- Support staging.
- Fix build on FreeBSD 10 (clang, libc++, hardcoded gcc).

PR:		ports/183307
Submitted by:	Pedro Giffuni <pfg@apache.org>

18 files changed, 467 insertions, 525 deletions

diff --git a/devel/hadoop/Makefile b/devel/hadoop/Makefile
index 3ac7a4304ae8..77ae8bd3fa2c 100644
--- a/devel/hadoop/Makefile
+++ b/devel/hadoop/Makefile
@@ -2,65 +2,58 @@
 # $FreeBSD$
 
 PORTNAME=	hadoop
-PORTVERSION=	1.0.0
+PORTVERSION=	1.2.1
 CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	${PORTNAME}/core/${PORTNAME}-${PORTVERSION}
+PKGNAMEPREFIX=	apache-
 DIST_SUBDIR=	hadoop
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	pfg@apache.org
 COMMENT=	Apache Map/Reduce framework
 
 LICENSE=	AL2
-LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+
+BUILD_DEPENDS=	gmake:${PORTSDIR}/devel/gmake \
+		gsed:${PORTSDIR}/textproc/gsed
+RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.6
 USE_ANT=	yes
-ONLY_FOR_ARCHS=	amd64 i386
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+DESTDIRNAME=	-Ddestdir
+ONLY_FOR_ARCHS= amd64 i386
 
-BUILD_DEPENDS+=	${LOCALBASE}/bin/gmake:${PORTSDIR}/devel/gmake \
-		${LOCALBASE}/bin/gsed:${PORTSDIR}/textproc/gsed
-RUN_DEPENDS+=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
-
-_HADOOP_DIR=	share/${PORTNAME}
-_HADOOP_ETC=	etc/${PORTNAME}
-HADOOP_HOME=	${PREFIX}/${_HADOOP_DIR}
-HADOOP_ETC=	${PREFIX}/${_HADOOP_ETC}
+OPTIONS_DEFINE=	DOCS
 
 HADOOP_LOGDIR=	/var/log/${PORTNAME}
 HADOOP_RUNDIR=	/var/run/${PORTNAME}
-HADOOP_BIN=	${PREFIX}/bin/${PORTNAME}
 
-USERS=		hadoop
-GROUPS=		hadoop
-HADOOP_USER=	${USERS}
-HADOOP_GROUP=	${GROUPS}
+HADOOP_USER=	hadoop
+HADOOP_GROUP=	hadoop
+USERS=		${HADOOP_USER}
+GROUPS=		${HADOOP_GROUP}
 
-SUB_FILES+=	pkg-install pkg-deinstall hadoop 000.java_home.env
-USE_RC_SUBR+=	tasktracker jobtracker datanode namenode secondarynamenode
+SUB_FILES=	hadoop 000.java_home.env
+USE_RC_SUBR=	tasktracker jobtracker datanode namenode secondarynamenode
 
-PLIST_SUB+=	PORTVERSION="${PORTVERSION}"\
-		HADOOP_HOME="${_HADOOP_DIR}" \
-		HADOOP_ETC="${_HADOOP_ETC}"
-SUB_LIST=	HADOOP_LOGDIR="${HADOOP_LOGDIR}" \
+PLIST_SUB=	PORTVERSION="${PORTVERSION}" \
+		HADOOP_LOGDIR="${HADOOP_LOGDIR}" \
 		HADOOP_RUNDIR="${HADOOP_RUNDIR}" \
 		HADOOP_USER="${HADOOP_USER}" \
+		HADOOP_GROUP="${HADOOP_GROUP}"
+SUB_LIST=	HADOOP_USER="${HADOOP_USER}" \
 		HADOOP_GROUP="${HADOOP_GROUP}" \
-		HADOOP_UID="${HADOOP_UID}" \
-		HADOOP_GID="${HADOOP_GID}" \
-		HADOOP_HOME="${HADOOP_HOME}" \
-		HADOOP_ETC="${HADOOP_ETC}" \
 		JAVA_HOME="${JAVA_HOME}"
 
 PORTDOCS=	*
-FIX_PERMS=	src/c++/pipes/install-sh src/c++/utils/install-sh src/c++/libhdfs/install-sh \
-		src/c++/libhdfs/tests/test-libhdfs.sh
 
-FIX_DOCS=	docs/cn/skin/css docs/cn/skin/scripts docs/cn/skin/translations \
-		docs/jdiff docs/skin/css docs/skin/scripts docs/skin/translations
+FIX_GCC=	src/c++/libhdfs/configure src/c++/pipes/configure \
+		src/c++/task-controller/configure src/c++/utils/configure \
+		src/examples/pipes/configure src/native/configure
+FIX_PERMS=	src/c++/pipes/install-sh src/c++/utils/install-sh \
+		src/c++/libhdfs/install-sh src/c++/libhdfs/tests/test-libhdfs.sh
+FIX_DOCS=	docs/jdiff docs/skin/css docs/skin/scripts docs/skin/translations
 
 DOC=		CHANGES.txt LICENSE.txt NOTICE.txt README.txt
 
@@ -75,17 +68,21 @@ MAKE_ARGS=	-Dbuild.classes=${WRKSRC}/hadoop-core-${PORTVERSION}.jar -Dversion=${
 		-Dcompile.c++=true -Dmake.cmd=${GMAKE} -Dlibhdfs=1 -Dlibrecordio=true  -Dskip.record-parser=true
 ALL_TARGET=	compile-core-native compile-c++ compile-c++-libhdfs compile-c++-pipes compile-c++-utils
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${ARCH} == "amd64"
 _HADOOP_ARCH=	FreeBSD-amd64-64
 .else
-_HADOOP_ARCH=	FreeBSD-i386-32
+_HADOOP_ARCH=	FreeBSD-${ARCH}-32
 .endif
 PLIST_SUB+=	HADOOP_ARCH=${_HADOOP_ARCH}
 
-pre-build:
+post-patch:
+	@${REINPLACE_CMD} -e 's/ -DCPU=\\\\\\".*\\\\\\"//' \
+		${WRKSRC}/src/c++/libhdfs/configure
+.for f in ${FIX_GCC}
+	@${REINPLACE_CMD} -e 's/`gcc/`$$LTCC/' ${WRKSRC}/${f}
+.endfor
 .for f in ${FIX_PERMS}
 	@${CHMOD} +x ${WRKSRC}/${f}
 .endfor
@@ -93,50 +90,37 @@ pre-build:
 	@${TOUCH} ${WRKSRC}/${d}/.empty
 .endfor
 
-#do-build:
-#	@cd ${WRKSRC}; \
-#	${ANT} -Dbuild.classes=${WRKSRC}/hadoop-core-${PORTVERSION}.jar -Dversion=${PORTVERSION} -Dcompile.native=true \
-#	-Dcompile.c++=true -Dmake.cmd=${GMAKE} compile-core-native compile-c++ compile-c++-libhdfs compile-c++-pipes \
-#	compile-c++-utils -Dlibhdfs=1 -Dlibrecordio=true  -Dskip.record-parser=true
-
 post-build:
 	@cd ${WRKSRC} ;${ANT} FreeBSD-dist
 	@${TAR} -cf - -C ${WRKSRC}/build/c++/ ${_HADOOP_ARCH}/lib ${_HADOOP_ARCH}/include | ${TAR} xf - -C ${WRKSRC}/c++/
 
-pre-install:
-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
 do-install:
-	@${MKDIR} ${HADOOP_HOME}
-	@${TAR} -cf - -C ${WRKSRC}/ ${DIST}  | ${TAR} -xf - -C ${HADOOP_HOME}
-
-	@${MKDIR} ${HADOOP_ETC} ${HADOOP_ETC}/envvars.d
-	@${INSTALL_DATA} ${WRKDIR}/000.java_home.env ${HADOOP_ETC}/envvars.d/
-	@${ECHO} "export HADOOP_HOME=${HADOOP_HOME}" > ${HADOOP_ETC}/envvars.d/001.hadoop_home.env
-	@${ECHO} "export HADOOP_CONF_DIR=${HADOOP_ETC}" > ${HADOOP_ETC}/envvars.d/002.hadoop_conf.env
-	@${ECHO} "export HADOOP_LOG_DIR=${HADOOP_LOGDIR}" > ${HADOOP_ETC}/envvars.d/003.hadoop_log.env
-	@${ECHO} "export HADOOP_PID_DIR=${HADOOP_RUNDIR}" > ${HADOOP_ETC}/envvars.d/004.hadoop_run.env
-	@${MKDIR} ${EXAMPLESDIR}
-	@${TAR} -cf - -C ${WRKSRC}/c++/${_HADOOP_ARCH}/  include lib| ${TAR} xf - -C ${PREFIX}
+	${MKDIR} ${STAGEDIR}${DATADIR}
+	${TAR} -cf - -C ${WRKSRC} ${DIST} | ${TAR} -xf - -C ${STAGEDIR}${DATADIR}
+
+	${MKDIR} ${STAGEDIR}${ETCDIR}/envvars.d
+	${INSTALL_DATA} ${WRKDIR}/000.java_home.env ${STAGEDIR}${ETCDIR}/envvars.d
+	${ECHO} "export HADOOP_PREFIX=${DATADIR}" > ${STAGEDIR}${ETCDIR}/envvars.d/001.hadoop_home.env
+	${ECHO} "export HADOOP_CONF_DIR=${ETCDIR}" > ${STAGEDIR}${ETCDIR}/envvars.d/002.hadoop_conf.env
+	${ECHO} "export HADOOP_LOG_DIR=${HADOOP_LOGDIR}" > ${STAGEDIR}${ETCDIR}/envvars.d/003.hadoop_log.env
+	${ECHO} "export HADOOP_PID_DIR=${HADOOP_RUNDIR}" > ${STAGEDIR}${ETCDIR}/envvars.d/004.hadoop_run.env
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${TAR} -cf - -C ${WRKSRC}/c++/${_HADOOP_ARCH} include lib | ${TAR} xf - -C ${STAGEDIR}${PREFIX}
 
 .for f in ${DEFAULTS}
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
 
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${TAR} -cf - -C ${WRKSRC}/ docs | ${TAR} -xf - -C ${DOCSDIR}
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR}
 .for f in ${DOC}
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
-	@${INSTALL_SCRIPT} ${WRKDIR}/hadoop ${PREFIX}/bin/
-	@cd ${WRKSRC}; ${COPYTREE_SHARE} conf ${EXAMPLESDIR}
-.for f in ${CONF}
-	@[ -f ${HADOOP_ETC}/${f} ] || ${INSTALL_DATA} ${EXAMPLESDIR}/conf/${f} ${HADOOP_ETC}
-.endfor
-
-post-install:
-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	${INSTALL_SCRIPT} ${WRKDIR}/hadoop ${STAGEDIR}${PREFIX}/bin
+	cd ${WRKSRC} && ${COPYTREE_SHARE} conf ${STAGEDIR}${EXAMPLESDIR}
+	${MKDIR} ${STAGEDIR}${HADOOP_LOGDIR}
+	${MKDIR} ${STAGEDIR}${HADOOP_RUNDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/hadoop/distinfo b/devel/hadoop/distinfo
index 92325bd9cd80..147de742c93a 100644
--- a/devel/hadoop/distinfo
+++ b/devel/hadoop/distinfo
@@ -1,2 +1,2 @@
-SHA256 (hadoop/hadoop-1.0.0.tar.gz) = 587bc9389d062f4e8042f2604b2d9a574080d4178614cccc07c5e5d743836f71
-SIZE (hadoop/hadoop-1.0.0.tar.gz) = 59468784
+SHA256 (hadoop/hadoop-1.2.1.tar.gz) = 94a1181771f173bdb55c8f901722825866396091f0516bdd12b34dc3de1706a1
+SIZE (hadoop/hadoop-1.2.1.tar.gz) = 63851630
diff --git a/devel/hadoop/files/datanode.in b/devel/hadoop/files/datanode.in
index 402ecc228531..19a158705a95 100644
--- a/devel/hadoop/files/datanode.in
+++ b/devel/hadoop/files/datanode.in
@@ -31,7 +31,7 @@ load_rc_config "${name}"
 : ${datanode_user:=%%HADOOP_USER%%}
 : ${datanode_group:=%%HADOOP_GROUP%%}
 
-command="%%HADOOP_HOME%%/bin/hadoop-daemon.sh"
+command="%%DATADIR%%/bin/hadoop-daemon.sh"
 command_args='--config ${HADOOP_CONF_DIR} start datanode'
 
 start_precmd=datanode_init
@@ -46,7 +46,7 @@ datanode_init()
 		export JAVA_HOME="${datanode_java_home}"
 	fi
 
-	for f in %%HADOOP_ETC%%/envvars.d/*.env
+	for f in %%ETCDIR%%/envvars.d/*.env
 	do
 		. ${f}
 	done
diff --git a/devel/hadoop/files/hadoop.in b/devel/hadoop/files/hadoop.in
index 269b9821332b..69b152c74e6c 100644
--- a/devel/hadoop/files/hadoop.in
+++ b/devel/hadoop/files/hadoop.in
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
-for i in `ls %%HADOOP_ETC%%/envvars.d/*.env`
+for i in `ls %%ETCDIR%%/envvars.d/*.env`
 do
    . ${i}
 done
 
-exec %%HADOOP_HOME%%/bin/hadoop $@
+exec %%DATADIR%%/bin/hadoop $@
diff --git a/devel/hadoop/files/jobtracker.in b/devel/hadoop/files/jobtracker.in
index 20313e8dd661..480b0ab55cb8 100644
--- a/devel/hadoop/files/jobtracker.in
+++ b/devel/hadoop/files/jobtracker.in
@@ -31,7 +31,7 @@ load_rc_config "${name}"
 : ${jobtracker_user:=%%HADOOP_USER%%}
 : ${jobtracker_group:=%%HADOOP_GROUP%%}
 
-command="%%HADOOP_HOME%%/bin/hadoop-daemon.sh"
+command="%%DATADIR%%/bin/hadoop-daemon.sh"
 command_args='--config ${HADOOP_CONF_DIR} start jobtracker'
 
 start_precmd=jobtracker_init
@@ -46,7 +46,7 @@ jobtracker_init()
 		export JAVA_HOME="${jobtracker_java_home}"
 	fi
 
-	for f in %%HADOOP_ETC%%/envvars.d/*.env
+	for f in %%ETCDIR%%/envvars.d/*.env
 	do
 		. ${f}
 	done
diff --git a/devel/hadoop/files/namenode.in b/devel/hadoop/files/namenode.in
index dc48bccc50b2..fb835b396682 100644
--- a/devel/hadoop/files/namenode.in
+++ b/devel/hadoop/files/namenode.in
@@ -31,7 +31,7 @@ load_rc_config "${name}"
 : ${namenode_user:=%%HADOOP_USER%%}
 : ${namenode_group:=%%HADOOP_GROUP%%}
 
-command="%%HADOOP_HOME%%/bin/hadoop-daemon.sh"
+command="%%DATADIR%%/bin/hadoop-daemon.sh"
 command_args='--config ${HADOOP_CONF_DIR} start namenode'
 
 start_precmd=namenode_init
@@ -46,7 +46,7 @@ namenode_init()
 		export JAVA_HOME="${namenode_java_home}"
 	fi
 
-	for f in %%HADOOP_ETC%%/envvars.d/*.env
+	for f in %%ETCDIR%%/envvars.d/*.env
 	do
 		. ${f}
 	done
diff --git a/devel/hadoop/files/patch-build.xml b/devel/hadoop/files/patch-build.xml
index ef61c7ce5845..dd3fc5ee155e 100644
--- a/devel/hadoop/files/patch-build.xml
+++ b/devel/hadoop/files/patch-build.xml
@@ -1,6 +1,6 @@
---- build.xml.orig	2011-05-04 08:30:16.000000000 +0200
-+++ build.xml	2011-08-08 00:08:22.000000000 +0200
-@@ -372,7 +372,7 @@
+--- build.xml.orig	2013-07-23 00:26:41.000000000 +0200
++++ build.xml	2013-10-29 16:27:54.000000000 +0100
+@@ -452,7 +452,7 @@
    <!-- ====================================================== -->
    <!-- Compile the Java files                                 -->
    <!-- ====================================================== -->
@@ -9,16 +9,16 @@
        <javacc
            target="${core.src.dir}/org/apache/hadoop/record/compiler/generated/rcc.jj"
            outputdirectory="${core.src.dir}/org/apache/hadoop/record/compiler/generated"
-@@ -539,7 +539,7 @@
-     </antcall> 
+@@ -636,7 +636,7 @@
+     </exec>
    </target>
  
--  <target name="compile-core-native" depends="compile-core-classes"
+-  <target name="compile-core-native" depends="create-native-configure, compile-core-classes"
 +  <target name="compile-core-native"
            if="compile.native">
    	
      <mkdir dir="${build.native}/lib"/>
-@@ -1669,7 +1669,7 @@
+@@ -2042,7 +2042,7 @@
  <!-- librecordio targets.                                               -->
  <!-- ================================================================== -->		
  
@@ -27,7 +27,7 @@
       <mkdir dir="${build.librecordio}"/>
       <exec dir="${librecordio.src}" executable="${make.cmd}" failonerror="true">
          <env key="XERCESCROOT" value="${xercescroot}"/>
-@@ -1703,7 +1703,7 @@
+@@ -2076,7 +2076,7 @@
      </chmod>
    </target>
   
@@ -36,7 +36,7 @@
      <exec executable="autoreconf" dir="${c++.utils.src}" searchpath="yes" 
            failonerror="yes">
         <arg value="-if"/>
-@@ -1726,7 +1726,7 @@
+@@ -2099,7 +2099,7 @@
      </exec>
    </target>
  
@@ -45,7 +45,7 @@
      <condition property="need.c++.utils.makefile">
         <not> <available file="${build.c++.utils}/Makefile"/> </not>
      </condition>
-@@ -1747,7 +1747,7 @@
+@@ -2120,7 +2120,7 @@
      </condition>
    </target>
  
@@ -54,8 +54,17 @@
      <condition property="need.c++.libhdfs.makefile">
         <not> <available file="${build.c++.libhdfs}/Makefile"/> </not>
      </condition>
-@@ -2326,5 +2326,23 @@
-       <fileset file="${jsvc.install.dir}/jsvc"/>
+@@ -2176,7 +2176,7 @@
+   </target>
+ 
+   <target name="compile-c++" 
+-          depends="create-c++-configure,compile-c++-pipes"/>
++          depends="compile-c++-pipes"/>
+ 
+   <target name="create-c++-examples-pipes-makefile" 
+           depends="check-c++-makefiles" 
+@@ -2824,5 +2824,23 @@
+       <fileset file="${jsvc.install.dir}/jsvc.${os.arch}"/>
      </chmod>
   </target>
 +  <target name="FreeBSD-dist" >
diff --git a/devel/hadoop/files/patch-src-c++-libhdfs-configure b/devel/hadoop/files/patch-src-c++-libhdfs-configure
new file mode 100644
index 000000000000..a0fce9f562b9
--- /dev/null
+++ b/devel/hadoop/files/patch-src-c++-libhdfs-configure
@@ -0,0 +1,11 @@
+--- src/c++/libhdfs/configure.orig	2013-07-23 00:26:40.000000000 +0200
++++ src/c++/libhdfs/configure	2013-11-01 12:45:14.000000000 +0100
+@@ -3782,7 +3782,7 @@
+   i?86)
+     CFLAGS="$CFLAGS -DCPU=\\\"i386\\\""
+     HOST_CPU=i386;;
+-  x86_64)
++  amd64|x86_64)
+     CFLAGS="$CFLAGS -DCPU=\\\"amd64\\\""
+     HOST_CPU=amd64;;
+   bs2000)
diff --git a/devel/hadoop/files/patch-src-c++-pipes-impl-HadoopPipes.cc b/devel/hadoop/files/patch-src-c++-pipes-impl-HadoopPipes.cc
new file mode 100644
index 000000000000..b35e0d12ee92
--- /dev/null
+++ b/devel/hadoop/files/patch-src-c++-pipes-impl-HadoopPipes.cc
@@ -0,0 +1,10 @@
+--- src/c++/pipes/impl/HadoopPipes.cc.orig	2013-07-23 00:26:40.000000000 +0200
++++ src/c++/pipes/impl/HadoopPipes.cc	2013-10-30 15:42:33.000000000 +0100
+@@ -34,6 +34,7 @@
+ #include <pthread.h>
+ #include <iostream>
+ #include <fstream>
++#include <unistd.h>
+ 
+ #include <openssl/hmac.h>
+ #include <openssl/buffer.h>
diff --git a/devel/hadoop/files/patch-src__native__Makefile.in b/devel/hadoop/files/patch-src__native__Makefile.in
index 0ebf9fb4223f..4917f1ca7023 100644
--- a/devel/hadoop/files/patch-src__native__Makefile.in
+++ b/devel/hadoop/files/patch-src__native__Makefile.in
@@ -1,52 +1,56 @@
---- src/native/Makefile.in.orig	2011-05-04 08:30:16.000000000 +0200
-+++ src/native/Makefile.in	2011-12-09 10:38:40.000000000 +0100
-@@ -92,10 +92,7 @@
- libLTLIBRARIES_INSTALL = $(INSTALL)
+--- src/native/Makefile.in.orig	2013-07-22 17:26:40.000000000 -0500
++++ src/native/Makefile.in	2013-10-25 09:42:34.000000000 -0500
+@@ -93,10 +93,7 @@
  LTLIBRARIES = $(lib_LTLIBRARIES)
  libhadoop_la_DEPENDENCIES =
--am_libhadoop_la_OBJECTS = ZlibCompressor.lo ZlibDecompressor.lo \
--	getGroup.lo JniBasedUnixGroupsMapping.lo \
+ am_libhadoop_la_OBJECTS = ZlibCompressor.lo ZlibDecompressor.lo \
+-	SnappyCompressor.lo SnappyDecompressor.lo getGroup.lo \
+-	JniBasedUnixGroupsMapping.lo \
 -	JniBasedUnixGroupsNetgroupMapping.lo file_descriptor.lo \
 -	errno_enum.lo NativeIO.lo
-+am_libhadoop_la_OBJECTS = ZlibCompressor.lo ZlibDecompressor.lo
++	SnappyCompressor.lo SnappyDecompressor.lo
  libhadoop_la_OBJECTS = $(am_libhadoop_la_OBJECTS)
  DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
  depcomp = $(SHELL) $(top_srcdir)/config/depcomp
-@@ -223,24 +220,15 @@
- sysconfdir = @sysconfdir@
+@@ -230,9 +227,7 @@
  target_alias = @target_alias@
  AM_CPPFLAGS = @JNI_CPPFLAGS@ -I$(HADOOP_NATIVE_SRCDIR)/src \
--              -Isrc/org/apache/hadoop/io/compress/zlib \
+               -Isrc/org/apache/hadoop/io/compress/zlib \
+-              -Isrc/org/apache/hadoop/io/compress/snappy \
 -              -Isrc/org/apache/hadoop/io/nativeio \
 -              -Isrc/org/apache/hadoop/security
-+              -Isrc/org/apache/hadoop/io/compress/zlib 
++              -Isrc/org/apache/hadoop/io/compress/snappy
  
  AM_LDFLAGS = @JNI_LDFLAGS@ -m$(JVM_DATA_MODEL)
  AM_CFLAGS = -g -Wall -fPIC -O2 -m$(JVM_DATA_MODEL)
- lib_LTLIBRARIES = libhadoop.la
+@@ -240,16 +235,10 @@
  libhadoop_la_SOURCES = src/org/apache/hadoop/io/compress/zlib/ZlibCompressor.c \
--                       src/org/apache/hadoop/io/compress/zlib/ZlibDecompressor.c \
+                        src/org/apache/hadoop/io/compress/zlib/ZlibDecompressor.c \
+                        src/org/apache/hadoop/io/compress/snappy/SnappyCompressor.c \
+-                       src/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.c \
 -                       src/org/apache/hadoop/security/getGroup.c \
 -                       src/org/apache/hadoop/security/JniBasedUnixGroupsMapping.c \
 -                       src/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.c \
 -                       src/org/apache/hadoop/io/nativeio/file_descriptor.c \
 -                       src/org/apache/hadoop/io/nativeio/errno_enum.c \
 -                       src/org/apache/hadoop/io/nativeio/NativeIO.c
--
-+                       src/org/apache/hadoop/io/compress/zlib/ZlibDecompressor.c 
- libhadoop_la_LDFLAGS = -version-info 1:0:0
++                       src/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.c
+ 
+ libhadoop_la_LDFLAGS = -version-info 1:0:0 $(AM_LDFLAGS)
 -libhadoop_la_LIBADD = -ldl -ljvm
 +libhadoop_la_LIBADD = -ljvm
  all: config.h
  	$(MAKE) $(AM_MAKEFLAGS) all-am
  
-@@ -332,14 +320,8 @@
+@@ -341,16 +330,10 @@
  distclean-compile:
  	-rm -f *.tab.c
  
 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/JniBasedUnixGroupsMapping.Plo@am__quote@
 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/JniBasedUnixGroupsNetgroupMapping.Plo@am__quote@
 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NativeIO.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SnappyCompressor.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SnappyDecompressor.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ZlibCompressor.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ZlibDecompressor.Plo@am__quote@
 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/errno_enum.Plo@am__quote@
@@ -55,9 +59,9 @@
  
  .c.o:
  @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@@ -376,47 +358,6 @@
+@@ -401,47 +384,6 @@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ZlibDecompressor.lo `test -f 'src/org/apache/hadoop/io/compress/zlib/ZlibDecompressor.c' || echo '$(srcdir)/'`src/org/apache/hadoop/io/compress/zlib/ZlibDecompressor.c
+ @am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o SnappyDecompressor.lo `test -f 'src/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.c' || echo '$(srcdir)/'`src/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.c
  
 -getGroup.lo: src/org/apache/hadoop/security/getGroup.c
 -@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getGroup.lo -MD -MP -MF "$(DEPDIR)/getGroup.Tpo" -c -o getGroup.lo `test -f 'src/org/apache/hadoop/security/getGroup.c' || echo '$(srcdir)/'`src/org/apache/hadoop/security/getGroup.c; \
diff --git a/devel/hadoop/files/patch-src__native__configure.ac b/devel/hadoop/files/patch-src__native__configure.ac
deleted file mode 100644
index 91561671f959..000000000000
--- a/devel/hadoop/files/patch-src__native__configure.ac
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/native/configure.ac.orig	2011-05-04 08:30:16.000000000 +0200
-+++ src/native/configure.ac	2011-08-07 16:17:58.000000000 +0200
-@@ -46,10 +46,6 @@
- AC_PROG_CC
- AC_PROG_LIBTOOL
- 
--# Checks for libraries.
--dnl Check for '-ldl'
--AC_CHECK_LIB([dl], [dlopen])
--
- dnl Check for '-ljvm'
- JNI_LDFLAGS=""
- if test $JAVA_HOME != ""
diff --git a/devel/hadoop/files/patch-src__native__src__org__apache__hadoop__io__nativeio__NativeIO.c b/devel/hadoop/files/patch-src__native__src__org__apache__hadoop__io__nativeio__NativeIO.c
deleted file mode 100644
index 20ae853ee768..000000000000
--- a/devel/hadoop/files/patch-src__native__src__org__apache__hadoop__io__nativeio__NativeIO.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/native/src/org/apache/hadoop/io/nativeio/NativeIO.c.orig	2011-08-10 13:43:50.000000000 +0200
-+++ src/native/src/org/apache/hadoop/io/nativeio/NativeIO.c	2011-08-10 13:44:32.000000000 +0200
-@@ -188,7 +188,7 @@
-   if (flags & O_CREAT) {
-     fd = open(path, flags, mode);
-   } else {
--    fd = open(path, flags);
-+    fd = open(path, flags | O_CREAT);
-   }
- 
-   if (fd == -1) {
diff --git a/devel/hadoop/files/patch-src__native__src__org__apache__hadoop__security__JniBasedUnixGroupsNetgroupMapping.c b/devel/hadoop/files/patch-src__native__src__org__apache__hadoop__security__JniBasedUnixGroupsNetgroupMapping.c
index d8881f76bb33..8b323c4377b4 100644
--- a/devel/hadoop/files/patch-src__native__src__org__apache__hadoop__security__JniBasedUnixGroupsNetgroupMapping.c
+++ b/devel/hadoop/files/patch-src__native__src__org__apache__hadoop__security__JniBasedUnixGroupsNetgroupMapping.c
@@ -1,12 +1,11 @@
 --- src/native/src/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.c.orig	2011-08-07 16:43:00.000000000 +0200
 +++ src/native/src/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.c	2011-08-07 16:43:30.000000000 +0200
-@@ -73,7 +73,8 @@
+@@ -73,7 +73,7 @@
    // was successfull or not (as long as it was called we need to call
    // endnetgrent)
    setnetgrentCalledFlag = 1;
 -  if(setnetgrent(cgroup) == 1) {
-+  setnetgrent(cgroup);
-+  if(1 == 1) {
++  if(setnetgrent(cgroup) >= 1) {
      UserList *current = NULL;
      // three pointers are for host, user, domain, we only care
      // about user now
diff --git a/devel/hadoop/files/pkg-deinstall.in b/devel/hadoop/files/pkg-deinstall.in
deleted file mode 100644
index e42856245c9f..000000000000
--- a/devel/hadoop/files/pkg-deinstall.in
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-PATH="/bin:/sbin:/usr/bin:/usr/sbin"
-
-RUNDIR=%%HADOOP_RUNDIR%%
-LOGDIR=%%HADOOP_LOGDIR%%
-
-if [ "$2" = "POST-DEINSTALL" ]; then
-	echo "=> Deleting ${RUNDIR} if empty..."
-	rm -d ${RUNDIR}  2>/dev/null || true
-	echo "=> Deleting ${LOGDIR} if empty..."
-	rm -d ${LOGDIR} 2>/dev/null || true
-fi
diff --git a/devel/hadoop/files/pkg-install.in b/devel/hadoop/files/pkg-install.in
deleted file mode 100644
index 7d0b09b046c3..000000000000
--- a/devel/hadoop/files/pkg-install.in
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-PATH="/bin:/sbin:/usr/bin:/usr/sbin"
-
-HADOOP_USER=%%HADOOP_USER%%
-HADOOP_GROUP=%%HADOOP_GROUP%%
-UID=%%HADOOP_UID%%
-GID=%%HADOOP_GID%%
-
-RUNDIR=%%HADOOP_RUNDIR%%
-LOGDIR=%%HADOOP_LOGDIR%%
-
-PW="pw"
-CHOWN="chown"
-INSTALL_DIR="install -d -o ${HADOOP_USER} -g ${HADOOP_GROUP} -m 0755"
-
-if [ "$2" = "PRE-INSTALL" ]; then
-
-#	if ! ${PW} groupshow ${HADOOP_GROUP} 2>/dev/null 1>&2; then
-#		if ${PW} groupadd ${HADOOP_GROUP} -g $GID; then
-#			echo "=> Added group \"${HADOOP_GROUP}\"."
-#		else
-#			echo "=> Adding group \"${HADOOP_GROUP}\" failed..."
-#			exit 1
-#		fi
-#	fi
-
-#	if ! ${PW} usershow ${HADOOP_USER} 2>/dev/null 1>&2; then
-#		if ${PW} useradd ${HADOOP_USER} -u $UID -g ${HADOOP_GROUP} -h - \
-#			-s "/sbin/nologin" -d "/nonexistent" \
-#           -c "Hadoop Daemons"; then
-#			echo "=> Added user \"${HADOOP_USER}\"."
-#		else
-#			echo "=> Adding user \"${HADOOP_USER}\" failed..."
-#			exit 1
-#		fi
-#	fi
-        sleep 1
-
-elif [ "$2" = "POST-INSTALL" ]; then
-	if [ -d ${RUNDIR} ]; then
-		echo "=> ${RUNDIR} already exists."
-	else
-		echo -n "=> Creating RUNDIR ${RUNDIR}... "
-		${INSTALL_DIR} ${RUNDIR} || echo "failed"
-	fi
-	if [ -d ${LOGDIR} ]; then
-		echo "=> ${LOGDIR} already exists."
-	else
-		echo -n "=> Creating LOGDIR ${LOGDIR}... "
-		${INSTALL_DIR} ${LOGDIR} || echo "failed"
-	fi
-fi
-
-exit 0
diff --git a/devel/hadoop/files/secondarynamenode.in b/devel/hadoop/files/secondarynamenode.in
index fa58dd346017..77661b8701ce 100644
--- a/devel/hadoop/files/secondarynamenode.in
+++ b/devel/hadoop/files/secondarynamenode.in
@@ -31,7 +31,7 @@ load_rc_config "${name}"
 : ${secondarynamenode_user:=%%HADOOP_USER%%}
 : ${secondarynamenode_group:=%%HADOOP_GROUP%%}
 
-command="%%HADOOP_HOME%%/bin/hadoop-daemon.sh"
+command="%%DATADIR%%/bin/hadoop-daemon.sh"
 command_args='--config ${HADOOP_CONF_DIR} start secondarynamenode'
 
 start_precmd=secondarynamenode_init
@@ -46,7 +46,7 @@ secondarynamenode_init()
 		export JAVA_HOME="${secondarynamenode_java_home}"
 	fi
 
-	for f in %%HADOOP_ETC%%/envvars.d/*.env
+	for f in %%ETCDIR%%/envvars.d/*.env
 	do
 		. ${f}
 	done
diff --git a/devel/hadoop/files/tasktracker.in b/devel/hadoop/files/tasktracker.in
index 6d97a049f361..9de90fec3db6 100644
--- a/devel/hadoop/files/tasktracker.in
+++ b/devel/hadoop/files/tasktracker.in
@@ -31,7 +31,7 @@ load_rc_config "${name}"
 : ${tasktracker_user:=%%HADOOP_USER%%}
 : ${tasktracker_group:=%%HADOOP_GROUP%%}
 
-command="%%HADOOP_HOME%%/bin/hadoop-daemon.sh"
+command="%%DATADIR%%/bin/hadoop-daemon.sh"
 command_args='--config ${HADOOP_CONF_DIR} start tasktracker'
 
 start_precmd=tasktracker_init
@@ -46,7 +46,7 @@ tasktracker_init()
 		export JAVA_HOME="${tasktracker_java_home}"
 	fi
 
-	for f in %%HADOOP_ETC%%/envvars.d/*.env
+	for f in %%ETCDIR%%/envvars.d/*.env
 	do
 		. ${f}
 	done
diff --git a/devel/hadoop/pkg-plist b/devel/hadoop/pkg-plist
index bf4079f1a338..2717fc1590be 100644
--- a/devel/hadoop/pkg-plist
+++ b/devel/hadoop/pkg-plist
@@ -1,346 +1,364 @@
 bin/hadoop
-%%HADOOP_ETC%%/envvars.d/000.java_home.env
-%%HADOOP_ETC%%/envvars.d/001.hadoop_home.env
-%%HADOOP_ETC%%/envvars.d/002.hadoop_conf.env
-%%HADOOP_ETC%%/envvars.d/003.hadoop_log.env
-%%HADOOP_ETC%%/envvars.d/004.hadoop_run.env
-%%HADOOP_HOME%%/bin/hadoop
-%%HADOOP_HOME%%/bin/hadoop-config.sh
-%%HADOOP_HOME%%/bin/hadoop-daemon.sh
-%%HADOOP_HOME%%/bin/hadoop-daemons.sh
-%%HADOOP_HOME%%/bin/rcc
-%%HADOOP_HOME%%/bin/slaves.sh
-%%HADOOP_HOME%%/bin/start-all.sh
-%%HADOOP_HOME%%/bin/start-balancer.sh
-%%HADOOP_HOME%%/bin/start-dfs.sh
-%%HADOOP_HOME%%/bin/start-jobhistoryserver.sh
-%%HADOOP_HOME%%/bin/start-mapred.sh
-%%HADOOP_HOME%%/bin/stop-all.sh
-%%HADOOP_HOME%%/bin/stop-balancer.sh
-%%HADOOP_HOME%%/bin/stop-dfs.sh
-%%HADOOP_HOME%%/bin/stop-jobhistoryserver.sh
-%%HADOOP_HOME%%/bin/stop-mapred.sh
-%%HADOOP_HOME%%/bin/task-controller
-%%HADOOP_HOME%%/lib/hadoop-capacity-scheduler-%%PORTVERSION%%.jar
-%%HADOOP_HOME%%/contrib/datajoin/hadoop-datajoin-%%PORTVERSION%%.jar
-%%HADOOP_HOME%%/contrib/failmon/hadoop-failmon-%%PORTVERSION%%.jar
-%%HADOOP_HOME%%/lib/hadoop-fairscheduler-%%PORTVERSION%%.jar
-%%HADOOP_HOME%%/contrib/gridmix/hadoop-gridmix-%%PORTVERSION%%.jar
-%%HADOOP_HOME%%/contrib/hdfsproxy/bin/hdfsproxy
-%%HADOOP_HOME%%/contrib/hdfsproxy/bin/hdfsproxy-config.sh
-%%HADOOP_HOME%%/contrib/hdfsproxy/bin/hdfsproxy-daemon.sh
-%%HADOOP_HOME%%/contrib/hdfsproxy/bin/hdfsproxy-daemons.sh
-%%HADOOP_HOME%%/contrib/hdfsproxy/bin/hdfsproxy-slaves.sh
-%%HADOOP_HOME%%/contrib/hdfsproxy/bin/start-hdfsproxy.sh
-%%HADOOP_HOME%%/contrib/hdfsproxy/bin/stop-hdfsproxy.sh
-%%HADOOP_HOME%%/contrib/hdfsproxy/conf/configuration.xsl
-%%HADOOP_HOME%%/contrib/hdfsproxy/conf/hdfsproxy-default.xml
-%%HADOOP_HOME%%/contrib/hdfsproxy/conf/hdfsproxy-env.sh
-%%HADOOP_HOME%%/contrib/hdfsproxy/conf/hdfsproxy-env.sh.template
-%%HADOOP_HOME%%/contrib/hdfsproxy/conf/hdfsproxy-hosts
-%%HADOOP_HOME%%/contrib/hdfsproxy/conf/log4j.properties
-%%HADOOP_HOME%%/contrib/hdfsproxy/conf/ssl-server.xml
-%%HADOOP_HOME%%/contrib/hdfsproxy/conf/tomcat-forward-web.xml
-%%HADOOP_HOME%%/contrib/hdfsproxy/conf/tomcat-web.xml
-%%HADOOP_HOME%%/contrib/hdfsproxy/conf/user-certs.xml
-%%HADOOP_HOME%%/contrib/hdfsproxy/conf/user-permissions.xml
-%%HADOOP_HOME%%/contrib/hdfsproxy/README
-%%HADOOP_HOME%%/contrib/hdfsproxy/build.xml
-%%HADOOP_HOME%%/contrib/hdfsproxy/hdfsproxy-2.0.jar
-%%HADOOP_HOME%%/contrib/hod/bin/VERSION
-%%HADOOP_HOME%%/contrib/hod/bin/checknodes
-%%HADOOP_HOME%%/contrib/hod/bin/hod
-%%HADOOP_HOME%%/contrib/hod/bin/hodcleanup
-%%HADOOP_HOME%%/contrib/hod/bin/hodring
-%%HADOOP_HOME%%/contrib/hod/bin/ringmaster
-%%HADOOP_HOME%%/contrib/hod/bin/verify-account
-%%HADOOP_HOME%%/contrib/hod/conf/hodrc
-%%HADOOP_HOME%%/contrib/hod/hodlib/AllocationManagers/__init__.py
-%%HADOOP_HOME%%/contrib/hod/hodlib/AllocationManagers/goldAllocationManager.py
-%%HADOOP_HOME%%/contrib/hod/hodlib/Common/__init__.py
-%%HADOOP_HOME%%/contrib/hod/hodlib/Common/allocationManagerUtil.py
-%%HADOOP_HOME%%/contrib/hod/hodlib/Common/desc.py
-%%HADOOP_HOME%%/contrib/hod/hodlib/Common/descGenerator.py
-%%HADOOP_HOME%%/contrib/hod/hodlib/Common/hodsvc.py
-%%HADOOP_HOME%%/contrib/hod/hodlib/Common/logger.py
-%%HADOOP_HOME%%/contrib/hod/hodlib/Common/miniHTMLParser.py
-%%HADOOP_HOME%%/contrib/hod/hodlib/Common/nodepoolutil.py
-%%HADOOP_HOME%%/contrib/hod/hodlib/Common/setup.py
-%%HADOOP_HOME%%/contrib/hod/hodlib/Common/socketServers.py
-%%HADOOP_HOME%%/contrib/hod/hodlib/Common/tcp.py
-%%HADOOP_HOME%%/contrib/hod/hodlib/Common/threads.py
-%%HADOOP_HOME%%/contrib/hod/hodlib/Common/types.py
-%%HADOOP_HOME%%/contrib/hod/hodlib/Common/util.py
-%%HADOOP_HOME%%/contrib/hod/hodlib/Common/xmlrpc.py
-%%HADOOP_HOME%%/contrib/hod/hodlib/GridServices/__init__.py
-%%HADOOP_HOME%%/contrib/hod/hodlib/GridServices/hdfs.py
-%%HADOOP_HOME%%/contrib/hod/hodlib/GridServices/mapred.py
-%%HADOOP_HOME%%/contrib/hod/hodlib/GridServices/service.py
-%%HADOOP_HOME%%/contrib/hod/hodlib/Hod/__init__.py
-%%HADOOP_HOME%%/contrib/hod/hodlib/Hod/hadoop.py
-%%HADOOP_HOME%%/contrib/hod/hodlib/Hod/hod.py
-%%HADOOP_HOME%%/contrib/hod/hodlib/Hod/nodePool.py
-%%HADOOP_HOME%%/contrib/hod/hodlib/HodRing/__init__.py
-%%HADOOP_HOME%%/contrib/hod/hodlib/HodRing/hodRing.py
-%%HADOOP_HOME%%/contrib/hod/hodlib/NodePools/__init__.py
-%%HADOOP_HOME%%/contrib/hod/hodlib/NodePools/torque.py
-%%HADOOP_HOME%%/contrib/hod/hodlib/RingMaster/__init__.py
-%%HADOOP_HOME%%/contrib/hod/hodlib/RingMaster/idleJobTracker.py
-%%HADOOP_HOME%%/contrib/hod/hodlib/RingMaster/ringMaster.py
-%%HADOOP_HOME%%/contrib/hod/hodlib/Schedulers/__init__.py
-%%HADOOP_HOME%%/contrib/hod/hodlib/Schedulers/torque.py
-%%HADOOP_HOME%%/contrib/hod/hodlib/ServiceProxy/__init__.py
-%%HADOOP_HOME%%/contrib/hod/hodlib/ServiceProxy/serviceProxy.py
-%%HADOOP_HOME%%/contrib/hod/hodlib/ServiceRegistry/__init__.py
-%%HADOOP_HOME%%/contrib/hod/hodlib/ServiceRegistry/serviceRegistry.py
-%%HADOOP_HOME%%/contrib/hod/hodlib/__init__.py
-%%HADOOP_HOME%%/contrib/hod/ivy/libraries.properties
-%%HADOOP_HOME%%/contrib/hod/support/checklimits.sh
-%%HADOOP_HOME%%/contrib/hod/support/logcondense.py
-%%HADOOP_HOME%%/contrib/hod/testing/__init__.py
-%%HADOOP_HOME%%/contrib/hod/testing/helper.py
-%%HADOOP_HOME%%/contrib/hod/testing/lib.py
-%%HADOOP_HOME%%/contrib/hod/testing/main.py
-%%HADOOP_HOME%%/contrib/hod/testing/testHadoop.py
-%%HADOOP_HOME%%/contrib/hod/testing/testHod.py
-%%HADOOP_HOME%%/contrib/hod/testing/testHodCleanup.py
-%%HADOOP_HOME%%/contrib/hod/testing/testHodRing.py
-%%HADOOP_HOME%%/contrib/hod/testing/testModule.py
-%%HADOOP_HOME%%/contrib/hod/testing/testRingmasterRPCs.py
-%%HADOOP_HOME%%/contrib/hod/testing/testThreads.py
-%%HADOOP_HOME%%/contrib/hod/testing/testTypes.py
-%%HADOOP_HOME%%/contrib/hod/testing/testUtil.py
-%%HADOOP_HOME%%/contrib/hod/testing/testXmlrpc.py
-%%HADOOP_HOME%%/contrib/hod/CHANGES.txt
-%%HADOOP_HOME%%/contrib/hod/README
-%%HADOOP_HOME%%/contrib/hod/build.xml
-%%HADOOP_HOME%%/contrib/hod/config.txt
-%%HADOOP_HOME%%/contrib/hod/getting_started.txt
-%%HADOOP_HOME%%/contrib/hod/ivy.xml
-%%HADOOP_HOME%%/contrib/index/hadoop-index-%%PORTVERSION%%.jar
-%%HADOOP_HOME%%/contrib/streaming/hadoop-streaming-%%PORTVERSION%%.jar
-%%HADOOP_HOME%%/lib/hadoop-thriftfs-%%PORTVERSION%%.jar
-%%HADOOP_HOME%%/contrib/vaidya/bin/vaidya.sh
-%%HADOOP_HOME%%/contrib/vaidya/conf/postex_diagnosis_tests.xml
-%%HADOOP_HOME%%/contrib/vaidya/hadoop-vaidya-%%PORTVERSION%%.jar
-%%HADOOP_HOME%%/hadoop-ant-%%PORTVERSION%%.jar
-%%HADOOP_HOME%%/hadoop-core-%%PORTVERSION%%.jar
-%%HADOOP_HOME%%/hadoop-test-%%PORTVERSION%%.jar
-%%HADOOP_HOME%%/hadoop-tools-%%PORTVERSION%%.jar
-%%HADOOP_HOME%%/lib/jdiff/hadoop_0.17.0.xml
-%%HADOOP_HOME%%/lib/jdiff/hadoop_0.18.1.xml
-%%HADOOP_HOME%%/lib/jdiff/hadoop_0.18.2.xml
-%%HADOOP_HOME%%/lib/jdiff/hadoop_0.18.3.xml
-%%HADOOP_HOME%%/lib/jdiff/hadoop_0.19.0.xml
-%%HADOOP_HOME%%/lib/jdiff/hadoop_0.19.1.xml
-%%HADOOP_HOME%%/lib/jdiff/hadoop_0.19.2.xml
-%%HADOOP_HOME%%/lib/jdiff/hadoop_0.20.1.xml
-%%HADOOP_HOME%%/lib/jdiff/hadoop_0.20.205.0.xml
-%%HADOOP_HOME%%/lib/jdiff/hadoop_%%PORTVERSION%%.xml
-%%HADOOP_HOME%%/lib/jsp-2.1/jsp-2.1.jar
-%%HADOOP_HOME%%/lib/jsp-2.1/jsp-api-2.1.jar
-%%HADOOP_HOME%%/lib/native/Linux-amd64-64/libhadoop.a
-%%HADOOP_HOME%%/lib/native/Linux-amd64-64/libhadoop.la
-%%HADOOP_HOME%%/lib/native/Linux-amd64-64/libhadoop.so
-%%HADOOP_HOME%%/lib/native/Linux-amd64-64/libhadoop.so.1
-%%HADOOP_HOME%%/lib/native/Linux-amd64-64/libhadoop.so.1.0.0
-%%HADOOP_HOME%%/lib/native/Linux-i386-32/libhadoop.a
-%%HADOOP_HOME%%/lib/native/Linux-i386-32/libhadoop.la
-%%HADOOP_HOME%%/lib/native/Linux-i386-32/libhadoop.so
-%%HADOOP_HOME%%/lib/native/Linux-i386-32/libhadoop.so.1
-%%HADOOP_HOME%%/lib/native/Linux-i386-32/libhadoop.so.1.0.0
-%%HADOOP_HOME%%/lib/native/%%HADOOP_ARCH%%/libhadoop.a
-%%HADOOP_HOME%%/lib/native/%%HADOOP_ARCH%%/libhadoop.la
-%%HADOOP_HOME%%/lib/native/%%HADOOP_ARCH%%/libhadoop.so
-%%HADOOP_HOME%%/lib/native/%%HADOOP_ARCH%%/libhadoop.so.1
-%%HADOOP_HOME%%/lib/asm-3.2.jar
-%%HADOOP_HOME%%/lib/aspectjrt-1.6.5.jar
-%%HADOOP_HOME%%/lib/aspectjtools-1.6.5.jar
-%%HADOOP_HOME%%/lib/commons-beanutils-1.7.0.jar
-%%HADOOP_HOME%%/lib/commons-beanutils-core-1.8.0.jar
-%%HADOOP_HOME%%/lib/commons-cli-1.2.jar
-%%HADOOP_HOME%%/lib/commons-codec-1.4.jar
-%%HADOOP_HOME%%/lib/commons-collections-3.2.1.jar
-%%HADOOP_HOME%%/lib/commons-configuration-1.6.jar
-%%HADOOP_HOME%%/lib/commons-daemon-1.0.1.jar
-%%HADOOP_HOME%%/lib/commons-digester-1.8.jar
-%%HADOOP_HOME%%/lib/commons-el-1.0.jar
-%%HADOOP_HOME%%/lib/commons-httpclient-3.0.1.jar
-%%HADOOP_HOME%%/lib/commons-lang-2.4.jar
-%%HADOOP_HOME%%/lib/commons-logging-1.1.1.jar
-%%HADOOP_HOME%%/lib/commons-logging-api-1.0.4.jar
-%%HADOOP_HOME%%/lib/commons-math-2.1.jar
-%%HADOOP_HOME%%/lib/commons-net-1.4.1.jar
-%%HADOOP_HOME%%/lib/core-3.1.1.jar
-%%HADOOP_HOME%%/lib/hsqldb-1.8.0.10.LICENSE.txt
-%%HADOOP_HOME%%/lib/hsqldb-1.8.0.10.jar
-%%HADOOP_HOME%%/lib/jackson-core-asl-1.0.1.jar
-%%HADOOP_HOME%%/lib/jackson-mapper-asl-1.0.1.jar
-%%HADOOP_HOME%%/lib/jasper-compiler-5.5.12.jar
-%%HADOOP_HOME%%/lib/jasper-runtime-5.5.12.jar
-%%HADOOP_HOME%%/lib/jdeb-0.8.jar
-%%HADOOP_HOME%%/lib/jersey-core-1.8.jar
-%%HADOOP_HOME%%/lib/jersey-json-1.8.jar
-%%HADOOP_HOME%%/lib/jersey-server-1.8.jar
-%%HADOOP_HOME%%/lib/jets3t-0.6.1.jar
-%%HADOOP_HOME%%/lib/jetty-6.1.26.jar
-%%HADOOP_HOME%%/lib/jetty-util-6.1.26.jar
-%%HADOOP_HOME%%/lib/jsch-0.1.42.jar
-%%HADOOP_HOME%%/lib/junit-4.5.jar
-%%HADOOP_HOME%%/lib/kfs-0.2.2.jar
-%%HADOOP_HOME%%/lib/kfs-0.2.LICENSE.txt
-%%HADOOP_HOME%%/lib/log4j-1.2.15.jar
-%%HADOOP_HOME%%/lib/mockito-all-1.8.5.jar
-%%HADOOP_HOME%%/lib/oro-2.0.8.jar
-%%HADOOP_HOME%%/lib/servlet-api-2.5-20081211.jar
-%%HADOOP_HOME%%/lib/slf4j-api-1.4.3.jar
-%%HADOOP_HOME%%/lib/slf4j-log4j12-1.4.3.jar
-%%HADOOP_HOME%%/lib/xmlenc-0.52.jar
-%%HADOOP_HOME%%/webapps/task/index.html
-%%HADOOP_HOME%%/webapps/task/WEB-INF/web.xml
-%%HADOOP_HOME%%/webapps/static/sorttable.js
-%%HADOOP_HOME%%/webapps/static/jobtracker.js
-%%HADOOP_HOME%%/webapps/static/jobconf.xsl
-%%HADOOP_HOME%%/webapps/static/hadoop.css
-%%HADOOP_HOME%%/webapps/static/hadoop-logo.jpg
-%%HADOOP_HOME%%/webapps/job/taskstatshistory.jsp
-%%HADOOP_HOME%%/webapps/job/taskstats.jsp
-%%HADOOP_HOME%%/webapps/job/taskdetailshistory.jsp
-%%HADOOP_HOME%%/webapps/job/taskdetails.jsp
-%%HADOOP_HOME%%/webapps/job/machines.jsp
-%%HADOOP_HOME%%/webapps/job/loadhistory.jsp
-%%HADOOP_HOME%%/webapps/job/legacyjobhistory.jsp
-%%HADOOP_HOME%%/webapps/job/jobtracker.jsp
-%%HADOOP_HOME%%/webapps/job/jobtaskshistory.jsp
-%%HADOOP_HOME%%/webapps/job/jobtasks.jsp
-%%HADOOP_HOME%%/webapps/job/jobqueue_details.jsp
-%%HADOOP_HOME%%/webapps/job/jobhistoryhome.jsp
-%%HADOOP_HOME%%/webapps/job/jobhistory.jsp
-%%HADOOP_HOME%%/webapps/job/jobfailures.jsp
-%%HADOOP_HOME%%/webapps/job/jobdetailshistory.jsp
-%%HADOOP_HOME%%/webapps/job/jobdetails.jsp
-%%HADOOP_HOME%%/webapps/job/jobconf_history.jsp
-%%HADOOP_HOME%%/webapps/job/jobconf.jsp
-%%HADOOP_HOME%%/webapps/job/jobblacklistedtrackers.jsp
-%%HADOOP_HOME%%/webapps/job/job_authorization_error.jsp
-%%HADOOP_HOME%%/webapps/job/index.html
-%%HADOOP_HOME%%/webapps/job/gethistory.jsp
-%%HADOOP_HOME%%/webapps/job/analysejobhistory.jsp
-%%HADOOP_HOME%%/webapps/job/WEB-INF/web.xml
-%%HADOOP_HOME%%/webapps/history/WEB-INF/web.xml
-%%HADOOP_HOME%%/webapps/hdfs/index.html
-%%HADOOP_HOME%%/webapps/hdfs/WEB-INF/web.xml
-%%HADOOP_HOME%%/webapps/datanode/WEB-INF/web.xml
+%%ETCDIR%%/envvars.d/000.java_home.env
+%%ETCDIR%%/envvars.d/001.hadoop_home.env
+%%ETCDIR%%/envvars.d/002.hadoop_conf.env
+%%ETCDIR%%/envvars.d/003.hadoop_log.env
+%%ETCDIR%%/envvars.d/004.hadoop_run.env
+%%DATADIR%%/bin/hadoop
+%%DATADIR%%/bin/hadoop-config.sh
+%%DATADIR%%/bin/hadoop-daemon.sh
+%%DATADIR%%/bin/hadoop-daemons.sh
+%%DATADIR%%/bin/rcc
+%%DATADIR%%/bin/slaves.sh
+%%DATADIR%%/bin/start-all.sh
+%%DATADIR%%/bin/start-balancer.sh
+%%DATADIR%%/bin/start-dfs.sh
+%%DATADIR%%/bin/start-jobhistoryserver.sh
+%%DATADIR%%/bin/start-mapred.sh
+%%DATADIR%%/bin/stop-all.sh
+%%DATADIR%%/bin/stop-balancer.sh
+%%DATADIR%%/bin/stop-dfs.sh
+%%DATADIR%%/bin/stop-jobhistoryserver.sh
+%%DATADIR%%/bin/stop-mapred.sh
+%%DATADIR%%/bin/task-controller
+%%DATADIR%%/lib/hadoop-capacity-scheduler-%%PORTVERSION%%.jar
+%%DATADIR%%/contrib/datajoin/hadoop-datajoin-%%PORTVERSION%%.jar
+%%DATADIR%%/contrib/failmon/hadoop-failmon-%%PORTVERSION%%.jar
+%%DATADIR%%/lib/hadoop-fairscheduler-%%PORTVERSION%%.jar
+%%DATADIR%%/contrib/gridmix/hadoop-gridmix-%%PORTVERSION%%.jar
+%%DATADIR%%/contrib/hdfsproxy/bin/hdfsproxy
+%%DATADIR%%/contrib/hdfsproxy/bin/hdfsproxy-config.sh
+%%DATADIR%%/contrib/hdfsproxy/bin/hdfsproxy-daemon.sh
+%%DATADIR%%/contrib/hdfsproxy/bin/hdfsproxy-daemons.sh
+%%DATADIR%%/contrib/hdfsproxy/bin/hdfsproxy-slaves.sh
+%%DATADIR%%/contrib/hdfsproxy/bin/start-hdfsproxy.sh
+%%DATADIR%%/contrib/hdfsproxy/bin/stop-hdfsproxy.sh
+%%DATADIR%%/contrib/hdfsproxy/conf/configuration.xsl
+%%DATADIR%%/contrib/hdfsproxy/conf/hdfsproxy-default.xml
+%%DATADIR%%/contrib/hdfsproxy/conf/hdfsproxy-env.sh
+%%DATADIR%%/contrib/hdfsproxy/conf/hdfsproxy-env.sh.template
+%%DATADIR%%/contrib/hdfsproxy/conf/hdfsproxy-hosts
+%%DATADIR%%/contrib/hdfsproxy/conf/log4j.properties
+%%DATADIR%%/contrib/hdfsproxy/conf/ssl-server.xml
+%%DATADIR%%/contrib/hdfsproxy/conf/tomcat-forward-web.xml
+%%DATADIR%%/contrib/hdfsproxy/conf/tomcat-web.xml
+%%DATADIR%%/contrib/hdfsproxy/conf/user-certs.xml
+%%DATADIR%%/contrib/hdfsproxy/conf/user-permissions.xml
+%%DATADIR%%/contrib/hdfsproxy/README
+%%DATADIR%%/contrib/hdfsproxy/build.xml
+%%DATADIR%%/contrib/hdfsproxy/hdfsproxy-2.0.jar
+%%DATADIR%%/contrib/hod/bin/VERSION
+%%DATADIR%%/contrib/hod/bin/checknodes
+%%DATADIR%%/contrib/hod/bin/hod
+%%DATADIR%%/contrib/hod/bin/hodcleanup
+%%DATADIR%%/contrib/hod/bin/hodring
+%%DATADIR%%/contrib/hod/bin/ringmaster
+%%DATADIR%%/contrib/hod/bin/verify-account
+%%DATADIR%%/contrib/hod/conf/hodrc
+%%DATADIR%%/contrib/hod/hodlib/AllocationManagers/__init__.py
+%%DATADIR%%/contrib/hod/hodlib/AllocationManagers/goldAllocationManager.py
+%%DATADIR%%/contrib/hod/hodlib/Common/__init__.py
+%%DATADIR%%/contrib/hod/hodlib/Common/allocationManagerUtil.py
+%%DATADIR%%/contrib/hod/hodlib/Common/desc.py
+%%DATADIR%%/contrib/hod/hodlib/Common/descGenerator.py
+%%DATADIR%%/contrib/hod/hodlib/Common/hodsvc.py
+%%DATADIR%%/contrib/hod/hodlib/Common/logger.py
+%%DATADIR%%/contrib/hod/hodlib/Common/miniHTMLParser.py
+%%DATADIR%%/contrib/hod/hodlib/Common/nodepoolutil.py
+%%DATADIR%%/contrib/hod/hodlib/Common/setup.py
+%%DATADIR%%/contrib/hod/hodlib/Common/socketServers.py
+%%DATADIR%%/contrib/hod/hodlib/Common/tcp.py
+%%DATADIR%%/contrib/hod/hodlib/Common/threads.py
+%%DATADIR%%/contrib/hod/hodlib/Common/types.py
+%%DATADIR%%/contrib/hod/hodlib/Common/util.py
+%%DATADIR%%/contrib/hod/hodlib/Common/xmlrpc.py
+%%DATADIR%%/contrib/hod/hodlib/GridServices/__init__.py
+%%DATADIR%%/contrib/hod/hodlib/GridServices/hdfs.py
+%%DATADIR%%/contrib/hod/hodlib/GridServices/mapred.py
+%%DATADIR%%/contrib/hod/hodlib/GridServices/service.py
+%%DATADIR%%/contrib/hod/hodlib/Hod/__init__.py
+%%DATADIR%%/contrib/hod/hodlib/Hod/hadoop.py
+%%DATADIR%%/contrib/hod/hodlib/Hod/hod.py
+%%DATADIR%%/contrib/hod/hodlib/Hod/nodePool.py
+%%DATADIR%%/contrib/hod/hodlib/HodRing/__init__.py
+%%DATADIR%%/contrib/hod/hodlib/HodRing/hodRing.py
+%%DATADIR%%/contrib/hod/hodlib/NodePools/__init__.py
+%%DATADIR%%/contrib/hod/hodlib/NodePools/torque.py
+%%DATADIR%%/contrib/hod/hodlib/RingMaster/__init__.py
+%%DATADIR%%/contrib/hod/hodlib/RingMaster/idleJobTracker.py
+%%DATADIR%%/contrib/hod/hodlib/RingMaster/ringMaster.py
+%%DATADIR%%/contrib/hod/hodlib/Schedulers/__init__.py
+%%DATADIR%%/contrib/hod/hodlib/Schedulers/torque.py
+%%DATADIR%%/contrib/hod/hodlib/ServiceProxy/__init__.py
+%%DATADIR%%/contrib/hod/hodlib/ServiceProxy/serviceProxy.py
+%%DATADIR%%/contrib/hod/hodlib/ServiceRegistry/__init__.py
+%%DATADIR%%/contrib/hod/hodlib/ServiceRegistry/serviceRegistry.py
+%%DATADIR%%/contrib/hod/hodlib/__init__.py
+%%DATADIR%%/contrib/hod/ivy/libraries.properties
+%%DATADIR%%/contrib/hod/support/checklimits.sh
+%%DATADIR%%/contrib/hod/support/logcondense.py
+%%DATADIR%%/contrib/hod/testing/__init__.py
+%%DATADIR%%/contrib/hod/testing/helper.py
+%%DATADIR%%/contrib/hod/testing/lib.py
+%%DATADIR%%/contrib/hod/testing/main.py
+%%DATADIR%%/contrib/hod/testing/testHadoop.py
+%%DATADIR%%/contrib/hod/testing/testHod.py
+%%DATADIR%%/contrib/hod/testing/testHodCleanup.py
+%%DATADIR%%/contrib/hod/testing/testHodRing.py
+%%DATADIR%%/contrib/hod/testing/testModule.py
+%%DATADIR%%/contrib/hod/testing/testRingmasterRPCs.py
+%%DATADIR%%/contrib/hod/testing/testThreads.py
+%%DATADIR%%/contrib/hod/testing/testTypes.py
+%%DATADIR%%/contrib/hod/testing/testUtil.py
+%%DATADIR%%/contrib/hod/testing/testXmlrpc.py
+%%DATADIR%%/contrib/hod/CHANGES.txt
+%%DATADIR%%/contrib/hod/README
+%%DATADIR%%/contrib/hod/build.xml
+%%DATADIR%%/contrib/hod/config.txt
+%%DATADIR%%/contrib/hod/getting_started.txt
+%%DATADIR%%/contrib/hod/ivy.xml
+%%DATADIR%%/contrib/index/hadoop-index-%%PORTVERSION%%.jar
+%%DATADIR%%/contrib/streaming/hadoop-streaming-%%PORTVERSION%%.jar
+%%DATADIR%%/lib/hadoop-thriftfs-%%PORTVERSION%%.jar
+%%DATADIR%%/contrib/vaidya/bin/vaidya.sh
+%%DATADIR%%/contrib/vaidya/conf/postex_diagnosis_tests.xml
+%%DATADIR%%/contrib/vaidya/hadoop-vaidya-%%PORTVERSION%%.jar
+%%DATADIR%%/hadoop-ant-%%PORTVERSION%%.jar
+%%DATADIR%%/hadoop-core-%%PORTVERSION%%.jar
+%%DATADIR%%/hadoop-test-%%PORTVERSION%%.jar
+%%DATADIR%%/hadoop-tools-%%PORTVERSION%%.jar
+%%DATADIR%%/lib/jdiff/hadoop_0.17.0.xml
+%%DATADIR%%/lib/jdiff/hadoop_0.18.1.xml
+%%DATADIR%%/lib/jdiff/hadoop_0.18.2.xml
+%%DATADIR%%/lib/jdiff/hadoop_0.18.3.xml
+%%DATADIR%%/lib/jdiff/hadoop_0.19.0.xml
+%%DATADIR%%/lib/jdiff/hadoop_0.19.1.xml
+%%DATADIR%%/lib/jdiff/hadoop_0.19.2.xml
+%%DATADIR%%/lib/jdiff/hadoop_0.20.1.xml
+%%DATADIR%%/lib/jdiff/hadoop_0.20.205.0.xml
+%%DATADIR%%/lib/jdiff/hadoop_1.0.0.xml
+%%DATADIR%%/lib/jdiff/hadoop_1.0.1.xml
+%%DATADIR%%/lib/jdiff/hadoop_1.0.2.xml
+%%DATADIR%%/lib/jdiff/hadoop_1.0.3.xml
+%%DATADIR%%/lib/jdiff/hadoop_1.0.4.xml
+%%DATADIR%%/lib/jdiff/hadoop_1.1.0.xml
+%%DATADIR%%/lib/jdiff/hadoop_1.1.1.xml
+%%DATADIR%%/lib/jdiff/hadoop_1.1.2.xml
+%%DATADIR%%/lib/jdiff/hadoop_1.2.0.xml
+%%DATADIR%%/lib/jdiff/hadoop_%%PORTVERSION%%.xml
+%%DATADIR%%/lib/jsp-2.1/jsp-2.1.jar
+%%DATADIR%%/lib/jsp-2.1/jsp-api-2.1.jar
+%%DATADIR%%/lib/native/Linux-amd64-64/libhadoop.a
+%%DATADIR%%/lib/native/Linux-amd64-64/libhadoop.la
+%%DATADIR%%/lib/native/Linux-amd64-64/libhadoop.so
+%%DATADIR%%/lib/native/Linux-amd64-64/libhadoop.so.1
+%%DATADIR%%/lib/native/Linux-amd64-64/libhadoop.so.1.0.0
+%%DATADIR%%/lib/native/Linux-i386-32/libhadoop.a
+%%DATADIR%%/lib/native/Linux-i386-32/libhadoop.la
+%%DATADIR%%/lib/native/Linux-i386-32/libhadoop.so
+%%DATADIR%%/lib/native/Linux-i386-32/libhadoop.so.1
+%%DATADIR%%/lib/native/Linux-i386-32/libhadoop.so.1.0.0
+%%DATADIR%%/lib/native/%%HADOOP_ARCH%%/libhadoop.a
+%%DATADIR%%/lib/native/%%HADOOP_ARCH%%/libhadoop.la
+%%DATADIR%%/lib/native/%%HADOOP_ARCH%%/libhadoop.so
+%%DATADIR%%/lib/native/%%HADOOP_ARCH%%/libhadoop.so.1
+%%DATADIR%%/lib/asm-3.2.jar
+%%DATADIR%%/lib/aspectjrt-1.6.11.jar
+%%DATADIR%%/lib/aspectjtools-1.6.11.jar
+%%DATADIR%%/lib/commons-beanutils-1.7.0.jar
+%%DATADIR%%/lib/commons-beanutils-core-1.8.0.jar
+%%DATADIR%%/lib/commons-cli-1.2.jar
+%%DATADIR%%/lib/commons-codec-1.4.jar
+%%DATADIR%%/lib/commons-collections-3.2.1.jar
+%%DATADIR%%/lib/commons-configuration-1.6.jar
+%%DATADIR%%/lib/commons-daemon-1.0.1.jar
+%%DATADIR%%/lib/commons-digester-1.8.jar
+%%DATADIR%%/lib/commons-el-1.0.jar
+%%DATADIR%%/lib/commons-httpclient-3.0.1.jar
+%%DATADIR%%/lib/commons-io-2.1.jar
+%%DATADIR%%/lib/commons-lang-2.4.jar
+%%DATADIR%%/lib/commons-logging-1.1.1.jar
+%%DATADIR%%/lib/commons-logging-api-1.0.4.jar
+%%DATADIR%%/lib/commons-math-2.1.jar
+%%DATADIR%%/lib/commons-net-3.1.jar
+%%DATADIR%%/lib/core-3.1.1.jar
+%%DATADIR%%/lib/hsqldb-1.8.0.10.LICENSE.txt
+%%DATADIR%%/lib/hsqldb-1.8.0.10.jar
+%%DATADIR%%/lib/jackson-core-asl-1.8.8.jar
+%%DATADIR%%/lib/jackson-mapper-asl-1.8.8.jar
+%%DATADIR%%/lib/jasper-compiler-5.5.12.jar
+%%DATADIR%%/lib/jasper-runtime-5.5.12.jar
+%%DATADIR%%/lib/jdeb-0.8.jar
+%%DATADIR%%/lib/jersey-core-1.8.jar
+%%DATADIR%%/lib/jersey-json-1.8.jar
+%%DATADIR%%/lib/jersey-server-1.8.jar
+%%DATADIR%%/lib/jets3t-0.6.1.jar
+%%DATADIR%%/lib/jetty-6.1.26.jar
+%%DATADIR%%/lib/jetty-util-6.1.26.jar
+%%DATADIR%%/lib/jsch-0.1.42.jar
+%%DATADIR%%/lib/junit-4.5.jar
+%%DATADIR%%/lib/kfs-0.2.2.jar
+%%DATADIR%%/lib/kfs-0.2.LICENSE.txt
+%%DATADIR%%/lib/log4j-1.2.15.jar
+%%DATADIR%%/lib/mockito-all-1.8.5.jar
+%%DATADIR%%/lib/oro-2.0.8.jar
+%%DATADIR%%/lib/servlet-api-2.5-20081211.jar
+%%DATADIR%%/lib/slf4j-api-1.4.3.jar
+%%DATADIR%%/lib/slf4j-log4j12-1.4.3.jar
+%%DATADIR%%/lib/xmlenc-0.52.jar
+%%DATADIR%%/webapps/task/index.html
+%%DATADIR%%/webapps/task/WEB-INF/web.xml
+%%DATADIR%%/webapps/static/sorttable.js
+%%DATADIR%%/webapps/static/jobtracker.js
+%%DATADIR%%/webapps/static/jobconf.xsl
+%%DATADIR%%/webapps/static/hadoop.css
+%%DATADIR%%/webapps/static/hadoop-logo.jpg
+%%DATADIR%%/webapps/secondary/index.html
+%%DATADIR%%/webapps/secondary/WEB-INF/web.xml
+%%DATADIR%%/webapps/job/taskstatshistory.jsp
+%%DATADIR%%/webapps/job/taskstats.jsp
+%%DATADIR%%/webapps/job/taskdetailshistory.jsp
+%%DATADIR%%/webapps/job/taskdetails.jsp
+%%DATADIR%%/webapps/job/machines.jsp
+%%DATADIR%%/webapps/job/loadhistory.jsp
+%%DATADIR%%/webapps/job/legacyjobhistory.jsp
+%%DATADIR%%/webapps/job/jobtracker.jsp
+%%DATADIR%%/webapps/job/jobtaskshistory.jsp
+%%DATADIR%%/webapps/job/jobtasks.jsp
+%%DATADIR%%/webapps/job/jobqueue_details.jsp
+%%DATADIR%%/webapps/job/jobhistoryhome.jsp
+%%DATADIR%%/webapps/job/jobhistory.jsp
+%%DATADIR%%/webapps/job/jobfailures.jsp
+%%DATADIR%%/webapps/job/jobdetailshistory.jsp
+%%DATADIR%%/webapps/job/jobdetails.jsp
+%%DATADIR%%/webapps/job/jobconf_history.jsp
+%%DATADIR%%/webapps/job/jobconf.jsp
+%%DATADIR%%/webapps/job/jobblacklistedtrackers.jsp
+%%DATADIR%%/webapps/job/job_authorization_error.jsp
+%%DATADIR%%/webapps/job/index.html
+%%DATADIR%%/webapps/job/gethistory.jsp
+%%DATADIR%%/webapps/job/analysejobhistory.jsp
+%%DATADIR%%/webapps/job/WEB-INF/web.xml
+%%DATADIR%%/webapps/history/WEB-INF/web.xml
+%%DATADIR%%/webapps/hdfs/index.html
+%%DATADIR%%/webapps/hdfs/WEB-INF/web.xml
+%%DATADIR%%/webapps/datanode/WEB-INF/web.xml
 %%EXAMPLESDIR%%/hadoop-examples-%%PORTVERSION%%.jar
 %%EXAMPLESDIR%%/core-default.xml
 %%EXAMPLESDIR%%/hdfs-default.xml
 %%EXAMPLESDIR%%/mapred-default.xml
 %%EXAMPLESDIR%%/conf/masters
 %%EXAMPLESDIR%%/conf/slaves
+%%EXAMPLESDIR%%/conf/task-log4j.properties
 %%EXAMPLESDIR%%/conf/ssl-client.xml.example
 %%EXAMPLESDIR%%/conf/ssl-server.xml.example
-@unexec if cmp -s %D/%%HADOOP_ETC%%/capacity-scheduler.xml %D/%%EXAMPLESDIR%%/conf/capacity-scheduler.xml; then rm -f %D/%%HADOOP_ETC%%/capacity-scheduler.xml; fi
+@unexec if cmp -s %D/%%ETCDIR%%/capacity-scheduler.xml %D/%%EXAMPLESDIR%%/conf/capacity-scheduler.xml; then rm -f %D/%%ETCDIR%%/capacity-scheduler.xml; fi
 %%EXAMPLESDIR%%/conf/capacity-scheduler.xml
-@exec [ -f %D/%%HADOOP_ETC%%/capacity-scheduler.xml ] || cp %D/%%EXAMPLESDIR%%/conf/capacity-scheduler.xml %D/%%HADOOP_ETC%%
-@unexec if cmp -s %D/%%HADOOP_ETC%%/configuration.xsl %D/%%EXAMPLESDIR%%/conf/configuration.xsl; then rm -f %D/%%HADOOP_ETC%%/configuration.xsl; fi
+@exec [ -f %D/%%ETCDIR%%/capacity-scheduler.xml ] || cp %D/%%EXAMPLESDIR%%/conf/capacity-scheduler.xml %D/%%ETCDIR%%
+@unexec if cmp -s %D/%%ETCDIR%%/configuration.xsl %D/%%EXAMPLESDIR%%/conf/configuration.xsl; then rm -f %D/%%ETCDIR%%/configuration.xsl; fi
 %%EXAMPLESDIR%%/conf/configuration.xsl
-@exec [ -f %D/%%HADOOP_ETC%%/configuration.xsl ] || cp %D/%%EXAMPLESDIR%%/conf/configuration.xsl %D/%%HADOOP_ETC%%
-@unexec if cmp -s %D/%%HADOOP_ETC%%/core-site.xml %D/%%EXAMPLESDIR%%/conf/core-site.xml; then rm -f %D/%%HADOOP_ETC%%/core-site.xml; fi
+@exec [ -f %D/%%ETCDIR%%/configuration.xsl ] || cp %D/%%EXAMPLESDIR%%/conf/configuration.xsl %D/%%ETCDIR%%
+@unexec if cmp -s %D/%%ETCDIR%%/core-site.xml %D/%%EXAMPLESDIR%%/conf/core-site.xml; then rm -f %D/%%ETCDIR%%/core-site.xml; fi
 %%EXAMPLESDIR%%/conf/core-site.xml
-@exec [ -f %D/%%HADOOP_ETC%%/core-site.xml ] || cp %D/%%EXAMPLESDIR%%/conf/core-site.xml %D/%%HADOOP_ETC%%
-@unexec if cmp -s %D/%%HADOOP_ETC%%/hadoop-env.sh %D/%%EXAMPLESDIR%%/conf/hadoop-env.sh; then rm -f %D/%%HADOOP_ETC%%/hadoop-env.sh; fi
+@exec [ -f %D/%%ETCDIR%%/core-site.xml ] || cp %D/%%EXAMPLESDIR%%/conf/core-site.xml %D/%%ETCDIR%%
+@unexec if cmp -s %D/%%ETCDIR%%/hadoop-env.sh %D/%%EXAMPLESDIR%%/conf/hadoop-env.sh; then rm -f %D/%%ETCDIR%%/hadoop-env.sh; fi
 %%EXAMPLESDIR%%/conf/hadoop-env.sh
-@exec [ -f %D/%%HADOOP_ETC%%/hadoop-env.sh ] || cp %D/%%EXAMPLESDIR%%/conf/hadoop-env.sh %D/%%HADOOP_ETC%%
-@unexec if cmp -s %D/%%HADOOP_ETC%%/hadoop-metrics2.properties %D/%%EXAMPLESDIR%%/conf/hadoop-metrics2.properties; then rm -f %D/%%HADOOP_ETC%%/hadoop-metrics2.properties; fi
+@exec [ -f %D/%%ETCDIR%%/hadoop-env.sh ] || cp %D/%%EXAMPLESDIR%%/conf/hadoop-env.sh %D/%%ETCDIR%%
+@unexec if cmp -s %D/%%ETCDIR%%/hadoop-metrics2.properties %D/%%EXAMPLESDIR%%/conf/hadoop-metrics2.properties; then rm -f %D/%%ETCDIR%%/hadoop-metrics2.properties; fi
 %%EXAMPLESDIR%%/conf/hadoop-metrics2.properties
-@exec [ -f %D/%%HADOOP_ETC%%/hadoop-metrics2.properties ] || cp %D/%%EXAMPLESDIR%%/conf/hadoop-metrics2.properties %D/%%HADOOP_ETC%%
-@unexec if cmp -s %D/%%HADOOP_ETC%%/hadoop-policy.xml %D/%%EXAMPLESDIR%%/conf/hadoop-policy.xml; then rm -f %D/%%HADOOP_ETC%%/hadoop-policy.xml; fi
+@exec [ -f %D/%%ETCDIR%%/hadoop-metrics2.properties ] || cp %D/%%EXAMPLESDIR%%/conf/hadoop-metrics2.properties %D/%%ETCDIR%%
+@unexec if cmp -s %D/%%ETCDIR%%/hadoop-policy.xml %D/%%EXAMPLESDIR%%/conf/hadoop-policy.xml; then rm -f %D/%%ETCDIR%%/hadoop-policy.xml; fi
 %%EXAMPLESDIR%%/conf/hadoop-policy.xml
-@exec [ -f %D/%%HADOOP_ETC%%/hadoop-policy.xml ] || cp %D/%%EXAMPLESDIR%%/conf/hadoop-policy.xml %D/%%HADOOP_ETC%%
-@unexec if cmp -s %D/%%HADOOP_ETC%%/hdfs-site.xml %D/%%EXAMPLESDIR%%/conf/hdfs-site.xml; then rm -f %D/%%HADOOP_ETC%%/hdfs-site.xml; fi
+@exec [ -f %D/%%ETCDIR%%/hadoop-policy.xml ] || cp %D/%%EXAMPLESDIR%%/conf/hadoop-policy.xml %D/%%ETCDIR%%
+@unexec if cmp -s %D/%%ETCDIR%%/hdfs-site.xml %D/%%EXAMPLESDIR%%/conf/hdfs-site.xml; then rm -f %D/%%ETCDIR%%/hdfs-site.xml; fi
 %%EXAMPLESDIR%%/conf/hdfs-site.xml
-@exec [ -f %D/%%HADOOP_ETC%%/hdfs-site.xml ] || cp %D/%%EXAMPLESDIR%%/conf/hdfs-site.xml %D/%%HADOOP_ETC%%
-@unexec if cmp -s %D/%%HADOOP_ETC%%/log4j.properties %D/%%EXAMPLESDIR%%/conf/log4j.properties; then rm -f %D/%%HADOOP_ETC%%/log4j.properties; fi
+@exec [ -f %D/%%ETCDIR%%/hdfs-site.xml ] || cp %D/%%EXAMPLESDIR%%/conf/hdfs-site.xml %D/%%ETCDIR%%
+@unexec if cmp -s %D/%%ETCDIR%%/log4j.properties %D/%%EXAMPLESDIR%%/conf/log4j.properties; then rm -f %D/%%ETCDIR%%/log4j.properties; fi
 %%EXAMPLESDIR%%/conf/log4j.properties
-@exec [ -f %D/%%HADOOP_ETC%%/log4j.properties ] || cp %D/%%EXAMPLESDIR%%/conf/log4j.properties %D/%%HADOOP_ETC%%
-@unexec if cmp -s %D/%%HADOOP_ETC%%/mapred-queue-acls.xml %D/%%EXAMPLESDIR%%/conf/mapred-queue-acls.xml; then rm -f %D/%%HADOOP_ETC%%/mapred-queue-acls.xml; fi
+@exec [ -f %D/%%ETCDIR%%/log4j.properties ] || cp %D/%%EXAMPLESDIR%%/conf/log4j.properties %D/%%ETCDIR%%
+@unexec if cmp -s %D/%%ETCDIR%%/mapred-queue-acls.xml %D/%%EXAMPLESDIR%%/conf/mapred-queue-acls.xml; then rm -f %D/%%ETCDIR%%/mapred-queue-acls.xml; fi
 %%EXAMPLESDIR%%/conf/mapred-queue-acls.xml
-@exec [ -f %D/%%HADOOP_ETC%%/mapred-queue-acls.xml ] || cp %D/%%EXAMPLESDIR%%/conf/mapred-queue-acls.xml %D/%%HADOOP_ETC%%
-@unexec if cmp -s %D/%%HADOOP_ETC%%/mapred-site.xml %D/%%EXAMPLESDIR%%/conf/mapred-site.xml; then rm -f %D/%%HADOOP_ETC%%/mapred-site.xml; fi
+@exec [ -f %D/%%ETCDIR%%/mapred-queue-acls.xml ] || cp %D/%%EXAMPLESDIR%%/conf/mapred-queue-acls.xml %D/%%ETCDIR%%
+@unexec if cmp -s %D/%%ETCDIR%%/mapred-site.xml %D/%%EXAMPLESDIR%%/conf/mapred-site.xml; then rm -f %D/%%ETCDIR%%/mapred-site.xml; fi
 %%EXAMPLESDIR%%/conf/mapred-site.xml
-@exec [ -f %D/%%HADOOP_ETC%%/mapred-site.xml ] || cp %D/%%EXAMPLESDIR%%/conf/mapred-site.xml %D/%%HADOOP_ETC%%
-@unexec if cmp -s %D/%%HADOOP_ETC%%/taskcontroller.cfg %D/%%EXAMPLESDIR%%/conf/taskcontroller.cfg; then rm -f %D/%%HADOOP_ETC%%/taskcontroller.cfg; fi
+@exec [ -f %D/%%ETCDIR%%/mapred-site.xml ] || cp %D/%%EXAMPLESDIR%%/conf/mapred-site.xml %D/%%ETCDIR%%
+@unexec if cmp -s %D/%%ETCDIR%%/taskcontroller.cfg %D/%%EXAMPLESDIR%%/conf/taskcontroller.cfg; then rm -f %D/%%ETCDIR%%/taskcontroller.cfg; fi
 %%EXAMPLESDIR%%/conf/taskcontroller.cfg
-@exec [ -f %D/%%HADOOP_ETC%%/taskcontroller.cfg ] || cp %D/%%EXAMPLESDIR%%/conf/taskcontroller.cfg %D/%%HADOOP_ETC%%
-@unexec if cmp -s %D/%%HADOOP_ETC%%/fair-scheduler.xml %D/%%EXAMPLESDIR%%/conf/fair-scheduler.xml; then rm -f %D/%%HADOOP_ETC%%/fair-scheduler.xml; fi
+@exec [ -f %D/%%ETCDIR%%/taskcontroller.cfg ] || cp %D/%%EXAMPLESDIR%%/conf/taskcontroller.cfg %D/%%ETCDIR%%
+@unexec if cmp -s %D/%%ETCDIR%%/fair-scheduler.xml %D/%%EXAMPLESDIR%%/conf/fair-scheduler.xml; then rm -f %D/%%ETCDIR%%/fair-scheduler.xml; fi
 %%EXAMPLESDIR%%/conf/fair-scheduler.xml
-@exec [ -f %D/%%HADOOP_ETC%%/fair-scheduler.xml ] || cp %D/%%EXAMPLESDIR%%/conf/fair-scheduler.xml %D/%%HADOOP_ETC%%
+@exec [ -f %D/%%ETCDIR%%/fair-scheduler.xml ] || cp %D/%%EXAMPLESDIR%%/conf/fair-scheduler.xml %D/%%ETCDIR%%
 include/hadoop/StringUtils.hh
 include/hadoop/SerialUtils.hh
 include/hadoop/Pipes.hh
 include/hadoop/TemplateFactory.hh
 lib/libhadooputils.a
 lib/libhadooppipes.a
+lib/libhdfs.a
 lib/libhdfs.so.0
 lib/libhdfs.so
 lib/libhdfs.la
-@exec mkdir -p %D/%%HADOOP_HOME%%/webapps/secondary/WEB-INF
-@exec mkdir -p %D/%%HADOOP_HOME%%/contrib/hdfsproxy/logs
+@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
 @dirrm %%EXAMPLESDIR%%/conf
 @dirrm %%EXAMPLESDIR%%
-@dirrm %%HADOOP_HOME%%/lib/native/Linux-i386-32
-@dirrm %%HADOOP_HOME%%/lib/native/Linux-amd64-64
-@dirrm %%HADOOP_HOME%%/lib/native/%%HADOOP_ARCH%%
-@dirrm %%HADOOP_HOME%%/lib/native
-@dirrm %%HADOOP_HOME%%/lib/jsp-2.1
-@dirrm %%HADOOP_HOME%%/lib/jdiff
-@dirrm %%HADOOP_HOME%%/lib
-@dirrm %%HADOOP_HOME%%/bin
-@dirrm %%HADOOP_HOME%%/webapps/task/WEB-INF
-@dirrm %%HADOOP_HOME%%/webapps/task
-@dirrm %%HADOOP_HOME%%/webapps/static
-@dirrm %%HADOOP_HOME%%/webapps/secondary/WEB-INF
-@dirrm %%HADOOP_HOME%%/webapps/secondary
-@dirrm %%HADOOP_HOME%%/webapps/job/WEB-INF
-@dirrm %%HADOOP_HOME%%/webapps/job
-@dirrm %%HADOOP_HOME%%/webapps/history/WEB-INF
-@dirrm %%HADOOP_HOME%%/webapps/history
-@dirrm %%HADOOP_HOME%%/webapps/hdfs/WEB-INF
-@dirrm %%HADOOP_HOME%%/webapps/hdfs
-@dirrm %%HADOOP_HOME%%/webapps/datanode/WEB-INF
-@dirrm %%HADOOP_HOME%%/webapps/datanode
-@dirrm %%HADOOP_HOME%%/webapps/
-@dirrm %%HADOOP_HOME%%/contrib/vaidya/conf
-@dirrm %%HADOOP_HOME%%/contrib/vaidya/bin
-@dirrm %%HADOOP_HOME%%/contrib/vaidya
-@dirrm %%HADOOP_HOME%%/contrib/streaming
-@dirrm %%HADOOP_HOME%%/contrib/index
-@dirrm %%HADOOP_HOME%%/contrib/hod/testing
-@dirrm %%HADOOP_HOME%%/contrib/hod/support
-@dirrm %%HADOOP_HOME%%/contrib/hod/ivy
-@dirrm %%HADOOP_HOME%%/contrib/hod/hodlib/ServiceRegistry
-@dirrm %%HADOOP_HOME%%/contrib/hod/hodlib/ServiceProxy
-@dirrm %%HADOOP_HOME%%/contrib/hod/hodlib/Schedulers
-@dirrm %%HADOOP_HOME%%/contrib/hod/hodlib/RingMaster
-@dirrm %%HADOOP_HOME%%/contrib/hod/hodlib/NodePools
-@dirrm %%HADOOP_HOME%%/contrib/hod/hodlib/HodRing
-@dirrm %%HADOOP_HOME%%/contrib/hod/hodlib/Hod
-@dirrm %%HADOOP_HOME%%/contrib/hod/hodlib/GridServices
-@dirrm %%HADOOP_HOME%%/contrib/hod/hodlib/Common
-@dirrm %%HADOOP_HOME%%/contrib/hod/hodlib/AllocationManagers
-@dirrm %%HADOOP_HOME%%/contrib/hod/hodlib
-@dirrm %%HADOOP_HOME%%/contrib/hod/conf
-@dirrm %%HADOOP_HOME%%/contrib/hod/bin
-@dirrm %%HADOOP_HOME%%/contrib/hod
-@dirrm %%HADOOP_HOME%%/contrib/hdfsproxy/logs
-@dirrm %%HADOOP_HOME%%/contrib/hdfsproxy/conf
-@dirrm %%HADOOP_HOME%%/contrib/hdfsproxy/bin
-@dirrm %%HADOOP_HOME%%/contrib/hdfsproxy
-@dirrm %%HADOOP_HOME%%/contrib/gridmix
-@dirrm %%HADOOP_HOME%%/contrib/failmon
-@dirrm %%HADOOP_HOME%%/contrib/datajoin
-@dirrm %%HADOOP_HOME%%/contrib/
-@dirrm %%HADOOP_HOME%%
+@dirrm %%DATADIR%%/lib/native/Linux-i386-32
+@dirrm %%DATADIR%%/lib/native/Linux-amd64-64
+@dirrm %%DATADIR%%/lib/native/%%HADOOP_ARCH%%
+@dirrm %%DATADIR%%/lib/native
+@dirrm %%DATADIR%%/lib/jsp-2.1
+@dirrm %%DATADIR%%/lib/jdiff
+@dirrm %%DATADIR%%/lib
+@dirrm %%DATADIR%%/bin
+@dirrm %%DATADIR%%/webapps/task/WEB-INF
+@dirrm %%DATADIR%%/webapps/task
+@dirrm %%DATADIR%%/webapps/static
+@dirrm %%DATADIR%%/webapps/secondary/WEB-INF
+@dirrm %%DATADIR%%/webapps/secondary
+@dirrm %%DATADIR%%/webapps/job/WEB-INF
+@dirrm %%DATADIR%%/webapps/job
+@dirrm %%DATADIR%%/webapps/history/WEB-INF
+@dirrm %%DATADIR%%/webapps/history
+@dirrm %%DATADIR%%/webapps/hdfs/WEB-INF
+@dirrm %%DATADIR%%/webapps/hdfs
+@dirrm %%DATADIR%%/webapps/datanode/WEB-INF
+@dirrm %%DATADIR%%/webapps/datanode
+@dirrm %%DATADIR%%/webapps
+@dirrm %%DATADIR%%/contrib/vaidya/conf
+@dirrm %%DATADIR%%/contrib/vaidya/bin
+@dirrm %%DATADIR%%/contrib/vaidya
+@dirrm %%DATADIR%%/contrib/streaming
+@dirrm %%DATADIR%%/contrib/index
+@dirrm %%DATADIR%%/contrib/hod/testing
+@dirrm %%DATADIR%%/contrib/hod/support
+@dirrm %%DATADIR%%/contrib/hod/ivy
+@dirrm %%DATADIR%%/contrib/hod/hodlib/ServiceRegistry
+@dirrm %%DATADIR%%/contrib/hod/hodlib/ServiceProxy
+@dirrm %%DATADIR%%/contrib/hod/hodlib/Schedulers
+@dirrm %%DATADIR%%/contrib/hod/hodlib/RingMaster
+@dirrm %%DATADIR%%/contrib/hod/hodlib/NodePools
+@dirrm %%DATADIR%%/contrib/hod/hodlib/HodRing
+@dirrm %%DATADIR%%/contrib/hod/hodlib/Hod
+@dirrm %%DATADIR%%/contrib/hod/hodlib/GridServices
+@dirrm %%DATADIR%%/contrib/hod/hodlib/Common
+@dirrm %%DATADIR%%/contrib/hod/hodlib/AllocationManagers
+@dirrm %%DATADIR%%/contrib/hod/hodlib
+@dirrm %%DATADIR%%/contrib/hod/conf
+@dirrm %%DATADIR%%/contrib/hod/bin
+@dirrm %%DATADIR%%/contrib/hod
+@dirrm %%DATADIR%%/contrib/hdfsproxy/logs
+@dirrm %%DATADIR%%/contrib/hdfsproxy/conf
+@dirrm %%DATADIR%%/contrib/hdfsproxy/bin
+@dirrm %%DATADIR%%/contrib/hdfsproxy
+@dirrm %%DATADIR%%/contrib/gridmix
+@dirrm %%DATADIR%%/contrib/failmon
+@dirrm %%DATADIR%%/contrib/datajoin
+@dirrm %%DATADIR%%/contrib
+@dirrm %%DATADIR%%
 @dirrm include/hadoop
-@dirrmtry %%HADOOP_ETC%%/envvars.d
-@dirrmtry %%HADOOP_ETC%%
+@dirrmtry %%ETCDIR%%/envvars.d
+@dirrmtry %%ETCDIR%%