Replace MIRROR_DISTFILES and NO_CDROM with the more descriptive and

more fine-grained NO_{BIN,SRC}_ON_{FTP,CDROM} definitions.

MIRROR_DISTFILES and NO_CDROM are now dead.

16 files changed, 40 insertions, 36 deletions

diff --git a/security/crack/Makefile b/security/crack/Makefile
index 5fe0e5e44d3..dc1e996f8a5 100644
--- a/security/crack/Makefile
+++ b/security/crack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/02/05 04:53:17 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2000/08/18 22:46:47 hubertf Exp $
 # FreeBSD Id: ports/security/crack/Makefile,v 1.11 1999/09/04 19:24:50 obrien Exp
 
 DISTNAME=	crack5.0
@@ -11,8 +11,9 @@ MASTER_SITES=	ftp://ftp.win.tue.nl/pub/security/  \
 
 MAINTAINER=	bouyer@netbsd.org
 
-RESTRICTED=	"Crypto; export-controlled"
-MIRROR_DISTFILE= no
+RESTRICTED=		"Crypto; export-controlled"
+NO_SRC_ON_FTP=		${RESTRICTED}
+MIRROR_DISTFILE=	 no
 
 WRKSRC=		${WRKDIR}/c50a
 
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index 3d613b784a6..f226abdd2f9 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2000/07/31 04:14:10 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2000/08/18 22:46:47 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.20 1997/08/27 13:06:01 ache Exp
 #
 
@@ -16,6 +16,7 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
 RESTRICTED=	"Cryptographic software"
+NO_SRC_ON_FTP=	${RESTRICTED}
 MIRROR_DISTFILE=no
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/security/isakmpd/Makefile b/security/isakmpd/Makefile
index a38931ea08c..762382cdd9d 100644
--- a/security/isakmpd/Makefile
+++ b/security/isakmpd/Makefile
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2000/06/12 11:26:25 itojun Exp $
+# $NetBSD: Makefile,v 1.6 2000/08/18 22:46:48 hubertf Exp $
 #
 
+BROKEN=			"broken by PF_KEY API change"
+
 DISTNAME=		isakmpd-000220
 PKGNAME=		isakmpd-20000220
 CATEGORIES=		security net
@@ -13,7 +15,6 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=		itojun@kame.net
 
 RESTRICTED=		"Crypto; export-controlled"
-IGNORE=			"broken by PF_KEY API change"
 
 # this is not compatible with cross build - there's no other way
 .if !exists(/usr/include/netinet6/ipsec.h)
@@ -29,7 +30,7 @@ DEPENDS+=		openssl-0.9.*:../../security/openssl
 DEPENDS+=		gmp-*:../../devel/gmp
 
 RESTRICTED=		"Crypto; export-controlled"
-MIRROR_DISTFILE=	no
+NO_SRC_ON_FTP=		${RESTRICTED}
 
 ALL_TARGET=		depend all
 
diff --git a/security/kth-krb4/Makefile b/security/kth-krb4/Makefile
index df2f72c77f2..baffdb60361 100644
--- a/security/kth-krb4/Makefile
+++ b/security/kth-krb4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/06/08 15:31:36 wennmach Exp $
+# $NetBSD: Makefile,v 1.4 2000/08/18 22:46:48 hubertf Exp $
 #
 
 DISTNAME=		krb4-1.0.1
@@ -12,7 +12,7 @@ HOMEPAGE=		http://www.pdc.kth.se/kth-krb/
 CONFLICTS+=		openssl-*
 
 RESTRICTED=		"Crypto; export-controlled"
-MIRROR_DISTFILE=	no
+NO_SRC_ON_FTP=		${RESTRICTED}
 
 GNU_CONFIGURE=		yes
 #USE_GTEXINFO=		yes #not currently needed
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index ae82c446e21..7e01b9ffdc1 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2000/08/11 05:19:42 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2000/08/18 22:46:48 hubertf Exp $
 #
 
 DISTNAME=		openssh-2.1.1p4
@@ -44,10 +44,10 @@ CONFLICTS=		ssh-[0-9]* ssh6-[0-9]*
 # retain the following line, for IPv6-ready pkgsrc webpage 
 BUILD_DEFS+=		USE_INET6
 BUILD_DEFS+=		SSH_CONF_DIR
-
 # USE_PERL5=		yes
+
 RESTRICTED=		"Crypto; export-controlled"
