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.

7 files changed, 29 insertions, 18 deletions

diff --git a/x11/XF86Setup/Makefile b/x11/XF86Setup/Makefile
index fc8912f0ec7..698d567f40e 100644
--- a/x11/XF86Setup/Makefile
+++ b/x11/XF86Setup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2000/03/16 14:17:13 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2000/08/18 22:46:52 hubertf Exp $
 
 DISTNAME=		XF86Setup-3.3.6
 CATEGORIES=		x11
@@ -16,7 +16,8 @@ ONLY_FOR_PLATFORM=	*-*-i386
 TCLLIB=			${LOCALBASE}/lib/libtcl80.a
 TKLIB=			${LOCALBASE}/lib/libtk80.a
 
-MIRROR_DISTFILE=	no
+NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
+
 WRKSRC=			${WRKDIR}/hw/xfree86/XF86Setup
 USE_IMAKE=		yes
 
diff --git a/x11/fvwm1/Makefile b/x11/fvwm1/Makefile
index 635287a5a82..b11e1cda034 100644
--- a/x11/fvwm1/Makefile
+++ b/x11/fvwm1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 1999/11/08 20:48:22 tron Exp $
+# $NetBSD: Makefile,v 1.22 2000/08/18 22:46:52 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp
 #
 
@@ -14,7 +14,8 @@ DEPENDS=	xpmroot-2.*:../../x11/xpmroot
 
 CONFLICTS=	fvwm-1.*
 
-MIRROR_DISTFILE= no
+NO_SRC_ON_FTP=	Already in MASTER_SITE_LOCAL
+
 USE_IMAKE=	yes
 # drop -a because we have no `depends' target
 XMKMF=		${SH} -c "xmkmf && ${MAKE} Makefiles"
diff --git a/x11/swing/Makefile b/x11/swing/Makefile
index c11526da95c..4f77efcf4e7 100644
--- a/x11/swing/Makefile
+++ b/x11/swing/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/08/02 12:44:35 veego Exp $
+# $NetBSD: Makefile,v 1.3 2000/08/18 22:46:52 hubertf Exp $
 
 DISTNAME=	swing1_1_1
 PKGNAME=	swing-1.1.1
@@ -9,15 +9,17 @@ EXTRACT_SUFX=	.zip
 MAINTAINER=	jwise@netbsd.org
 HOMEPAGE=	http://www.javasoft.com/products/jfc/
 
-USE_JAVA=	yes
+RESTRICTED=	"Read license before redistributing the Java(tm) Foundation Classes"
+NO_SRC_ON_FTP=	${RESTRICTED}
+NO_SRC_ON_CDROM=	${RESTRICTED}
+NO_BIN_ON_FTP=	${RESTRICTED}
+NO_BIN_ON_CDROM=	${RESTRICTED}
 
+USE_JAVA=	yes
 WRKSRC=		${WRKDIR}/swing-1.1.1fcs
 NO_PATCH=
 NO_CONFIGURE=
 NO_BUILD=
-RESTRICTED=	"Read license before redistributing the Java(tm) Foundation Classes"
-NO_CDROM=	${RESTRICTED}
-MIRROR_DISTFILE=no
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/x11/tkman/Makefile b/x11/tkman/Makefile
index a92156a3358..c92d2fff86d 100644
--- a/x11/tkman/Makefile
+++ b/x11/tkman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2000/04/18 06:49:17 fredb Exp $
+# $NetBSD: Makefile,v 1.22 2000/08/18 22:46:52 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.28 1997/12/08 15:51:20 tg Exp
 #
 
@@ -13,8 +13,12 @@ DEPENDS+=		tk-8.0.5:../../x11/tk80
 DEPENDS+=		rman-3.0.*:../../textproc/rman
 DEPENDS+=		glimpse-4.1:../../textproc/glimpse
 
+RESTRICTED=		"Don't sell for profit"
+NO_SRC_ON_FTP=		${RESTRICTED}
+NO_SRC_ON_CDROM=	${RESTRICTED}
+NO_BIN_ON_FTP=		${RESTRICTED}
+NO_BIN_ON_CDROM=	${RESTRICTED}
+
 USE_X11=		yes
-NO_CDROM=		"Don't sell for profit"
-MIRROR_DISTFILE=	no
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xview-clients/Makefile b/x11/xview-clients/Makefile
index 515382bcb4a..0f94a000faa 100644
--- a/x11/xview-clients/Makefile
+++ b/x11/xview-clients/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/06/16 14:16:49 pooka Exp $
+# $NetBSD: Makefile,v 1.7 2000/08/18 22:46:53 hubertf Exp $
 # $FreeBSD Id: Makefile,v 1.11 1996/11/16 10:49:52 asami Exp
 #
 
@@ -11,7 +11,8 @@ MAINTAINER=	packages@netbsd.org
 
 DEPENDS=        xview-lib-3.2.1:../../x11/xview-lib
 
-MIRROR_DISTFILE= no
+NO_SRC_ON_FTP=	Already in MASTER_SITE_LOCAL
+
 EXTRACT_ELEMENTS=	xview3.2p1-X11R6/clients xview3.2p1-X11R6/images
 WRKSRC=      	${WRKDIR}/xview3.2p1-X11R6/clients
 USE_IMAKE=	yes
diff --git a/x11/xview-config/Makefile b/x11/xview-config/Makefile
index 62c9d27126d..bfadc1de49b 100644
--- a/x11/xview-config/Makefile
+++ b/x11/xview-config/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/03/16 14:20:03 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2000/08/18 22:46:53 hubertf Exp $
 # $FreeBSD Id: Makefile,v 1.9 1998/05/04 03:34:50 steve Exp
 #
 
@@ -9,7 +9,8 @@ MASTER_SITES=	${MASTER_SITE_LOCAL}
 
 MAINTAINER=	packages@netbsd.org
 
-MIRROR_DISTFILE= no
+NO_SRC_ON_FTP=	Already in MASTER_SITE_LOCAL
+
 EXTRACT_ELEMENTS=	xview3.2p1-X11R6/config
 WRKSRC=      	${WRKDIR}/${EXTRACT_ELEMENTS}
 USE_IMAKE=	yes
diff --git a/x11/xview-lib/Makefile b/x11/xview-lib/Makefile
index 634d15a738b..7bba2a8bed3 100644
--- a/x11/xview-lib/Makefile
+++ b/x11/xview-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1998/07/15 11:08:55 agc Exp $
+# $NetBSD: Makefile,v 1.5 2000/08/18 22:46:53 hubertf Exp $
 # $FreeBSD Id: Makefile,v 1.13 1997/07/17 15:13:03 max Exp
 #
 
@@ -11,7 +11,8 @@ MAINTAINER=	packages@netbsd.org
 
 DEPENDS=        xview-config-3.2.1:../../x11/xview-config
 
-MIRROR_DISTFILE= no
+NO_SRC_ON_FTP=	Already in MASTER_SITE_LOCAL
+
 USE_IMAKE=	yes
 
 .include "../../mk/bsd.pkg.mk"