Document two new make variables which may be defined in mk.conf:

USE_CRYPTO:	YES, NO; Default: YES
	- whether or not net/speakfreely is compiled with support for
	  encrypted connections

USE_IDEA:	YES, NO; Default: package-dependent
	- whether or not to compile with support for patented IDEA;
	  used by net/speakfreely and security/ssh

Also, remove SSH_DONT_USE_IDEA.  This is still handled by ssh Makefile,
but is marked as deprecated.

1 files changed, 12 insertions, 6 deletions

diff --git a/mk/mk.conf.example b/mk/mk.conf.example
index 7a978d10acb..12db642ee1a 100644
--- a/mk/mk.conf.example
+++ b/mk/mk.conf.example
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf.example,v 1.115 2000/01/17 14:49:55 agc Exp $
+# $NetBSD: mk.conf.example,v 1.116 2000/01/17 16:21:31 jlam Exp $
 #
 
 # Sample /etc/mk.conf file, which can be used to set specific values
@@ -515,11 +515,6 @@ PAPERSIZE=	A4
 # Possible: any valid directory
 # Default: /etc
 
-#SSH_DONT_USE_IDEA=
-# Used in ssh package to stop IDEA encryption
-# Possible: defined, not defined
-# Default: not defined
-
 #SSH_RSHPATH=
 # Used in ssh to specify standard rsh path
 # Possible: path to rsh binary
@@ -541,6 +536,11 @@ PAPERSIZE=	A4
 # Possible: YES, or NO.
 # Default: YES
 
+#USE_CRYPTO=	YES
+# Used in speakfreely to choose support for encrypted connections.
+# Possible: YES, or NO.
+# Default: YES
+
 #USE_GIF=
 # Enable GIF support in qt.  (disabled per default due to licensing
 # problems; future revisions might have no support at all)
@@ -548,6 +548,12 @@ PAPERSIZE=	A4
 # Possible: defined, not defined
 # Default: not defined
 
+#USE_IDEA=	NO
+# Used in speakfreely and ssh to choose whether to compile using
+# the patented IDEA encryption algorithm.
+# Possible: YES, or NO.
+# Default: package-dependent
+
 #USE_INET6=
 # Enable IPv6 support on certain packages.  Use IPv6-ready kernel if
 # you define this.