Whoops, do not hardcode hadoop version.

3 files changed, 25 insertions, 23 deletions

diff --git a/devel/oozie/Makefile b/devel/oozie/Makefile
index ae0d30d02e08..e69b950d43f8 100644
--- a/devel/oozie/Makefile
+++ b/devel/oozie/Makefile
@@ -8,9 +8,9 @@ MASTER_SITES=	${MASTER_SITE_APACHE} \
 		LOCAL/demon/:maven \
 		http://archive.apache.org/dist/tomcat/tomcat-6/v${TOMCAT_VERSION}/bin/:tomcat \
 		http://extjs.com/deploy/:libext \
-		http://central.maven.org/maven2/org/apache/hadoop/hadoop-client/2.4.1/:hadoopclient
+		http://central.maven.org/maven2/org/apache/hadoop/hadoop-client/${HADOOP_VERSION}/:hadoopclient
 MASTER_SITE_SUBDIR=${PORTNAME}/${PORTVERSION}
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} FreeBSD-${PORTNAME}-${PORTVERSION}-maven-repository.tar.gz:maven apache-tomcat-${TOMCAT_VERSION}.tar.gz:tomcat ext-2.2.zip:libext hadoop-client-2.4.1.jar:hadoopclient
+DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} FreeBSD-${PORTNAME}-${PORTVERSION}-maven-repository.tar.gz:maven apache-tomcat-${TOMCAT_VERSION}.tar.gz:tomcat ext-2.2.zip:libext hadoop-client-${HADOOP_VERSION}.jar:hadoopclient
 DIST_SUBDIR=	hadoop
 EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} FreeBSD-${PORTNAME}-${PORTVERSION}-maven-repository.tar.gz
 
@@ -28,6 +28,7 @@ USES=		shebangfix
 USE_JAVA=	yes
 JAVA_VERSION=	1.7+
 TOMCAT_VERSION=	6.0.41
+HADOOP_VERSION=	2.6.0		# Matches devel/hadoop2
 SHEBANG_FILES=	client/src/main/bin/oozie distro/src/main/bin/addtowar.sh distro/src/main/bin/oozied.sh distro/src/main/bin/oozie-setup.sh distro/src/main/bin/oozie-sys.sh tools/src/main/bin/ooziedb.sh core/src/main/conf/oozie-env.sh
 
 OOZIE_USER=	oozie
@@ -39,7 +40,8 @@ GROUPS=		${OOZIE_USER}
 USE_RC_SUBR=	oozied
 PLIST_SUB=	OOZIE_USER=${OOZIE_USER} \
 		OOZIE_RUNDIR=${OOZIE_RUNDIR} \
-		OOZIE_LOGDIR=${OOZIE_LOGDIR}
+		OOZIE_LOGDIR=${OOZIE_LOGDIR} \
+		HADOOP_VERSION=${HADOOP_VERSION}
 SUB_LIST=	OOZIE_USER=${OOZIE_USER} \
 		OOZIE_RUNDIR=${OOZIE_RUNDIR}
 
@@ -52,7 +54,7 @@ do-build:
 
 post-build:
 	${RM} ${WRKSRC}/distro/target/oozie-${PORTVERSION}-distro/oozie-${PORTVERSION}/lib/hadoop-auth-2.3.0.jar
