Date: Mon, 5 Jan 2015 22:50:29 +0000 (UTC) From: Dmitry Sivachenko <demon@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r376367 - in head/devel: hadoop hadoop2 Message-ID: <201501052250.t05MoTl8093217@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: demon Date: Mon Jan 5 22:50:28 2015 New Revision: 376367 URL: https://svnweb.freebsd.org/changeset/ports/376367 QAT: https://qat.redports.org/buildarchive/r376367/ Log: Fix CONFLICTs. Modified: head/devel/hadoop/Makefile head/devel/hadoop2/Makefile Modified: head/devel/hadoop/Makefile ============================================================================== --- head/devel/hadoop/Makefile Mon Jan 5 22:49:41 2015 (r376366) +++ head/devel/hadoop/Makefile Mon Jan 5 22:50:28 2015 (r376367) @@ -20,7 +20,7 @@ BUILD_DEPENDS= gmake:${PORTSDIR}/devel/g gsed:${PORTSDIR}/textproc/gsed RUN_DEPENDS= bash:${PORTSDIR}/shells/bash -CONFLICTS_INSTALL= apache-hadoop2-2* +CONFLICTS_INSTALL= hadoop2-2* USES= libtool USE_JAVA= yes Modified: head/devel/hadoop2/Makefile ============================================================================== --- head/devel/hadoop2/Makefile Mon Jan 5 22:49:41 2015 (r376366) +++ head/devel/hadoop2/Makefile Mon Jan 5 22:50:28 2015 (r376367) @@ -31,7 +31,7 @@ LIB_DEPENDS= libsnappy.so:${PORTSDIR}/ar RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \ ssid:${PORTSDIR}/sysutils/ssid -CONFLICTS_INSTALL= apache-hadoop-1* +CONFLICTS_INSTALL= hadoop-1* USES= shebangfix USE_JAVA= yes
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501052250.t05MoTl8093217>