aboutsummaryrefslogtreecommitdiff
path: root/lang/linux-j
diff options
context:
space:
mode:
authorVolker Stolz <vs@FreeBSD.org>2006-04-12 08:49:16 +0000
committerVolker Stolz <vs@FreeBSD.org>2006-04-12 08:49:16 +0000
commit7d138add1b10acdbbbb097debfa8782ef0e03b63 (patch)
treea5fc98002567783cef251d9091119aa1d9e7caea /lang/linux-j
parentcf2a99722174d36a7e8e86c7a3d121d36eb25516 (diff)
downloadports-7d138add1b10acdbbbb097debfa8782ef0e03b63.tar.gz
ports-7d138add1b10acdbbbb097debfa8782ef0e03b63.zip
Band aid: bin/jconsole CONFLICTS with recently released diablo-jdk-1.5.0
Notes
Notes: svn path=/head/; revision=159361
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