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.

8 files changed, 37 insertions, 20 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 5cd5e7530eb..bd0355b745f 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2000/08/10 08:57:23 tron Exp $
+# $NetBSD: Makefile,v 1.60 2000/08/18 22:46:34 hubertf Exp $
 
 DISTNAME=		ImageMagick-5.2.2
 CATEGORIES=		graphics
@@ -13,7 +13,7 @@ DEPENDS+=		mpeg2codec-1.2:../../graphics/mpeg2codec
 DEPENDS+=		png>=1.0.6:../../graphics/png
 DEPENDS+=		tiff-*:../../graphics/tiff
 
-MIRROR_DISTFILE=	no
+NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 
 GNU_CONFIGURE=		YES
 USE_X11=		YES
diff --git a/graphics/mtv/Makefile b/graphics/mtv/Makefile
index fc6686d2226..642f5022897 100644
--- a/graphics/mtv/Makefile
+++ b/graphics/mtv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2000/08/05 15:40:31 mycroft Exp $
+# $NetBSD: Makefile,v 1.22 2000/08/18 22:46:35 hubertf Exp $
 
 DISTNAME=		mtv-1.1.4
 CATEGORIES=		graphics
@@ -16,7 +16,12 @@ ONLY_FOR_PLATFORM=	NetBSD-1.4[Y-Z]-i386 NetBSD-1.4Z[A-Z]-i386 \
 DIST_SUBDIR=		mtv
 LICENSE=		fee-based-commercial-use
 MANCOMPRESSED=
-MIRROR_DISTFILE=	no
+
+RESTRICTED=		"Commercial software."
+NO_SRC_ON_FTP=		${RESTRICTED}
+NO_SRC_ON_CDROM=	${RESTRICTED}
+NO_BIN_ON_FTP=		${RESTRICTED}
+NO_BIN_ON_CDROM=	${RESTRICTED}
 
 EXTRACT_ONLY=		# empty
 NO_BUILD=		yes
diff --git a/graphics/ns-flash/Makefile b/graphics/ns-flash/Makefile
index 602b7ca8bc2..b1faf19812e 100644
--- a/graphics/ns-flash/Makefile
+++ b/graphics/ns-flash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/06/01 09:45:42 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.6 2000/08/18 22:46:35 hubertf Exp $
 #
 
 PKGNAME=		ns-flash-4.0r12
@@ -25,9 +25,11 @@ MASTER_SITES=		http://download.macromedia.com/pub/shockwave/flash/${SUB}/
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.flash.com/
 
-NO_CDROM=               "Redistribution not permitted"
-RESTRICTED=             "Export-controlled"
-MIRROR_DISTFILE=        no
+RESTRICTED=             "Export-controlled, redistribution not permitted"
+NO_SRC_ON_FTP=		${RESTRICTED}
+NO_SRC_ON_CDROM=	${RESTRICTED}
+NO_BIN_ON_FTP=		${RESTRICTED}
+NO_BIN_ON_CDROM=	${RESTRICTED}
 
 NO_CONFIGURE=		yes
 NO_BUILD=		yes
diff --git a/graphics/p5-PerlMagick/Makefile b/graphics/p5-PerlMagick/Makefile
index 3529c226ab3..7ced38e7948 100644
--- a/graphics/p5-PerlMagick/Makefile
+++ b/graphics/p5-PerlMagick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/08/14 19:31:29 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2000/08/18 22:46:35 hubertf Exp $
 
 DISTNAME=		ImageMagick-5.2.2
 PKGNAME=		p5-PerlMagick-5.2.2
@@ -11,6 +11,8 @@ HOMEPAGE=		http://www.wizards.dupont.com/cristy/ImageMagick.html
 
 DEPENDS+=		ImageMagick-5.2.2:../../${MAGICK}
 
+NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
+
 MAGICK=			graphics/ImageMagick
 MAGICKDIR=		${PKGSRCDIR}/${MAGICK}
 PATCHDIR=		${MAGICKDIR}/patches
@@ -23,7 +25,6 @@ WRKSRC=			${WRKDIR}/${DISTNAME}/PerlMagick
 
 #EXTRACT_AFTER_ARGS+=	${WRKSRC}
 
