Do not use NO_PACKAGE and NO_CDROM to denote restricted packages. Use the

appropriate variables instead.

9 files changed, 42 insertions, 27 deletions

diff --git a/archivers/rar/Makefile b/archivers/rar/Makefile
index 8c6c92fc8dc..312e60e02af 100644
--- a/archivers/rar/Makefile
+++ b/archivers/rar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2000/05/12 18:20:17 drochner Exp $
+# $NetBSD: Makefile,v 1.25 2000/07/20 13:30:59 rh Exp $
 # FreeBSD Id: Makefile,v 1.7 1997/08/10 22:31:27 fenner Exp 
 #
 
@@ -15,8 +15,8 @@ HOMEPAGE=		http://www.rarsoft.com/
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
 RESTRICTED=		Only unmodified original package can be distributed
-NO_PACKAGE=		${RESTRICTED}
-NO_CDROM=		${RESTRICTED}
+NO_BIN_ON_CDROM=	${RESTRICTED}
+NO_BIN_ON_FTP=		${RESTRICTED}
 
 NO_WRKSUBDIR=		yes
 EXTRACT_CMD=		${DOWNLOADED_DISTFILE} >/dev/null
diff --git a/devel/ipv6socket_scrub/Makefile b/devel/ipv6socket_scrub/Makefile
index cba0f7914b7..b109a098d2c 100644
--- a/devel/ipv6socket_scrub/Makefile
+++ b/devel/ipv6socket_scrub/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/03/16 12:25:49 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2000/07/20 13:30:59 rh Exp $
 # KAME Id: Makefile,v 1.6 1999/11/28 14:36:04 itojun Exp
 #
 
@@ -15,9 +15,11 @@ HOMEPAGE=		http://www.sun.com/solaris/ipv6/
 DECOMPRESS_CMD=		${CAT}
 EXTRACT_BEFORE_ARGS=	-xf
 WRKSRC=			${WRKDIR}/${DISTNAME}/src
-NO_CDROM=		"not redistributable"
-NO_PACKAGE=		"not redistributable"
 RESTRICTED=		"not redistributable, license agreement required"
+NO_BIN_ON_CDROM=	${RESTRICTED}
+NO_SRC_ON_CDROM=	${RESTRICTED}
+NO_BIN_ON_FTP=		${RESTRICTED}
+NO_SRC_ON_FTP=		${RESTRICTED}
 MIRROR_DISTFILES=	no
 
 do-fetch:
diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index 3475625c15f..0eb5084bb88 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2000/02/08 03:44:16 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2000/07/20 13:30:59 rh Exp $
 
 DISTNAME=		vice-1.2
 CATEGORIES=		emulators
@@ -13,8 +13,10 @@ MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.cs.cmu.edu/~dsladic/vice/vice.html
 
 RESTRICTED=		"ROM image copyright is questionable"
-NO_CDROM=		${RESTRICTED}
-NO_PACKAGE=		${RESTRICTED}
+NO_BIN_ON_CDROM=	${RESTRICTED}
+NO_SRC_ON_CDROM=	${RESTRICTED}
+NO_BIN_ON_FTP=		${RESTRICTED}
+NO_SRC_ON_FTP=		${RESTRICTED}
 MIRROR_DISTFILE=	no
 
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
diff --git a/games/rollemup/Makefile b/games/rollemup/Makefile
index 4b5ff0af4e1..38b0aee3276 100644
--- a/games/rollemup/Makefile
+++ b/games/rollemup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2000/01/13 11:15:10 soren Exp $
+# $NetBSD: Makefile,v 1.10 2000/07/20 13:31:00 rh Exp $
 #
 
 DISTNAME=	Rollemup
@@ -18,8 +18,10 @@ MIRROR_DISTFILE=no
 EXTRACT_ONLY=	# empty
 NO_PATCH=	yes
 NO_CONFIGURE=	yes
-NO_PACKAGE=	${RESTRICTED}
-NO_CDROM=	${RESTRICTED}
+NO_BIN_ON_CDROM=${RESTRICTED}
+NO_SRC_ON_CDROM=${RESTRICTED}
+NO_BIN_ON_FTP=	${RESTRICTED}
+NO_SRC_ON_FTP=	${RESTRICTED}
 
 MESSAGE_FILE=	${WRKDIR}/MESSAGE
 
diff --git a/graphics/CompuPic/Makefile b/graphics/CompuPic/Makefile
index 56fca60bfa9..1be417d860a 100644
--- a/graphics/CompuPic/Makefile
+++ b/graphics/CompuPic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/04/02 02:56:26 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2000/07/20 13:31:00 rh Exp $
 #
 
 DISTNAME=	compupic-5.0.1033-i386-netbsd
@@ -16,8 +16,10 @@ LICENSE=	fee-based-commercial-use
 NO_CONFIGURE=	YES
 NO_BUILD=	YES
 RESTRICTED=	"Commercial product, purchase at http://www.photodex.com/ordering/order.html"
