diff options
| author | jschauma <jschauma> | 2002-05-14 18:07:01 +0000 |
|---|---|---|
| committer | jschauma <jschauma> | 2002-05-14 18:07:01 +0000 |
| commit | c49db0f9fa163daf73bd6ec56b11b642912b4650 (patch) | |
| tree | a29d58f1505507f9b3bf940d96af64a7c820b42f | |
| parent | c4bcbef3b0f88cdde6f5501f6f975a7913c18a74 (diff) | |
| download | pkgsrc-c49db0f9fa163daf73bd6ec56b11b642912b4650.tar.gz | |
Add and enable sun-jdk14 as an option for PKG_JVM:
If no PKG_JVM is specified, same behaviour as before.
If PKG_JVM=sun-jdk, check if on -current or linux and if so,
use sun-jdk14, else sun-jdk13. Else believe user when she
specified PKG_JVM=sun-jdk13 or PKG_JVM=sun-jdk14.
| -rw-r--r-- | mk/bsd.pkg.mk | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index b4051473072..a7154dc2ee9 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.977 2002/05/14 12:47:48 seb Exp $ +# $NetBSD: bsd.pkg.mk,v 1.978 2002/05/14 18:07:01 jschauma Exp $ # # This file is in the public domain. # @@ -75,10 +75,25 @@ JAVA_HOME?= ${JDK_HOME} . else JAVA_HOME?= ${LOCALBASE}/java . endif +. elif ${PKG_JVM} == "sun-jdk14" +BUILD_DEPENDS+= sun-jdk-[0-9]*:../../lang/sun-jdk14 +DEPENDS+= sun-jre-[0-9]*:../../lang/sun-jre14 +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 +JAVA_HOME?= ${LOCALBASE}/java . elif ${PKG_JVM} == "sun-jdk" +. if ${MACHINE_PLATFORM:MNetBSD-1.5Z[A-Z]-i386} != "" || \ + ${MACHINE_PLATFORM:MNetBSD-1.[6-9]-i386} != "" || \ + ${MACHINE_PLATFORM:MLinux-*-i386} != "" +BUILD_DEPENDS+= sun-jdk-[0-9]*:../../lang/sun-jdk14 +DEPENDS+= sun-jre-[0-9]*:../../lang/sun-jre14 +. elif ${MACHINE_PLATFORM:MNetBSD-*-i386} != "" || \ + ${MACHINE_PLATFORM:MLinux-*-i386} != "" BUILD_DEPENDS+= sun-jdk-[0-9]*:../../lang/sun-jdk13 DEPENDS+= sun-jre-[0-9]*:../../lang/sun-jre13 - +. endif JAVA_HOME?= ${LOCALBASE}/java . elif ${PKG_JVM} == "blackdown-jdk13" DEPENDS+= blackdown-jdk-[0-9]*:../../lang/blackdown-jdk13 |