diff options
| author | schmonz <schmonz@pkgsrc.org> | 2002-08-01 13:25:26 +0000 |
|---|---|---|
| committer | schmonz <schmonz@pkgsrc.org> | 2002-08-01 13:25:26 +0000 |
| commit | 856d2fdf3e7bb192a523cc1b77a9ebfc8efecce6 (patch) | |
| tree | f4010825652f3d30f64e4079d0f50c7f9c757359 /mk | |
| parent | 5568b6502b8334dae5a55f4d36ae4e61ac1ce6bf (diff) | |
| download | pkgsrc-856d2fdf3e7bb192a523cc1b77a9ebfc8efecce6.tar.gz | |
Set JAVA_HOME correctly on Darwin.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 1820432fbf5..f72d0b237a5 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1023 2002/07/31 14:48:03 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1024 2002/08/01 13:25:26 schmonz Exp $ # # This file is in the public domain. # @@ -97,7 +97,11 @@ ${_JDK_DEPMETHOD}+= sun-jdk14-[0-9]*:../../lang/sun-jdk14 DEPENDS+= sun-jre14-[0-9]*:../../lang/sun-jre14 . elif ${PKG_JVM} == "sun-jdk13" _JAVA_PKGBASE= sun-jdk13 +. if ${OPSYS} == "Darwin" +_JAVA_PREFIX_DEFAULT= /usr +. else _JAVA_PREFIX_DEFAULT= ${LOCALBASE}/java/sun-1.3.1 +. endif _JAVA_HOME= ${_JAVA_PREFIX} ${_JDK_DEPMETHOD}+= sun-jdk13-[0-9]*:../../lang/sun-jdk13 DEPENDS+= sun-jre13-[0-9]*:../../lang/sun-jre13 @@ -114,7 +118,11 @@ DEPENDS+= sun-jre1[34]-[0-9]*:../../lang/sun-jre14 ${MACHINE_PLATFORM:MDarwin-*-*} != "" || \ ${MACHINE_PLATFORM:MLinux-*-i386} != "" _JAVA_PKGBASE= sun-jdk1[34] +. if ${OPSYS} == "Darwin" +_JAVA_PREFIX_DEFAULT= /usr +. else _JAVA_PREFIX_DEFAULT= ${LOCALBASE}/java/sun-1.3.1 +. endif _JAVA_HOME= ${_JAVA_PREFIX} ${_JDK_DEPMETHOD}+= sun-jdk1[34]-[0-9]*:../../lang/sun-jdk13 DEPENDS+= sun-jre1[34]-[0-9]*:../../lang/sun-jre13 |