-NO_PACKAGE=	${RESTRICTED}
-NO_CDROM=	${RESTRICTED}
+NO_BIN_ON_CDROM=${RESTRICTED}
+NO_SRC_ON_CDROM=${RESTRICTED}
+NO_BIN_ON_FTP=	${RESTRICTED}
+NO_SRC_ON_FTP=	${RESTRICTED}
 EXTRACT_CMD=	# empty
 
 do-install:
diff --git a/japanese/king/Makefile b/japanese/king/Makefile
index ae1dc4bd1d5..a1309f725f7 100644
--- a/japanese/king/Makefile
+++ b/japanese/king/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/06/15 11:30:35 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 2000/07/20 13:31:00 rh Exp $
 #
 
 DISTNAME=	king-1.00-tb40-1
@@ -10,9 +10,11 @@ ONLY_FOR_PLATFORM=	NetBSD-*-i386
 MAINTAINER=	sakamoto@netbsd.org
 HOMEPAGE=	http://www.ibm.co.jp/software/internet/king/
 
-RESTRICTED=	"You should buy from IBM Corp"
-NO_PACKAGE=	${RESTRICTED}
-NO_CDROM=	${RESTRICTED}
+RESTRICTED=	"A commercial licence needs to be purchased from IBM Corp"
+NO_BIN_ON_CDROM=${RESTRICTED}
+NO_SRC_ON_CDROM=${RESTRICTED}
+NO_BIN_ON_FTP=	${RESTRICTED}
+NO_SRC_ON_FTP=	${RESTRICTED}
 MIRROR_DISTFILE=no
 
 KINGDISTDIR?=	/cdrom/linux
diff --git a/security/uvscan-dat/Makefile b/security/uvscan-dat/Makefile
index 7ca8cc74f14..36f80d7cc0f 100644
--- a/security/uvscan-dat/Makefile
+++ b/security/uvscan-dat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/06/27 10:18:05 rh Exp $
+# $NetBSD: Makefile,v 1.4 2000/07/20 13:31:01 rh Exp $
 #
 
 DISTNAME=	dat-4083
@@ -15,8 +15,10 @@ NO_BUILD=	YES
 
 MIRROR_DISTFILE=no
 RESTRICTED=	"restricted to the license terms set for VirusScan"
-NO_PACKAGE=	${RESTRICTED}
-NO_CDROM=	${RESTRICTED}
+NO_BIN_ON_FTP=	${RESTRICTED}
+NO_BIN_ON_CDROM=${RESTRICTED}
+NO_SRC_ON_FTP=	${RESTRICTED}
+NO_SRC_ON_CDROM=${RESTRICTED}
 
 do-configure:
 	${SED} -e 's:@PREFIX@:${PREFIX}:g' \
diff --git a/security/uvscan/Makefile b/security/uvscan/Makefile
index a1c5bb1a86a..d3f1a16ab4a 100644
--- a/security/uvscan/Makefile
+++ b/security/uvscan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/06/05 12:01:24 rh Exp $
+# $NetBSD: Makefile,v 1.2 2000/07/20 13:31:00 rh Exp $
 #
 
 DISTNAME=		vlnx407e
@@ -20,8 +20,10 @@ NO_BUILD=		YES
 MIRROR_DISTFILE=	no
 LICENSE=		shareware
 RESTRICTED=		"restrictive 30 day evaluation license"
-NO_PACKAGE=		${RESTRICTED}
-NO_CDROM=		${RESTRICTED}
+NO_BIN_ON_FTP=		${RESTRICTED}
+NO_BIN_ON_CDROM=	${RESTRICTED}
+NO_SRC_ON_FTP=		${RESTRICTED}
+NO_SRC_ON_CDROM=	${RESTRICTED}
 
 do-configure:
 	${SED} <${FILESDIR}/uvscan.sh >${WRKSRC}/uvscan.sh \
diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile
index 95f1df5d026..ed3bc7851aa 100644
--- a/www/lynx-current/Makefile
+++ b/www/lynx-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2000/06/02 04:14:12 itohy Exp $
+# $NetBSD: Makefile,v 1.11 2000/07/20 13:31:00 rh Exp $
 #
 
 DISTNAME=		lynx2.8.3rel.1
@@ -16,8 +16,9 @@ HOMEPAGE=		http://lynx.browser.org/
 
 DEPENDS+=		gettext-0.10.*:../../devel/gettext
 
-NO_PACKAGE=		${RESTRICTED}
 RESTRICTED=		"Crypto; export-controlled"
+NO_BIN_ON_FTP=		${RESTRICTED}
+NO_SRC_ON_FTP=		${RESTRICTED}
 
 WRKSRC=			${WRKDIR}/lynx2-8-3