summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhubertf <hubertf>2000-08-18 22:46:29 +0000
committerhubertf <hubertf>2000-08-18 22:46:29 +0000
commit319851030c59cf23051f4b644ce57723ba62c60c (patch)
tree04f7b6c9f02d31bfb54ab2070f124b8e32554867
parentc62864cb6595a43a3e5a23bf12ad8dafe7481b48 (diff)
downloadpkgsrc-319851030c59cf23051f4b644ce57723ba62c60c.tar.gz
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.
-rw-r--r--archivers/hpack/Makefile5
-rw-r--r--archivers/zip/Makefile5
-rw-r--r--archivers/zip1/Makefile5
-rw-r--r--audio/amp/Makefile5
-rw-r--r--audio/gogo/Makefile7
-rw-r--r--audio/realplayer7/Makefile13
-rw-r--r--audio/snd/Makefile7
-rw-r--r--audio/timidity/Makefile6
-rw-r--r--audio/tracker/Makefile8
-rw-r--r--biology/fastDNAml/Makefile6
-rw-r--r--biology/phylip/Makefile6
-rw-r--r--databases/mysql-client/Makefile6
-rw-r--r--databases/mysql-server/Makefile6
-rw-r--r--devel/ipv6socket_scrub/Makefile3
-rw-r--r--editors/framemaker/Makefile9
-rw-r--r--emulators/atari800/Makefile12
-rw-r--r--emulators/fmsx/Makefile3
-rw-r--r--emulators/freebsd_lib/Makefile12
-rw-r--r--emulators/vice/Makefile3
-rw-r--r--fonts/acroread-font-share/Makefile.common9
-rw-r--r--games/gnuchess4/Makefile4
-rw-r--r--games/quakedata/Makefile9
-rw-r--r--games/rollemup/Makefile7
-rw-r--r--games/xbat/Makefile8
-rw-r--r--games/xmahjongg/Makefile6
-rw-r--r--graphics/ImageMagick/Makefile4
-rw-r--r--graphics/mtv/Makefile9
-rw-r--r--graphics/ns-flash/Makefile10
-rw-r--r--graphics/p5-PerlMagick/Makefile5
-rw-r--r--graphics/pstoedit/Makefile6
-rw-r--r--graphics/qvplay/Makefile9
-rw-r--r--graphics/xanim/Makefile9
-rw-r--r--graphics/xpdf-crypto/Makefile5
-rw-r--r--japanese/king/Makefile3
-rw-r--r--lang/clisp/Makefile6
-rw-r--r--lang/jdk/Makefile7
-rw-r--r--mail/mailwrapper/Makefile5
-rw-r--r--mail/mush/Makefile4
-rw-r--r--mail/mutt-current/Makefile9
-rw-r--r--mail/postfix-current/Makefile3
-rw-r--r--mail/postfix/Makefile3
-rw-r--r--mail/xfmail/Makefile5
-rw-r--r--mbone/nte/Makefile6
-rw-r--r--mbone/rat/Makefile8
-rw-r--r--mbone/sdr/Makefile9
-rw-r--r--misc/cardboard-schedule/Makefile6
-rw-r--r--misc/chord/Makefile5
-rw-r--r--misc/colorls/Makefile5
-rw-r--r--misc/dt/Makefile6
-rw-r--r--misc/linuxls/Makefile5
-rw-r--r--misc/py-mxDateTime/Makefile6
-rw-r--r--misc/staroffice/Makefile9
-rw-r--r--misc/team/Makefile5
-rw-r--r--net/dip/Makefile5
-rw-r--r--net/gated/Makefile8
-rw-r--r--net/icb/Makefile4
-rw-r--r--net/ra-pna-proxy/Makefile8
-rw-r--r--net/ra-rtsp-proxy/Makefile8
-rw-r--r--net/socks4/Makefile5
-rw-r--r--net/socks5/Makefile5
-rw-r--r--net/speakfreely/Makefile6
-rw-r--r--net/zenicb/Makefile4
-rw-r--r--parallel/glunix/Makefile3
-rw-r--r--print/acroread/Makefile7
-rw-r--r--print/acroread3/Makefile7
-rw-r--r--print/lgrind/Makefile4
-rw-r--r--security/crack/Makefile7
-rw-r--r--security/gnupg/Makefile3
-rw-r--r--security/isakmpd/Makefile7
-rw-r--r--security/kth-krb4/Makefile4
-rw-r--r--security/openssh/Makefile6
-rw-r--r--security/openssl/Makefile5
-rw-r--r--security/pgp2/Makefile5
-rw-r--r--security/pgp5/Makefile4
-rw-r--r--security/py-crypto/Makefile4
-rw-r--r--security/rc5des/Makefile4
-rw-r--r--security/rsaref/Makefile5
-rw-r--r--security/srp_client/Makefile4
-rw-r--r--security/ssh/Makefile6
-rw-r--r--security/ssh6/Makefile6
-rw-r--r--security/uvscan-dat/Makefile3
-rw-r--r--security/uvscan/Makefile3
-rw-r--r--textproc/glimpse/Makefile7
-rw-r--r--www/asWedit/Makefile10
-rw-r--r--www/jsdk20/Makefile11
-rw-r--r--www/navigator/Makefile.common7
-rw-r--r--www/navigator3/Makefile10
-rw-r--r--x11/XF86Setup/Makefile5
-rw-r--r--x11/fvwm1/Makefile5
-rw-r--r--x11/swing/Makefile12
-rw-r--r--x11/tkman/Makefile10
-rw-r--r--x11/xview-clients/Makefile5
-rw-r--r--x11/xview-config/Makefile5
-rw-r--r--x11/xview-lib/Makefile5
94 files changed, 352 insertions, 232 deletions
diff --git a/archivers/hpack/Makefile b/archivers/hpack/Makefile
index 1c9c28a1537..ff2bf97f863 100644
--- a/archivers/hpack/Makefile
+++ b/archivers/hpack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/07/06 18:31:45 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.5 2000/08/18 22:46:29 hubertf Exp $
DISTNAME= hpack79${USE_RSAREF2:S/YES/u/:C/[^u]*//g}src
PKGNAME= hpack-0.79
@@ -8,7 +8,8 @@ MASTER_SITES= ftp://src.doc.ic.ac.uk/packages/hpack/
MAINTAINER= packages@netbsd.org
RESTRICTED= crypto
-MIRROR_DISTFILE=no
+NO_SRC_ON_FTP= ${RESTRICTED}
+NO_SRC_ON_CDROM= ${RESTRICTED}
NO_WRKSUBDIR= yes
PATCHDIR= ${WRKDIR}/.patches
diff --git a/archivers/zip/Makefile b/archivers/zip/Makefile
index ed44713b13a..3574a86bc50 100644
--- a/archivers/zip/Makefile
+++ b/archivers/zip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 1999/12/28 03:59:01 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2000/08/18 22:46:29 hubertf Exp $
# FreeBSD Id: Makefile,v 1.10 1997/04/27 16:06:15 ache Exp
#
@@ -24,7 +24,8 @@ DISTFILES+= zcrypt28.zip
EXTRACT_ONLY= zip23.tar.gz
BUILD_DEPENDS= unzip:../../archivers/unzip
RESTRICTED= crypto
-MIRROR_DISTFILE=no
+NO_SRC_ON_FTP= ${RESTRICTED}
+NO_SRC_ON_CDROM= ${RESTRICTED}
post-extract:
@cd ${WRKSRC} && unzip -qo ${DISTDIR}/zcrypt28.zip
diff --git a/archivers/zip1/Makefile b/archivers/zip1/Makefile
index a7f566942a0..b14b53bf3f9 100644
--- a/archivers/zip1/Makefile
+++ b/archivers/zip1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1999/12/28 03:59:01 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2000/08/18 22:46:29 hubertf Exp $
#
DISTNAME= zip1-1.1
@@ -29,7 +29,8 @@ BUILD_DEFS+= ZIP_ENCRYPTION
DISTFILES+= zcrypt10.zip
ALL_TARGET+= zipcloak
RESTRICTED= crypto
-MIRROR_DISTFILE=no
+NO_SRC_ON_FTP= ${RESTRICTED}
+NO_SRC_ON_CDROM= ${RESTRICTED}
.endif
do-install:
diff --git a/audio/amp/Makefile b/audio/amp/Makefile
index bea23318cd9..1b8414a8c2c 100644
--- a/audio/amp/Makefile
+++ b/audio/amp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1999/12/25 18:03:23 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2000/08/18 22:46:30 hubertf Exp $
#
DISTNAME= amp-0.7.6
@@ -9,7 +9,8 @@ EXTRACT_SUFX= .tgz
MAINTAINER= mycroft@netbsd.org
-MIRROR_DISTFILE= no
+NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL
+
GNU_CONFIGURE= yes
do-install:
diff --git a/audio/gogo/Makefile b/audio/gogo/Makefile
index 4ccb4d6bbc4..f6e4fc29043 100644
--- a/audio/gogo/Makefile
+++ b/audio/gogo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/08/13 19:01:53 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2000/08/18 22:46:30 hubertf Exp $
#
DISTNAME= gogo235
@@ -15,7 +15,10 @@ BUILD_DEPENDS+= nasm:../../devel/nasm
ONLY_FOR_PLATFORM= *-*-i386
USE_GMAKE= YES
-MIRROR_DISTFILE= NO
+
+RESTRICTED= 'Source based on patent protected Fraunhofer code'
+NO_SRC_ON_FTP= ${RESTRICTED}
+NO_SRC_ON_CDROM= ${RESTRICTED}
LICENSE= fee-based-commercial-use
do-install:
diff --git a/audio/realplayer7/Makefile b/audio/realplayer7/Makefile
index 326ada1f4c5..c73be6149ed 100644
--- a/audio/realplayer7/Makefile
+++ b/audio/realplayer7/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/08/15 06:38:35 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2000/08/18 22:46:30 hubertf Exp $
#
DISTNAME= rp7_linux20_libc6_i386_cs1
@@ -13,12 +13,15 @@ HOMEPAGE= http://www.real.com/products/player/
DEPENDS+= suse_linux>=6.1:../../emulators/suse_linux
+RESTRICTED= "Export-controlled, 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-*-i386
-NO_CDROM= "Redistribution not permitted"
-RESTRICTED= "Export-controlled"
-MIRROR_DISTFILE= no
-IS_INTERACTIVE= yes
+IS_INTERACTIVE= yes
NO_CONFIGURE= yes
RP_INSTALLER= ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
EXTRACT_CMD= HOME=${WRKDIR} ${RP_INSTALLER}
diff --git a/audio/snd/Makefile b/audio/snd/Makefile
index ce054ad0fe8..ddde613b126 100644
--- a/audio/snd/Makefile
+++ b/audio/snd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 1998/08/20 15:16:39 tsarna Exp $
+# $NetBSD: Makefile,v 1.16 2000/08/18 22:46:30 hubertf Exp $
#
DISTNAME= snd
@@ -8,11 +8,12 @@ CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_LOCAL}
MAINTAINER= hubertf@netbsd.org
-HOMEPAGE= http://ccrma-www/CCRMA/Software/snd/snd.html
+HOMEPAGE= http://ccrma-www.stanford.edu/CCRMA/Software/snd/snd.html
DEPENDS+= xpm-3.4k:../../graphics/xpm
-MIRROR_DISTFILE= no
+NO_SRC_ON_FTP= Already on MASTER_SITE_LOCAL
+
USE_MOTIF= yes
MAKEFILE= makefile.netbsd
ALL_TARGET= snd
diff --git a/audio/timidity/Makefile b/audio/timidity/Makefile
index 06328ea2113..90a51fe6c6c 100644
--- a/audio/timidity/Makefile
+++ b/audio/timidity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2000/07/28 21:47:49 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2000/08/18 22:46:30 hubertf Exp $
#
DISTNAME= timidity-0.2i
@@ -15,7 +15,9 @@ DEPENDS+= tk-8.0.5:../../x11/tk80
USE_CURSES= # defined
-NO_CDROM= "Uses copyrighted patches"
+RESTRICTED= "Uses copyrighted patches"
+NO_BIN_ON_FTP= ${RESTRICTED}
+NO_BIN_ON_CDROM= ${RESTRICTED}
EXTRACT_ONLY= ${DISTNAME}.tar.gz
INSTALL_TARGET= install.all
diff --git a/audio/tracker/Makefile b/audio/tracker/Makefile
index e124dcf0d1d..22c17e0d78d 100644
--- a/audio/tracker/Makefile
+++ b/audio/tracker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 1999/12/25 23:43:56 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2000/08/18 22:46:31 hubertf Exp $
# FreeBSD Id: Makefile,v 1.29 1996/12/20 23:46:22 ache Exp
#
@@ -10,8 +10,10 @@ EXTRACT_SUFX= .tgz
MAINTAINER= packages@netbsd.org
RESTRICTED= "Non-redistributable beta"
-NO_CDROM= ${RESTRICTED}
-MIRROR_DISTFILE= no
+NO_BIN_ON_FTP= ${RESTRICTED}
+NO_BIN_ON_CDROM= ${RESTRICTED}
+NO_SRC_ON_FTP= ${RESTRICTED}
+NO_SRC_ON_CDROM= ${RESTRICTED}
WRKSRC= ${WRKDIR}/tracker
MAKE_FLAGS= MACHINE=netbsd CC=${CC} INSTALL="${INSTALL}" \
diff --git a/biology/fastDNAml/Makefile b/biology/fastDNAml/Makefile
index a631053f116..91946a7ba56 100644
--- a/biology/fastDNAml/Makefile
+++ b/biology/fastDNAml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/07/28 20:18:55 rh Exp $
+# $NetBSD: Makefile,v 1.2 2000/08/18 22:46:31 hubertf Exp $
DISTNAME= fastDNAml_1.2.1
PKGNAME= fastDNAml-1.2.1
@@ -9,7 +9,9 @@ MASTER_SITES= http://geta.life.uiuc.edu/~gary/programs/fastDNAml/
MAINTAINER= babafou@babafou.eu.org
HOMEPAGE= http://geta.life.uiuc.edu/~gary/programs/fastDNAml.html
-NO_CDROM= "No commercial distribution without a royalty agreement with the author"
+RESTRICTED= "No commercial distribution without a royalty agreement with the author"
+NO_SRC_ON_CDROM= ${RESTRICTED}
+NO_BIN_ON_CDROM= ${RESTRICTED}
do-build :
@ cd ${WRKSRC}/source && ${MAKE} LDFLAGS=-lm fastDNAml
diff --git a/biology/phylip/Makefile b/biology/phylip/Makefile
index d76285a5ae2..69b78d00016 100644
--- a/biology/phylip/Makefile
+++ b/biology/phylip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/07/28 19:58:56 rh Exp $
+# $NetBSD: Makefile,v 1.2 2000/08/18 22:46:31 hubertf Exp $
DISTNAME= phylip
PKGNAME= phylip-3.573c
@@ -11,7 +11,9 @@ EXTRACT_SUFX= .tar.Z
MAINTAINER= babafou@babafou.eu.org
HOMEPAGE= http://evolution.genetics.washington.edu/phylip.html
-NO_CDROM= "No commercial distribution without a royalty agreement with the author"
+RESTRICTED= "No commercial distribution without a royalty agreement with the author"
+NO_SRC_ON_CDROM= ${RESTRICTED}
+NO_BIN_ON_CDROM= ${RESTRICTED}
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/phylip
diff --git a/databases/mysql-client/Makefile b/databases/mysql-client/Makefile
index 9b8f4d5c290..b45cc85a155 100644
--- a/databases/mysql-client/Makefile
+++ b/databases/mysql-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2000/08/16 01:54:09 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2000/08/18 22:46:31 hubertf Exp $
#
DISTNAME= mysql-3.22.32
@@ -10,7 +10,9 @@ MASTER_SITES= ftp://ftp.mysql.com/MySQL-3.22/ \
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.mysql.com/
-NO_CDROM= "Restrictive license."
+RESTRICTED= "Restrictive license."
+NO_SRC_ON_CDROM= ${RESTRICTED}
+NO_BIN_ON_CDROM= ${RESTRICTED}
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--without-perl --without-debug --without-bench \
diff --git a/databases/mysql-server/Makefile b/databases/mysql-server/Makefile
index db33ff5293d..9fd56e5365b 100644
--- a/databases/mysql-server/Makefile
+++ b/databases/mysql-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2000/08/12 01:26:52 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2000/08/18 22:46:31 hubertf Exp $
#
DISTNAME= mysql-3.22.32
@@ -12,7 +12,9 @@ HOMEPAGE= http://www.mysql.com/
DEPENDS= ${DISTNAME:S/-/-client-/}:../../databases/mysql-client
-NO_CDROM= "Restrictive license."
+RESTRICTED= "Restrictive license."
+NO_SRC_ON_CDROM= ${RESTRICTED}
+NO_BIN_ON_CDROM= ${RESTRICTED}
EXTRACT_USING_PAX= yes
diff --git a/devel/ipv6socket_scrub/Makefile b/devel/ipv6socket_scrub/Makefile
index b109a098d2c..555c2807927 100644
--- a/devel/ipv6socket_scrub/Makefile
+++ b/devel/ipv6socket_scrub/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/07/20 13:30:59 rh Exp $
+# $NetBSD: Makefile,v 1.8 2000/08/18 22:46:32 hubertf Exp $
# KAME Id: Makefile,v 1.6 1999/11/28 14:36:04 itojun Exp
#
@@ -20,7 +20,6 @@ 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:
@if ${TEST} \! -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}; then \
diff --git a/editors/framemaker/Makefile b/editors/framemaker/Makefile
index 575ab50311c..5be5351f44b 100644
--- a/editors/framemaker/Makefile
+++ b/editors/framemaker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/03/10 19:17:51 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 2000/08/18 22:46:32 hubertf Exp $
#
DISTNAME= fmlinux
@@ -19,10 +19,13 @@ HOMEPAGE= http://www.adobe.com/products/framemaker/fmlinux.html
DEPENDS+= suse_linux>=6.1:../../emulators/suse_linux
.endif
-MIRROR_DISTFILE=NO
+RESTRICTED= "Distributed only by Adobe Inc."
+NO_SRC_ON_FTP= ${RESTRICTED}
+NO_SRC_ON_CDROM= ${RESTRICTED}
+NO_BIN_ON_FTP= ${RESTRICTED}
+NO_BIN_ON_CDROM= ${RESTRICTED}
NO_CONFIGURE= YES
-NO_CDROM= Distributed only by Adobe Inc.
DIST_SUBDIR= framemaker
diff --git a/emulators/atari800/Makefile b/emulators/atari800/Makefile
index 675a2284bd9..7a973b46f15 100644
--- a/emulators/atari800/Makefile
+++ b/emulators/atari800/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/07/22 12:03:38 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.6 2000/08/18 22:46:32 hubertf Exp $
DISTNAME= Atari800-0.9.9a
PKGNAME= atari800-0.9.9a
@@ -12,11 +12,13 @@ HOMEPAGE= http://cas3.zlin.vutbr.cz/~stehlik/a800.htm
BUILD_DEPENDS= unzip:../../archivers/unzip
-USE_X11= yes
-RESTRICTED= "copyrighted ROM images"
-NO_CDROM= ${RESTRICTED}
-MIRROR_DISTFILE=no
+RESTRICTED= "copyrighted ROM images"
+NO_SRC_ON_FTP= ${RESTRICTED}
+NO_SRC_ON_CDROM= ${RESTRICTED}
+NO_BIN_ON_FTP= ${RESTRICTED}
+NO_BIN_ON_CDROM= ${RESTRICTED}
+USE_X11= yes
EXTRACT_CMD= unzip -Loq ${DOWNLOADED_DISTFILE}
MAKE_FLAGS= LDFLAGS="${LDFLAGS} -L${X11BASE}/lib" OBJ="atari_x11.o" \
CFLAGS="-c ${CFLAGS} -DPREFIX=\\\"${PREFIX}\\\""
diff --git a/emulators/fmsx/Makefile b/emulators/fmsx/Makefile
index 5747236b4bc..cc21b875ded 100644
--- a/emulators/fmsx/Makefile
+++ b/emulators/fmsx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/08/06 14:45:04 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2000/08/18 22:46:32 hubertf Exp $
DISTNAME= fMSX22.tar
PKGNAME= fmsx-2.2
@@ -14,7 +14,6 @@ NO_BIN_ON_CDROM= ${RESTRICTED}
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
NO_SRC_ON_FTP= ${RESTRICTED}
-MIRROR_DISTFILE= no
USE_X11= yes
diff --git a/emulators/freebsd_lib/Makefile b/emulators/freebsd_lib/Makefile
index 31a0245eef7..4d0c204d432 100644
--- a/emulators/freebsd_lib/Makefile
+++ b/emulators/freebsd_lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1999/12/29 01:41:00 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2000/08/18 22:46:33 hubertf Exp $
#
DISTNAME= freebsd_lib-2.2.7
@@ -9,16 +9,6 @@ MAINTAINER= packages@netbsd.org
ONLY_FOR_PLATFORM= NetBSD-*-i386
-#
-# The distfile is distributed under the GPL, so no re-distribution of
-# binaries without source.
-#
-# Source can be found on
-# http://www.flame.org/NetBSD/freebsd_lib.2.2.7-src.tar.gz.
-# It seems nasty to have to provide source when FreeBSD already does.
-#
-MIRROR_DISTFILE= no
-
NO_BUILD= yes
NO_WRKSUBDIR= yes
diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index 0eb5084bb88..4b7cbbf6090 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2000/07/20 13:30:59 rh Exp $
+# $NetBSD: Makefile,v 1.11 2000/08/18 22:46:33 hubertf Exp $
DISTNAME= vice-1.2
CATEGORIES= emulators
@@ -17,7 +17,6 @@ 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/fonts/acroread-font-share/Makefile.common b/fonts/acroread-font-share/Makefile.common
index 657d8ac559c..f6c57246dbe 100644
--- a/fonts/acroread-font-share/Makefile.common
+++ b/fonts/acroread-font-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2000/05/12 20:39:12 sakamoto Exp $
+# $NetBSD: Makefile.common,v 1.2 2000/08/18 22:46:33 hubertf Exp $
#
PKGNAME= acroread-${DISTNAME}-4.0
@@ -10,8 +10,11 @@ HOMEPAGE= http://www.adobe.com/prodindex/acrobat/readstep.html
DEPENDS+= acroread-4.*:../../print/acroread
RESTRICTED= Redistribution not permitted
-NO_CDROM= ${RESTRICTED}
-MIRROR_DISTFILE=no
+NO_SRC_ON_CDROM= ${RESTRICTED}
+NO_BIN_ON_CDROM= ${RESTRICTED}
+NO_SRC_ON_FTP= ${RESTRICTED}
+NO_BIN_ON_FTP= ${RESTRICTED}
+
IS_INTERACTIVE= yes
NO_PATCH= yes
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
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 5cd5e7530eb..bd0355b745f 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2000/08/10 08:57:23 tron Exp $
+# $NetBSD: Makefile,v 1.60 2000/08/18 22:46:34 hubertf Exp $
DISTNAME= ImageMagick-5.2.2
CATEGORIES= graphics
@@ -13,7 +13,7 @@ DEPENDS+= mpeg2codec-1.2:../../graphics/mpeg2codec
DEPENDS+= png>=1.0.6:../../graphics/png
DEPENDS+= tiff-*:../../graphics/tiff
-MIRROR_DISTFILE= no
+NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL
GNU_CONFIGURE= YES
USE_X11= YES
diff --git a/graphics/mtv/Makefile b/graphics/mtv/Makefile
index fc6686d2226..642f5022897 100644
--- a/graphics/mtv/Makefile
+++ b/graphics/mtv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2000/08/05 15:40:31 mycroft Exp $
+# $NetBSD: Makefile,v 1.22 2000/08/18 22:46:35 hubertf Exp $
DISTNAME= mtv-1.1.4
CATEGORIES= graphics
@@ -16,7 +16,12 @@ ONLY_FOR_PLATFORM= NetBSD-1.4[Y-Z]-i386 NetBSD-1.4Z[A-Z]-i386 \
DIST_SUBDIR= mtv
LICENSE= fee-based-commercial-use
MANCOMPRESSED=
-MIRROR_DISTFILE= no
+
+RESTRICTED= "Commercial software."
+NO_SRC_ON_FTP= ${RESTRICTED}
+NO_SRC_ON_CDROM= ${RESTRICTED}
+NO_BIN_ON_FTP= ${RESTRICTED}
+NO_BIN_ON_CDROM= ${RESTRICTED}
EXTRACT_ONLY= # empty
NO_BUILD= yes
diff --git a/graphics/ns-flash/Makefile b/graphics/ns-flash/Makefile
index 602b7ca8bc2..b1faf19812e 100644
--- a/graphics/ns-flash/Makefile
+++ b/graphics/ns-flash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/06/01 09:45:42 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.6 2000/08/18 22:46:35 hubertf Exp $
#
PKGNAME= ns-flash-4.0r12
@@ -25,9 +25,11 @@ MASTER_SITES= http://download.macromedia.com/pub/shockwave/flash/${SUB}/
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.flash.com/
-NO_CDROM= "Redistribution not permitted"
-RESTRICTED= "Export-controlled"
-MIRROR_DISTFILE= no
+RESTRICTED= "Export-controlled, redistribution not permitted"
+NO_SRC_ON_FTP= ${RESTRICTED}
+NO_SRC_ON_CDROM= ${RESTRICTED}
+NO_BIN_ON_FTP= ${RESTRICTED}
+NO_BIN_ON_CDROM= ${RESTRICTED}
NO_CONFIGURE= yes
NO_BUILD= yes
diff --git a/graphics/p5-PerlMagick/Makefile b/graphics/p5-PerlMagick/Makefile
index 3529c226ab3..7ced38e7948 100644
--- a/graphics/p5-PerlMagick/Makefile
+++ b/graphics/p5-PerlMagick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/08/14 19:31:29 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2000/08/18 22:46:35 hubertf Exp $
DISTNAME= ImageMagick-5.2.2
PKGNAME= p5-PerlMagick-5.2.2
@@ -11,6 +11,8 @@ HOMEPAGE= http://www.wizards.dupont.com/cristy/ImageMagick.html
DEPENDS+= ImageMagick-5.2.2:../../${MAGICK}
+NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL
+
MAGICK= graphics/ImageMagick
MAGICKDIR= ${PKGSRCDIR}/${MAGICK}
PATCHDIR= ${MAGICKDIR}/patches
@@ -23,7 +25,6 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/PerlMagick
#EXTRACT_AFTER_ARGS+= ${WRKSRC}
-MIRROR_DISTFILE= no
USE_LIBTOOL= yes
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
USE_PERL5= yes
diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index 283cb456068..9a99ffea445 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/07/18 23:07:47 itohy Exp $
+# $NetBSD: Makefile,v 1.4 2000/08/18 22:46:35 hubertf Exp $
DISTNAME= pstoedit_3_20
PKGNAME= pstoedit-3.20
@@ -14,7 +14,9 @@ DEPENDS+= plotutils-2.3nb1:../../graphics/plotutils
# Any ghostscript pkg will probably do, if not a font pkg.
DEPENDS+= ghostscript-[^f]*:../../print/ghostscript
-NO_CDROM?= "The author writes: If you include this program on a CDROM, please send me a copy of the CD, or if it goes with a book, of the book."
+RESTRICTED?= "The author writes: If you include this program on a CDROM, please send me a copy of the CD, or if it goes with a book, of the book."
+NO_SRC_ON_CDROM= ${RESTRICTED}
+NO_BIN_ON_CDROM= ${RESTRICTED}
WRKSRC= ${WRKDIR}/pstoedit_3.20/src
diff --git a/graphics/qvplay/Makefile b/graphics/qvplay/Makefile
index ea1ece4f9e6..63bcd697e19 100644
--- a/graphics/qvplay/Makefile
+++ b/graphics/qvplay/Makefile
@@ -1,11 +1,14 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/09/17 03:46:32 jwise Exp $
+# $NetBSD: Makefile,v 1.2 2000/08/18 22:46:36 hubertf Exp $
#
DISTNAME= qvplay-0.94
WRKSRC= ${WRKDIR}/QVplay094/src
CATEGORIES= graphics
-MASTER_SITES= http://www.asahi-net.or.jp/~xg2k-hys/
-MIRROR_DISTFILE=no
+MASTER_SITES= http://www.asahi-net.or.jp/~xg2k-hys/index-e.html
+
+RESTRICTED= Undistributable development version.
+NO_SRC_ON_FTP= ${RESTRICTED}
+NO_SRC_ON_CDROM= ${RESTRICTED}
MAINTAINER= jwise@netbsd.org
HOMEPAGE= http://www.asahi-net.or.jp/~xg2k-hys/index-e.html
diff --git a/graphics/xanim/Makefile b/graphics/xanim/Makefile
index 226b106584e..dbf7d33dbad 100644
--- a/graphics/xanim/Makefile
+++ b/graphics/xanim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2000/01/02 03:38:32 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2000/08/18 22:46:36 hubertf Exp $
#
DISTNAME= xanim2801
@@ -22,8 +22,11 @@ HOMEPAGE= http://xanim.va.pubnix.com/
EXTRACT_ONLY= ${DISTNAME}.tar.gz
-# we can't mirror/distribute iv32 or cyuv object modules
-MIRROR_DISTFILE= no
+RESTRICTED= Can't mirror/distribute iv32 or cyuv object modules
+NO_SRC_ON_FTP= ${RESTRICTED}
+NO_SRC_ON_CDROM= ${RESTRICTED}
+NO_BIN_ON_FTP= ${RESTRICTED}
+NO_BIN_ON_CDROM= ${RESTRICTED}
USE_IMAKE= yes
diff --git a/graphics/xpdf-crypto/Makefile b/graphics/xpdf-crypto/Makefile
index 19c61ac10bd..b868730da0f 100644
--- a/graphics/xpdf-crypto/Makefile
+++ b/graphics/xpdf-crypto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/10/25 01:36:26 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 2000/08/18 22:46:36 hubertf Exp $
# FreeBSD Id: Makefile,v 1.12 1998/03/11 03:08:12 vanilla Exp
#
@@ -12,7 +12,8 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.foolabs.com/xpdf/
RESTRICTED= "Crypto; export-controlled"
-MIRROR_DISTFILE= no
+NO_SRC_ON_FTP= ${RESTRICTED}
+NO_SRC_ON_CDROM= ${RESTRICTED}
CONFLICTS= xpdf-0.[789][a0]
diff --git a/japanese/king/Makefile b/japanese/king/Makefile
index a1309f725f7..1651fbc654c 100644
--- a/japanese/king/Makefile
+++ b/japanese/king/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/07/20 13:31:00 rh Exp $
+# $NetBSD: Makefile,v 1.7 2000/08/18 22:46:36 hubertf Exp $
#
DISTNAME= king-1.00-tb40-1
@@ -15,7 +15,6 @@ 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
DISTDIR= ${KINGDISTDIR}
diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile
index b99b03127b6..4748c2932ba 100644
--- a/lang/clisp/Makefile
+++ b/lang/clisp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2000/06/16 23:53:43 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2000/08/18 22:46:37 hubertf Exp $
DISTNAME= clisp-2000-03-06
PKGNAME= clisp-20000306
@@ -12,7 +12,9 @@ HOMEPAGE= http://clisp.cons.org/
NOT_FOR_PLATFORM= *-*-alpha # severe LP64 problems
-MIRROR_DISTFILE= no
+RESTRICTED= "Contract notify author when selling for profit."
+NO_BIN_ON_CDROM= ${RESTRICTED}
+NO_SRC_ON_CDROM= ${RESTRICTED}
GNU_CONFIGURE= YES
WRKSRC= ${WRKDIR}/${DISTNAME}/src
diff --git a/lang/jdk/Makefile b/lang/jdk/Makefile
index d41f482b371..7f377dad09e 100644
--- a/lang/jdk/Makefile
+++ b/lang/jdk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2000/03/16 18:51:07 kim Exp $
+# $NetBSD: Makefile,v 1.17 2000/08/18 22:46:37 hubertf Exp $
#
.include "../../mk/bsd.prefs.mk"
@@ -35,7 +35,10 @@ MESSAGE_FILE= ${WRKDIR}/.MESSAGE
ONLY_FOR_PLATFORM= NetBSD-*-i386
RESTRICTED= "No redistribution of the Java(tm) Development Kit"
-NO_CDROM= ${RESTRICTED}
+NO_SRC_ON_CDROM= ${RESTRICTED}
+NO_BIN_ON_CDROM= ${RESTRICTED}
+NO_SRC_ON_FTP= ${RESTRICTED}
+NO_BIN_ON_FTP= ${RESTRICTED}
.if ${OBJECT_FMT} == "ELF"
# This gross hack normalizes the shlib names so that automatic
diff --git a/mail/mailwrapper/Makefile b/mail/mailwrapper/Makefile
index 53e1ceade0b..e33de6c0747 100644
--- a/mail/mailwrapper/Makefile
+++ b/mail/mailwrapper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/04/08 23:17:11 bad Exp $
+# $NetBSD: Makefile,v 1.7 2000/08/18 22:46:37 hubertf Exp $
DISTNAME= mailwrapper-19990412
CATEGORIES= mail
@@ -6,7 +6,8 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MAINTAINER= packages@netbsd.org
-MIRROR_DISTFILE= no
+NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL
+
NO_CONFIGURE= yes
MANCOMPRESSED_IF_MANZ= yes
diff --git a/mail/mush/Makefile b/mail/mush/Makefile
index ca4457878e7..1a6c541ee5f 100644
--- a/mail/mush/Makefile
+++ b/mail/mush/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/06/24 16:24:36 kim Exp $
+# $NetBSD: Makefile,v 1.6 2000/08/18 22:46:38 hubertf Exp $
DISTNAME= mush-7.2.5
PKGNAME= mush-7.2.6.b4.pl1
@@ -20,8 +20,6 @@ MAINTAINER= christos@netbsd.org
DIST_SUBDIR= mush
-RESTRICTED= "Z-Code license"
-MIRROR_DISTFILE= no
NO_WRKSUBDIR= yes
pre-configure:
diff --git a/mail/mutt-current/Makefile b/mail/mutt-current/Makefile
index b23c6c4a6ec..9fee274a49e 100644
--- a/mail/mutt-current/Makefile
+++ b/mail/mutt-current/Makefile
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2000/05/09 22:23:27 pooka Exp $
+# $NetBSD: Makefile,v 1.5 2000/08/18 22:46:38 hubertf Exp $
+
+IGNORE= "Stable mutt avaiable in mail/mutt"
DISTNAME= mutt-1.1.10i
WRKSRC= ${WRKDIR}/mutt-1.1.10
@@ -26,10 +28,9 @@ CONFIGURE_ARGS+= --with-curses=${LOCALBASE} --with-exec-shell=/bin/ksh \
--enable-pop --enable-imap
LDFLAGS+= -s
-MIRROR_DISTFILE=no
RESTRICTED= "Contains PGP code"
-
-IGNORE= "Stable mutt avaiable in mail/mutt"
+NO_SRC_ON_FTP= ${RESTRICTED}
+NO_SRC_ON_CDROM= ${RESTRICTED}
.include "../../mk/bsd.prefs.mk"
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index cc0a81a441d..8b39cfc40cf 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/08/14 12:38:21 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2000/08/18 22:46:38 hubertf Exp $
DISTNAME= snapshot-20000531
PKGNAME= postfix-20000531
@@ -12,7 +12,6 @@ PATCH_DIST_STRIP= -p1
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.postfix.org/
-MIRROR_DISTFILE= no
DIST_SUBDIR= postfix
POSTFIX_SPOOL= /var/spool/postfix
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 9c31dd6f6c2..392b58cfff0 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2000/07/03 02:46:16 sommerfeld Exp $
+# $NetBSD: Makefile,v 1.21 2000/08/18 22:46:38 hubertf Exp $
DISTNAME= postfix-19991231-pl08
PKGNAME= postfix-19991231pl08
@@ -16,7 +16,6 @@ PATCH_DIST_STRIP= -p1
MAINTAINER= christos@netbsd.org
HOMEPAGE= http://www.postfix.org/
-MIRROR_DISTFILE= no
MANCOMPRESSED_IF_MANZ= yes
DIST_SUBDIR= postfix
diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile
index 96697989772..69e2841421c 100644
--- a/mail/xfmail/Makefile
+++ b/mail/xfmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2000/06/13 10:40:26 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2000/08/18 22:46:39 hubertf Exp $
#
DISTNAME= xfmail-1.3
@@ -15,7 +15,8 @@ DEPENDS+= xforms-0.88:../../x11/xforms
ONLY_FOR_PLATFORM= *-*-arm32 *-*-i386 *-*-m68k *-*-sparc *-*-ns32k
RESTRICTED= "Selling this software requires permission of the authors."
-NO_CDROM= ${RESTRICTED}
+NO_SRC_ON_CDROM= ${RESTRICTED}
+NO_BIN_ON_CDROM= ${RESTRICTED}
USE_X11BASE= YES
GNU_CONFIGURE= YES
diff --git a/mbone/nte/Makefile b/mbone/nte/Makefile
index 1a919da653d..d53cf662f6e 100644
--- a/mbone/nte/Makefile
+++ b/mbone/nte/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2000/04/07 15:28:57 hubertf Exp $
+# $NetBSD: Makefile,v 1.20 2000/08/18 22:46:42 hubertf Exp $
#
DISTNAME= nt.1.5a23
@@ -14,7 +14,9 @@ DEPENDS+= tk-8.0.5:../../x11/tk80
NOT_FOR_PLATFORM= *-*-alpha # ANSI headers cause LP64 problems
RESTRICTED= "Contains DES encryption"
-MIRROR_DISTFILE= no
+NO_SRC_ON_FTP= ${RESTRICTED}
+NO_SRC_ON_CDROM= ${RESTRICTED}
+
NO_WRKSUBDIR= yes
USE_GMAKE= yes
# Pass this on to our child
diff --git a/mbone/rat/Makefile b/mbone/rat/Makefile
index 83b9af123e0..afff3e75346 100644
--- a/mbone/rat/Makefile
+++ b/mbone/rat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 1999/04/01 13:38:44 agc Exp $
+# $NetBSD: Makefile,v 1.14 2000/08/18 22:46:42 hubertf Exp $
#
DISTNAME= rat-3.0.28
@@ -10,8 +10,10 @@ HOMEPAGE= http://www-mice.cs.ucl.ac.uk/multimedia/software/rat/
DEPENDS+= tk-8.0.5:../../x11/tk80
-RESTRICTED= "Contains DES encryption"
-MIRROR_DISTFILE=no
+RESTRICTED= "Contains DES encryption"
+NO_SRC_ON_FTP= ${RESTRICTED}
+NO_SRC_ON_CDROM= ${RESTRICTED}
+
USE_GMAKE= yes
USE_X11BASE= yes
diff --git a/mbone/sdr/Makefile b/mbone/sdr/Makefile
index e731182c515..f6d6ec6560f 100644
--- a/mbone/sdr/Makefile
+++ b/mbone/sdr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2000/03/15 07:17:39 bouyer Exp $
+# $NetBSD: Makefile,v 1.26 2000/08/18 22:46:42 hubertf Exp $
#
DISTNAME= sdr-2.7
@@ -10,10 +10,11 @@ HOMEPAGE= http://www-mice.cs.ucl.ac.uk/multimedia/software/sdr/
DEPENDS+= tk-8.0.5:../../x11/tk80
-MIRROR_DISTFILE= no
-USE_GMAKE= yes
-
RESTRICTED= "Uses encryption"
+NO_SRC_ON_FTP= ${RESTRICTED}
+NO_SRC_ON_CDROM= ${RESTRICTED}
+
+USE_GMAKE= yes
.include "../../mk/bsd.prefs.mk"
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"
diff --git a/net/dip/Makefile b/net/dip/Makefile
index 99eb0ede186..a60ae682468 100644
--- a/net/dip/Makefile
+++ b/net/dip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1999/07/02 08:37:27 agc Exp $
+# $NetBSD: Makefile,v 1.8 2000/08/18 22:46:44 hubertf Exp $
# FreeBSD Id: Makefile,v 1.5 1997/04/30 03:18:07 asami Exp
#
@@ -12,7 +12,8 @@ EXTRACT_SUFX= .tar.Z
MAINTAINER= packages@netbsd.org
-MIRROR_DISTFILE= no
+NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL
+
NO_CONFIGURE= yes
MANCOMPRESSED_IF_MANZ= yes
diff --git a/net/gated/Makefile b/net/gated/Makefile
index c5c73ec8e8a..03bc07b8a0c 100644
--- a/net/gated/Makefile
+++ b/net/gated/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1999/11/19 13:23:51 hubertf Exp $
+# $NetBSD: Makefile,v 1.7 2000/08/18 22:46:44 hubertf Exp $
# FreeBSD Id: Makefile,v 1.17 1998/04/26 18:47:12 peter Exp
#
@@ -10,7 +10,11 @@ MASTER_SITES= ftp://ftp.gated.merit.edu/net-research/gated/
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.gated.org/
-MIRROR_DISTFILE= no
+RESTRICTED= "Required license from Merit"
+NO_SRC_ON_FTP= ${RESTRICTED}
+NO_SRC_ON_CDROM= ${RESTRICTED}
+NO_BIN_ON_FTP= ${RESTRICTED}
+NO_BIN_ON_CDROM= ${RESTRICTED}
ALL_TARGET= gated
diff --git a/net/icb/Makefile b/net/icb/Makefile
index 0f70bc73404..ebef01a8805 100644
--- a/net/icb/Makefile
+++ b/net/icb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 1999/11/26 22:43:46 hubertf Exp $
+# $NetBSD: Makefile,v 1.12 2000/08/18 22:46:45 hubertf Exp $
#
# Note: The file ftp://ftp.icb.net/pub/icb/icb-0.9grok2.tar.gz is way
@@ -11,7 +11,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MAINTAINER= cjs@netbsd.org
HOMEPAGE= http://www.icb.net/
-MIRROR_DISTFILE= no
+NO_SRC_ON_FTP= "already in MASTER_SITE_LOCAL"
do-configure:
@cd ${WRKSRC}; \
diff --git a/net/ra-pna-proxy/Makefile b/net/ra-pna-proxy/Makefile
index eaec082d602..6765c49a1e2 100644
--- a/net/ra-pna-proxy/Makefile
+++ b/net/ra-pna-proxy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1999/10/26 16:17:44 tron Exp $
+# $NetBSD: Makefile,v 1.5 2000/08/18 22:46:45 hubertf Exp $
DISTNAME= raproxy3.0b1
PKGNAME= ra-pna-proxy-3.0b1
@@ -11,7 +11,11 @@ HOMEPAGE= http://service.real.com/firewall/fdev.html
IS_INTERACTIVE= yes
LICENSE= no-commercial-use
-MIRROR_DISTFILE= no
+RESTRICTED= ${LICENSE}
+NO_SRC_ON_FTP= ${RESTRICTED}
+NO_SRC_ON_CDROM= ${RESTRICTED}
+NO_BIN_ON_FTP= ${RESTRICTED}
+NO_BIN_ON_CDROM= ${RESTRICTED}
DOWNLOAD= http://proforma.real.com/mario/devzone/proxyform.html
diff --git a/net/ra-rtsp-proxy/Makefile b/net/ra-rtsp-proxy/Makefile
index 5b4ba214b00..682f6755f40 100644
--- a/net/ra-rtsp-proxy/Makefile
+++ b/net/ra-rtsp-proxy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1999/10/26 16:17:45 tron Exp $
+# $NetBSD: Makefile,v 1.5 2000/08/18 22:46:45 hubertf Exp $
DISTNAME= rtspd-src-1.0.0.0
PKGNAME= ra-rtsp-proxy-1.0.0.0
@@ -11,7 +11,11 @@ HOMEPAGE= http://service.real.com/firewall/fdev.html
IS_INTERACTIVE= yes
LICENSE= no-commercial-use
-MIRROR_DISTFILE= no
+RESTRICTED= ${LICENSE}
+NO_SRC_ON_FTP= ${RESTRICTED}
+NO_SRC_ON_CDROM= ${RESTRICTED}
+NO_BIN_ON_FTP= ${RESTRICTED}
+NO_BIN_ON_CDROM= ${RESTRICTED}
DOWNLOAD= http://proforma.real.com/mario/devzone/rtspproxyform.html
diff --git a/net/socks4/Makefile b/net/socks4/Makefile
index b79342fcefc..f180f56a3fe 100644
--- a/net/socks4/Makefile
+++ b/net/socks4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1999/08/05 13:09:27 agc Exp $
+# $NetBSD: Makefile,v 1.8 2000/08/18 22:46:45 hubertf Exp $
#
DISTNAME= export.socks.cstc.4.2.2
@@ -11,8 +11,9 @@ HOMEPAGE= http://www.socks.nec.com/socksv4.html
CONFLICTS= socks5-*
-NO_CDROM= "NEC has a funky license for this software"
RESTRICTED= "no commercial use"
+NO_SRC_ON_CDROM= ${RESTRICTED}
+NO_BIN_ON_CDROM= ${RESTRICTED}
WRKSRC= ${WRKDIR}/socks.cstc.4.2
diff --git a/net/socks5/Makefile b/net/socks5/Makefile
index fc0d37ed354..3db63577e7f 100644
--- a/net/socks5/Makefile
+++ b/net/socks5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2000/05/03 17:44:27 rh Exp $
+# $NetBSD: Makefile,v 1.16 2000/08/18 22:46:46 hubertf Exp $
# FreeBSD Id: Makefile,v 1.14 1997/08/28 06:49:06 obrien Exp
#
@@ -14,8 +14,9 @@ HOMEPAGE= http://www.socks.nec.com/
CONFLICTS= socks4-*
-NO_CDROM= "NEC has a funky license for this software"
RESTRICTED= "no commercial use"
+NO_SRC_ON_CDROM= ${RESTRICTED}
+NO_BIN_ON_CDROM= ${RESTRICTED}
# here are some extra configure args you may wish to use
# see the readme file before screwing with them
diff --git a/net/speakfreely/Makefile b/net/speakfreely/Makefile
index b9e79041e3c..22c56dc0344 100644
--- a/net/speakfreely/Makefile
+++ b/net/speakfreely/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/07/29 03:12:19 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2000/08/18 22:46:46 hubertf Exp $
#
DISTNAME= speak_freely-7.2
@@ -14,7 +14,9 @@ DEPENDS+= gsm-1.0.10:../../audio/gsm
USE_PERL= # defined
PERL_PATH= ${LOCALBASE}/bin/perl
-MIRROR_DISTFILE= no # source includes crypto code
+RESTRICTED= Source includes crypto code
+NO_SRC_ON_FTP= ${RESTRICTED}
+NO_SRC_ON_CDROM= ${RESTRICTED}
NO_CONFIGURE= # defined
diff --git a/net/zenicb/Makefile b/net/zenicb/Makefile
index 5cc67bbd022..4f55b1abd96 100644
--- a/net/zenicb/Makefile
+++ b/net/zenicb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2000/08/04 18:50:36 martin Exp $
+# $NetBSD: Makefile,v 1.9 2000/08/18 22:46:46 hubertf Exp $
#
DISTNAME= zenicb-19981202
@@ -7,7 +7,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MAINTAINER= thorpej@netbsd.org
-MIRROR_DISTFILE= no
+NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL
# XXX YUCK! I really don't like this, but what else are we going to do?
.include "../../mk/bsd.prefs.mk"
diff --git a/parallel/glunix/Makefile b/parallel/glunix/Makefile
index b696b28bbab..5d627abd4a8 100644
--- a/parallel/glunix/Makefile
+++ b/parallel/glunix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2000/06/12 12:01:59 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2000/08/18 22:46:46 hubertf Exp $
DISTNAME= glunix-release-1-0a
PKGNAME= glunix-1.0a
@@ -17,7 +17,6 @@ USE_PERL5= yes
IS_INTERACTIVE= yes
NO_MTREE= yes
NO_WRKSUBDIR= yes
-MIRROR_DISTFILE=NO
MESSAGE_FILE= ${WRKDIR}/MESSAGE
diff --git a/print/acroread/Makefile b/print/acroread/Makefile
index 3a7a3d9e23b..9ed627b765c 100644
--- a/print/acroread/Makefile
+++ b/print/acroread/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2000/04/18 01:46:16 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.15 2000/08/18 22:46:46 hubertf Exp $
# FreeBSD Id: Makefile,v 1.13 1999/04/08 07:49:18 dima Exp $
PKGNAME= acroread-4.05
@@ -10,7 +10,10 @@ HOMEPAGE= http://www.adobe.com/prodindex/acrobat/readstep.html
IS_INTERACTIVE= YES
RESTRICTED= "Original installer required to redistribute."
-NO_CDROM= ${RESTRICTED}
+NO_SRC_ON_CDROM= ${RESTRICTED}
+NO_BIN_ON_CDROM= ${RESTRICTED}
+NO_BIN_ON_FTP= ${RESTRICTED}
+NO_SRC_ON_FTP= ${RESTRICTED}
NO_BUILD= YES
diff --git a/print/acroread3/Makefile b/print/acroread3/Makefile
index 6b3709c79e1..65604a8143a 100644
--- a/print/acroread3/Makefile
+++ b/print/acroread3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/06/19 15:31:52 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.8 2000/08/18 22:46:47 hubertf Exp $
PKGNAME= acroread3-3.01
CATEGORIES= print
@@ -9,7 +9,10 @@ HOMEPAGE= http://www.adobe.com/prodindex/acrobat/readstep.html
IS_INTERACTIVE= YES
RESTRICTED= "Original installer required to redistribute."
-NO_CDROM= ${RESTRICTED}
+NO_SRC_ON_CDROM= ${RESTRICTED}
+NO_BIN_ON_CDROM= ${RESTRICTED}
+NO_SRC_ON_FTP= ${RESTRICTED}
+NO_BIN_ON_FTP= ${RESTRICTED}
NO_BUILD= YES
diff --git a/print/lgrind/Makefile b/print/lgrind/Makefile
index 8484f941156..c4e019c1608 100644
--- a/print/lgrind/Makefile
+++ b/print/lgrind/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2000/06/15 11:30:56 hubertf Exp $
+# $NetBSD: Makefile,v 1.10 2000/08/18 22:46:47 hubertf Exp $
DISTNAME= lgrind
PKGNAME= lgrind-3.5
@@ -11,7 +11,7 @@ MAINTAINER= jwise@netbsd.org
DEPENDS+= teTeX-1.0.*:../../print/teTeX
USE_X11= yes
-MIRROR_DISTFILE=no
+NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL
WRKSRC= ${WRKDIR}/lgrind/source
NO_CONFIGURE= yes
diff --git a/security/crack/Makefile b/security/crack/Makefile
index 5fe0e5e44d3..dc1e996f8a5 100644
--- a/security/crack/Makefile
+++ b/security/crack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/02/05 04:53:17 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2000/08/18 22:46:47 hubertf Exp $
# FreeBSD Id: ports/security/crack/Makefile,v 1.11 1999/09/04 19:24:50 obrien Exp
DISTNAME= crack5.0
@@ -11,8 +11,9 @@ MASTER_SITES= ftp://ftp.win.tue.nl/pub/security/ \
MAINTAINER= bouyer@netbsd.org
-RESTRICTED= "Crypto; export-controlled"
-MIRROR_DISTFILE= no
+RESTRICTED= "Crypto; export-controlled"
+NO_SRC_ON_FTP= ${RESTRICTED}
+MIRROR_DISTFILE= no
WRKSRC= ${WRKDIR}/c50a
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index 3d613b784a6..f226abdd2f9 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2000/07/31 04:14:10 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2000/08/18 22:46:47 hubertf Exp $
# FreeBSD Id: Makefile,v 1.20 1997/08/27 13:06:01 ache Exp
#
@@ -16,6 +16,7 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
RESTRICTED= "Cryptographic software"
+NO_SRC_ON_FTP= ${RESTRICTED}
MIRROR_DISTFILE=no
.include "../../mk/bsd.prefs.mk"
diff --git a/security/isakmpd/Makefile b/security/isakmpd/Makefile
index a38931ea08c..762382cdd9d 100644
--- a/security/isakmpd/Makefile
+++ b/security/isakmpd/Makefile
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2000/06/12 11:26:25 itojun Exp $
+# $NetBSD: Makefile,v 1.6 2000/08/18 22:46:48 hubertf Exp $
#
+BROKEN= "broken by PF_KEY API change"
+
DISTNAME= isakmpd-000220
PKGNAME= isakmpd-20000220
CATEGORIES= security net
@@ -13,7 +15,6 @@ PATCH_DIST_STRIP= -p1
MAINTAINER= itojun@kame.net
RESTRICTED= "Crypto; export-controlled"
-IGNORE= "broken by PF_KEY API change"
# this is not compatible with cross build - there's no other way
.if !exists(/usr/include/netinet6/ipsec.h)
@@ -29,7 +30,7 @@ DEPENDS+= openssl-0.9.*:../../security/openssl
DEPENDS+= gmp-*:../../devel/gmp
RESTRICTED= "Crypto; export-controlled"
-MIRROR_DISTFILE= no
+NO_SRC_ON_FTP= ${RESTRICTED}
ALL_TARGET= depend all
diff --git a/security/kth-krb4/Makefile b/security/kth-krb4/Makefile
index df2f72c77f2..baffdb60361 100644
--- a/security/kth-krb4/Makefile
+++ b/security/kth-krb4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/06/08 15:31:36 wennmach Exp $
+# $NetBSD: Makefile,v 1.4 2000/08/18 22:46:48 hubertf Exp $
#
DISTNAME= krb4-1.0.1
@@ -12,7 +12,7 @@ HOMEPAGE= http://www.pdc.kth.se/kth-krb/
CONFLICTS+= openssl-*
RESTRICTED= "Crypto; export-controlled"
-MIRROR_DISTFILE= no
+NO_SRC_ON_FTP= ${RESTRICTED}
GNU_CONFIGURE= yes
#USE_GTEXINFO= yes #not currently needed
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index ae82c446e21..7e01b9ffdc1 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2000/08/11 05:19:42 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2000/08/18 22:46:48 hubertf Exp $
#
DISTNAME= openssh-2.1.1p4
@@ -44,10 +44,10 @@ CONFLICTS= ssh-[0-9]* ssh6-[0-9]*
# retain the following line, for IPv6-ready pkgsrc webpage
BUILD_DEFS+= USE_INET6
BUILD_DEFS+= SSH_CONF_DIR
-
# USE_PERL5= yes
+
RESTRICTED= "Crypto; export-controlled"
-MIRROR_DISTFILE= no
+NO_SRC_ON_FTP= ${RESTRICTED}
DEINSTALL_FILE= ${WRKDIR}/DEINSTALL
INSTALL_FILE= ${WRKDIR}/INSTALL
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index 0c06e6476e6..a0bad47de76 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2000/07/24 11:11:16 tron Exp $
+# $NetBSD: Makefile,v 1.17 2000/08/18 22:46:48 hubertf Exp $
#
DISTNAME= openssl-0.9.5a
@@ -14,7 +14,8 @@ CONFLICTS= SSLeay-* ssleay-*
USE_PERL5= yes
RESTRICTED= "Crypto; export-controlled"
-MIRROR_DISTFILE= no
+NO_SRC_ON_FTP= ${RESTRICTED}
+
# matches what's in `Configure' (except sparc64)
ONLY_FOR_PLATFORM= NetBSD-*-alpha NetBSD-*-arm32 NetBSD-*-i386 \
NetBSD-*-m68k NetBSD-*-mips NetBSD-*-mipseb \
diff --git a/security/pgp2/Makefile b/security/pgp2/Makefile
index 6e18018c4e8..63536171dff 100644
--- a/security/pgp2/Makefile
+++ b/security/pgp2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2000/04/28 02:20:21 mycroft Exp $
+# $NetBSD: Makefile,v 1.24 2000/08/18 22:46:49 hubertf Exp $
# FreeBSD Id: Makefile,v 1.20 1997/08/27 13:06:01 ache Exp
#
@@ -29,7 +29,8 @@ CFLAGS=
.endif
RESTRICTED= "Cryptographic software"
-MIRROR_DISTFILE=no
+NO_SRC_ON_FTP= ${RESTRICTED}
+
PGPLIB= ${PREFIX}/share/pgp
CFLAGS+= -DPGP_SYSTEM_DIR=\\\"${PGPLIB}/\\\"
diff --git a/security/pgp5/Makefile b/security/pgp5/Makefile
index 33924b6e017..a0a4defe59b 100644
--- a/security/pgp5/Makefile
+++ b/security/pgp5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1999/08/07 06:01:07 rh Exp $
+# $NetBSD: Makefile,v 1.5 2000/08/18 22:46:49 hubertf Exp $
#
DISTNAME= pgp50i-unix-src
@@ -20,7 +20,7 @@ HOMEPAGE= http://www.pgpi.com/
BUILD_DEPENDS= ${LOCALBASE}/bin/perl:../../lang/perl5
RESTRICTED= "Cryptographic software"
-MIRROR_DISTFILE=no
+NO_SRC_ON_FTP= ${RESTRICTED}
GNU_CONFIGURE= YES
diff --git a/security/py-crypto/Makefile b/security/py-crypto/Makefile
index 6a8c5f4281a..b2c9d2923a2 100644
--- a/security/py-crypto/Makefile
+++ b/security/py-crypto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1999/09/21 03:40:23 hubertf Exp $
+# $NetBSD: Makefile,v 1.10 2000/08/18 22:46:49 hubertf Exp $
DISTNAME= pycrypt100
PKGNAME= py-crypto-1.0.0
@@ -12,7 +12,7 @@ HOMEPAGE= http://starship.skyport.net/crew/amk/writing/pct/
DEPENDS+= python-1.5.2:../../lang/python
RESTRICTED= "Cryptographic software"
-MIRROR_DISTFILE=no
+NO_SRC_ON_FTP= ${RESTRICTED}
WRKSRC= ${WRKDIR}/Extensions/Crypto
MAKE_FLAGS= 'OPT=${CFLAGS}'
diff --git a/security/rc5des/Makefile b/security/rc5des/Makefile
index a68cb4a6258..cbf9c3f60f5 100644
--- a/security/rc5des/Makefile
+++ b/security/rc5des/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/02/05 05:01:26 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2000/08/18 22:46:49 hubertf Exp $
#
DISTNAME= rc5-mlg-004
@@ -12,7 +12,7 @@ HOMEPAGE= http://rc5.distributed.net/
ONLY_FOR_PLATFORM= NetBSD-*-alpha NetBSD-*-arm32 NetBSD-*-i386
RESTRICTED= "Crypto; export-controlled"
-MIRROR_DISTFILE= no
+NO_SRC_ON_FTP= ${RESTRICTED}
WRKSRC= ${WRKDIR}/RC5
diff --git a/security/rsaref/Makefile b/security/rsaref/Makefile
index 730d523e09f..e79cd9b167a 100644
--- a/security/rsaref/Makefile
+++ b/security/rsaref/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2000/06/21 01:17:52 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2000/08/18 22:46:49 hubertf Exp $
#
DISTNAME= rsaref
@@ -11,7 +11,8 @@ EXTRACT_SUFX= .tar.Z
MAINTAINER= tv@netbsd.org
RESTRICTED= "Cryptographic source usable only within the USA"
-MIRROR_DISTFILE= no
+NO_SRC_ON_FTP= ${RESTRICTED}
+
IS_INTERACTIVE= yes # requires options to be set in order to use
LICENSE= no-commercial-use
diff --git a/security/srp_client/Makefile b/security/srp_client/Makefile
index 9ee9c96df05..edb8dbe8226 100644
--- a/security/srp_client/Makefile
+++ b/security/srp_client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/06/30 16:30:24 danw Exp $
+# $NetBSD: Makefile,v 1.4 2000/08/18 22:46:50 hubertf Exp $
#
DISTNAME= srp-1.4.4
@@ -19,7 +19,7 @@ HOMEPAGE= http://srp.stanford.edu/srp/
DEPENDS+= gmp>=2.0.2:../../devel/gmp
RESTRICTED= "Crypto; export-controlled"
-MIRROR_DISTFILE= no
+NO_SRC_ON_FTP= ${RESTRICTED}
GNU_CONFIGURE= yes
diff --git a/security/ssh/Makefile b/security/ssh/Makefile
index 4c06198b7f4..ac5d958d0ee 100644
--- a/security/ssh/Makefile
+++ b/security/ssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.80 2000/08/10 17:02:25 thorpej Exp $
+# $NetBSD: Makefile,v 1.81 2000/08/18 22:46:50 hubertf Exp $
# FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp
#
@@ -18,11 +18,11 @@ HOMEPAGE= http://www.cs.hut.fi/ssh/
CONFLICTS= openssh-[0-9]* ssh6-[0-9]*
-EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
RESTRICTED= "Crypto; export-controlled"
-MIRROR_DISTFILE= no
+NO_SRC_ON_FTP= ${RESTRICTED}
LICENSE= no-commercial-use
+EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
CFLAGS= -O2
GNU_CONFIGURE= YES
diff --git a/security/ssh6/Makefile b/security/ssh6/Makefile
index 721e4d85ef5..bffe300dd3a 100644
--- a/security/ssh6/Makefile
+++ b/security/ssh6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/08/11 03:12:51 itojun Exp $
+# $NetBSD: Makefile,v 1.5 2000/08/18 22:46:50 hubertf Exp $
# FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp
#
@@ -19,11 +19,11 @@ HOMEPAGE= http://www.cs.hut.fi/ssh/
CONFLICTS= openssh-[0-9]* ssh-[0-9]*
-EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
RESTRICTED= "Crypto; export-controlled"
-MIRROR_DISTFILE= no
+NO_SRC_ON_FTP= ${RESTRICTED}
LICENSE= no-commercial-use
+EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
CFLAGS= -O2
GNU_CONFIGURE= YES
diff --git a/security/uvscan-dat/Makefile b/security/uvscan-dat/Makefile
index 36f80d7cc0f..fd80b426e16 100644
--- a/security/uvscan-dat/Makefile
+++ b/security/uvscan-dat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/07/20 13:31:01 rh Exp $
+# $NetBSD: Makefile,v 1.5 2000/08/18 22:46:50 hubertf Exp $
#
DISTNAME= dat-4083
@@ -13,7 +13,6 @@ HOMEPAGE= http://www.nai.com/asp_set/download/dats/mcafee_4x.asp
NO_BUILD= YES
-MIRROR_DISTFILE=no
RESTRICTED= "restricted to the license terms set for VirusScan"
NO_BIN_ON_FTP= ${RESTRICTED}
NO_BIN_ON_CDROM=${RESTRICTED}
diff --git a/security/uvscan/Makefile b/security/uvscan/Makefile
index d3f1a16ab4a..4b9f86d9bef 100644
--- a/security/uvscan/Makefile
+++ b/security/uvscan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/07/20 13:31:00 rh Exp $
+# $NetBSD: Makefile,v 1.3 2000/08/18 22:46:51 hubertf Exp $
#
DISTNAME= vlnx407e
@@ -17,7 +17,6 @@ DEPENDS+= uvscan-dat>=4080:../../security/uvscan-dat
ONLY_FOR_PLATFORM= NetBSD-*-i386
NO_BUILD= YES
-MIRROR_DISTFILE= no
LICENSE= shareware
RESTRICTED= "restrictive 30 day evaluation license"
NO_BIN_ON_FTP= ${RESTRICTED}
diff --git a/textproc/glimpse/Makefile b/textproc/glimpse/Makefile
index d5b5f4b07a6..0ca6bb90c13 100644
--- a/textproc/glimpse/Makefile
+++ b/textproc/glimpse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2000/03/17 23:38:39 hubertf Exp $
+# $NetBSD: Makefile,v 1.10 2000/08/18 22:46:51 hubertf Exp $
# FreeBSD Id: Makefile,v 1.12 1997/07/17 19:29:07 andreas Exp
#
@@ -11,7 +11,10 @@ MASTER_SITES= ftp://ftp.cs.arizona.edu/glimpse/
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://glimpse.cs.arizona.edu/
-NO_CDROM= "Restrictive copyright (don't sell for profit)"
+RESTRICTED= "Restrictive copyright (don't sell for profit)"
+NO_SRC_ON_CDROM= ${RESTRICTED}
+NO_BIN_ON_CDROM= ${RESTRICTED}
+
USE_GMAKE= yes
GNU_CONFIGURE= yes
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}
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"