diff --git a/benchmarks/netperf/Makefile b/benchmarks/netperf/Makefile index 019b58a9be6..9f67f4b2321 100644 --- a/benchmarks/netperf/Makefile +++ b/benchmarks/netperf/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2000/02/22 17:08:37 espie Exp $ +# $OpenBSD: Makefile,v 1.4 2000/03/05 23:00:29 jakob Exp $ DISTNAME= netperf-2.1pl3 CATEGORIES= benchmarks net @@ -9,6 +9,11 @@ NEED_VERSION= 1.210 MASTER_SITES= ftp://ftp.cup.hp.com/dist/networking/benchmarks/netperf/ \ ftp://ftp.sunet.se/pub/network/monitoring/netperf/ +PERMIT_PACKAGE_CDROM= no +PERMIT_PACKAGE_FTP= yes +PERMIT_DISTFILES_CDROM= no +PERMIT_DISTFILES_FTP= yes + MAKE_FILE= makefile SHAREDIR= ${PREFIX}/share/netperf diff --git a/graphics/gifsicle/Makefile b/graphics/gifsicle/Makefile index 1ae396a7dc4..2c6df1b99dc 100644 --- a/graphics/gifsicle/Makefile +++ b/graphics/gifsicle/Makefile @@ -1,10 +1,15 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2000/01/20 22:14:57 jakob Exp $ +# $OpenBSD: Makefile,v 1.2 2000/03/05 23:00:30 jakob Exp $ DISTNAME= gifsicle-1.16.1 CATEGORIES= graphics MAINTAINER= jakob@openbsd.org +PERMIT_PACKAGE_CDROM= yes +PERMIT_PACKGE_FTP= yes +PERMIT_DISTFILES_CDROM= yes +PERMIT_DISTFILES_FTP= yes + MASTER_SITES= http://www.lcdf.org/gifsicle/ SEPARATE_BUILD= concurrent diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile index fb24f98f32c..7f5c2f9f0f4 100644 --- a/mail/imap-uw/Makefile +++ b/mail/imap-uw/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2000/02/18 20:36:03 jakob Exp $ +# $OpenBSD: Makefile,v 1.3 2000/03/05 23:00:30 jakob Exp $ DISTNAME= imap-4.7a PKGNAME= imap-uw-4.7a @@ -6,11 +6,10 @@ CATEGORIES= mail MAINTAINER= jakob@openbsd.org -LICENSE_TYPE= NOFEE -PERMIT_PACKAGE_CDROM= NO -PERMIT_PACKAGE_FTP= YES -PERMIT_DISTFILES_CDROM= NO -PERMIT_DISTFILES_FTP= YES +PERMIT_PACKAGE_CDROM= no +PERMIT_PACKAGE_FTP= yes +PERMIT_DISTFILES_CDROM= no +PERMIT_DISTFILES_FTP= yes MASTER_SITES= ftp://ftp.cac.washington.edu/imap/ \ ftp://ftp.cac.washington.edu/imap/old/ \ diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index 0ba1ae5a785..e86723669f1 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2000/03/03 11:54:44 turan Exp $ +# $OpenBSD: Makefile,v 1.19 2000/03/05 23:00:30 jakob Exp $ BROKEN= auto installs files in /etc @@ -11,6 +11,11 @@ MASTER_SITES= ftp://ftp.merit.edu/postfix/official/ \ MAINTAINER= jakob@openbsd.org +PERMIT_PACKAGE_CDROM= yes +PERMIT_PACKAGE_FTP= yes +PERMIT_DISTFILES_CDROM= yes +PERMIT_DISTFILES_FTP= yes + NO_CONFIGURE= yes MAKE_FLAGS= CC="${CC}" DEBUG="" OPT="${CFLAGS}" \ diff --git a/misc/pi-address/Makefile b/misc/pi-address/Makefile index bcd39371cc6..071dd7d1219 100644 --- a/misc/pi-address/Makefile +++ b/misc/pi-address/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2000/03/05 18:30:36 espie Exp $ +# $OpenBSD: Makefile,v 1.7 2000/03/05 23:00:31 jakob Exp $ DISTNAME= pi-address-0.3.3 CATEGORIES= misc x11 @@ -6,11 +6,10 @@ NEED_VERSION= 1.223 MAINTAINER= jakob@openbsd.org -LICENSE_TYPE= GPL -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes +PERMIT_PACKAGE_CDROM= yes +PERMIT_PACKAGE_FTP= yes +PERMIT_DISTFILES_CDROM= yes +PERMIT_DISTFILES_FTP= yes MASTER_SITES= ftp://linux.in-berlin.de/pub/pilot/ \ ftp://pv915.pv.reshsg.uci.edu/pub/pilot/ diff --git a/net/bind8/Makefile b/net/bind8/Makefile index 693c89dae30..f513ac32895 100644 --- a/net/bind8/Makefile +++ b/net/bind8/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2000/02/17 14:28:48 ho Exp $ +# $OpenBSD: Makefile,v 1.13 2000/03/05 23:00:31 jakob Exp $ DISTNAME= bind-openbsd-8.2.2-P6-19991217 PKGNAME= bind-8.2.2-P6 @@ -15,8 +15,8 @@ NO_MTREE= yes NO_CONFIGURE= yes SAMPLEDIR= ${DESTDIR}/usr/local/share/examples/bind8 -LICENSE_TYPE= CRYPTO RESTRICTED= "Unclear status of crypto components." + PERMIT_PACKAGE_CDROM= "Unclear status of crypto components." PERMIT_PACKAGE_FTP= "Unclear status of crypto components." PERMIT_DISTFILES_CDROM= "Unclear status of crypto components." diff --git a/net/httptunnel/Makefile b/net/httptunnel/Makefile index 96f2c413581..f3e85ac1115 100644 --- a/net/httptunnel/Makefile +++ b/net/httptunnel/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2000/02/15 05:04:53 turan Exp $ +# $OpenBSD: Makefile,v 1.5 2000/03/05 23:00:32 jakob Exp $ DISTNAME= httptunnel-2.0 CATEGORIES= net @@ -8,11 +8,10 @@ MASTER_SITE_SUBDIR= httptunnel MAINTAINER= jakob@openbsd.org -LICENSE_TYPE= GPL -PERMIT_PACKAGE_CDROM= YES -PERMIT_PACKAGE_FTP= YES -PERMIT_DISTFILES_CDROM= YES -PERMIT_DISTFILES_FTP= YES +PERMIT_PACKAGE_CDROM= yes +PERMIT_PACKAGE_FTP= yes +PERMIT_DISTFILES_CDROM= yes +PERMIT_DISTFILES_FTP= yes SEPARATE_BUILD= concurrent GNU_CONFIGURE= yes diff --git a/net/mtr/Makefile b/net/mtr/Makefile index 7a175bc3ec3..5bef87dcf45 100644 --- a/net/mtr/Makefile +++ b/net/mtr/Makefile @@ -1,15 +1,14 @@ -# $OpenBSD: Makefile,v 1.8 2000/02/15 05:04:56 turan Exp $ +# $OpenBSD: Makefile,v 1.9 2000/03/05 23:00:32 jakob Exp $ DISTNAME= mtr-0.41 CATEGORIES= net MAINTAINER= jakob@openbsd.org -LICENSE_TYPE= GPL -PERMIT_PACKAGE_CDROM= YES -PERMIT_PACKAGE_FTP= YES -PERMIT_DISTFILES_CDROM= YES -PERMIT_DISTFILES_FTP= YES +PERMIT_PACKAGE_CDROM= yes +PERMIT_PACKAGE_FTP= yes +PERMIT_DISTFILES_CDROM= yes +PERMIT_DISTFILES_FTP= yes NEED_VERSION= 1.175 MASTER_SITES= ftp://ftp.bitwizard.nl/mtr/ \ diff --git a/security/dante/Makefile b/security/dante/Makefile index e1377d375d4..d053e443eaf 100644 --- a/security/dante/Makefile +++ b/security/dante/Makefile @@ -1,11 +1,10 @@ -# $OpenBSD: Makefile,v 1.4 2000/02/15 05:05:09 turan Exp $ +# $OpenBSD: Makefile,v 1.5 2000/03/05 23:00:32 jakob Exp $ DISTNAME= dante-1.1.1 CATEGORIES= security MAINTAINER= jakob@openbsd.org -LICENSE_TYPE= BSD PERMIT_PACKAGE_CDROM= YES PERMIT_PACKAGE_FTP= YES PERMIT_DISTFILES_CDROM= YES diff --git a/security/logsurfer/Makefile b/security/logsurfer/Makefile index d6a45f76c94..058d21ad812 100644 --- a/security/logsurfer/Makefile +++ b/security/logsurfer/Makefile @@ -1,11 +1,10 @@ -# $OpenBSD: Makefile,v 1.4 2000/02/15 05:05:10 turan Exp $ +# $OpenBSD: Makefile,v 1.5 2000/03/05 23:00:33 jakob Exp $ DISTNAME= logsurfer-1.41 CATEGORIES= security MAINTAINER= jakob@openbsd.org -LICENSE_TYPE= BSD PERMIT_PACKAGE_CDROM= YES PERMIT_PACKAGE_FTP= YES PERMIT_DISTFILES_CDROM= YES diff --git a/sysutils/usbutil/Makefile b/sysutils/usbutil/Makefile index 4a4f985531a..707ed46da73 100644 --- a/sysutils/usbutil/Makefile +++ b/sysutils/usbutil/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2000/02/15 05:05:19 turan Exp $ +# $OpenBSD: Makefile,v 1.4 2000/03/05 23:00:33 jakob Exp $ DISTNAME= usbutil-0.3 CATEGORIES= sysutils @@ -7,7 +7,6 @@ MASTER_SITES= ftp://ftp.augustsson.net/pub/netbsd/ MAINTAINER= jakob@openbsd.org -LICENSE_TYPE= BSD PERMIT_PACKAGE_CDROM= YES PERMIT_PACKAGE_FTP= YES PERMIT_DISTFILES_CDROM= YES diff --git a/textproc/TclXML/Makefile b/textproc/TclXML/Makefile index 3a989b2c988..0ce67e4a730 100644 --- a/textproc/TclXML/Makefile +++ b/textproc/TclXML/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2000/03/05 18:30:44 espie Exp $ +# $OpenBSD: Makefile,v 1.3 2000/03/05 23:00:33 jakob Exp $ DISTNAME= TclXML-1.1.1 CATEGORIES= textproc @@ -7,6 +7,11 @@ MASTER_SITES= ftp://ftp.zveno.com/TclXML/ MAINTAINER= jakob@openbsd.org +PERMIT_PACKAGE_CDROM= no +PERMIT_PACKAGE_FTP= yes +PERMIT_DISTFILES_CDROM= no +PERMIT_DISTFILES_FTP= yes + RUN_DEPENDS= tclsh8.0:lang/tcl80 NO_BUILD= Yes diff --git a/textproc/rxp/Makefile b/textproc/rxp/Makefile index 9e5dadde978..5ba7bd66a7c 100644 --- a/textproc/rxp/Makefile +++ b/textproc/rxp/Makefile @@ -1,11 +1,10 @@ -# $OpenBSD: Makefile,v 1.4 2000/02/15 05:05:22 turan Exp $ +# $OpenBSD: Makefile,v 1.5 2000/03/05 23:00:33 jakob Exp $ DISTNAME= rxp-1.0.9 CATEGORIES= textproc MAINTAINER= jakob@openbsd.org -LICENSE_TYPE= GPL PERMIT_PACKAGE_CDROM= YES PERMIT_PACKAGE_FTP= YES PERMIT_DISTFILES_CDROM= YES diff --git a/textproc/xml2rfc/Makefile b/textproc/xml2rfc/Makefile index 9bb797c752b..7d74f93dc8a 100644 --- a/textproc/xml2rfc/Makefile +++ b/textproc/xml2rfc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2000/03/05 18:30:44 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2000/03/05 23:00:34 jakob Exp $ # DISTNAME= xml2rfc @@ -8,7 +8,6 @@ MASTER_SITES= http://memory.palace.org/authoring/ MAINTAINER= jakob@openbsd.org -LICENSE_TYPE= NONE PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes diff --git a/www/php3/Makefile b/www/php3/Makefile index f8a87d1a878..519e93e5163 100644 --- a/www/php3/Makefile +++ b/www/php3/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2000/02/28 10:36:27 kevlo Exp $ +# $OpenBSD: Makefile,v 1.6 2000/03/05 23:00:34 jakob Exp $ DISTNAME= php-3.0.15 PKGNAME= php3-3.0.15 @@ -11,7 +11,6 @@ MASTER_SITES= http://www.php.net/distributions/ \ http://se.php.net/distributions/ \ http://no.php.net/distributions/ -LICENSE_TYPE= GPL PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes diff --git a/x11/wmx/Makefile b/x11/wmx/Makefile index f72142e7145..3e5414409ae 100644 --- a/x11/wmx/Makefile +++ b/x11/wmx/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2000/02/15 05:05:32 turan Exp $ +# $OpenBSD: Makefile,v 1.5 2000/03/05 23:00:34 jakob Exp $ DISTNAME= wmx-5 PKGNAME= wmx-5.0 @@ -11,7 +11,6 @@ MASTER_SITES= http://www.all-day-breakfast.com/wmx/ \ MAINTAINER= jakob@openbsd.org -LICENSE_TYPE= BSD PERMIT_PACKAGE_CDROM= YES PERMIT_PACKAGE_FTP= YES PERMIT_DISTFILES_CDROM= YES diff --git a/x11/xdu/Makefile b/x11/xdu/Makefile index ad95a4f38c5..f8f5399c608 100644 --- a/x11/xdu/Makefile +++ b/x11/xdu/Makefile @@ -1,10 +1,15 @@ -# $OpenBSD: Makefile,v 1.2 2000/02/10 23:14:38 espie Exp $ +# $OpenBSD: Makefile,v 1.3 2000/03/05 23:00:34 jakob Exp $ DISTNAME= xdu-2.1 CATEGORIES= x11 MAINTAINER= jakob@openbsd.org +PERMIT_PACKAGE_CDROM= yes +PERMIT_PACKAGE_FTP= yes +PERMIT_DISTFILES_CDROM= yes +PERMIT_DISTFILES_FTP= yes + MASTER_SITES= ftp://ftp.x.org/R5contrib/ EXTRACT_SUFX= .tar.Z NEED_VERSION= 1.191