From c8126da8b7b0864d81cd5d4e2347d6db9ca4ec1f Mon Sep 17 00:00:00 2001 From: Herve Quiroz Date: Mon, 3 Jul 2006 22:13:48 +0000 Subject: - Better set CONFLICTS: all Java 1.5 JDKs install ${PREFIX}/bin/jconsole just like this port. - Forbid dependency on any Java 1.5 JDK (this should unbreak build on pointyhat) - Some portlint'ing while I am there Reported by: pointyhat via linimon --- lang/linux-j/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'lang/linux-j') diff --git a/lang/linux-j/Makefile b/lang/linux-j/Makefile index d227ee207748..e180f9771267 100644 --- a/lang/linux-j/Makefile +++ b/lang/linux-j/Makefile @@ -15,13 +15,14 @@ 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 +# Java 1.5 JDKs install ${PREFIX}/bin/jconsole +CONFLICTS= diablo-jdk-1.5.0* jdk-1.5.0* linux-sun-jdk-1.5.0* + USE_LINUX= yes USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.3 1.4 ONLY_FOR_ARCHS= i386 -- cgit v1.2.3