-	${INSTALL_DATA} ${PREFIX}/share/hadoop/common/lib/hadoop-auth-2.4.1.jar ${WRKSRC}//distro/target/oozie-${PORTVERSION}-distro/oozie-${PORTVERSION}/lib/
+	${INSTALL_DATA} ${PREFIX}/share/hadoop/common/lib/hadoop-auth-${HADOOP_VERSION}.jar ${WRKSRC}//distro/target/oozie-${PORTVERSION}-distro/oozie-${PORTVERSION}/lib/
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/oozie ${STAGEDIR}${PREFIX}/oozie/libext ${STAGEDIR}${PREFIX}/oozie/bin ${STAGEDIR}${PREFIX}/oozie/conf ${STAGEDIR}${PREFIX}/oozie/conf/action-conf
@@ -65,8 +67,8 @@ do-install:
 	${FIND} ${STAGEDIR}${PREFIX}/oozie/oozie-server/conf -name '*.xml' -or -name '*.properties' | ${XARGS} ${CHMOD} 644
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/ext-2.2.zip ${STAGEDIR}${PREFIX}/oozie/libext/
 	cd ${PREFIX}/share/hadoop/common/lib && ${INSTALL_DATA} activation-1.1.jar avro-1.7.4.jar commons-beanutils-1.7.0.jar commons-beanutils-core-1.8.0.jar commons-cli-1.2.jar commons-codec-1.4.jar commons-collections-3.2.1.jar commons-compress-1.4.1.jar commons-configuration-1.6.jar commons-digester-1.8.jar commons-httpclient-3.1.jar commons-io-2.4.jar commons-lang-2.6.jar commons-logging-1.1.3.jar commons-math3-3.1.1.jar commons-net-3.1.jar guava-11.0.2.jar httpclient-4.2.5.jar httpcore-4.2.5.jar jackson-core-asl-1.8.8.jar jackson-mapper-asl-1.8.8.jar jaxb-api-2.2.2.jar jersey-core-1.9.jar jetty-util-6.1.14.jar jsr305-1.3.9.jar log4j-1.2.17.jar paranamer-2.3.jar protobuf-java-2.5.0.jar servlet-api-2.5.jar slf4j-api-1.7.5.jar slf4j-log4j12-1.7.5.jar snappy-java-1.0.4.1.jar stax-api-1.0-2.jar xmlenc-0.52.jar xz-1.0.jar zookeeper-3.4.5.jar ${STAGEDIR}${PREFIX}/oozie/libext/
-	cd ${PREFIX}/share/hadoop && ${INSTALL_DATA} common/lib/hadoop-annotations-2.4.1.jar common/lib/hadoop-auth-2.4.1.jar common/hadoop-common-2.4.1.jar hdfs/hadoop-hdfs-2.4.1.jar mapreduce/hadoop-mapreduce-client-app-2.4.1.jar mapreduce/hadoop-mapreduce-client-common-2.4.1.jar mapreduce/hadoop-mapreduce-client-core-2.4.1.jar mapreduce/hadoop-mapreduce-client-jobclient-2.4.1.jar mapreduce/hadoop-mapreduce-client-shuffle-2.4.1.jar yarn/hadoop-yarn-api-2.4.1.jar yarn/hadoop-yarn-client-2.4.1.jar yarn/hadoop-yarn-common-2.4.1.jar yarn/hadoop-yarn-server-common-2.4.1.jar ${STAGEDIR}${PREFIX}/oozie/libext/
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/hadoop-client-2.4.1.jar ${STAGEDIR}${PREFIX}/oozie/libext/
+	cd ${PREFIX}/share/hadoop && ${INSTALL_DATA} common/lib/hadoop-annotations-${HADOOP_VERSION}.jar common/lib/hadoop-auth-${HADOOP_VERSION}.jar common/hadoop-common-${HADOOP_VERSION}.jar hdfs/hadoop-hdfs-${HADOOP_VERSION}.jar mapreduce/hadoop-mapreduce-client-app-${HADOOP_VERSION}.jar mapreduce/hadoop-mapreduce-client-common-${HADOOP_VERSION}.jar mapreduce/hadoop-mapreduce-client-core-${HADOOP_VERSION}.jar mapreduce/hadoop-mapreduce-client-jobclient-${HADOOP_VERSION}.jar mapreduce/hadoop-mapreduce-client-shuffle-${HADOOP_VERSION}.jar yarn/hadoop-yarn-api-${HADOOP_VERSION}.jar yarn/hadoop-yarn-client-${HADOOP_VERSION}.jar yarn/hadoop-yarn-common-${HADOOP_VERSION}.jar yarn/hadoop-yarn-server-common-${HADOOP_VERSION}.jar ${STAGEDIR}${PREFIX}/oozie/libext/
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/hadoop-client-${HADOOP_VERSION}.jar ${STAGEDIR}${PREFIX}/oozie/libext/
 	cd ${STAGEDIR}${PREFIX}/oozie && bin/oozie-setup.sh prepare-war
 	${MKDIR} ${STAGEDIR}${OOZIE_RUNDIR}
 	${MKDIR} ${STAGEDIR}${OOZIE_LOGDIR}
diff --git a/devel/oozie/distinfo b/devel/oozie/distinfo
index 47f44d13e9ee..6234105c5b60 100644
--- a/devel/oozie/distinfo
+++ b/devel/oozie/distinfo
@@ -6,5 +6,5 @@ SHA256 (hadoop/apache-tomcat-6.0.41.tar.gz) = 2eb2812b42f3559690542fcb9ea0c1f43d
 SIZE (hadoop/apache-tomcat-6.0.41.tar.gz) = 7176167
 SHA256 (hadoop/ext-2.2.zip) = c463e298c7cc6fe3c5c863424a688b53a452bfe8f136bf20002e15b2bd201369
 SIZE (hadoop/ext-2.2.zip) = 6800612
