diff options
| author | jlam <jlam> | 2002-07-31 14:48:03 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-07-31 14:48:03 +0000 |
| commit | 65ad4c673e0ba528731a44e5d65765f6c69876e9 (patch) | |
| tree | e1f25d2a00bc04c3fa911dc9a6b7ff05e4bbbde2 | |
| parent | 33a4618fbef9595e8594249099675e7b8f364e8b (diff) | |
| download | pkgsrc-65ad4c673e0ba528731a44e5d65765f6c69876e9.tar.gz | |
* Rename _JAVA_PKGNAME to _JAVA_PKGBASE which more accurately reflects its
contents.
* Each PKG_JVM needs its own special _JAVA_PREFIX_DEFAULT hardcoded as
there's no way to discern the subdirectory of ${LOCALBASE}/java in which
the PKG_JVM is installed.
* If PKG_JVM == "sun-jdk", allow either sun-jdk13 or sun-jdk14 to be used,
preferring whichever one is already installed, but otherwise using the
best default for a given platform.
| -rw-r--r-- | mk/bsd.pkg.mk | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index d77213cfdbf..1820432fbf5 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1022 2002/07/31 14:43:29 wiz Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1023 2002/07/31 14:48:03 jlam Exp $ # # This file is in the public domain. # @@ -85,16 +85,19 @@ _JDK_DEPMETHOD= _UNUSED_DEPENDS _JDK_DEPMETHOD= BUILD_DEPENDS . endif . if ${PKG_JVM} == "jdk" -_JAVA_PKGNAME= jdk +_JAVA_PKGBASE= jdk +_JAVA_PREFIX_DEFAULT= ${LOCALBASE}/java/jdk-1.1.8 _JAVA_HOME= ${_JAVA_PREFIX} DEPENDS+= jdk-[0-9]*:../../lang/jdk . elif ${PKG_JVM} == "sun-jdk14" -_JAVA_PKGNAME= sun-jdk14 +_JAVA_PKGBASE= sun-jdk14 +_JAVA_PREFIX_DEFAULT= ${LOCALBASE}/java/sun-1.4.0 _JAVA_HOME= ${_JAVA_PREFIX} ${_JDK_DEPMETHOD}+= sun-jdk14-[0-9]*:../../lang/sun-jdk14 DEPENDS+= sun-jre14-[0-9]*:../../lang/sun-jre14 . elif ${PKG_JVM} == "sun-jdk13" -_JAVA_PKGNAME= sun-jdk13 +_JAVA_PKGBASE= sun-jdk13 +_JAVA_PREFIX_DEFAULT= ${LOCALBASE}/java/sun-1.3.1 _JAVA_HOME= ${_JAVA_PREFIX} ${_JDK_DEPMETHOD}+= sun-jdk13-[0-9]*:../../lang/sun-jdk13 DEPENDS+= sun-jre13-[0-9]*:../../lang/sun-jre13 @@ -102,31 +105,34 @@ DEPENDS+= sun-jre13-[0-9]*:../../lang/sun-jre13 . if ${MACHINE_PLATFORM:MNetBSD-1.5Z[A-Z]-i386} != "" || \ ${MACHINE_PLATFORM:MNetBSD-1.[6-9]*-i386} != "" || \ ${MACHINE_PLATFORM:MLinux-*-i386} != "" -_JAVA_PKGNAME= sun-jdk14 +_JAVA_PKGBASE= sun-jdk1[34] +_JAVA_PREFIX_DEFAULT= ${LOCALBASE}/java/sun-1.4.0 _JAVA_HOME= ${_JAVA_PREFIX} -${_JDK_DEPMETHOD}+= sun-jdk14-[0-9]*:../../lang/sun-jdk14 -DEPENDS+= sun-jre14-[0-9]*:../../lang/sun-jre14 +${_JDK_DEPMETHOD}+= sun-jdk1[34]-[0-9]*:../../lang/sun-jdk14 +DEPENDS+= sun-jre1[34]-[0-9]*:../../lang/sun-jre14 . elif ${MACHINE_PLATFORM:MNetBSD-*-i386} != "" || \ ${MACHINE_PLATFORM:MDarwin-*-*} != "" || \ ${MACHINE_PLATFORM:MLinux-*-i386} != "" -_JAVA_PKGNAME= sun-jdk13 +_JAVA_PKGBASE= sun-jdk1[34] +_JAVA_PREFIX_DEFAULT= ${LOCALBASE}/java/sun-1.3.1 _JAVA_HOME= ${_JAVA_PREFIX} -${_JDK_DEPMETHOD}+= sun-jdk13-[0-9]*:../../lang/sun-jdk13 -DEPENDS+= sun-jre13-[0-9]*:../../lang/sun-jre13 +${_JDK_DEPMETHOD}+= sun-jdk1[34]-[0-9]*:../../lang/sun-jdk13 +DEPENDS+= sun-jre1[34]-[0-9]*:../../lang/sun-jre13 . endif . elif ${PKG_JVM} == "blackdown-jdk13" -_JAVA_PKGNAME= blackdown-jdk13 +_JAVA_PKGBASE= blackdown-jdk13 +_JAVA_PREFIX_DEFAULT= ${LOCALBASE} _JAVA_HOME= ${_JAVA_PREFIX}/java/blackdown-1.3.1 ${_JDK_DEPMETHOD}+= blackdown-jdk13-[0-9]*:../../lang/blackdown-jdk13 DEPENDS+= blackdown-jre13-[0-9]*:../../lang/blackdown-jre13 . elif ${PKG_JVM} == "kaffe" -_JAVA_PKGNAME= kaffe -_JAVA_HOME= ${_JAVA_PREFIX} +_JAVA_PKGBASE= kaffe +_JAVA_PREFIX_DEFAULT= ${LOCALBASE} +_JAVA_HOME= ${_JAVA_PREFIX}/java/kaffe DEPENDS+= kaffe-[0-9]*:../../lang/kaffe . endif . undef _UNUSED_DEPENDS -_JAVA_PREFIX_DEFAULT= ${LOCALBASE}/java/${_JAVA_PKGNAME} -EVAL_PREFIX+= _JAVA_PREFIX=${_JAVA_PKGNAME} +EVAL_PREFIX+= _JAVA_PREFIX=${_JAVA_PKGBASE} MAKE_ENV+= JAVA_HOME=${JAVA_HOME} CONFIGURE_ENV+= JAVA_HOME=${JAVA_HOME} SCRIPTS_ENV+= JAVA_HOME=${JAVA_HOME} |