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.

6 files changed, 29 insertions, 17 deletions

diff --git a/audio/amp/Makefile b/audio/amp/Makefile
index bea23318cd9..1b8414a8c2c 100644
--- a/audio/amp/Makefile
+++ b/audio/amp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1999/12/25 18:03:23 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2000/08/18 22:46:30 hubertf Exp $
 #
 
 DISTNAME=	amp-0.7.6
@@ -9,7 +9,8 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	mycroft@netbsd.org
 
-MIRROR_DISTFILE=	no
+NO_SRC_ON_FTP=	Already in MASTER_SITE_LOCAL
+
 GNU_CONFIGURE=	yes
 
 do-install:
diff --git a/audio/gogo/Makefile b/audio/gogo/Makefile
index 4ccb4d6bbc4..f6e4fc29043 100644
--- a/audio/gogo/Makefile
+++ b/audio/gogo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/08/13 19:01:53 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2000/08/18 22:46:30 hubertf Exp $
 #
 
 DISTNAME=		gogo235
@@ -15,7 +15,10 @@ BUILD_DEPENDS+=		nasm:../../devel/nasm
 ONLY_FOR_PLATFORM=	*-*-i386
 
 USE_GMAKE=		YES
-MIRROR_DISTFILE=	NO
+
+RESTRICTED=		'Source based on patent protected Fraunhofer code'
+NO_SRC_ON_FTP=	${RESTRICTED}
+NO_SRC_ON_CDROM=	${RESTRICTED}
 LICENSE=		fee-based-commercial-use
 
 do-install:
diff --git a/audio/realplayer7/Makefile b/audio/realplayer7/Makefile
index 326ada1f4c5..c73be6149ed 100644
--- a/audio/realplayer7/Makefile
+++ b/audio/realplayer7/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/08/15 06:38:35 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2000/08/18 22:46:30 hubertf Exp $
 #
 
 DISTNAME=		rp7_linux20_libc6_i386_cs1
@@ -13,12 +13,15 @@ HOMEPAGE=		http://www.real.com/products/player/
 
 DEPENDS+=		suse_linux>=6.1:../../emulators/suse_linux
 
+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}
+
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
-NO_CDROM=		"Redistribution not permitted"
-RESTRICTED=		"Export-controlled"
-MIRROR_DISTFILE=	no
-IS_INTERACTIVE=		yes
 
+IS_INTERACTIVE=		yes
 NO_CONFIGURE=		yes
 RP_INSTALLER=		${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
 EXTRACT_CMD=		HOME=${WRKDIR} ${RP_INSTALLER}
diff --git a/audio/snd/Makefile b/audio/snd/Makefile
index ce054ad0fe8..ddde613b126 100644
--- a/audio/snd/Makefile
+++ b/audio/snd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 1998/08/20 15:16:39 tsarna Exp $
+# $NetBSD: Makefile,v 1.16 2000/08/18 22:46:30 hubertf Exp $
 #
 
 DISTNAME=		snd
@@ -8,11 +8,12 @@ CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 
 MAINTAINER=		hubertf@netbsd.org
-HOMEPAGE=		http://ccrma-www/CCRMA/Software/snd/snd.html
+HOMEPAGE=		http://ccrma-www.stanford.edu/CCRMA/Software/snd/snd.html
 
 DEPENDS+=		xpm-3.4k:../../graphics/xpm
 
-MIRROR_DISTFILE=	no
+NO_SRC_ON_FTP=		Already on MASTER_SITE_LOCAL
+
 USE_MOTIF=		yes
 MAKEFILE=		makefile.netbsd
 ALL_TARGET=		snd
diff --git a/audio/timidity/Makefile b/audio/timidity/Makefile
index 06328ea2113..90a51fe6c6c 100644
--- a/audio/timidity/Makefile
+++ b/audio/timidity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2000/07/28 21:47:49 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2000/08/18 22:46:30 hubertf Exp $
 #
 
 DISTNAME=       timidity-0.2i
@@ -15,7 +15,9 @@ DEPENDS+=	tk-8.0.5:../../x11/tk80
 
 USE_CURSES=	# defined
 
-NO_CDROM=       "Uses copyrighted patches"
+RESTRICTED=		"Uses copyrighted patches"
+NO_BIN_ON_FTP=		${RESTRICTED}
+NO_BIN_ON_CDROM=	${RESTRICTED}
 
 EXTRACT_ONLY=   ${DISTNAME}.tar.gz
 INSTALL_TARGET= install.all
diff --git a/audio/tracker/Makefile b/audio/tracker/Makefile
index e124dcf0d1d..22c17e0d78d 100644
--- a/audio/tracker/Makefile
+++ b/audio/tracker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 1999/12/25 23:43:56 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2000/08/18 22:46:31 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.29 1996/12/20 23:46:22 ache Exp 
 #
 
@@ -10,8 +10,10 @@ EXTRACT_SUFX=		.tgz
 MAINTAINER=		packages@netbsd.org
 
 RESTRICTED=		"Non-redistributable beta"
-NO_CDROM=		${RESTRICTED}
-MIRROR_DISTFILE=	no
+NO_BIN_ON_FTP=		${RESTRICTED}
+NO_BIN_ON_CDROM=	${RESTRICTED}
+NO_SRC_ON_FTP=		${RESTRICTED}
+NO_SRC_ON_CDROM=	${RESTRICTED}
 
 WRKSRC=			${WRKDIR}/tracker
 MAKE_FLAGS=		MACHINE=netbsd CC=${CC} INSTALL="${INSTALL}" \