From 402899809af063240e564f105ec22423fefbea61 Mon Sep 17 00:00:00 2001 From: hubertf Date: Fri, 18 Aug 2000 22:46:29 +0000 Subject: 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. --- misc/cardboard-schedule/Makefile | 6 ++++-- misc/chord/Makefile | 5 +++-- misc/colorls/Makefile | 5 +++-- misc/dt/Makefile | 6 +++--- misc/linuxls/Makefile | 5 +++-- misc/py-mxDateTime/Makefile | 6 ++++-- misc/staroffice/Makefile | 9 ++++++--- misc/team/Makefile | 5 +++-- 8 files changed, 29 insertions(+), 18 deletions(-) (limited to 'misc') diff --git a/misc/cardboard-schedule/Makefile b/misc/cardboard-schedule/Makefile index fc22c6ab4f5..99fe265a195 100644 --- a/misc/cardboard-schedule/Makefile +++ b/misc/cardboard-schedule/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2000/05/26 18:21:10 jwise Exp $ +# $NetBSD: Makefile,v 1.3 2000/08/18 22:46:42 hubertf Exp $ # DISTNAME= cs113ins @@ -15,7 +15,9 @@ USE_X11BASE= yes DEPENDS+= unzip-*:../../archivers/unzip DEPENDS+= swing-*:../../x11/swing -NO_CDROM= "License prohibits redistribution on CDROM" +RESTRICTED= "License prohibits redistribution on CDROM" +NO_SRC_ON_CDROM= ${RESTRICTED} +NO_BIN_ON_CDROM= ${RESTRICTED} EXTRACT_CMD= (cd ${WRKDIR} && unzip -x ${DOWNLOADED_DISTFILE}) || ${TRUE} MESSAGE_FILE= ${WRKDIR}/MESSAGE diff --git a/misc/chord/Makefile b/misc/chord/Makefile index 736794059a7..d7b2e842f10 100644 --- a/misc/chord/Makefile +++ b/misc/chord/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 1998/07/03 23:30:09 tron Exp $ +# $NetBSD: Makefile,v 1.7 2000/08/18 22:46:43 hubertf Exp $ # FreeBSD Id: Makefile,v 1.4 1997/04/30 03:18:06 asami 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 + MANCOMPRESSED= yes .include "../../mk/bsd.pkg.mk" diff --git a/misc/colorls/Makefile b/misc/colorls/Makefile index 7dcf5f29d1b..e867d253a7b 100644 --- a/misc/colorls/Makefile +++ b/misc/colorls/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2000/02/05 20:05:22 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2000/08/18 22:46:43 hubertf Exp $ # FreeBSD Id: Makefile,v 1.13 1997/04/30 03:18:06 asami 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 + MANCOMPRESSED_IF_MANZ= yes pre-patch: diff --git a/misc/dt/Makefile b/misc/dt/Makefile index 4a5a427dcf3..4020708608f 100644 --- a/misc/dt/Makefile +++ b/misc/dt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 1999/09/07 14:53:55 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2000/08/18 22:46:43 hubertf Exp $ # DISTNAME= dt-1.1.7 @@ -8,13 +8,13 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} MAINTAINER= fb@enteract.com +NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL + .BEGIN: .if (${MACHINE} != "mac68k") && (${MACHINE} != "macppc") IGNORE= "is only useful for ports that have the adb and grf devices" .endif -MIRROR_DISTFILE=no - ALL_TARGET= depend all DTDOCSDIR= ${PREFIX}/share/doc/dt diff --git a/misc/linuxls/Makefile b/misc/linuxls/Makefile index 92a3ee008ae..4be2d234e4c 100644 --- a/misc/linuxls/Makefile +++ b/misc/linuxls/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 1998/08/20 15:17:14 tsarna Exp $ +# $NetBSD: Makefile,v 1.9 2000/08/18 22:46:43 hubertf Exp $ # FreeBSD Id: Makefile,v 1.6 1997/04/30 04:43:34 asami Exp # @@ -14,7 +14,8 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= bmc@WillsCreek.COM HOMEPAGE= http://www.gnu.org/software/fileutils/fileutils.html -MIRROR_DISTFILE= no +NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL + GNU_CONFIGURE= yes .include "../../mk/bsd.pkg.mk" diff --git a/misc/py-mxDateTime/Makefile b/misc/py-mxDateTime/Makefile index 317b4853df2..e1ee80cfe7e 100644 --- a/misc/py-mxDateTime/Makefile +++ b/misc/py-mxDateTime/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 1999/09/22 19:21:52 hubertf Exp $ +# $NetBSD: Makefile,v 1.3 2000/08/18 22:46:44 hubertf Exp $ DISTNAME= mxDateTime-1.3.0 PKGNAME= py-mxDateTime-1.3.0 @@ -15,7 +15,9 @@ DEPENDS+= python-1.5.2:../../lang/python EXTRACT_CMD= unzip -Laqo ${DOWNLOADED_DISTFILE} -NO_CDROM= No commerciao distribution +RESTRICTED= No commercial distribution +NO_SRC_ON_CDROM= ${RESTRICTED} +NO_BIN_ON_CDROM= ${RESTRICTED} do-configure: ( cd ${WRKSRC}/mxDateTime ; \ diff --git a/misc/staroffice/Makefile b/misc/staroffice/Makefile index bce4ef357d1..26424dfc557 100644 --- a/misc/staroffice/Makefile +++ b/misc/staroffice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2000/07/14 19:01:31 thorpej Exp $ +# $NetBSD: Makefile,v 1.10 2000/08/18 22:46:44 hubertf Exp $ # DISTNAME= so51a_lnx_${LANGNO} @@ -15,8 +15,11 @@ CONFLICTS= staroffice-* DEPENDS+= unzip-*:../../archivers/unzip DEPENDS+= suse_linux>=6.1:../../emulators/suse_linux -NO_CDROM= "Redistribution not permitted" -MIRROR_DISTFILE= NO +RESTRICTED= "Redistribution not permitted" +NO_SRC_ON_FTP= ${RESTRICTED} +NO_SRC_ON_CDROM= ${RESTRICTED} +NO_BIN_ON_FTP= ${RESTRICTED} +NO_BIN_ON_CDROM= ${RESTRICTED} ONLY_FOR_PLATFORM= NetBSD-1.4?-i386 NetBSD-1.4Z[A-Z]-i386 \ NetBSD-1.5_ALPHA-i386 NetBSD-1.5?-i386 diff --git a/misc/team/Makefile b/misc/team/Makefile index e434d215033..69d99dcaa5f 100644 --- a/misc/team/Makefile +++ b/misc/team/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 1999/07/02 08:37:26 agc Exp $ +# $NetBSD: Makefile,v 1.14 2000/08/18 22:46:44 hubertf Exp $ # FreeBSD Id: Makefile,v 1.6 1997/04/30 03:18:06 asami Exp # @@ -8,7 +8,8 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} MAINTAINER= packages@netbsd.org -MIRROR_DISTFILE= no +NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL + MANCOMPRESSED_IF_MANZ= yes .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3