Reorganize crypto handling, as discussed on tech-pkg. Remove all

RESTRICTED= variables that were predicated on former U.S. export
regulations. Add CRYPTO=, as necessary, so it's still possible to
exclude all crypto packages from a build by setting MKCRYPTO=no
(but "lintpkgsrc -R" will no longer catch them).

Specifically,

- - All packages which set USE_SSL just lose their RESTRICTED
    variable, since MKCRYPTO responds to USE_SSL directly.
- - realplayer7 and ns-flash keep their RESTRICTED, which is based
    on license terms, but also gain the CRYPTO variable.
- - srp-client is now marked broken, since the distfile is evidently
    no longer available. On this, we're no worse off than before.
    [We haven't been mirroring the distfile, or testing the build!]
- - isakmpd gets CRYPTO for RESTRICTED, but remains broken.
- - crack loses all restrictions, as it does not evidently empower
    a user to utilize strong encryption (working definition: ability
    to encode a message that requires a secret key plus big number
    arithmetic to decode).

2 files changed, 9 insertions, 19 deletions

diff --git a/net/speakfreely/Makefile b/net/speakfreely/Makefile
index 1e8f453a594..d1b8fe1726b 100644
--- a/net/speakfreely/Makefile
+++ b/net/speakfreely/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2000/08/27 02:46:06 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2000/09/09 19:40:20 fredb Exp $
 #
 
 DISTNAME=		speak_freely-7.2
@@ -11,13 +11,8 @@ HOMEPAGE=		http://www.fourmilab.ch/speakfree/unix/
 
 DEPENDS+=		gsm-1.0.10:../../audio/gsm
 
-USE_PERL5=		# defined
-
-RESTRICTED=		Source includes crypto code
-NO_SRC_ON_FTP=		${RESTRICTED}
-NO_SRC_ON_CDROM=	${RESTRICTED}
-
-NO_CONFIGURE=		# defined
+NO_CONFIGURE=		YES
+USE_PERL5=		YES
 
 BUILD_DEFS+=		SPEAKFREELY_OPTIONS USE_CRYPTO USE_IDEA
 
@@ -39,8 +34,7 @@ CCFLAGS+=		-DHALF_DUPLEX
 
 .if defined(USE_CRYPTO) && ${USE_CRYPTO} == "YES"
 HAVE_LIBCRYPTO=		YES
-USE_SSL=		# defined
-RESTRICTED=		"Crypto; export-controlled"
+USE_SSL=		YES
 
 .if defined(USE_IDEA) && ${USE_IDEA} == "YES"
 LICENSE=		no-commercial-use
diff --git a/net/vnc/Makefile b/net/vnc/Makefile
index ddba9054ccf..21a7cf3440e 100644
--- a/net/vnc/Makefile
+++ b/net/vnc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2000/08/28 09:14:50 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2000/09/09 19:40:20 fredb Exp $
 # FreeBSD Id: Makefile,v 1.2 1998/03/19 01:54:59 msmith Exp
 #
 
@@ -12,17 +12,13 @@ DISTFILES=		vnc-3.3.3r1_unixsrc.tgz \
 MAINTAINER=	 	packages@netbsd.org
 HOMEPAGE=		http://www.uk.research.att.com/vnc/
 
-USE_PERL5=		# defined
-
-# Is this for real? The code was developed in the UK,
-# but the DES parts came from the USA in the first place.
-RESTRICTED=		Contains cryptographic software
+CRYPTO=			yes
+NO_INSTALL_MANPAGES=	yes
+USE_IMAKE=		yes
+USE_PERL5=		yes
 
 WRKSRC=			${WRKDIR}/vnc_unixsrc
 
-USE_IMAKE=		# defined
-NO_INSTALL_MANPAGES=	# defined
-
 ALL_TARGET=    		World
 
 # We have to frob a few things, and we want our own permissions, so it's easier