diff options
| author | schmonz <schmonz> | 2002-06-30 15:01:47 +0000 |
|---|---|---|
| committer | schmonz <schmonz> | 2002-06-30 15:01:47 +0000 |
| commit | 2030653c9df01f6205b8491faca55905e1f2776f (patch) | |
| tree | 0ee0f19358fd88265595eaa8f7fb1eecef31add7 /mk | |
| parent | 082a0ad5ea9c8aa98adb3f0969742abf744b43b9 (diff) | |
| download | pkgsrc-2030653c9df01f6205b8491faca55905e1f2776f.tar.gz | |
Register lang/sun{jre,jdk}13 as stub packages on Darwin, pointing
to the included 1.3.1 JDK. Teach USE_JAVA about this. Approved by
jwise and agc.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index fbfaa0d1a31..2c365b858e8 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.997 2002/06/28 09:05:20 seb Exp $ +# $NetBSD: bsd.pkg.mk,v 1.998 2002/06/30 15:01:47 schmonz Exp $ # # This file is in the public domain. # @@ -71,6 +71,8 @@ BUILD_DEFS+= PKG_JVM JAVA_HOME PKG_JVM?= jdk . elif ${MACHINE_PLATFORM:MNetBSD-*-powerpc} != "" PKG_JVM?= blackdown-jdk13 +. elif ${MACHINE_PLATFORM:MDarwin-*-*} != "" +PKG_JVM?= sun-jdk . else PKG_JVM?= kaffe . endif @@ -89,7 +91,11 @@ JAVA_HOME?= ${LOCALBASE}/java . elif ${PKG_JVM} == "sun-jdk13" BUILD_DEPENDS+= sun-jdk-[0-9]*:../../lang/sun-jdk13 DEPENDS+= sun-jre-[0-9]*:../../lang/sun-jre13 +. if ${OPSYS} == "Darwin" +JAVA_HOME?= /usr +. else JAVA_HOME?= ${LOCALBASE}/java +. endif . elif ${PKG_JVM} == "sun-jdk" . if ${MACHINE_PLATFORM:MNetBSD-1.5Z[A-Z]-i386} != "" || \ ${MACHINE_PLATFORM:MNetBSD-1.[6-9]-i386} != "" || \ @@ -97,11 +103,16 @@ JAVA_HOME?= ${LOCALBASE}/java BUILD_DEPENDS+= sun-jdk-[0-9]*:../../lang/sun-jdk14 DEPENDS+= sun-jre-[0-9]*:../../lang/sun-jre14 . elif ${MACHINE_PLATFORM:MNetBSD-*-i386} != "" || \ + ${MACHINE_PLATFORM:MDarwin-*-*} != "" || \ ${MACHINE_PLATFORM:MLinux-*-i386} != "" BUILD_DEPENDS+= sun-jdk-[0-9]*:../../lang/sun-jdk13 DEPENDS+= sun-jre-[0-9]*:../../lang/sun-jre13 . endif +. if ${OPSYS} == "Darwin" +JAVA_HOME?= /usr +. else JAVA_HOME?= ${LOCALBASE}/java +. endif . elif ${PKG_JVM} == "blackdown-jdk13" DEPENDS+= blackdown-jdk-[0-9]*:../../lang/blackdown-jdk13 JAVA_HOME?= ${LOCALBASE}/java |