svn commit: r360619 - head/devel/hadoop

[Dmitry Sivachenko]

Author: demon
Date: Fri Jul  4 14:13:10 2014
New Revision: 360619
URL: http://svnweb.freebsd.org/changeset/ports/360619
QAT: https://qat.redports.org/buildarchive/r360619/

Log:
  Register conflict with hadoop2.
  Pet portlint.

Modified:
  head/devel/hadoop/Makefile

Modified: head/devel/hadoop/Makefile
==============================================================================
--- head/devel/hadoop/Makefile	Fri Jul  4 14:11:51 2014	(r360618)
+++ head/devel/hadoop/Makefile	Fri Jul  4 14:13:10 2014	(r360619)
@@ -9,18 +9,20 @@ MASTER_SITES=	${MASTER_SITE_APACHE} \
 		http://dist.codehaus.org/jetty/jetty-6.1.14/:jetty
 MASTER_SITE_SUBDIR=	${PORTNAME}/core/${PORTNAME}-${PORTVERSION}
 PKGNAMEPREFIX=	apache-
-DIST_SUBDIR=	hadoop
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} jetty-6.1.14.zip:jetty
+DIST_SUBDIR=	hadoop
 
 MAINTAINER=	demon at FreeBSD.org
 COMMENT=	Apache Map/Reduce framework
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	gmake:${PORTSDIR}/devel/gmake \
-		gsed:${PORTSDIR}/textproc/gsed
+BUILD_DEPENDS=	gsed:${PORTSDIR}/textproc/gsed
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
+CONFLICTS_INSTALL=	apache-hadoop2-2*
+
+USES=		gmake
 USE_JAVA=	yes
 JAVA_VERSION=	1.7+
 USE_ANT=	yes