diff options
| author | wiz <wiz> | 2005-04-19 11:54:50 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2005-04-19 11:54:50 +0000 |
| commit | cf5d2eb13ccd035999a0c077e8b78ea937c55808 (patch) | |
| tree | 111e2c27e10391581329170c1547ba05b6e1c01d /mk/java-vm.mk | |
| parent | 42849c755be218d6ff2701910394632259aabc07 (diff) | |
| download | pkgsrc-cf5d2eb13ccd035999a0c077e8b78ea937c55808.tar.gz | |
Remove wonka support, now that wonka package is gone.
Noted by schmonz@.
Diffstat (limited to 'mk/java-vm.mk')
| -rw-r--r-- | mk/java-vm.mk | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/mk/java-vm.mk b/mk/java-vm.mk index 8190471ce41..b66b5eecdcb 100644 --- a/mk/java-vm.mk +++ b/mk/java-vm.mk @@ -1,4 +1,4 @@ -# $NetBSD: java-vm.mk,v 1.39 2005/03/24 17:46:01 tv Exp $ +# $NetBSD: java-vm.mk,v 1.40 2005/04/19 11:54:50 wiz Exp $ # # This Makefile fragment handles Java dependencies and make variables, # and is meant to be included by packages that require Java either at @@ -40,14 +40,13 @@ PKG_JVM_DEFAULT?= # empty PKG_JVMS_ACCEPTED?= ${_PKG_JVMS} # This is a list of all of the JVMs that may be used with java-vm.mk. -# Note: The wonka configuration is still under development # .if defined(USE_JAVA2) && !empty(USE_JAVA2:M[yY][eE][sS]) -_PKG_JVMS?= sun-jdk13 sun-jdk14 blackdown-jdk13 kaffe wonka \ +_PKG_JVMS?= sun-jdk13 sun-jdk14 blackdown-jdk13 kaffe \ sun-jdk15 jdk14 # win32-jdk .else _PKG_JVMS?= jdk sun-jdk13 sun-jdk14 blackdown-jdk13 kaffe \ - wonka sun-jdk15 jdk14 # win32-jdk + sun-jdk15 jdk14 # win32-jdk .endif # To be deprecated: if PKG_JVM is explicitly set, then use it as the @@ -103,8 +102,6 @@ _ONLY_FOR_PLATFORMS.sun-jdk15= \ Linux-*-i[3-6]86 #_ONLY_FOR_PLATFORMS.win32-jdk= \ # Interix-*-* -_ONLY_FOR_PLATFORMS.wonka= \ - *-*-arm *-*-arm32 *-*-i386 # Set the accepted JVMs for this platform. .for _jvm_ in ${_PKG_JVMS} @@ -123,7 +120,6 @@ _JAVA_PKGBASE.sun-jdk13= sun-jdk13 _JAVA_PKGBASE.sun-jdk14= sun-jdk14 _JAVA_PKGBASE.sun-jdk15= sun-jdk15 #_JAVA_PKGBASE.win32-jdk= win32-jdk -_JAVA_PKGBASE.wonka= wonka # Mark the acceptable JVMs and check which JVM packages are installed. .for _jvm_ in ${_PKG_JVMS_ACCEPTED} @@ -209,7 +205,6 @@ BUILDLINK_DEPENDS.sun-jre14?= sun-jre14-[0-9]* BUILDLINK_DEPENDS.sun-jdk15?= sun-jdk15-[0-9]* BUILDLINK_DEPENDS.sun-jre15?= sun-jre15-[0-9]* #BUILDLINK_DEPENDS.win32-jdk?= win32-jdk>=0.1 -BUILDLINK_DEPENDS.wonka?= wonka-[0-9]* _JRE.blackdown-jdk13= blackdown-jre13 _JRE.jdk= jdk @@ -219,7 +214,6 @@ _JRE.sun-jdk13= sun-jre13 _JRE.sun-jdk14= sun-jre14 _JRE.sun-jdk15= sun-jre15 #_JRE.win32-jdk= win32-jdk -_JRE.wonka= wonka _JAVA_BASE_CLASSES= classes.zip @@ -261,12 +255,6 @@ UNLIMIT_RESOURCES+= datasize #_JDK_PKGSRCDIR= ../../lang/win32-jdk #_JRE_PKGSRCDIR= ${_JDK_PKGSRCDIR} #_JAVA_HOME_DEFAULT= ${LOCALBASE}/java/win32 -.elif ${_PKG_JVM} == "wonka" -_JDK_PKGSRCDIR= ../../lang/wonka -_JRE_PKGSRCDIR= ${_JDK_PKGSRCDIR} -_JAVA_HOME_DEFAULT= ${LOCALBASE}/java/wonka -_JAVA_BASE_CLASSES= wre.jar -SCRIPTS_ENV+= JAVAC="jikes" .endif .if defined(_JAVA_HOME_DEFAULT) |