diff options
| author | Herve Quiroz <hq@FreeBSD.org> | 2006-07-03 22:13:48 +0000 |
|---|---|---|
| committer | Herve Quiroz <hq@FreeBSD.org> | 2006-07-03 22:13:48 +0000 |
| commit | c8126da8b7b0864d81cd5d4e2347d6db9ca4ec1f (patch) | |
| tree | a3f320e0f15062c75d425979ac32729aacce09f2 /lang | |
| parent | 7f5bb6bf3164ad98b779699bfd8aeed744c58d9e (diff) | |
| download | ports-c8126da8b7b0864d81cd5d4e2347d6db9ca4ec1f.tar.gz ports-c8126da8b7b0864d81cd5d4e2347d6db9ca4ec1f.zip | |
- 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
Notes
Notes:
svn path=/head/; revision=166873
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/linux-j/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
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 |