-MIRROR_DISTFILE=	no
 USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 USE_PERL5=		yes
diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index 283cb456068..9a99ffea445 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/07/18 23:07:47 itohy Exp $
+# $NetBSD: Makefile,v 1.4 2000/08/18 22:46:35 hubertf Exp $
 
 DISTNAME=	pstoedit_3_20
 PKGNAME=	pstoedit-3.20
@@ -14,7 +14,9 @@ DEPENDS+=	plotutils-2.3nb1:../../graphics/plotutils
 # Any ghostscript pkg will probably do, if not a font pkg.
 DEPENDS+=	ghostscript-[^f]*:../../print/ghostscript
 
-NO_CDROM?=	"The author writes: If you include this program on a CDROM, please send me a copy of the CD, or if it goes with a book, of the book."
+RESTRICTED?=	"The author writes: If you include this program on a CDROM, please send me a copy of the CD, or if it goes with a book, of the book."
+NO_SRC_ON_CDROM=	${RESTRICTED}
+NO_BIN_ON_CDROM=	${RESTRICTED}
 
 WRKSRC=		${WRKDIR}/pstoedit_3.20/src
 
diff --git a/graphics/qvplay/Makefile b/graphics/qvplay/Makefile
index ea1ece4f9e6..63bcd697e19 100644
--- a/graphics/qvplay/Makefile
+++ b/graphics/qvplay/Makefile
@@ -1,11 +1,14 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/09/17 03:46:32 jwise Exp $
+# $NetBSD: Makefile,v 1.2 2000/08/18 22:46:36 hubertf Exp $
 #
 
 DISTNAME=	qvplay-0.94
 WRKSRC=		${WRKDIR}/QVplay094/src
 CATEGORIES=    	graphics
-MASTER_SITES=	http://www.asahi-net.or.jp/~xg2k-hys/
-MIRROR_DISTFILE=no
+MASTER_SITES=	http://www.asahi-net.or.jp/~xg2k-hys/index-e.html
+
+RESTRICTED=	Undistributable development version.
+NO_SRC_ON_FTP=		${RESTRICTED}
+NO_SRC_ON_CDROM=	${RESTRICTED}
 
 MAINTAINER=	jwise@netbsd.org
 HOMEPAGE=	http://www.asahi-net.or.jp/~xg2k-hys/index-e.html
diff --git a/graphics/xanim/Makefile b/graphics/xanim/Makefile
index 226b106584e..dbf7d33dbad 100644
--- a/graphics/xanim/Makefile
+++ b/graphics/xanim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2000/01/02 03:38:32 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2000/08/18 22:46:36 hubertf Exp $
 #
 
 DISTNAME=	xanim2801
@@ -22,8 +22,11 @@ HOMEPAGE=	http://xanim.va.pubnix.com/
 
 EXTRACT_ONLY=   ${DISTNAME}.tar.gz
 
-# we can't mirror/distribute iv32 or cyuv object modules
-MIRROR_DISTFILE=	no
+RESTRICTED=		Can't mirror/distribute iv32 or cyuv object modules
+NO_SRC_ON_FTP=		${RESTRICTED}
+NO_SRC_ON_CDROM=	${RESTRICTED}
+NO_BIN_ON_FTP=		${RESTRICTED}
+NO_BIN_ON_CDROM=	${RESTRICTED}
 
 USE_IMAKE=	yes
 
diff --git a/graphics/xpdf-crypto/Makefile b/graphics/xpdf-crypto/Makefile
index 19c61ac10bd..b868730da0f 100644
--- a/graphics/xpdf-crypto/Makefile
+++ b/graphics/xpdf-crypto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/10/25 01:36:26 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 2000/08/18 22:46:36 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.12 1998/03/11 03:08:12 vanilla Exp
 # 
 
@@ -12,7 +12,8 @@ MAINTAINER=     packages@netbsd.org
 HOMEPAGE=       http://www.foolabs.com/xpdf/
 
 RESTRICTED=	"Crypto; export-controlled"
-MIRROR_DISTFILE= no
+NO_SRC_ON_FTP=	${RESTRICTED}
+NO_SRC_ON_CDROM=	${RESTRICTED}
 
 CONFLICTS=	xpdf-0.[789][a0]