-MIRROR_DISTFILE=	no
+NO_SRC_ON_FTP=	${RESTRICTED}
 
 DEINSTALL_FILE=		${WRKDIR}/DEINSTALL
 INSTALL_FILE=		${WRKDIR}/INSTALL
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index 0c06e6476e6..a0bad47de76 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2000/07/24 11:11:16 tron Exp $
+# $NetBSD: Makefile,v 1.17 2000/08/18 22:46:48 hubertf Exp $
 #
 
 DISTNAME=		openssl-0.9.5a
@@ -14,7 +14,8 @@ CONFLICTS=		SSLeay-* ssleay-*
 USE_PERL5=		yes
 
 RESTRICTED=		"Crypto; export-controlled"
-MIRROR_DISTFILE=	no
+NO_SRC_ON_FTP=	${RESTRICTED}
+
 # matches what's in `Configure' (except sparc64)
 ONLY_FOR_PLATFORM=	NetBSD-*-alpha NetBSD-*-arm32 NetBSD-*-i386 \
 			NetBSD-*-m68k NetBSD-*-mips NetBSD-*-mipseb \
diff --git a/security/pgp2/Makefile b/security/pgp2/Makefile
index 6e18018c4e8..63536171dff 100644
--- a/security/pgp2/Makefile
+++ b/security/pgp2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2000/04/28 02:20:21 mycroft Exp $
+# $NetBSD: Makefile,v 1.24 2000/08/18 22:46:49 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.20 1997/08/27 13:06:01 ache Exp
 #
 
@@ -29,7 +29,8 @@ CFLAGS=
 .endif
 
 RESTRICTED=	"Cryptographic software"
-MIRROR_DISTFILE=no
+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 33924b6e017..a0a4defe59b 100644
--- a/security/pgp5/Makefile
+++ b/security/pgp5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1999/08/07 06:01:07 rh Exp $
+# $NetBSD: Makefile,v 1.5 2000/08/18 22:46:49 hubertf Exp $
 #
 
 DISTNAME=	pgp50i-unix-src
@@ -20,7 +20,7 @@ HOMEPAGE=       http://www.pgpi.com/
 BUILD_DEPENDS=	${LOCALBASE}/bin/perl:../../lang/perl5
 
 RESTRICTED=	"Cryptographic software"
-MIRROR_DISTFILE=no
+NO_SRC_ON_FTP=	${RESTRICTED}
 
 GNU_CONFIGURE=	YES
 
diff --git a/security/py-crypto/Makefile b/security/py-crypto/Makefile
index 6a8c5f4281a..b2c9d2923a2 100644
--- a/security/py-crypto/Makefile
+++ b/security/py-crypto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1999/09/21 03:40:23 hubertf Exp $
+# $NetBSD: Makefile,v 1.10 2000/08/18 22:46:49 hubertf Exp $
 
 DISTNAME=	pycrypt100
 PKGNAME=	py-crypto-1.0.0
@@ -12,7 +12,7 @@ HOMEPAGE=	http://starship.skyport.net/crew/amk/writing/pct/
 DEPENDS+=	python-1.5.2:../../lang/python
 
 RESTRICTED=	"Cryptographic software"
-MIRROR_DISTFILE=no
+NO_SRC_ON_FTP=	${RESTRICTED}
 
 WRKSRC=		${WRKDIR}/Extensions/Crypto
 MAKE_FLAGS=	'OPT=${CFLAGS}'
diff --git a/security/rc5des/Makefile b/security/rc5des/Makefile
index a68cb4a6258..cbf9c3f60f5 100644
--- a/security/rc5des/Makefile
+++ b/security/rc5des/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/02/05 05:01:26 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2000/08/18 22:46:49 hubertf Exp $
 #
 
 DISTNAME=		rc5-mlg-004
@@ -12,7 +12,7 @@ HOMEPAGE=		http://rc5.distributed.net/
 ONLY_FOR_PLATFORM=	NetBSD-*-alpha NetBSD-*-arm32 NetBSD-*-i386
 
 RESTRICTED=		"Crypto; export-controlled"
-MIRROR_DISTFILE=	no
+NO_SRC_ON_FTP=	${RESTRICTED}
 
 WRKSRC=			${WRKDIR}/RC5
 
diff --git a/security/rsaref/Makefile b/security/rsaref/Makefile
index 730d523e09f..e79cd9b167a 100644
--- a/security/rsaref/Makefile
+++ b/security/rsaref/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2000/06/21 01:17:52 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2000/08/18 22:46:49 hubertf Exp $
 #
 
 DISTNAME=		rsaref
