diff options
| author | tv <tv> | 2000-10-16 19:43:14 +0000 |
|---|---|---|
| committer | tv <tv> | 2000-10-16 19:43:14 +0000 |
| commit | 605ddd2d4b14612eb10fee0c1f637a53f27df5dc (patch) | |
| tree | 23c59c4c7efe99e63dfb4ed0fd97d4813ef96863 /mk | |
| parent | c3c15c619e29b6fd30ebbe575b2a6f091386b5d2 (diff) | |
| download | pkgsrc-605ddd2d4b14612eb10fee0c1f637a53f27df5dc.tar.gz | |
Change DEPENDS for PKG_JAVA=jdk compiled packages such that both the native
jdk 1.1.8 and the blackdown-jre 1.2 will work (and make the version just *,
not 1.1.*). This is a precursor to native JDK 1.2 support. Leave the
preference of the dependency to use the native jdk 1.1.
XXX: There should be a standard location not specific to PKG_JAVA for Java
packages, and there is no particular need for a DEPENDS on the JVM for
most packages (even an external-to-tree JVM is typically happy with the code).
This per-VM PREFIX, and particularly configurable JAVA_HOME, is not clean.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 9285f6f8a92..dfdd28144e9 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.586 2000/10/15 11:31:41 rh Exp $ +# $NetBSD: bsd.pkg.mk,v 1.587 2000/10/16 19:43:14 tv Exp $ # # This file is in the public domain. # @@ -72,7 +72,7 @@ PKG_JVM?= kaffe .endif .endif .if ${PKG_JVM} == "jdk" -DEPENDS+= jdk-1.1.*:../../lang/jdk +DEPENDS+= {blackdown-jre,jdk}-*:../../lang/jdk .if defined(JDK_HOME) JAVA_HOME?= ${JDK_HOME} .else |