mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00
Code Issues Releases Activity

Fix CONFLICTs.

Browse Source
This commit is contained in:
Dmitry Sivachenko 2015-01-05 22:50:28 +00:00
parent 75983a5bd0
commit bdbc873f9b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=376367
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devel/hadoop/Makefile
View File

@ -20,7 +20,7 @@ BUILD_DEPENDS= gmake:${PORTSDIR}/devel/gmake \
gsed:${PORTSDIR}/textproc/gsed
RUN_DEPENDS= bash:${PORTSDIR}/shells/bash
CONFLICTS_INSTALL= apache-hadoop2-2*
CONFLICTS_INSTALL= hadoop2-2*
USES= libtool
USE_JAVA= yes

2
devel/hadoop2/Makefile
View File

@ -31,7 +31,7 @@ LIB_DEPENDS= libsnappy.so:${PORTSDIR}/archivers/snappy
RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \
ssid:${PORTSDIR}/sysutils/ssid
CONFLICTS_INSTALL= apache-hadoop-1*
CONFLICTS_INSTALL= hadoop-1*
USES= shebangfix
USE_JAVA= yes