diff options
author | Volker Stolz <vs@FreeBSD.org> | 2006-04-12 08:49:16 +0000 |
---|---|---|
committer | Volker Stolz <vs@FreeBSD.org> | 2006-04-12 08:49:16 +0000 |
commit | 7d138add1b10acdbbbb097debfa8782ef0e03b63 (patch) | |
tree | a5fc98002567783cef251d9091119aa1d9e7caea /lang/linux-j | |
parent | Update to 1.25. Require perl from ports. (diff) |
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/Makefile | 2 |
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 |