Clean up some obsolete Java stuff.

1 files changed, 6 insertions, 23 deletions

diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index 7c24f5e2918..4ffc4a3704f 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.190 2010/05/24 03:29:09 sbd Exp $
+# $NetBSD: mk.conf,v 1.191 2010/06/08 19:04:09 wiz Exp $
 #
 
 # This file provides default values for variables that may be overridden
@@ -1121,23 +1121,6 @@ JAKARTA_HOME?= ${JAVA_HOME}/jakarta
 # Possible: any directory
 # Default: ${JAVA_HOME}/jakarta
 
-#JAVA_HOME=
-# Location of jvm to be used by pkgsrc.  Java-based packages will be installed
-# in ${LOCALBASE}/lib/java, so that they are available to all jvms.
-#
-# Possible: any directory
-# Default: home of JVM chosen by ${PKG_JVM}
-
-JDK_HOME?= ${LOCALBASE}/java
-# Used by the lang/JDK package to choose an install location
-# Possible: any directory, e.g. /usr/jdk
-# Default: ${LOCALBASE}/java
-
-JSDK_HOME?= ${JAVA_HOME}/jsdk
-# Location for Java Servlet Development Kit installed by www/jsdk20
-# Possible: any directory
-# Default: ${JAVA_HOME}/jsdk
-
 #KERBEROS=
 # Used in many packages to specify use of a Kerberos (or compatible)
 # subsystem.  Requires Kerberos libraries in /usr/lib.
@@ -1504,11 +1487,11 @@ PILRC_USE_GTK?=	YES
 # Possible: YES, NO
 # Default: YES
 
-#PKG_JVM=
-# Used to choose a java virtual machine for packages which use Java.
-# ${JAVA_HOME} will be set based on this choice, if unset
-# Possible: jdk, sun-jdk, kaffe (kaffe currently has some problems)
-# Default: jdk on NetBSD/i386, kaffe elsewhere
+#PKG_JVM_DEFAULT=
+#       The JVM that should be used if nothing particular is specified.
+#
+#       Possible values: jdk kaffe openjdk7 openjdk7-bin
+#               jdk14 sun-jdk6 jdk15
 
 PKG_LANG?=english
 # Used to specify preferred language settings