pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk Remove wonka support, now that wonka package is gone.
details: https://anonhg.NetBSD.org/pkgsrc/rev/e4347af26089
branches: trunk
changeset: 492771:e4347af26089
user: wiz <wiz%pkgsrc.org@localhost>
date: Tue Apr 19 11:54:50 2005 +0000
description:
Remove wonka support, now that wonka package is gone.
Noted by schmonz@.
diffstat:
mk/java-vm.mk | 18 +++---------------
1 files changed, 3 insertions(+), 15 deletions(-)
diffs (72 lines):
diff -r 90067c9cec47 -r e4347af26089 mk/java-vm.mk
--- a/mk/java-vm.mk Tue Apr 19 11:02:29 2005 +0000
+++ b/mk/java-vm.mk Tue Apr 19 11:54:50 2005 +0000
@@ -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_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 @@
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-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-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-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 @@
#_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)
Home |
Main Index |
Thread Index |
Old Index