[pkgsrc/trunk]: pkgsrc/mk Remove traces of crypto restrictions.

[maya <maya%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ca9d772199aa
branches:  trunk
changeset: 373441:ca9d772199aa
user:      maya <maya%pkgsrc.org@localhost>
date:      Tue Jan 02 05:49:44 2018 +0000

description:
Remove traces of crypto restrictions.

ok for idea riastradh

diffstat:

 mk/bsd.pkg.mk       |  12 +-----------
 mk/bsd.pkg.use.mk   |   3 +--
 mk/defaults/mk.conf |  12 +-----------
 3 files changed, 3 insertions(+), 24 deletions(-)

diffs (90 lines):

diff -r 159c6a69ce71 -r ca9d772199aa mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Tue Jan 02 05:39:00 2018 +0000
+++ b/mk/bsd.pkg.mk     Tue Jan 02 05:49:44 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.2028 2017/11/12 13:34:14 khorben Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.2029 2018/01/02 05:49:44 maya Exp $
 #
 # This file is in the public domain.
 #
@@ -80,8 +80,6 @@
 # Transform package Makefile variables and set defaults
 ############################################################################
 
-MKCRYPTO?=             YES     # build crypto packages by default
-
 ##### Others
 
 BUILD_DEPENDS?=                # empty
@@ -451,9 +449,6 @@
 # Don't build a package if it's restricted and we don't want to
 # get into that.
 #
-# Don't build any package that utilizes strong cryptography, for
-# when the law of the land forbids it.
-#
 # Don't attempt to build packages against X if we don't have X.
 #
 # Don't build a package if it's broken.
@@ -478,11 +473,6 @@
 PKG_SKIP_REASON+= "${PKGNAME} is restricted:" \
         "    "${RESTRICTED:Q}
 .  endif
-.  if !(${MKCRYPTO} == "YES" || ${MKCRYPTO} == yes)
-.    if defined(CRYPTO)
-PKG_SKIP_REASON+= "${PKGNAME} may not be built, because it utilizes strong cryptography"
-.    endif
-.  endif
 .  if defined(USE_X11) && (${X11_TYPE} == "native") && !exists(${X11BASE})
 PKG_FAIL_REASON+= "${PKGNAME} uses X11, but ${X11BASE} not found"
 .  endif
diff -r 159c6a69ce71 -r ca9d772199aa mk/bsd.pkg.use.mk
--- a/mk/bsd.pkg.use.mk Tue Jan 02 05:39:00 2018 +0000
+++ b/mk/bsd.pkg.use.mk Tue Jan 02 05:49:44 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.use.mk,v 1.66 2017/03/05 10:38:37 kamil Exp $
+#      $NetBSD: bsd.pkg.use.mk,v 1.67 2018/01/02 05:49:44 maya Exp $
 #
 # Turn USE_* macros into proper depedency logic.  Included near the top of
 # bsd.pkg.mk, after bsd.prefs.mk.
@@ -62,7 +62,6 @@
 ### PKG_USE_KERBEROS
 
 .if defined(PKG_USE_KERBEROS)
-CRYPTO?=               uses Kerberos encryption code
 BUILD_DEFS+=           KERBEROS
 .endif
 
diff -r 159c6a69ce71 -r ca9d772199aa mk/defaults/mk.conf
--- a/mk/defaults/mk.conf       Tue Jan 02 05:39:00 2018 +0000
+++ b/mk/defaults/mk.conf       Tue Jan 02 05:49:44 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.289 2018/01/01 10:23:09 wiz Exp $
+# $NetBSD: mk.conf,v 1.290 2018/01/02 05:49:44 maya Exp $
 #
 
 # This file provides default values for variables that may be overridden
@@ -65,11 +65,6 @@
 #      this. Disabling this for an individual package can be done by
 #      setting MAKE_JOBS_SAFE=NO within the per package Makefile.
 
-#MKCRYPTO= no
-# If not YES or yes, don't fetch, build or install crypto packages.
-# Possible: not defined, no
-# Default: yes
-
 #OBJHOSTNAME=
 # use hostname-specific object directories, e.g.  work.amnesiac, work.localhost
 # OBJHOSTNAME takes precedence over OBJMACHINE (see below).
@@ -1731,11 +1726,6 @@
 # Possible: YES, NO
 # Default: NO
 
-USE_CRYPTO?=   YES
-# Used in speakfreely to choose support for encrypted connections.
-# Possible: YES, or NO.
-# Default: YES
-
 USERPPP_GROUP?=        network
 # Used in the userppp package to specify the default group.
 # Possible: any group name