aboutsummaryrefslogtreecommitdiffstats
path: root/lang/linux-j
diff options
context:
space:
mode:
authorvs <vs@FreeBSD.org>2006-04-12 16:49:16 +0800
committervs <vs@FreeBSD.org>2006-04-12 16:49:16 +0800
commit68ba6729d675519a0fa1fdc6b5c6fa1dfc7100b1 (patch)
treebdcfd99bbbc1b21e27995d509eb9ad9fd6740c1a /lang/linux-j
parentee68240b299283ce98b7d9be6d4e6b570db05c69 (diff)
downloadfreebsd-ports-gnome-68ba6729d675519a0fa1fdc6b5c6fa1dfc7100b1.tar.gz
freebsd-ports-gnome-68ba6729d675519a0fa1fdc6b5c6fa1dfc7100b1.tar.zst
freebsd-ports-gnome-68ba6729d675519a0fa1fdc6b5c6fa1dfc7100b1.zip
Band aid: bin/jconsole CONFLICTS with recently released diablo-jdk-1.5.0
Diffstat (limited to 'lang/linux-j')
-rw-r--r--lang/linux-j/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/lang/linux-j/Makefile b/lang/linux-j/Makefile
index 8d2fcbf86667..d227ee207748 100644
--- a/lang/linux-j/Makefile
+++ b/lang/linux-j/Makefile
@@ -15,6 +15,8 @@ DIST_SUBDIR= ${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A general purpose programming language
+CONFLICTS= diablo-jdk-1.5.0*
+
RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper
USE_LINUX= yes