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.

5 files changed, 23 insertions, 11 deletions

diff --git a/games/gnuchess4/Makefile b/games/gnuchess4/Makefile
index 0830eb34930..d24d1eb0a5e 100644
--- a/games/gnuchess4/Makefile
+++ b/games/gnuchess4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/03/28 06:34:47 tron Exp $
+# $NetBSD: Makefile,v 1.4 2000/08/18 22:46:33 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.6 1999/01/27 07:41:12 fenner Exp
 #
 
@@ -13,7 +13,7 @@ HOMEPAGE=		http://www.gnu.org/software/chess/chess.html
 
 CONFLICTS=		gnuchess-4.*
 
-MIRROR_DISTFILE=	no
+NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 
 GNU_CONFIGURE=		yes
 
diff --git a/games/quakedata/Makefile b/games/quakedata/Makefile
index d63730eaed8..9338c8e50d0 100644
--- a/games/quakedata/Makefile
+++ b/games/quakedata/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/02/15 09:26:20 agc Exp $
+# $NetBSD: Makefile,v 1.3 2000/08/18 22:46:34 hubertf Exp $
 # Based on FreeBSD ports/games/quakeserver
 # FreeBSD: ports/games/quakeserver/Makefile,v 1.20 1999/08/31 06:44:23 mharo Exp
 #
@@ -16,10 +16,13 @@ HOMEPAGE=	http://www.idsoftware.com/
 BUILD_DEPENDS=	unzip:../../archivers/unzip
 BUILD_DEPENDS+=	lha:../../archivers/lha
 
+LICENSE+=	shareware
+RESTRICTED=	"This software is shareware"
+NO_SRC_ON_CDROM=	${RESTRICTED}
+NO_BIN_ON_CDROM=	${RESTRICTED}
+
 NO_WRKSUBDIR=	YES
 NO_BUILD=	YES
-NO_CDROM=	"This software is shareware"
-LICENSE+=	shareware
 
 do-extract:
 		${RM} -rf ${WRKDIR}
diff --git a/games/rollemup/Makefile b/games/rollemup/Makefile
index 794936a7194..7c5333d1b14 100644
--- a/games/rollemup/Makefile
+++ b/games/rollemup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2000/08/08 03:50:29 sakamoto Exp $
+# $NetBSD: Makefile,v 1.12 2000/08/18 22:46:34 hubertf Exp $
 #
 
 DISTNAME=	Rollemup
@@ -13,7 +13,10 @@ LICENSE=	no-commercial-use
 RESTRICTED=	You are not allowed to distribute the software by any means. \
 		You are allowed to download a copy from this site for personal use. \
 		See http://www.medialab.lostboys.nl/content/showcase/license.html
-MIRROR_DISTFILE=no
+NO_SRC_ON_FTP=		${RESTRICTED}
+NO_SRC_ON_CDROM=	${RESTRICTED}
+NO_BIN_ON_FTP=		${RESTRICTED}
+NO_BIN_ON_CDROM=	${RESTRICTED}
 
 EXTRACT_ONLY=	# empty
 NO_PATCH=	yes
diff --git a/games/xbat/Makefile b/games/xbat/Makefile
index 4b6f503f4ab..ad04bdf84df 100644
--- a/games/xbat/Makefile
+++ b/games/xbat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/12/14 00:36:50 sakamoto Exp $
+# $NetBSD: Makefile,v 1.3 2000/08/18 22:46:34 hubertf Exp $
 # FreeBSD Id: ports/games/xbat/Makefile,v 1.5 1999/08/25 06:04:41 obrien Exp
 
 DISTNAME=	xev111
@@ -9,7 +9,11 @@ MASTER_SITES=	http://www.nemoto.ecei.tohoku.ac.jp/~wai/Xbat/
 MAINTAINER=	sakamoto@netbsd.org
 HOMEPAGE=	http://www.nemoto.ecei.tohoku.ac.jp/~wai/index_e.html
 
-NO_CDROM=	Possible copyright infringement
+RESTRICTED=	Possible copyright infringement
+NO_SRC_ON_CDROM=	${RESTRICTED}
+NO_BIN_ON_CDROM=	${RESTRICTED}
+NO_SRC_ON_FTP=		${RESTRICTED}
+NO_BIN_ON_FTP=		${RESTRICTED}
 
 USE_IMAKE=	yes
 WRKSRC=		${WRKDIR}/Xev111
diff --git a/games/xmahjongg/Makefile b/games/xmahjongg/Makefile
index 114fa97a80a..c3ca7c8aa4d 100644
--- a/games/xmahjongg/Makefile
+++ b/games/xmahjongg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/07/11 11:01:06 agc Exp $
+# $NetBSD: Makefile,v 1.8 2000/08/18 22:46:34 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.3 1996/12/08 01:11:27 max Exp
 #
 
@@ -14,7 +14,9 @@ MAINTAINER=	packages@netbsd.org
 WRKSRC=		${WRKDIR}/xmahjongg
 USE_IMAKE=	yes
 
-NO_CDROM=	"Restrictive copyright"
+RESTRICTED=	"Restrictive copyright"
+NO_SRC_ON_CDROM=	${RESTRICTED}
+NO_BIN_ON_CDROM=	${RESTRICTED}
 
 post-extract:
 	@${CP} ${WRKSRC}/xmahjongg.6 ${WRKSRC}/xmahjongg.man