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, 14 insertions, 15 deletions

diff --git a/mail/mailwrapper/Makefile b/mail/mailwrapper/Makefile
index 53e1ceade0b..e33de6c0747 100644
--- a/mail/mailwrapper/Makefile
+++ b/mail/mailwrapper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/04/08 23:17:11 bad Exp $
+# $NetBSD: Makefile,v 1.7 2000/08/18 22:46:37 hubertf Exp $
 
 DISTNAME=	mailwrapper-19990412
 CATEGORIES=	mail
@@ -6,7 +6,8 @@ MASTER_SITES=	${MASTER_SITE_LOCAL}
 
 MAINTAINER=	packages@netbsd.org
 
-MIRROR_DISTFILE=	no
+NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
+
 NO_CONFIGURE=		yes
 MANCOMPRESSED_IF_MANZ=	yes
 
diff --git a/mail/mush/Makefile b/mail/mush/Makefile
index ca4457878e7..1a6c541ee5f 100644
--- a/mail/mush/Makefile
+++ b/mail/mush/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/06/24 16:24:36 kim Exp $
+# $NetBSD: Makefile,v 1.6 2000/08/18 22:46:38 hubertf Exp $
 
 DISTNAME=	mush-7.2.5
 PKGNAME=	mush-7.2.6.b4.pl1
@@ -20,8 +20,6 @@ MAINTAINER=	christos@netbsd.org
 
 DIST_SUBDIR=	mush
 
-RESTRICTED=	"Z-Code license"
-MIRROR_DISTFILE= no
 NO_WRKSUBDIR=	yes
 
 pre-configure:
diff --git a/mail/mutt-current/Makefile b/mail/mutt-current/Makefile
index b23c6c4a6ec..9fee274a49e 100644
--- a/mail/mutt-current/Makefile
+++ b/mail/mutt-current/Makefile
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2000/05/09 22:23:27 pooka Exp $
+# $NetBSD: Makefile,v 1.5 2000/08/18 22:46:38 hubertf Exp $
+
+IGNORE=		"Stable mutt avaiable in mail/mutt"
 
 DISTNAME=	mutt-1.1.10i
 WRKSRC=		${WRKDIR}/mutt-1.1.10
@@ -26,10 +28,9 @@ CONFIGURE_ARGS+= --with-curses=${LOCALBASE} --with-exec-shell=/bin/ksh \
 		 --enable-pop --enable-imap
 LDFLAGS+=	-s
 
-MIRROR_DISTFILE=no
 RESTRICTED=	"Contains PGP code"
-
-IGNORE=		"Stable mutt avaiable in mail/mutt"
+NO_SRC_ON_FTP=	${RESTRICTED}
+NO_SRC_ON_CDROM=	${RESTRICTED}
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index cc0a81a441d..8b39cfc40cf 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/08/14 12:38:21 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2000/08/18 22:46:38 hubertf Exp $
 
 DISTNAME=	snapshot-20000531
 PKGNAME=	postfix-20000531
@@ -12,7 +12,6 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.postfix.org/
 
-MIRROR_DISTFILE= no
 DIST_SUBDIR=	postfix
 
 POSTFIX_SPOOL=	/var/spool/postfix
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 9c31dd6f6c2..392b58cfff0 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2000/07/03 02:46:16 sommerfeld Exp $
+# $NetBSD: Makefile,v 1.21 2000/08/18 22:46:38 hubertf Exp $
 
 DISTNAME=	postfix-19991231-pl08
 PKGNAME=	postfix-19991231pl08
@@ -16,7 +16,6 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	christos@netbsd.org
 HOMEPAGE=	http://www.postfix.org/
 
-MIRROR_DISTFILE= no
 MANCOMPRESSED_IF_MANZ=	yes
 DIST_SUBDIR=	postfix
 
diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile
index 96697989772..69e2841421c 100644
--- a/mail/xfmail/Makefile
+++ b/mail/xfmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2000/06/13 10:40:26 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2000/08/18 22:46:39 hubertf Exp $
 #
 
 DISTNAME=		xfmail-1.3
@@ -15,7 +15,8 @@ DEPENDS+=		xforms-0.88:../../x11/xforms
 ONLY_FOR_PLATFORM=	*-*-arm32 *-*-i386 *-*-m68k *-*-sparc *-*-ns32k
 
 RESTRICTED=		"Selling this software requires permission of the authors."
-NO_CDROM=		${RESTRICTED}
+NO_SRC_ON_CDROM=	${RESTRICTED}
+NO_BIN_ON_CDROM=	${RESTRICTED}
 
 USE_X11BASE=		YES
 GNU_CONFIGURE=		YES