@@ -11,7 +11,8 @@ EXTRACT_SUFX=		.tar.Z
 MAINTAINER=		tv@netbsd.org
 
 RESTRICTED=		"Cryptographic source usable only within the USA"
-MIRROR_DISTFILE=	no
+NO_SRC_ON_FTP=	${RESTRICTED}
+
 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 9ee9c96df05..edb8dbe8226 100644
--- a/security/srp_client/Makefile
+++ b/security/srp_client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/06/30 16:30:24 danw Exp $
+# $NetBSD: Makefile,v 1.4 2000/08/18 22:46:50 hubertf Exp $
 #
 
 DISTNAME=		srp-1.4.4
@@ -19,7 +19,7 @@ HOMEPAGE=		http://srp.stanford.edu/srp/
 DEPENDS+=		gmp>=2.0.2:../../devel/gmp
 
 RESTRICTED=             "Crypto; export-controlled"
-MIRROR_DISTFILE=        no
+NO_SRC_ON_FTP=	${RESTRICTED}
 
 GNU_CONFIGURE=		yes
 
diff --git a/security/ssh/Makefile b/security/ssh/Makefile
index 4c06198b7f4..ac5d958d0ee 100644
--- a/security/ssh/Makefile
+++ b/security/ssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.80 2000/08/10 17:02:25 thorpej Exp $
+# $NetBSD: Makefile,v 1.81 2000/08/18 22:46:50 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp
 #
 
@@ -18,11 +18,11 @@ HOMEPAGE=		http://www.cs.hut.fi/ssh/
 
 CONFLICTS=		openssh-[0-9]* ssh6-[0-9]*
 
-EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
 RESTRICTED=		"Crypto; export-controlled"
-MIRROR_DISTFILE=	no
+NO_SRC_ON_FTP=	${RESTRICTED}
 LICENSE=		no-commercial-use
 
+EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
 CFLAGS=			-O2
 GNU_CONFIGURE=		YES
 
diff --git a/security/ssh6/Makefile b/security/ssh6/Makefile
index 721e4d85ef5..bffe300dd3a 100644
--- a/security/ssh6/Makefile
+++ b/security/ssh6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/08/11 03:12:51 itojun Exp $
+# $NetBSD: Makefile,v 1.5 2000/08/18 22:46:50 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp
 #
 
@@ -19,11 +19,11 @@ HOMEPAGE=		http://www.cs.hut.fi/ssh/
 
 CONFLICTS=		openssh-[0-9]* ssh-[0-9]*
 
-EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
 RESTRICTED=		"Crypto; export-controlled"
-MIRROR_DISTFILE=	no
+NO_SRC_ON_FTP=	${RESTRICTED}
 LICENSE=		no-commercial-use
 
+EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
 CFLAGS=			-O2
 GNU_CONFIGURE=		YES
 
diff --git a/security/uvscan-dat/Makefile b/security/uvscan-dat/Makefile
index 36f80d7cc0f..fd80b426e16 100644
--- a/security/uvscan-dat/Makefile
+++ b/security/uvscan-dat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/07/20 13:31:01 rh Exp $
+# $NetBSD: Makefile,v 1.5 2000/08/18 22:46:50 hubertf Exp $
 #
 
 DISTNAME=	dat-4083
@@ -13,7 +13,6 @@ HOMEPAGE=	http://www.nai.com/asp_set/download/dats/mcafee_4x.asp
 
 NO_BUILD=	YES
 
-MIRROR_DISTFILE=no
 RESTRICTED=	"restricted to the license terms set for VirusScan"
 NO_BIN_ON_FTP=	${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
diff --git a/security/uvscan/Makefile b/security/uvscan/Makefile
index d3f1a16ab4a..4b9f86d9bef 100644
--- a/security/uvscan/Makefile
+++ b/security/uvscan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/07/20 13:31:00 rh Exp $
+# $NetBSD: Makefile,v 1.3 2000/08/18 22:46:51 hubertf Exp $
 #
 
 DISTNAME=		vlnx407e
@@ -17,7 +17,6 @@ DEPENDS+=		uvscan-dat>=4080:../../security/uvscan-dat
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
 NO_BUILD=		YES
 
-MIRROR_DISTFILE=	no
 LICENSE=		shareware
 RESTRICTED=		"restrictive 30 day evaluation license"
 NO_BIN_ON_FTP=		${RESTRICTED}