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).

31 files changed, 76 insertions, 155 deletions

diff --git a/archivers/hpack/Makefile b/archivers/hpack/Makefile
index ff2bf97f863..4db4ea1f15c 100644
--- a/archivers/hpack/Makefile
+++ b/archivers/hpack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/08/18 22:46:29 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 2000/09/09 19:40:14 fredb Exp $
 
 DISTNAME=       hpack79${USE_RSAREF2:S/YES/u/:C/[^u]*//g}src
 PKGNAME=        hpack-0.79
@@ -7,10 +7,7 @@ MASTER_SITES=   ftp://src.doc.ic.ac.uk/packages/hpack/
 
 MAINTAINER=     packages@netbsd.org
 
-RESTRICTED=	crypto
-NO_SRC_ON_FTP=	${RESTRICTED}
-NO_SRC_ON_CDROM=	${RESTRICTED}
-
+CRYPTO=		yes
 NO_WRKSUBDIR=	yes
 PATCHDIR=	${WRKDIR}/.patches
 
diff --git a/archivers/zip/Makefile b/archivers/zip/Makefile
index 3574a86bc50..0bf45404259 100644
--- a/archivers/zip/Makefile
+++ b/archivers/zip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2000/08/18 22:46:29 hubertf Exp $
+# $NetBSD: Makefile,v 1.19 2000/09/09 19:40:17 fredb Exp $
 # FreeBSD Id: Makefile,v 1.10 1997/04/27 16:06:15 ache Exp 
 #
 
@@ -23,9 +23,7 @@ BUILD_DEFS+=	ZIP_ENCRYPTION
 DISTFILES+=	zcrypt28.zip
 EXTRACT_ONLY=	zip23.tar.gz
 BUILD_DEPENDS=	unzip:../../archivers/unzip
-RESTRICTED=	crypto
-NO_SRC_ON_FTP=	${RESTRICTED}
-NO_SRC_ON_CDROM=	${RESTRICTED}
+CRYPTO=		yes
 
 post-extract:
 	@cd ${WRKSRC} && unzip -qo ${DISTDIR}/zcrypt28.zip
diff --git a/archivers/zip1/Makefile b/archivers/zip1/Makefile
index b14b53bf3f9..70272424fea 100644
--- a/archivers/zip1/Makefile
+++ b/archivers/zip1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2000/08/18 22:46:29 hubertf Exp $
+# $NetBSD: Makefile,v 1.9 2000/09/09 19:40:17 fredb Exp $
 #
 
 DISTNAME=	zip1-1.1
@@ -28,9 +28,7 @@ BUILD_DEFS+=	ZIP_ENCRYPTION
 .if defined(ZIP_ENCRYPTION)
 DISTFILES+=	zcrypt10.zip
 ALL_TARGET+=	zipcloak
-RESTRICTED=	crypto
-NO_SRC_ON_FTP=	${RESTRICTED}
-NO_SRC_ON_CDROM=	${RESTRICTED}
+CRYPTO=		yes
 .endif
 
 do-install:
diff --git a/audio/realplayer7/Makefile b/audio/realplayer7/Makefile
index 4865182b30f..4d3c255e64c 100644
--- a/audio/realplayer7/Makefile
+++ b/audio/realplayer7/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2000/09/09 08:31:14 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2000/09/09 19:40:17 fredb Exp $
 #
 
 DISTNAME=		rp7_linux20_libc6_i386_cs1
@@ -13,7 +13,7 @@ HOMEPAGE=		http://www.real.com/products/player/
 
 DEPENDS+=		suse_x11>=6.1:../../emulators/suse_x11
 
-RESTRICTED=		"Export-controlled, redistribution not permitted"
+RESTRICTED=		"Redistribution not permitted"
 NO_SRC_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
@@ -21,6 +21,7 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
+CRYPTO=			yes
 IS_INTERACTIVE=		yes
 NO_CONFIGURE=		yes
 RP_INSTALLER=		${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
diff --git a/graphics/ns-flash/Makefile b/graphics/ns-flash/Makefile
index 6aebe1722cf..e243ecccfad 100644
--- a/graphics/ns-flash/Makefile
+++ b/graphics/ns-flash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2000/08/31 02:35:26 hubertf Exp $
+# $NetBSD: Makefile,v 1.9 2000/09/09 19:40:18 fredb Exp $
 #
 
 PKGNAME=		ns-flash-4.0r12
@@ -25,7 +25,7 @@ MASTER_SITES=		http://download.macromedia.com/pub/shockwave/flash/${SUB}/
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.flash.com/
 
-RESTRICTED=             "Export-controlled, redistribution not permitted"
+RESTRICTED=             "Redistribution not permitted"
 NO_SRC_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
@@ -34,6 +34,7 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_CONFIGURE=		yes
 NO_BUILD=		yes
 CHECK_SHLIBS=		no
+CRYPTO=			yes
 
 WRKSRC=			${WRKDIR}/${WRKNAME}
 NS_PLUGINS_DIR=		${PREFIX}/lib/netscape/plugins
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index ad6c48600e7..181dd9b096a 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2000/08/13 11:23:19 frueauf Exp $
+# $NetBSD: Makefile,v 1.76 2000/09/09 19:40:18 fredb Exp $
 #
 
 DISTNAME=       fetchmail-5.5.0
@@ -17,7 +17,6 @@ CONFIGURE_ARGS+=--without-hesiod
 CONFIGURE_ENV+=  LDFLAGS="${CFLAGS}"
 
 BUILD_DEFS+=	USE_INET6
-RESTRICTED=	"Crypto; export-controlled"
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/mutt-current/Makefile b/mail/mutt-current/Makefile
index e125edf1100..ce89d83ed23 100644
--- a/mail/mutt-current/Makefile
+++ b/mail/mutt-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/08/21 21:01:31 hubertf Exp $
+# $NetBSD: Makefile,v 1.7 2000/09/09 19:40:18 fredb Exp $
 
 IGNORE=		"Stable mutt avaiable in mail/mutt"
 
@@ -28,14 +28,10 @@ CONFIGURE_ARGS+= --with-curses=${LOCALBASE} --with-exec-shell=/bin/ksh \
 		 --enable-pop --enable-imap
 LDFLAGS+=	-s
 
-RESTRICTED=	"Contains PGP code"
-NO_SRC_ON_FTP=	${RESTRICTED}
-NO_SRC_ON_CDROM=	${RESTRICTED}
-
 .include "../../mk/bsd.prefs.mk"
 
 .if !(defined(MUTT_INTERNATIONAL) && ${MUTT_INTERNATIONAL} == YES)
-IGNORE=		"${PKGNAME} contains PGP code"
+CRYPTO=		yes
 .endif
 
 .if ${OPSYS} == "SunOS"
diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index fb578328c7b..fa2766293e7 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2000/08/24 00:57:32 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2000/09/09 19:40:19 fredb Exp $
 #
 
 DISTNAME=		qpopper2.53
@@ -19,7 +19,7 @@ CONFIGURE_ARGS+=	--libexecdir=${PREFIX}/libexec \
 
 .if defined(USE_KERBEROS4)
 CONFIGURE_ARGS+=--enable-kerberos
-RESTRICTED=     uses Kerberos encryption code
+CRYPTO=		yes
 .endif
 
 BUILD_DEFS+=		QPOPPER_SERVERMODE USE_INET6
diff --git a/mbone/nte/Makefile b/mbone/nte/Makefile
index 7d4df10c997..e6ada65ae4d 100644
--- a/mbone/nte/Makefile
+++ b/mbone/nte/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2000/09/08 01:09:34 jwise Exp $
+# $NetBSD: Makefile,v 1.23 2000/09/09 19:40:19 fredb Exp $
 #
 
 DISTNAME=		nt.1.5a23
@@ -13,10 +13,7 @@ DEPENDS+=		tk-8.3.2:../../x11/tk
 
 NOT_FOR_PLATFORM=	*-*-alpha	# ANSI headers cause LP64 problems
 
-RESTRICTED=		"Contains DES encryption"
-NO_SRC_ON_FTP=		${RESTRICTED}
-NO_SRC_ON_CDROM=	${RESTRICTED}
-
+CRYPTO=			yes
 NO_WRKSUBDIR=		yes
 USE_GMAKE=		yes
 # Pass this on to our child
diff --git a/mbone/rat/Makefile b/mbone/rat/Makefile
index 914b9663810..634b0174dd1 100644
--- a/mbone/rat/Makefile
+++ b/mbone/rat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2000/08/31 00:11:31 jwise Exp $
+# $NetBSD: Makefile,v 1.16 2000/09/09 19:40:19 fredb Exp $
 #
 
 DISTNAME=	rat-3.0.28
@@ -10,10 +10,7 @@ HOMEPAGE=	http://www-mice.cs.ucl.ac.uk/multimedia/software/rat/
 
 DEPENDS+=	tk-8.3.2:../../x11/tk
 
-RESTRICTED=		"Contains DES encryption"
-NO_SRC_ON_FTP=		${RESTRICTED}
-NO_SRC_ON_CDROM=	${RESTRICTED}
-
+CRYPTO=		yes
 USE_GMAKE=	yes
 USE_X11BASE=	yes
 
diff --git a/mbone/sdr/Makefile b/mbone/sdr/Makefile
index 19053639c30..190b4dbe1f4 100644
--- a/mbone/sdr/Makefile
+++ b/mbone/sdr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2000/09/08 18:58:05 jwise Exp $
+# $NetBSD: Makefile,v 1.29 2000/09/09 19:40:19 fredb Exp $
 #
 
 DISTNAME=	sdr-2.7
@@ -10,10 +10,7 @@ HOMEPAGE=	http://www-mice.cs.ucl.ac.uk/multimedia/software/sdr/
 
 DEPENDS+=	tk-8.3.2:../../x11/tk
 
-RESTRICTED=	"Uses encryption"
-NO_SRC_ON_FTP=	${RESTRICTED}
-NO_SRC_ON_CDROM=	${RESTRICTED}
-
+CRYPTO=		yes
 USE_GMAKE=	yes
 
 .include "../../mk/bsd.prefs.mk"
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
diff --git a/security/crack/Makefile b/security/crack/Makefile
index dc1e996f8a5..774c43e7f0e 100644
--- a/security/crack/Makefile
+++ b/security/crack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/08/18 22:46:47 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 2000/09/09 19:40:20 fredb Exp $
 # FreeBSD Id: ports/security/crack/Makefile,v 1.11 1999/09/04 19:24:50 obrien Exp
 
 DISTNAME=	crack5.0
@@ -11,10 +11,6 @@ MASTER_SITES=	ftp://ftp.win.tue.nl/pub/security/  \
 
 MAINTAINER=	bouyer@netbsd.org
 
-RESTRICTED=		"Crypto; export-controlled"
-NO_SRC_ON_FTP=		${RESTRICTED}
-MIRROR_DISTFILE=	 no
-
 WRKSRC=		${WRKDIR}/c50a
 
 pre-configure:
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index f226abdd2f9..96264348292 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2000/08/18 22:46:47 hubertf Exp $
+# $NetBSD: Makefile,v 1.14 2000/09/09 19:40:21 fredb Exp $
 # FreeBSD Id: Makefile,v 1.20 1997/08/27 13:06:01 ache Exp
 #
 
@@ -11,13 +11,9 @@ HOMEPAGE=	http://www.gnupg.org/
 
 DEPENDS+=	gettext>=0.10.35nb1:../../devel/gettext
 
-USE_GMAKE=	yes
-
+CRYPTO=		yes
 GNU_CONFIGURE=	yes
-
-RESTRICTED=	"Cryptographic software"
-NO_SRC_ON_FTP=	${RESTRICTED}
-MIRROR_DISTFILE=no
+USE_GMAKE=	yes
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/security/isakmpd/Makefile b/security/isakmpd/Makefile
index 416ab2c7dde..05cbda40fb1 100644
--- a/security/isakmpd/Makefile
+++ b/security/isakmpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2000/09/03 13:12:52 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2000/09/09 19:40:21 fredb Exp $
 #
 
 DISTNAME=		isakmpd-000220
@@ -12,9 +12,8 @@ PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=		itojun@kame.net
 
-RESTRICTED=		"Crypto; export-controlled"
-
 BROKEN=			"broken by PF_KEY API change"
+CRYPTO=			yes
 
 # this is not compatible with cross build - there's no other way
 .if !exists(/usr/include/netinet6/ipsec.h)
@@ -29,9 +28,6 @@ DEPENDS+=		openssl-0.9.*:../../security/openssl
 .endif
 DEPENDS+=		gmp-*:../../devel/gmp
 
-RESTRICTED=		"Crypto; export-controlled"
-NO_SRC_ON_FTP=		${RESTRICTED}
-
 ALL_TARGET=		depend all
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/kth-krb4/Makefile b/security/kth-krb4/Makefile
index baffdb60361..e6e23dc3112 100644
--- a/security/kth-krb4/Makefile
+++ b/security/kth-krb4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/08/18 22:46:48 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 2000/09/09 19:40:21 fredb Exp $
 #
 
 DISTNAME=		krb4-1.0.1
@@ -11,9 +11,7 @@ HOMEPAGE=		http://www.pdc.kth.se/kth-krb/
 
 CONFLICTS+=		openssl-*
 
-RESTRICTED=		"Crypto; export-controlled"
-NO_SRC_ON_FTP=		${RESTRICTED}
-
+CRYPTO=			yes
 GNU_CONFIGURE=		yes
 #USE_GTEXINFO=		yes #not currently needed
 
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index 7c78ea25d0b..89813319de1 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2000/09/05 09:43:02 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2000/09/09 19:40:21 fredb Exp $
 #
 
 DISTNAME=		openssh-2.2.0p1
@@ -19,6 +19,8 @@ HOMEPAGE=		http://www.openssh.com/
 BUILD_DEPENDS+=		${PERL5}:../../lang/perl5-base
 BUILD_DEPENDS+=		autoreconf:../../devel/autoconf
 
+CRYPTO=			yes
+
 # Check for a usable installed version of OpenSSL.  Version must be greater
 # than 0.9.5a.  If a usable version isn't present, then use the pkgsrc
 # OpenSSL package.
@@ -45,9 +47,6 @@ CONFLICTS=		ssh-[0-9]* ssh6-[0-9]*
 BUILD_DEFS+=		USE_INET6
 BUILD_DEFS+=		SSH_CONF_DIR
 
-RESTRICTED=		"Crypto; export-controlled"
-NO_SRC_ON_FTP=	${RESTRICTED}
-
 DEINSTALL_FILE=		${WRKDIR}/DEINSTALL
 INSTALL_FILE=		${WRKDIR}/INSTALL
 MESSAGE_FILE=		${WRKDIR}/MESSAGE
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index 2d23bef1f6e..64e61a57f32 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2000/09/05 17:34:05 wennmach Exp $
+# $NetBSD: Makefile,v 1.21 2000/09/09 19:40:22 fredb Exp $
 #
 
 DISTNAME=		openssl-0.9.5a
@@ -11,10 +11,9 @@ HOMEPAGE=		http://www.openssl.org/
 
 CONFLICTS=		SSLeay-* ssleay-* kth-krb4-*
 
-USE_PERL5=		# defined
-
-RESTRICTED=		"Crypto; export-controlled"
-NO_SRC_ON_FTP=	${RESTRICTED}
+CRYPTO=			YES
+USE_PERL5=		YES
+USE_RSAREF2=		NO
 
 # matches what's in `Configure' (except sparc64)
 ONLY_FOR_PLATFORM=	NetBSD-*-alpha NetBSD-*-arm32 NetBSD-*-i386 \
@@ -46,17 +45,6 @@ CONFIGURE_ARGS+=	rsaref
 PLIST_RSAREF=		${PKGDIR}/PLIST.rsaref
 .endif
 
-fetch-depends:
-.if !defined(USE_RSAREF2) || ${USE_RSAREF2} != YES && ${USE_RSAREF2} != NO
-	@${ECHO}
-	@${ECHO} The variable USE_RSAREF2 must be set to either YES or NO
-	@${ECHO} in order to build this package.  People with no RSA
-	@${ECHO} license MUST set this variable to YES.  Users outside
-	@${ECHO} the USA MUST set this variable to NO.  RSA licensees may
-	@${ECHO} choose -- NO is faster.
-	@${FALSE}
-.endif
-
 pre-patch:
 	${MKDIR} ${WRKDIR}/.patches
 	@${CP} ${.CURDIR}/patches/patch-* ${WRKDIR}/.patches
diff --git a/security/pgp2/Makefile b/security/pgp2/Makefile
index 63536171dff..0e4b9e619cb 100644
--- a/security/pgp2/Makefile
+++ b/security/pgp2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2000/08/18 22:46:49 hubertf Exp $
+# $NetBSD: Makefile,v 1.25 2000/09/09 19:40:22 fredb Exp $
 # FreeBSD Id: Makefile,v 1.20 1997/08/27 13:06:01 ache Exp
 #
 
@@ -11,6 +11,8 @@ MASTER_SITES=	ftp://ftp.ifi.uio.no/pub/pgp/2.x/src/ \
 MAINTAINER=	packages@NetBSD.ORG
 HOMEPAGE=	http://www.pgpi.com/
 
+CRYPTO=		yes
+
 .include "../../mk/bsd.prefs.mk"
 
 .if defined(USE_RSAREF2) && ${USE_RSAREF2} == YES
@@ -28,9 +30,6 @@ RSAOBJS=	rsaglue1.o
 CFLAGS=
 .endif
 
-RESTRICTED=	"Cryptographic software"
-NO_SRC_ON_FTP=	${RESTRICTED}
-
 PGPLIB=		${PREFIX}/share/pgp
 CFLAGS+=	-DPGP_SYSTEM_DIR=\\\"${PGPLIB}/\\\"
 
diff --git a/security/pgp5/Makefile b/security/pgp5/Makefile
index 4e9bdbf970f..729e93346f4 100644
--- a/security/pgp5/Makefile
+++ b/security/pgp5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/09/05 09:33:16 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2000/09/09 19:40:22 fredb Exp $
 #
 
 DISTNAME=	pgp50i-unix-src
@@ -19,9 +19,7 @@ HOMEPAGE=       http://www.pgpi.com/
 
 BUILD_DEPENDS=	${PERL5}:../../lang/perl5-base
 
-RESTRICTED=	"Cryptographic software"
-NO_SRC_ON_FTP=	${RESTRICTED}
-
+CRYPTO=		YES
 GNU_CONFIGURE=	YES
 
 PGPLIB=	${PREFIX}/share/pgp5
diff --git a/security/py-crypto/Makefile b/security/py-crypto/Makefile
index 44ce95cf57c..55cd7acf066 100644
--- a/security/py-crypto/Makefile
+++ b/security/py-crypto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2000/08/21 21:01:33 hubertf Exp $
+# $NetBSD: Makefile,v 1.12 2000/09/09 19:40:22 fredb Exp $
 
 DISTNAME=	pycrypt100
 PKGNAME=	py-crypto-1.0.0
@@ -11,8 +11,7 @@ HOMEPAGE=	http://starship.skyport.net/crew/amk/writing/pct/
 
 DEPENDS+=	python-1.5.2:../../lang/python
 
-RESTRICTED=	"Cryptographic software"
-NO_SRC_ON_FTP=	${RESTRICTED}
+CRYPTO=		yes
 
 WRKSRC=		${WRKDIR}/Extensions/Crypto
 MAKE_FLAGS=	'OPT=${CFLAGS}'
diff --git a/security/racoon/Makefile b/security/racoon/Makefile
index 9a2674e50bf..0a1f774ffbb 100644
--- a/security/racoon/Makefile
+++ b/security/racoon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2000/08/27 07:35:09 itojun Exp $
+# $NetBSD: Makefile,v 1.19 2000/09/09 19:40:22 fredb Exp $
 #
 
 DISTNAME=	racoon-20000731a
@@ -8,7 +8,7 @@ MASTER_SITES=	ftp://ftp.kame.net/pub/kame/misc/
 MAINTAINER=	itojun@kame.net
 HOMEPAGE=	http:/www.kame.net/
 
-RESTRICTED=	"Crypto, export-controlled"
+CRYPTO=		yes
 
 # this is not compatible with cross build - there's no other way
 .if !exists(/usr/include/netinet6/ipsec.h)
diff --git a/security/rc5des/Makefile b/security/rc5des/Makefile
index cbf9c3f60f5..daf62d8b199 100644
--- a/security/rc5des/Makefile
+++ b/security/rc5des/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/08/18 22:46:49 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 2000/09/09 19:40:23 fredb Exp $
 #
 
 DISTNAME=		rc5-mlg-004
@@ -11,13 +11,11 @@ HOMEPAGE=		http://rc5.distributed.net/
 
 ONLY_FOR_PLATFORM=	NetBSD-*-alpha NetBSD-*-arm32 NetBSD-*-i386
 
-RESTRICTED=		"Crypto; export-controlled"
-NO_SRC_ON_FTP=	${RESTRICTED}
+CRYPTO=			yes
+NO_CONFIGURE=		yes
 
 WRKSRC=			${WRKDIR}/RC5
 
-NO_CONFIGURE=		yes
-
 # agc - this is commented out until I can test that it works.
 #post-patch:
 #	@(hostname=`/bin/hostname`;					\
diff --git a/security/rsaref/Makefile b/security/rsaref/Makefile
index e79cd9b167a..e32240b54b9 100644
--- a/security/rsaref/Makefile
+++ b/security/rsaref/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2000/08/18 22:46:49 hubertf Exp $
+# $NetBSD: Makefile,v 1.20 2000/09/09 19:40:23 fredb Exp $
 #
 
 DISTNAME=		rsaref
@@ -10,9 +10,7 @@ EXTRACT_SUFX=		.tar.Z
 
 MAINTAINER=		tv@netbsd.org
 
-RESTRICTED=		"Cryptographic source usable only within the USA"
-NO_SRC_ON_FTP=	${RESTRICTED}
-
+CRYPTO=			yes
 IS_INTERACTIVE=		yes # requires options to be set in order to use
 LICENSE=		no-commercial-use
 
diff --git a/security/srp_client/Makefile b/security/srp_client/Makefile
index 4367ce96fa3..cd36fb8cdb3 100644
--- a/security/srp_client/Makefile
+++ b/security/srp_client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/08/23 23:27:58 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2000/09/09 19:40:23 fredb Exp $
 #
 
 DISTNAME=		srp-1.4.4
@@ -20,9 +20,8 @@ BUILD_DEPENDS+=		autoconf:../../devel/autoconf
 BUILD_DEPENDS+=		automake:../../devel/automake
 DEPENDS+=		gmp>=2.0.2:../../devel/gmp
 
-RESTRICTED=             "Crypto; export-controlled"
-NO_SRC_ON_FTP=	${RESTRICTED}
-
+BROKEN=			"Distfile for srp-1.4.4 not available"
+CRYPTO=			yes
 GNU_CONFIGURE=		yes
 
 CPPFLAGS+=		-Dunix=1
diff --git a/security/ssh/Makefile b/security/ssh/Makefile
index ac5d958d0ee..a09bc16e786 100644
--- a/security/ssh/Makefile
+++ b/security/ssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2000/08/18 22:46:50 hubertf Exp $
+# $NetBSD: Makefile,v 1.82 2000/09/09 19:40:24 fredb Exp $
 # FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp
 #
 
@@ -18,8 +18,7 @@ HOMEPAGE=		http://www.cs.hut.fi/ssh/
 
 CONFLICTS=		openssh-[0-9]* ssh6-[0-9]*
 
-RESTRICTED=		"Crypto; export-controlled"
-NO_SRC_ON_FTP=	${RESTRICTED}
+CRYPTO=			YES
 LICENSE=		no-commercial-use
 
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
diff --git a/security/ssh6/Makefile b/security/ssh6/Makefile
index bffe300dd3a..904c11ec070 100644
--- a/security/ssh6/Makefile
+++ b/security/ssh6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/08/18 22:46:50 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 2000/09/09 19:40:24 fredb Exp $
 # FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp
 #
 
@@ -19,9 +19,7 @@ HOMEPAGE=		http://www.cs.hut.fi/ssh/
 
 CONFLICTS=		openssh-[0-9]* ssh-[0-9]*
 
-RESTRICTED=		"Crypto; export-controlled"
-NO_SRC_ON_FTP=	${RESTRICTED}
-LICENSE=		no-commercial-use
+CRYPTO=			YES
 
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
 CFLAGS=			-O2
diff --git a/www/libwww/Makefile b/www/libwww/Makefile
index 8761d8ec0f6..b80583baa98 100644
--- a/www/libwww/Makefile
+++ b/www/libwww/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2000/09/02 16:29:22 fredb Exp $
+# $NetBSD: Makefile,v 1.13 2000/09/09 19:40:24 fredb Exp $
 # FreeBSD Id: Makefile,v 1.10 1998/06/14 23:34:59 jseger Exp
 #
 
@@ -13,19 +13,16 @@ HOMEPAGE=		http://www.w3.org/Library/
 
 BUILD_DEPENDS+=		autoconf:../../devel/autoconf
 
-RESTRICTED=		"Crypto, export-controlled"
-NO_BIN_ON_FTP=		${RESTRICTED}
+USE_GMAKE=		yes
+USE_LIBTOOL=		yes
+USE_SSL=		yes
 
-USE_GMAKE=		# defined
-USE_LIBTOOL=		# defined
-USE_SSL=		# defined
-LTCONFIG_OVERRIDE=	${WRKSRC}/config/ltconfig
-
-GNU_CONFIGURE=		# defined
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--with-zlib --with-regex --without-x
 CONFIGURE_ARGS+=	--with-ssl
 
 DOCDIR=			${PREFIX}/share/doc/libwww
+LTCONFIG_OVERRIDE=	${WRKSRC}/config/ltconfig
 
 pre-configure:
 	cd ${WRKSRC}; autoconf
diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile
index e50b5f17ab9..2fda3d0c8f5 100644
--- a/www/lynx-current/Makefile
+++ b/www/lynx-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2000/08/11 13:18:39 fredb Exp $
+# $NetBSD: Makefile,v 1.19 2000/09/09 19:40:25 fredb Exp $
 #
 
 DISTNAME=		lynx2.8.4dev.7
@@ -27,10 +27,6 @@ HOMEPAGE=		http://lynx.browser.org/
 
 DEPENDS+=		gettext>=0.10.35nb1:../../devel/gettext
 
-RESTRICTED=		"Crypto, export-controlled"
-NO_BIN_ON_FTP=		${RESTRICTED}
-NO_SRC_ON_FTP=		${RESTRICTED}
-
 DIST_SUBDIR=		lynx
 EXTRACT_ONLY=		${DISTFILES:M*.tar.bz2}
 WRKSRC=			${WRKDIR}/lynx2-8-4
diff --git a/www/lynx/Makefile b/www/lynx/Makefile
index 0999f64ec36..cd8d3f9ed6a 100644
--- a/www/lynx/Makefile
+++ b/www/lynx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2000/08/11 08:11:23 tron Exp $
+# $NetBSD: Makefile,v 1.30 2000/09/09 19:40:24 fredb Exp $
 #
 
 DISTNAME=		lynx2.8.3rel.1
@@ -29,10 +29,6 @@ HOMEPAGE=		http://lynx.browser.org/
 
 DEPENDS+=		gettext>=0.10.35nb1:../../devel/gettext
 
-RESTRICTED=		"Crypto, export-controlled"
-NO_BIN_ON_FTP=		${RESTRICTED}
-NO_SRC_ON_FTP=		${RESTRICTED}
-
 DIST_SUBDIR=		lynx
 EXTRACT_ONLY=		${DISTFILES:M*.tar.bz2}
 WRKSRC=			${WRKDIR}/lynx2-8-3