Revert last change. I only tested this on netbsd-1-4; it doesn't seem to

work on netbsd-1-5 at all.

2 files changed, 12 insertions, 26 deletions

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 345a4b5f4bc..dd0ca71bb55 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.564 2000/09/06 20:28:32 fredb Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.565 2000/09/07 02:29:42 fredb Exp $
 #
 # This file is in the public domain.
 #
@@ -956,24 +956,21 @@ ACCEPTABLE_LICENSES=	${ACCEPTABLE_LICENCES}
 # Many ways to disable a package.
 #
 # If we're in BATCH mode and the package is interactive, or we're
-# in interactive mode and the package is non-interactive, skip
-# all the important targets. The reason we have two modes is that
-# one might want to leave a build in BATCH mode running overnight,
-# then come back in the morning and do _only_ the interactive ones
-# that required your intervention.
+# in interactive mode and the package is non-interactive, skip all
+# the important targets.  The reason we have two modes is that
+# one might want to leave a build in BATCH mode running
+# overnight, then come back in the morning and do _only_ the
+# interactive ones that required your intervention.
 #
-# Ignore packages that can't be resold if building for a CDROM.
+# Don't attempt to build packages that require Motif if you don't
+# have Motif.
 #
-# Don't build a package if it's restricted and we don't want to
-# get into that.
+# Ignore packages that can't be resold if building for a CDROM.
 #
-# Don't attempt to build packages against X if we don't have X.
+# Don't build a package if it's restricted and we don't want to get
+# into that.
 #
 # Don't build a package if it's broken.
-#
-# If so specified, for whatever reason, don't build any packages
-# from the "crypto" category
-#
 ################################################################
 
 .if !defined(NO_IGNORE)
@@ -1003,12 +1000,6 @@ IGNORE+= "${PKGNAME} uses X11, but ${X11BASE} not found"
 .if defined(BROKEN)
 IGNORE+= "${PKGNAME} is marked as broken:" ${BROKEN:Q}
 .endif
-.if defined(MKCRYPTO) && ${MKCRYPTO} != "YES"
-_crypto:= ${CATEGORIES:Mcrypto}
-.  if defined(_crypto)
-IGNORE+= "${PKGNAME} may not be built, because it contains strong cryptography"
-.  endif
-.endif # MKCRYPTO != YES
 
 .if defined(LICENSE)
 .  ifdef ACCEPTABLE_LICENSES
diff --git a/mk/mk.conf.example b/mk/mk.conf.example
index dea41c9d667..9c1bf9712ba 100644
--- a/mk/mk.conf.example
+++ b/mk/mk.conf.example
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf.example,v 1.151 2000/09/06 20:28:33 fredb Exp $
+# $NetBSD: mk.conf.example,v 1.152 2000/09/07 02:29:43 fredb Exp $
 #
 
 # Sample /etc/mk.conf file, which can be used to set specific values
@@ -30,11 +30,6 @@
 # Possible: defined, not defined
 # Default: not defined
 
-#MKCRYPTO= no
-# Don't fetch, build or install any package in the "crypto" category.
-# Possible: not defined, YES, defined
-# Default: not defined (same as YES)
-
 #OBJMACHINE=
 # use machine-specific object directories, e.g.  work.i386, work.sparc
 # Possible: defined, not defined