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.

4 files changed, 26 insertions, 12 deletions

diff --git a/www/asWedit/Makefile b/www/asWedit/Makefile
index b0f834c8ba3..cb8f1c621f1 100644
--- a/www/asWedit/Makefile
+++ b/www/asWedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/07/17 09:39:05 rh Exp $
+# $NetBSD: Makefile,v 1.2 2000/08/18 22:46:51 hubertf Exp $
 #
 
 DISTNAME=		${PKGNAME}-i386.linux
@@ -17,9 +17,13 @@ HOMEPAGE=		http://www.advasoft.com/asWedit.html
 DEPENDS+=		suse_linux>=6.1:../../emulators/suse_linux
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
-NO_CDROM=		"Redistribution not permitted"
+
 RESTRICTED=		"No re-distribution"
-MIRROR_DISTFILE=	no
+NO_SRC_ON_FTP=		${RESTRICTED}
+NO_SRC_ON_CDROM=	${RESTRICTED}
+NO_BIN_ON_FTP=		${RESTRICTED}
+NO_BIN_ON_CDROM=	${RESTRICTED}
+
 NO_BUILD=		yes
 MESSAGE_FILE=		${WRKDIR}/MESSAGE
 
diff --git a/www/jsdk20/Makefile b/www/jsdk20/Makefile
index 73447b2d836..4696ba178b5 100644
--- a/www/jsdk20/Makefile
+++ b/www/jsdk20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/06/22 14:23:25 jwise Exp $
+# $NetBSD: Makefile,v 1.7 2000/08/18 22:46:51 hubertf Exp $
 # STOP!  Don't update this to a later version of this software.
 # The JSDK and Apache Jakarta projects have merged, making the
 # jakarta-tomcat package the current version of this software.
@@ -21,9 +21,12 @@ BUILD_DEFS+=    JSDK_HOME
 NO_PATCH=
 NO_CONFIGURE=
 NO_BUILD=
-RESTRICTED=	"Read license before redistributing the Java(tm) Servlet Development Kit"
-NO_CDROM=	${RESTRICTED}
-MIRROR_DISTFILE=no
+
+RESTRICTED=		"Read license before redistributing the Java(tm) Servlet Development Kit"
+NO_SRC_ON_FTP=		${RESTRICTED}
+NO_SRC_ON_CDROM=	${RESTRICTED}
+NO_BIN_ON_FTP=		${RESTRICTED}
+NO_BIN_ON_CDROM=	${RESTRICTED}
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/www/navigator/Makefile.common b/www/navigator/Makefile.common
index 51caa85568f..e09d389cc04 100644
--- a/www/navigator/Makefile.common
+++ b/www/navigator/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.16 2000/08/18 15:44:45 tron Exp $
+# $NetBSD: Makefile.common,v 1.17 2000/08/18 22:46:51 hubertf Exp $
 #
 # Common include file for communicator and navigator packages
 
@@ -76,10 +76,13 @@ MASTER_SITES=	ftp://ftp.netscape.org/pub/communicator/${SUB}/ \
 ONLY_FOR_PLATFORM= *-*-alpha *-*-i386 *-*-sparc
 
 MIRROR_DISTFILE=no
-NO_CDROM=	Licensed product
 MAINTAINER=	abs@netbsd.org
 HOMEPAGE=	http://home.netscape.com/browsers/index.html
 RESTRICTED=	"No re-distribution without agreement from Netscape"
+NO_SRC_ON_CDROM=	${RESTRICTED}
+NO_BIN_ON_CDROM=	${RESTRICTED}
+NO_SRC_ON_FTP=		${RESTRICTED}
+NO_BIN_ON_FTP=		${RESTRICTED}
 
 BUILD_DEFS+=	NS_ENCRYPTION
 DIST_SUBDIR=	netscape
diff --git a/www/navigator3/Makefile b/www/navigator3/Makefile
index 5f8a92e349c..e5a267af033 100644
--- a/www/navigator3/Makefile
+++ b/www/navigator3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/10/05 01:02:52 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 2000/08/18 22:46:52 hubertf Exp $
 
 DISTNAME=		netscape-v304-export.x86-unknown-bsd
 PKGNAME=		navigator3-3.04
@@ -10,8 +10,12 @@ HOMEPAGE=		http://www.netscape.com
 
 ONLY_FOR_PLATFORM=	*-*-i386
 
-MIRROR_DISTFILE=	no
-NO_CDROM=		Licensed product
+RESTRICTED=		Licensed product
+NO_SRC_ON_FTP=		${RESTRICTED}
+NO_SRC_ON_CDROM=	${RESTRICTED}
+NO_BIN_ON_FTP=		${RESTRICTED}
+NO_BIN_ON_CDROM=	${RESTRICTED}
+
 NO_WRKSUBDIR=		yes
 USE_X11BASE=		yes
 SCRIPTS_ENV+=		MACHINE_ARCH=${MACHINE_ARCH}