-SHA256 (hadoop/hadoop-client-2.4.1.jar) = df937fb505930a91961427fcb174bea0069d97b95a84e19e756392c775a7cf0b
-SIZE (hadoop/hadoop-client-2.4.1.jar) = 2560
+SHA256 (hadoop/hadoop-client-2.6.0.jar) = e05887af8d943969273f0cf48edafcaefa79519d9193f8337e68b5e05e62d1da
+SIZE (hadoop/hadoop-client-2.6.0.jar) = 2556
diff --git a/devel/oozie/pkg-plist b/devel/oozie/pkg-plist
index f47d6404fe87..1f6e7e52cfd8 100644
--- a/devel/oozie/pkg-plist
+++ b/devel/oozie/pkg-plist
@@ -16,7 +16,7 @@ oozie/lib/commons-logging-1.1.jar
 oozie/lib/geronimo-j2ee-management_1.1_spec-1.0.1.jar
 oozie/lib/geronimo-jms_1.1_spec-1.1.1.jar
 oozie/lib/guava-11.0.2.jar
-oozie/lib/hadoop-auth-2.4.1.jar
+oozie/lib/hadoop-auth-%%HADOOP_VERSION%%.jar
 oozie/lib/hawtbuf-1.9.jar
 oozie/lib/httpclient-4.2.5.jar
 oozie/lib/httpcore-4.2.4.jar
@@ -47,20 +47,20 @@ oozie/libext/commons-math3-3.1.1.jar
 oozie/libext/commons-net-3.1.jar
 oozie/libext/ext-2.2.zip
 oozie/libext/guava-11.0.2.jar
-oozie/libext/hadoop-annotations-2.4.1.jar
-oozie/libext/hadoop-auth-2.4.1.jar
-oozie/libext/hadoop-client-2.4.1.jar
-oozie/libext/hadoop-common-2.4.1.jar
-oozie/libext/hadoop-hdfs-2.4.1.jar
-oozie/libext/hadoop-mapreduce-client-app-2.4.1.jar
-oozie/libext/hadoop-mapreduce-client-common-2.4.1.jar
-oozie/libext/hadoop-mapreduce-client-core-2.4.1.jar
-oozie/libext/hadoop-mapreduce-client-jobclient-2.4.1.jar
-oozie/libext/hadoop-mapreduce-client-shuffle-2.4.1.jar
-oozie/libext/hadoop-yarn-api-2.4.1.jar
-oozie/libext/hadoop-yarn-client-2.4.1.jar
-oozie/libext/hadoop-yarn-common-2.4.1.jar
-oozie/libext/hadoop-yarn-server-common-2.4.1.jar
+oozie/libext/hadoop-annotations-%%HADOOP_VERSION%%.jar
+oozie/libext/hadoop-auth-%%HADOOP_VERSION%%.jar
+oozie/libext/hadoop-client-%%HADOOP_VERSION%%.jar
+oozie/libext/hadoop-common-%%HADOOP_VERSION%%.jar
+oozie/libext/hadoop-hdfs-%%HADOOP_VERSION%%.jar
+oozie/libext/hadoop-mapreduce-client-app-%%HADOOP_VERSION%%.jar
+oozie/libext/hadoop-mapreduce-client-common-%%HADOOP_VERSION%%.jar
+oozie/libext/hadoop-mapreduce-client-core-%%HADOOP_VERSION%%.jar
+oozie/libext/hadoop-mapreduce-client-jobclient-%%HADOOP_VERSION%%.jar
+oozie/libext/hadoop-mapreduce-client-shuffle-%%HADOOP_VERSION%%.jar
+oozie/libext/hadoop-yarn-api-%%HADOOP_VERSION%%.jar
+oozie/libext/hadoop-yarn-client-%%HADOOP_VERSION%%.jar
+oozie/libext/hadoop-yarn-common-%%HADOOP_VERSION%%.jar
+oozie/libext/hadoop-yarn-server-common-%%HADOOP_VERSION%%.jar
 oozie/libext/httpclient-4.2.5.jar
 oozie/libext/httpcore-4.2.5.jar
 oozie/libext/jackson-core-asl-1.8.8.jar