Correct default for ${JDK_HOME}, and document ${PKG_JVM), ${JAVA_HOME},

${JAKARTA_HOME} and ${JSDK_HOME}

1 files changed, 25 insertions, 5 deletions

diff --git a/mk/mk.conf.example b/mk/mk.conf.example
index 3b8e2d7f14a..3c544dd7740 100644
--- a/mk/mk.conf.example
+++ b/mk/mk.conf.example
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf.example,v 1.112 2000/01/14 11:58:22 agc Exp $
+# $NetBSD: mk.conf.example,v 1.113 2000/01/15 01:03:17 jwise Exp $
 #
 
 # Sample /etc/mk.conf file, which can be used to set specific values
@@ -322,12 +322,27 @@
 # Used by jitterbug package as the mail alias to receive mail from
 # jitterbug
 # Possible: any valid mail alias
-# default: none
+# Default: none
+
+#JAKARTA_HOME=
+# Used by the www/jakarta-tomcat package to choose an install location
+# Possible: any directory
+# Default: ${JAVA_HOME}/jakarta
+
+#JAVA_HOME=
+# Location for packages which install java code
+# Possible: any directory
+# Default: home of JVM chosen by ${PACKAGE_JVM}
 
 #JDK_HOME=
-# Used by the lang/JDK package to relocate it.
-# Possible: any dir, e.g. /usr/jdk
-# default: ${LOCALBASE}/JDK
+# Used by the lang/JDK package to choose an install location
+# Possible: any directory, e.g. /usr/jdk
+# Default: ${LOCALBASE}/java
+
+#JSDK_HOME=
+# 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)
@@ -446,6 +461,11 @@ PAPERSIZE=	A4
 # Possible: YES, NO
 # Default: YES
 
+#PKG_JVM=
+# Used to choose a java virtual machine for packages which use Java.
+# Possible: jdk, kaffe (kaffe currently has some problems)
+# Default: jdk on NetBSD/i386, kaffe elsewhere
+
 #POPTOP_USE_MPPE=
 # Used in poptop package to specify the use of the mppe-ppp package
 # in preference to the standard ppp