espie will not shut up about this, DISTF -> DISTFILES, PKG -> PACKAGE

2000-02-15 05:03:51 +00:00 · 2000-02-15 05:03:51 +00:00 · 504f314d16
commit 504f314d16
parent cfe8ca0405
348 changed files with 1739 additions and 1745 deletions
--- a/archivers/bzip2/Makefile
+++ b/archivers/bzip2/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2000/02/12 06:29:49 turan Exp $
+# $OpenBSD: Makefile,v 1.18 2000/02/15 05:03:51 turan Exp $

 DISTNAME=	bzip2-0.9.5d
 CATEGORIES=	archivers
@ -8,10 +8,10 @@ MASTER_SITES=	ftp://sourceware.cygnus.com/pub/bzip2/v095/ \
 MAINTAINER=	angelos@openbsd.org

 LICENSE_TYPE=		BSD
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 post-install:
 	@${LDCONFIG} -m ${PREFIX}/lib
--- a/archivers/freeze/Makefile
+++ b/archivers/freeze/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2000/02/12 08:41:07 turan Exp $
+# $OpenBSD: Makefile,v 1.8 2000/02/15 05:03:52 turan Exp $

 DISTNAME=       freeze-2.5
 CATEGORIES=	archivers
@ -8,10 +8,10 @@ MASTER_SITES=	ftp://ftp.cdrom.com/pub/unixfreeware/archive/ \
 MAINTAINER=     ports@openbsd.org

 LICENSE_TYPE=		NONE
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 GNU_CONFIGURE=	yes

--- a/archivers/gshar+gunshar/Makefile
+++ b/archivers/gshar+gunshar/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2000/02/12 08:02:07 turan Exp $
+# $OpenBSD: Makefile,v 1.10 2000/02/15 05:03:52 turan Exp $

 DISTNAME=	sharutils-4.2
 CATEGORIES=	archivers
@ -8,10 +8,10 @@ MASTER_SITE_SUBDIR= sharutils
 MAINTAINER=	ports@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-prefix=g --disable-uucode --disable-nls
--- a/archivers/gtar/Makefile
+++ b/archivers/gtar/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2000/02/12 08:02:08 turan Exp $
+# $OpenBSD: Makefile,v 1.10 2000/02/15 05:03:53 turan Exp $

 DISTNAME=	tar-1.13
 CATEGORIES=	archivers
@ -10,10 +10,10 @@ NEED_VERSION=	1.114
 MAINTAINER=	niklas@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-prefix=g
--- a/archivers/ha/Makefile
+++ b/archivers/ha/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2000/02/12 08:02:08 turan Exp $
+# $OpenBSD: Makefile,v 1.8 2000/02/15 05:03:53 turan Exp $

 DISTNAME=	ha0999
 PKGNAME=	ha-0.999b
@ -9,10 +9,10 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	angelos@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 USE_GMAKE=	yes

--- a/archivers/lha/Makefile
+++ b/archivers/lha/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2000/02/12 08:41:07 turan Exp $
+# $OpenBSD: Makefile,v 1.8 2000/02/15 05:03:54 turan Exp $

 DISTNAME=       lha-114f
 PKGNAME=        lha-1.14f
@ -9,10 +9,10 @@ MASTER_SITES=	http://www2m.biglobe.ne.jp/~dolphin/lha/prog/ \
 MAINTAINER=     angelos@openbsd.org

 LICENSE_TYPE=		NONE
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 MANLANG=	ja_JP.EUC

--- a/archivers/lzo/Makefile
+++ b/archivers/lzo/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2000/02/12 08:02:08 turan Exp $
+# $OpenBSD: Makefile,v 1.9 2000/02/15 05:03:54 turan Exp $

 DISTNAME=	lzo-1.06
 CATEGORIES=	archivers devel
@ -12,10 +12,10 @@ NEED_VERSION=	1.114
 MAINTAINER=	brad@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 SEPARATE_BUILD=	concurrent
 GNU_CONFIGURE=	yes
--- a/archivers/unace/Makefile
+++ b/archivers/unace/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2000/02/14 22:12:48 brad Exp $
+# $OpenBSD: Makefile,v 1.10 2000/02/15 05:03:54 turan Exp $
 # $FreeBSD: Makefile,v 1.1.1.1 1999/04/02 04:19:20 steve Exp $

 DISTNAME=	unacepub
@ -11,10 +11,10 @@ NEED_VERSION=	1.191
 MAINTAINER=	brad@openbsd.org

 LICENSE_TYPE=		NONE
-PERMIT_PKG_CDROM=	yes
-PERMIT_PKG_FTP=		yes
-PERMIT_DISTF_CDROM=	yes
-PERMIT_DISTF_FTP=	yes
+PERMIT_PACKAGE_CDROM=	yes
+PERMIT_PACKAGE_FTP=	yes
+PERMIT_DISTFILES_CDROM=	yes
+PERMIT_DISTFILES_FTP=	yes

 USE_ZIP=	yes

--- a/astro/dgpsip/Makefile
+++ b/astro/dgpsip/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2000/02/12 08:02:08 turan Exp $
+# $OpenBSD: Makefile,v 1.5 2000/02/15 05:03:55 turan Exp $

 DISTNAME=	dgpsip-1.28
 CATEGORIES=	astro
@ -7,10 +7,10 @@ MASTER_SITES=	http://www.wsrcc.com/wolfgang/ftp/
 MAINTAINER=	wsr+dgpsip@wsrcc.com

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 HOMEPAGE=	http://www.wsrcc.com/wolfgang/gps/dgps-ip.html

--- a/audio/bladeenc/Makefile
+++ b/audio/bladeenc/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2000/02/12 08:02:09 turan Exp $
+# $OpenBSD: Makefile,v 1.11 2000/02/15 05:03:55 turan Exp $

 DISTNAME=	bladeenc-0.91-src-stable
 PKGNAME=	bladeenc-0.91
@ -10,10 +10,10 @@ NEED_VERSION=	1.191
 MAINTAINER=	brad@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 GNU_CONFIGURE=	yes

--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2000/02/12 08:02:09 turan Exp $
+# $OpenBSD: Makefile,v 1.9 2000/02/15 05:03:56 turan Exp $
 # $FreeBSD: Makefile,v 1.8 1999/03/09 01:08:46 nectar Exp $

 DISTNAME=	esound-0.2.16
@ -11,10 +11,10 @@ NEED_VERSION=	1.78
 MAINTAINER=	brad@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 LIB_DEPENDS=	audiofile:${PORTSDIR}/devel/libaudiofile

--- a/audio/gom/Makefile
+++ b/audio/gom/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2000/02/12 08:02:09 turan Exp $
+# $OpenBSD: Makefile,v 1.5 2000/02/15 05:03:56 turan Exp $

 DISTNAME=	gom-0.29.103
 CATEGORIES=     audio
@ -10,10 +10,10 @@ NEED_VERSION=	1.73
 MAINTAINER=	scott@tranzoa.com

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 LIB_DEPENDS=	xview:${PORTSDIR}/x11/xview-lib \
 		olgx:${PORTSDIR}/x11/xview-lib
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2000/02/12 08:02:09 turan Exp $
+# $OpenBSD: Makefile,v 1.7 2000/02/15 05:03:56 turan Exp $
 # Original from: Bruno Rohée

 DISTNAME=	gqmpeg-0.6.3.src
@ -12,10 +12,10 @@ HOMEPAGE=	http://gqview.netpedia.net/mpeg-over.html
 MAINTAINER=	rohee@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 LIB_DEPENDS=	glib.1.2:${PORTSDIR}/devel/glib \
 		gtk.1.2:${PORTSDIR}/x11/gtk+ \
--- a/audio/gsm/Makefile
+++ b/audio/gsm/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2000/02/12 06:29:50 turan Exp $
+# $OpenBSD: Makefile,v 1.13 2000/02/15 05:03:56 turan Exp $

 DISTNAME=       gsm-1.0.10
 CATEGORIES=	audio
@ -8,10 +8,10 @@ NEED_VERSION=	1.191
 MAINTAINER=	angelos@openbsd.org

 LICENSE_TYPE=		BSD
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 WRKDIST=         ${WRKDIR}/gsm-1.0-pl10

--- a/audio/mp3encode/Makefile
+++ b/audio/mp3encode/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2000/02/12 06:29:50 turan Exp $
+# $OpenBSD: Makefile,v 1.6 2000/02/15 05:03:56 turan Exp $

 DISTNAME=	dist10
 PKGNAME=	mp3encode-1.10
@ -9,10 +9,10 @@ NEED_VERSION=	1.191
 MAINTAINER=	angelos@openbsd.org

 LICENSE_TYPE=		BSD
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
--- a/audio/mp3info/Makefile
+++ b/audio/mp3info/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2000/02/12 08:02:09 turan Exp $
+# $OpenBSD: Makefile,v 1.7 2000/02/15 05:03:57 turan Exp $

 DISTNAME=	mp3info-0.2.16
 CATEGORIES=	audio
@ -9,10 +9,10 @@ MASTER_SITE_SUBDIR= apps/sound/editors
 MAINTAINER=	angelos@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CFLAGS}"
--- a/audio/nspmod/Makefile
+++ b/audio/nspmod/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2000/02/12 08:02:09 turan Exp $
+# $OpenBSD: Makefile,v 1.6 2000/02/15 05:03:57 turan Exp $

 DISTNAME=	nspmod-0.1
 CATEGORIES=	audio
@ -9,10 +9,10 @@ MASTER_SITE_SUBDIR= apps/sound/players
 MAINTAINER=	angelos@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/nspmod ${PREFIX}/bin
--- a/audio/rplay/Makefile
+++ b/audio/rplay/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2000/02/12 08:02:09 turan Exp $
+# $OpenBSD: Makefile,v 1.11 2000/02/15 05:03:58 turan Exp $

 DISTNAME=       rplay-3.3.0
 CATEGORIES=	audio
@ -7,10 +7,10 @@ MASTER_SITES=	http://rplay.doit.org/dist/
 MAINTAINER=	angelos@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 LIB_DEPENDS=    gsm.1.0:${PORTSDIR}/audio/gsm

--- a/audio/rsynth/Makefile
+++ b/audio/rsynth/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2000/02/12 08:41:07 turan Exp $
+# $OpenBSD: Makefile,v 1.9 2000/02/15 05:03:58 turan Exp $

 DISTNAME=	rsynth-2.0
 CATEGORIES=	audio
@ -7,10 +7,10 @@ MASTER_SITES=	ftp://svr-ftp.eng.cam.ac.uk/pub/comp.speech/synthesis/
 MAINTAINER=	angelos@openbsd.org

 LICENSE_TYPE=		NONE
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 BUILD_DEPENDS=	${PREFIX}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm

--- a/audio/timidity/Makefile
+++ b/audio/timidity/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2000/02/13 08:07:42 turan Exp $
+# $OpenBSD: Makefile,v 1.9 2000/02/15 05:03:58 turan Exp $

 DISTNAME=       timidity-0.2i
 CATEGORIES=     audio
@ -14,10 +14,10 @@ NEED_VERSION=	1.91
 MAINTAINER=     ports@openbsd.org

 LICENSE_TYPE=		"GPL NONE"
-PERMIT_PKG_CDROM=	NO
-PERMIT_PKG_FTP=		NO
-PERMIT_DISTF_CDROM=	NO
-PERMIT_DISTF_FTP=	NO
+PERMIT_PACKAGE_CDROM=	NO
+PERMIT_PACKAGE_FTP=	NO
+PERMIT_DISTFILES_CDROM=	NO
+PERMIT_DISTFILES_FTP=	NO

 USE_MOTIF=	yes

--- a/audio/tosha/Makefile
+++ b/audio/tosha/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2000/02/12 06:29:50 turan Exp $
+# $OpenBSD: Makefile,v 1.9 2000/02/15 05:04:00 turan Exp $

 DISTNAME=	tosha-0.6
 CATEGORIES=	audio
@ -7,10 +7,10 @@ MASTER_SITES=	ftp://ftp.tu-clausthal.de/pub/unix/audio/
 MAINTAINER=	angelos@openbsd.org

 LICENSE_TYPE=		BSD
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 post-install:
 	@if [ -e /etc/tosharc ] ; then \
--- a/audio/waveplay/Makefile
+++ b/audio/waveplay/Makefile
@ -11,10 +11,10 @@ NEED_VERSION=	1.114
 MAINTAINER=	ports@openbsd.org

 LICENSE_TYPE=		NONE
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/waveplay ${PREFIX}/bin/waveplay
--- a/audio/workman/Makefile
+++ b/audio/workman/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2000/02/12 08:02:10 turan Exp $
+# $OpenBSD: Makefile,v 1.8 2000/02/15 05:04:00 turan Exp $

 DISTNAME=	WorkMan-1.3a
 PKGNAME=	workman-1.3a
@ -10,10 +10,10 @@ NEED_VERSION=	1.191
 MAINTAINER=	angelos@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 LIB_DEPENDS=	xview.3.2:${PORTSDIR}/x11/xview-lib

--- a/audio/xcdplayer/Makefile
+++ b/audio/xcdplayer/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2000/02/12 06:29:50 turan Exp $
+# $OpenBSD: Makefile,v 1.6 2000/02/15 05:04:01 turan Exp $

 DISTNAME=	xcdplayer-2.2
 CATEGORIES=	audio
@ -9,10 +9,10 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	angelos@openbsd.org

 LICENSE_TYPE=		BSD
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 USE_IMAKE=      yes

--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2000/02/12 08:02:10 turan Exp $
+# $OpenBSD: Makefile,v 1.12 2000/02/15 05:04:01 turan Exp $

 BROKEN=		spinlocks in a loop if stdin is null

@ -10,10 +10,10 @@ MASTER_SITE_SUBDIR= applications/xmcd
 MAINTAINER=	ports@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 USE_MOTIF=	yes
 USE_IMAKE=	yes
--- a/audio/xmix/Makefile
+++ b/audio/xmix/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2000/02/12 08:02:10 turan Exp $
+# $OpenBSD: Makefile,v 1.9 2000/02/15 05:04:02 turan Exp $

 DISTNAME=		xmix-2.1
 CATEGORIES=		audio
@ -11,10 +11,10 @@ PATCHFILES=		xmix-2.1.mixers.patch
 MAINTAINER=		angelos@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 USE_IMAKE=		Yes

--- a/audio/xmmix/Makefile
+++ b/audio/xmmix/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2000/02/12 08:02:10 turan Exp $
+# $OpenBSD: Makefile,v 1.11 2000/02/15 05:04:02 turan Exp $

 DISTNAME=	xmmix-1.2
 CATEGORIES=	audio
@ -8,10 +8,10 @@ MASTER_SITE_SUBDIR= applications
 MAINTAINER=	ports@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 USE_IMAKE=	yes
 USE_MOTIF=	yes
--- a/audio/xmp/Makefile
+++ b/audio/xmp/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2000/02/12 08:02:10 turan Exp $
+# $OpenBSD: Makefile,v 1.8 2000/02/15 05:04:02 turan Exp $

 DISTNAME=	xmp-1.1.5
 CATEGORIES=	audio
@ -8,10 +8,10 @@ MASTER_SITE_SUBDIR= apps/sound/players
 MAINTAINER=	ports@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 PATCH_STRIP=	-p1
 PATCH_DIST_STRIP= -p1
--- a/audio/xmpeg3/Makefile
+++ b/audio/xmpeg3/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2000/02/12 08:02:10 turan Exp $
+# $OpenBSD: Makefile,v 1.5 2000/02/15 05:04:02 turan Exp $

 DISTNAME=	xmp3_1.0.0
 PKGNAME=	xmpeg3-1.0
@ -10,10 +10,10 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	angelos@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 RUN_DEPENDS=	amp:${PORTSDIR}/audio/amp \
 		wish8.0:${PORTSDIR}/x11/tk80
--- a/benchmarks/bonnie/Makefile
+++ b/benchmarks/bonnie/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2000/02/12 06:29:50 turan Exp $
+# $OpenBSD: Makefile,v 1.5 2000/02/15 05:04:03 turan Exp $

 DISTNAME=       Bonnie
 PKGNAME=	bonnie-1.0
@ -7,10 +7,10 @@ CATEGORIES=	benchmarks
 MAINTAINER=	niklas@openbsd.org

 LICENSE_TYPE=		BSD
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 MASTER_SITES=   ftp://ftp.sunet.se/pub/benchmark/Bonnie/ \
 		ftp://swedishchef.lerc.nasa.gov/drlabs/io/
--- a/benchmarks/bytebench/Makefile
+++ b/benchmarks/bytebench/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2000/02/12 08:41:07 turan Exp $
+# $OpenBSD: Makefile,v 1.7 2000/02/15 05:04:03 turan Exp $

 DISTNAME=       bytebench-3.1
 CATEGORIES=	benchmarks
@ -6,10 +6,10 @@ CATEGORIES=	benchmarks
 MAINTAINER=	angelos@openbsd.org

 LICENSE_TYPE=		NONE
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 MASTER_SITES=   ftp://ftp.inria.fr/system/benchmark/
 EXTRACT_SUFX=	.tar.Z
--- a/benchmarks/lmbench/Makefile
+++ b/benchmarks/lmbench/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2000/02/12 08:02:11 turan Exp $
+# $OpenBSD: Makefile,v 1.9 2000/02/15 05:04:03 turan Exp $

 DISTNAME=	lmbench
 PKGNAME=	lmbench-1.1
@ -8,10 +8,10 @@ BROKEN=	"version changed; different distributions/directories"
 MAINTAINER=	ports@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 # this is the new home site
 #
--- a/benchmarks/netpipe/Makefile
+++ b/benchmarks/netpipe/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2000/02/12 08:02:11 turan Exp $
+# $OpenBSD: Makefile,v 1.6 2000/02/15 05:04:03 turan Exp $
 # $FreeBSD: Makefile,v 1.2 1999/03/03 03:48:56 jkoshy Exp $

 DISTNAME=	netpipe-2.3
@ -9,9 +9,9 @@ MASTER_SITES=	ftp://ftp.scl.ameslab.gov/pub/netpipe/ \
 MAINTAINER=	brad@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 .include <bsd.port.mk>
--- a/benchmarks/tcpblast/Makefile
+++ b/benchmarks/tcpblast/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2000/02/12 08:41:08 turan Exp $
+# $OpenBSD: Makefile,v 1.8 2000/02/15 05:04:04 turan Exp $

 NEED_VERSION=		1.191
 DISTNAME=		tcpblast
@ -8,10 +8,10 @@ CATEGORIES=		net benchmarks
 MAINTAINER=		ports@openbsd.org

 LICENSE_TYPE=		NONE
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 # Link the contained source files into the build environment
 FULLDISTDIR=		${.CURDIR}/src
--- a/chinese/c2t/Makefile
+++ b/chinese/c2t/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2000/02/12 08:41:08 turan Exp $	
+# $OpenBSD: Makefile,v 1.8 2000/02/15 05:04:04 turan Exp $	

 DISTNAME=	zh-c2t-1.0
 CATEGORIES=	chinese
@ -6,10 +6,10 @@ CATEGORIES=	chinese
 MAINTAINER=     kevlo@openbsd.org

 LICENSE_TYPE=		NONE
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 MASTER_SITES=	ftp://ftp.ifcss.org/pub/software/unix/convert/  \
 		ftp://ftp.ifcss.org/pub/software/x-win/cxterm/dict/gb/  \
--- a/comms/conserver/Makefile
+++ b/comms/conserver/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2000/02/12 06:29:50 turan Exp $
+# $OpenBSD: Makefile,v 1.7 2000/02/15 05:04:04 turan Exp $

 DISTNAME=	conserver-5.21-Beta
 PKGNAME=	conserver-5.21
@ -17,10 +17,10 @@ NO_PACKAGE=	"binary distribution requires explicit acknowledgement"
 MAINTAINER=	angelos@openbsd.org

 LICENSE_TYPE=		BSD
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 MASTER_SITES=	ftp://ftp.uu.net/vendor/bitsko/config-mgmt/ \
 		ftp://unix.hensa.ac.uk/mirrors/uunet/vendor/bitsko/config-mgmt/
--- a/comms/efax/Makefile
+++ b/comms/efax/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2000/02/12 08:02:11 turan Exp $
+# $OpenBSD: Makefile,v 1.9 2000/02/15 05:04:05 turan Exp $

 DISTNAME=       efax-0.9
 PKGNAME=        efax-0.9
@ -7,10 +7,10 @@ CATEGORIES=	comms
 MAINTAINER=	ian@OpenBSD.ORG

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 MASTER_SITES=	ftp://sunsite.unc.edu/pub/Linux/apps/serialcomm/fax/

--- a/comms/hylafax/Makefile
+++ b/comms/hylafax/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2000/02/12 09:32:29 turan Exp $
+# $OpenBSD: Makefile,v 1.19 2000/02/15 05:04:05 turan Exp $

 BROKEN=		bad packing lists

@ -23,10 +23,10 @@ PATCH_DIST_STRIP= -p1
 MAINTAINER=	d@openbsd.org

 LICENSE_TYPE=		BSD
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 BUILD_DEPENDS=	${PREFIX}/lib/afm/Courier:${PORTSDIR}/print/afm
 RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript5
--- a/comms/lrzsz/Makefile
+++ b/comms/lrzsz/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2000/02/12 08:02:11 turan Exp $
+# $OpenBSD: Makefile,v 1.8 2000/02/15 05:04:05 turan Exp $

 DISTNAME=	lrzsz-0.12.20
 CATEGORIES=	comms
@ -12,10 +12,10 @@ MASTER_SITES=	ftp://tirka.ohse.de/uwe/releases/ \
 MAINTAINER=	ports@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 SEPARATE_BUILD=	concurrent
 GNU_CONFIGURE=	yes
--- a/comms/minicom/Makefile
+++ b/comms/minicom/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2000/02/12 08:02:11 turan Exp $
+# $OpenBSD: Makefile,v 1.19 2000/02/15 05:04:05 turan Exp $
 #

 PKGNAME=	minicom-1.82.1
@ -8,10 +8,10 @@ CATEGORIES=	comms
 MAINTAINER=     form@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 MASTER_SITES=	${MASTER_SITE_SUNSITE}  \
 		http://www.clinet.fi/~walker/
--- a/comms/pilot-link/Makefile
+++ b/comms/pilot-link/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2000/02/12 08:02:11 turan Exp $
+# $OpenBSD: Makefile,v 1.11 2000/02/15 05:04:06 turan Exp $

 DISTNAME=	pilot-link.0.9.3
 PKGNAME=	pilot-link-0.9.3
@ -7,10 +7,10 @@ CATEGORIES=	comms
 MAINTAINER=	angelos@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 MASTER_SITES=	ftp://ryeham.ee.ryerson.ca/pub/PalmOS/

--- a/comms/seyon/Makefile
+++ b/comms/seyon/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2000/02/12 06:29:51 turan Exp $
+# $OpenBSD: Makefile,v 1.8 2000/02/15 05:04:06 turan Exp $

 DISTNAME=	Seyon-2.14b
 PKGNAME=	seyon-2.14b
@ -10,10 +10,10 @@ NEED_VERSION=	1.191
 MAINTAINER=	ports@openbsd.org

 LICENSE_TYPE=		BSD
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 USE_IMAKE=	yes

--- a/comms/tkhylafax/Makefile
+++ b/comms/tkhylafax/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2000/02/13 06:59:16 turan Exp $
+# $OpenBSD: Makefile,v 1.9 2000/02/15 05:04:06 turan Exp $

 DISTNAME=	tkhylafax-3.0b2
 PKGNAME=	tkhylafax-3.0
@ -9,10 +9,10 @@ BROKEN=		"required dependencies not available"
 MAINTAINER=	ports@openbsd.org

 LICENSE_TYPE=		"BSD NONE"
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 MASTER_SITES=	http://www.NeoSoft.com/tcl/ftparchive/sorted/comm/tkhylafax-3.0b2/
 NEED_VERSION=	1.191
--- a/comms/xcept/Makefile
+++ b/comms/xcept/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2000/02/12 06:29:51 turan Exp $
+# $OpenBSD: Makefile,v 1.6 2000/02/15 05:04:06 turan Exp $

 DISTNAME=       xcept-2.1.2
 CATEGORIES=	comms
@ -6,10 +6,10 @@ CATEGORIES=	comms
 MAINTAINER=     ports@openbsd.org

 LICENSE_TYPE=		BSD
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 MASTER_SITES=   ${MASTER_SITE_LOCAL}
 NEED_VERSION=	1.191
--- a/converters/base64/Makefile
+++ b/converters/base64/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2000/02/12 08:58:16 turan Exp $
+# $OpenBSD: Makefile,v 1.8 2000/02/15 05:04:06 turan Exp $

 DISTNAME=	base64
 PKGNAME=	base64-1.0
@ -8,10 +8,10 @@ MASTER_SITES=	http://www.fourmilab.ch/webtools/base64/
 MAINTAINER=	angelos@openbsd.org

 LICENSE_TYPE=		PD
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/base64 ${PREFIX}/bin
--- a/converters/ish/Makefile
+++ b/converters/ish/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2000/02/12 08:58:16 turan Exp $
+# $OpenBSD: Makefile,v 1.6 2000/02/15 05:04:07 turan Exp $

 DISTNAME=	ish-1.11
 CATEGORIES=	converters
@ -6,10 +6,10 @@ CATEGORIES=	converters
 MAINTAINER=	angelos@openbsd.org

 LICENSE_TYPE=		PD
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 #MASTER_SITES=	ftp://jaz.jp.freebsd.org/pub/incoming/distfiles/

--- a/converters/mpack/Makefile
+++ b/converters/mpack/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2000/02/12 06:29:51 turan Exp $
+# $OpenBSD: Makefile,v 1.6 2000/02/15 05:04:07 turan Exp $

 DISTNAME=       mpack-1.5-src
 PKGNAME=        mpack-1.5
@ -7,10 +7,10 @@ CATEGORIES=     converters mail news
 MAINTAINER=     angelos@openbsd.org

 LICENSE_TYPE=		BSD
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 MASTER_SITES=   ftp://ftp.andrew.cmu.edu/pub/mpack/
 EXTRACT_SUFX=   .tar.Z
--- a/converters/recode/Makefile
+++ b/converters/recode/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2000/02/12 08:02:11 turan Exp $
+# $OpenBSD: Makefile,v 1.9 2000/02/15 05:04:07 turan Exp $

 DISTNAME=	recode-3.5
 CATEGORIES=	converters
@ -6,10 +6,10 @@ CATEGORIES=	converters
 MAINTAINER=	angelos@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR= recode
--- a/databases/db/Makefile
+++ b/databases/db/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2000/02/12 06:29:51 turan Exp $
+# $OpenBSD: Makefile,v 1.16 2000/02/15 05:04:08 turan Exp $

 DISTNAME=	db-3.0.55
 CATEGORIES=	databases
@ -8,10 +8,10 @@ NEED_VERSION=	1.191
 MAINTAINER=	tacho@openbsd.org

 LICENSE_TYPE=		BSD
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 GNU_CONFIGURE=	yes
 CONFIGURE_SCRIPT=../dist/configure
--- a/databases/gdbm/Makefile
+++ b/databases/gdbm/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2000/02/12 08:02:12 turan Exp $
+# $OpenBSD: Makefile,v 1.11 2000/02/15 05:04:08 turan Exp $

 DISTNAME=	gdbm-1.8.0
 CATEGORIES=	databases
@ -10,10 +10,10 @@ NEED_VERSION=	1.73
 MAINTAINER=	ports@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
--- a/databases/postgresql/Makefile
+++ b/databases/postgresql/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2000/02/12 06:29:51 turan Exp $
+# $OpenBSD: Makefile,v 1.24 2000/02/15 05:04:09 turan Exp $
 # $FreeBSD: Makefile,v 1.25 1998/04/22 08:28:07 asami Exp $

 DISTNAME=	postgresql-6.5.3
@ -9,10 +9,10 @@ NEED_VERSION=	1.191
 MAINTAINER=	form@OpenBSD.ORG

 LICENSE_TYPE=		BSD
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 MASTER_SITES=	ftp://ftp.postgresql.org/pub/ \
 		ftp://gd.tuwien.ac.at/db/www.postgresql.org/pub/ \
--- a/devel/ElectricFence/Makefile
+++ b/devel/ElectricFence/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2000/02/12 08:02:12 turan Exp $
+# $OpenBSD: Makefile,v 1.4 2000/02/15 05:04:09 turan Exp $

 PKGNAME=	electricfence-2.0.5
 DISTNAME=	ElectricFence-2.0.5
@ -9,10 +9,10 @@ MASTER_SITE_SUBDIR=	devel/lang/c
 MAINTAINER=	niklas@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 do-install:
 	${INSTALL_DATA} ${WRKBUILD}/libefence.a ${PREFIX}/lib
--- a/devel/ORBit/Makefile
+++ b/devel/ORBit/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2000/02/12 08:02:12 turan Exp $
+# $OpenBSD: Makefile,v 1.12 2000/02/15 05:04:09 turan Exp $

 DISTNAME=	ORBit-0.5.0
 CATEGORIES=	devel
@ -13,10 +13,10 @@ LIB_DEPENDS=	intl:${PORTSDIR}/devel/gettext \
 MAINTAINER=	rohee@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
--- a/devel/autoconf/Makefile
+++ b/devel/autoconf/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2000/02/12 08:02:12 turan Exp $
+# $OpenBSD: Makefile,v 1.15 2000/02/15 05:04:09 turan Exp $

 DISTNAME=	autoconf-2.13
 CATEGORIES=	devel
@ -8,10 +8,10 @@ MASTER_SITE_SUBDIR= autoconf
 MAINTAINER=	espie@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 # Both are needed for now as bsd.port.mk does not cause RUN_DEPENDS to
 # be created before running configure, which causes the build to do the
--- a/devel/automake/Makefile
+++ b/devel/automake/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2000/02/12 08:02:12 turan Exp $
+# $OpenBSD: Makefile,v 1.11 2000/02/15 05:04:10 turan Exp $

 DISTNAME=	automake-1.4
 CATEGORIES=	devel
@ -8,10 +8,10 @@ MASTER_SITE_SUBDIR= automake
 MAINTAINER=	jasoni@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 GNU_CONFIGURE=	yes

--- a/devel/bison/Makefile
+++ b/devel/bison/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2000/02/12 08:02:12 turan Exp $
+# $OpenBSD: Makefile,v 1.14 2000/02/15 05:04:11 turan Exp $

 DISTNAME=       bison-1.27
 CATEGORIES=	devel
@ -6,10 +6,10 @@ CATEGORIES=	devel
 MAINTAINER=	d@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR= bison
--- a/devel/boehm-gc/Makefile
+++ b/devel/boehm-gc/Makefile
@ -15,10 +15,10 @@ EXTRACT_AFTER_ARGS=	| ${TAR} -xf - || true
 MAINTAINER=	niklas@openbsd.org

 LICENSE_TYPE=		BSD
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 MAKE_ENV=	CP="${CP}" \
 		INSTALL_DATA="${INSTALL_DATA}" \
--- a/devel/ddd/Makefile
+++ b/devel/ddd/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2000/02/12 08:02:13 turan Exp $
+# $OpenBSD: Makefile,v 1.19 2000/02/15 05:04:11 turan Exp $

 DISTNAME=	ddd-3.2
 CATEGORIES=	devel
@ -8,10 +8,10 @@ MASTER_SITE_SUBDIR= ddd
 MAINTAINER=	ports@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 USE_MOTIF=	yes
 USE_GMAKE=	yes
--- a/devel/dejagnu/Makefile
+++ b/devel/dejagnu/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2000/02/12 08:02:13 turan Exp $
+# $OpenBSD: Makefile,v 1.6 2000/02/15 05:04:11 turan Exp $

 DISTNAME=       dejagnu-1.3
 CATEGORIES=	devel
@ -6,10 +6,10 @@ CATEGORIES=	devel
 MAINTAINER=	niklas@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR= dejagnu
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2000/02/12 08:02:13 turan Exp $
+# $OpenBSD: Makefile,v 1.10 2000/02/15 05:04:12 turan Exp $
 # $FreeBSD: Makefile,v 1.4 1998/11/18 15:09:35 vanilla Exp $

 DISTNAME=	gettext-0.10.35
@ -11,10 +11,10 @@ NEED_VERSION=	1.73
 MAINTAINER=	jasoni@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
--- a/devel/gindent/Makefile
+++ b/devel/gindent/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2000/02/12 08:02:13 turan Exp $
+# $OpenBSD: Makefile,v 1.12 2000/02/15 05:04:12 turan Exp $

 DISTNAME=	indent-2.2.2
 CATEGORIES=	devel
@ -8,10 +8,10 @@ MASTER_SITE_SUBDIR= indent
 MAINTAINER=	ports@OpenBSD.ORG

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 GNU_CONFIGURE=	yes

--- a/devel/glib/Makefile
+++ b/devel/glib/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2000/02/12 08:02:13 turan Exp $
+# $OpenBSD: Makefile,v 1.21 2000/02/15 05:04:12 turan Exp $

 DISTNAME=	glib-1.2.6
 CATEGORIES=	devel
@ -11,10 +11,10 @@ NEED_VERSION=	1.73
 MAINTAINER=	brad@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
--- a/devel/gmake/Makefile
+++ b/devel/gmake/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2000/02/12 08:02:13 turan Exp $
+# $OpenBSD: Makefile,v 1.15 2000/02/15 05:04:12 turan Exp $

 DISTNAME=	make-3.78.1
 PKGNAME=	gmake-3.78.1
@ -9,10 +9,10 @@ MASTER_SITE_SUBDIR= make
 MAINTAINER=	todd@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 SEPARATE_BUILD=	simple
 GNU_CONFIGURE=	yes
--- a/devel/gperf/Makefile
+++ b/devel/gperf/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2000/02/13 07:08:57 turan Exp $
+# $OpenBSD: Makefile,v 1.7 2000/02/15 05:04:12 turan Exp $

 DISTNAME=	gperf-2.7
 PKGNAME=	gperf-2.7-19981006
@ -7,10 +7,10 @@ CATEGORIES=   	devel
 MAINTAINER=	espie@cvs.openbsd.org

 LICENSE_TYPE=		"GPL NONE"
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 # where the source files and patches can be fetched
 #
--- a/devel/gsl/Makefile
+++ b/devel/gsl/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2000/02/12 08:02:14 turan Exp $
+# $OpenBSD: Makefile,v 1.4 2000/02/15 05:04:13 turan Exp $

 DISTNAME=	gsl-0.3b
 CATEGORIES=	devel
@ -9,10 +9,10 @@ NEED_VERSION=	1.78
 MAINTAINER=	rohee@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 GNU_CONFIGURE=	yes

--- a/devel/id-utils/Makefile
+++ b/devel/id-utils/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2000/02/12 08:02:14 turan Exp $
+# $OpenBSD: Makefile,v 1.15 2000/02/15 05:04:13 turan Exp $

 DISTNAME=	id-utils-3.2d
 CATEGORIES=	devel
@ -6,10 +6,10 @@ CATEGORIES=	devel
 MAINTAINER=	ports@OpenBSD.ORG

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 MASTER_SITES=	ftp://alpha.gnu.org/gnu/ \
 		ftp://ftp.enst.fr/pub/gnu/gnits/
--- a/devel/lclint/Makefile
+++ b/devel/lclint/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2000/02/13 07:03:18 turan Exp $
+# $OpenBSD: Makefile,v 1.13 2000/02/15 05:04:13 turan Exp $

 NEED_VERSION=	1.116
 DISTNAME=	lclint-2.4b
@ -13,10 +13,10 @@ DISTFILES=	${EXTRACT_ONLY} ${GUIDE}
 MAINTAINER=	espie@cvs.openbsd.org

 LICENSE_TYPE=		"GPL NONE"
-PERMIT_PKG_CDROM=	NO
-PERMIT_PKG_FTP=		NO
-PERMIT_DISTF_CDROM=	NO
-PERMIT_DISTF_FTP=	NO
+PERMIT_PACKAGE_CDROM=	NO
+PERMIT_PACKAGE_FTP=	NO
+PERMIT_DISTFILES_CDROM=	NO
+PERMIT_DISTFILES_FTP=	NO
 AUTHOR=		evs@sds.lcs.mit.edu # David Evans
 BUGS=		lclint-bug@sds.lcs.mit.edu

--- a/devel/libaudiofile/Makefile
+++ b/devel/libaudiofile/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2000/02/12 08:02:14 turan Exp $
+# $OpenBSD: Makefile,v 1.10 2000/02/15 05:04:14 turan Exp $

 DISTNAME=	audiofile-0.1.9
 PKGNAME=	libaudiofile-0.1.9
@ -11,10 +11,10 @@ NEED_VERSION=	1.73
 MAINTAINER=	rohee@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 SEPARATE_BUILD=	concurrent
 GNU_CONFIGURE=	yes
--- a/devel/libicq/Makefile
+++ b/devel/libicq/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2000/02/12 08:02:14 turan Exp $
+# $OpenBSD: Makefile,v 1.5 2000/02/15 05:04:14 turan Exp $
 # $FreeBSD: Makefile,v 1.3 1999/03/15 19:59:22 nectar Exp $

 DISTNAME=	libicq-0.33
@ -10,10 +10,10 @@ NEED_VERSION=	1.73
 MAINTAINER=	brad@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 LIB_DEPENDS=	glib.1.2:${PORTSDIR}/devel/glib

--- a/devel/libproplist/Makefile
+++ b/devel/libproplist/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2000/02/12 08:02:14 turan Exp $
+# $OpenBSD: Makefile,v 1.10 2000/02/15 05:04:14 turan Exp $

 DISTNAME=	libPropList-0.9.1
 PKGNAME=	libproplist-0.9.1	
@ -11,10 +11,10 @@ NEED_VERSION=	1.73
 MAINTAINER=	jasoni@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 USE_GMAKE=	yes
 SEPARATE_BUILD=	concurrent
--- a/devel/libtool/Makefile
+++ b/devel/libtool/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2000/02/12 08:02:14 turan Exp $
+# $OpenBSD: Makefile,v 1.10 2000/02/15 05:04:14 turan Exp $
 # $FreeBSD: Makefile,v 1.2 1998/09/23 16:15:53 vanilla Exp $

 DISTNAME=		libtool-1.3.3
@ -11,10 +11,10 @@ NEED_VERSION=		1.73
 MAINTAINER=		ports@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 SEPARATE_BUILD=		simple
 GNU_CONFIGURE=		yes
--- a/devel/m4/Makefile
+++ b/devel/m4/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2000/02/12 08:02:15 turan Exp $
+# $OpenBSD: Makefile,v 1.9 2000/02/15 05:04:14 turan Exp $
 # $FreeBSD: Makefile,v 1.7 1997/06/16 08:22:35 max Exp $

 DISTNAME=	m4-1.4
@ -9,10 +9,10 @@ MASTER_SITE_SUBDIR= m4
 MAINTAINER=	niklas@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 # This port does use gnu configure, but uses old autoconf files.
 # We can't say USE_AUTOCONF because then we'd get a circular dependency:
--- a/devel/prc-tools/Makefile
+++ b/devel/prc-tools/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2000/02/12 08:02:15 turan Exp $
+# $OpenBSD: Makefile,v 1.7 2000/02/15 05:04:15 turan Exp $

 DISTNAME=       prc-tools.0.5.0
 PKGNAME=	prc-tools-0.5.0
@ -12,10 +12,10 @@ NEED_VERSION=	1.191
 MAINTAINER=     angelos@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 # install things in ${LOCALBASE}/pilot to avoid conflicts
 PREFIX=		${LOCALBASE}/pilot
--- a/devel/shtool/Makefile
+++ b/devel/shtool/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2000/02/12 08:02:15 turan Exp $
+# $OpenBSD: Makefile,v 1.16 2000/02/15 05:04:15 turan Exp $
 # $FreeBSD: Makefile,v 1.3 1999/04/29 15:32:56 rse Exp $

 DISTNAME=	shtool-1.4.7
@ -9,10 +9,10 @@ MASTER_SITE_SUBDIR= shtool
 MAINTAINER=	brad@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 GNU_CONFIGURE=	yes

--- a/devel/swig/Makefile
+++ b/devel/swig/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2000/02/12 06:29:52 turan Exp $
+# $OpenBSD: Makefile,v 1.8 2000/02/15 05:04:15 turan Exp $

 BROKEN=		c++ syntax errors

@ -11,10 +11,10 @@ CATEGORIES=	devel
 MAINTAINER=	ports@openbsd.org

 LICENSE_TYPE=		BSD
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 MASTER_SITES=	ftp://ftp.cs.utah.edu/pub/beazley/SWIG/
 NEED_VERSION=	1.191
--- a/devel/tkcvs/Makefile
+++ b/devel/tkcvs/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2000/02/12 08:41:08 turan Exp $
+# $OpenBSD: Makefile,v 1.7 2000/02/15 05:04:15 turan Exp $

 DISTNAME=	tkcvs-6.0
 CATEGORIES=	devel
@ -6,10 +6,10 @@ CATEGORIES=	devel
 MAINTAINER=	todd@OpenBSD.org

 LICENSE_TYPE=		NONE
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 MASTER_SITES=	http://www.neosoft.com/tcl/ftparchive/sorted/packages-7.6/apps/tkcvs-6.0/

--- a/devel/xmake/Makefile
+++ b/devel/xmake/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2000/02/12 08:41:08 turan Exp $
+# $OpenBSD: Makefile,v 1.6 2000/02/15 05:04:16 turan Exp $

 DISTNAME=	xmake-1.01
 CATEGORIES=	devel
@ -6,10 +6,10 @@ CATEGORIES=	devel
 MAINTAINER=	ports@openbsd.org

 LICENSE_TYPE=		NONE
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 MASTER_SITES=	http://www.backplane.com/xmake/ \
 		ftp://atari.saturn5.com/pub/dlowe/
--- a/editors/beav/Makefile
+++ b/editors/beav/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2000/02/12 08:02:15 turan Exp $
+# $OpenBSD: Makefile,v 1.9 2000/02/15 05:04:16 turan Exp $

 DISTNAME=	beav_1.40-13
 PKGNAME=	beav-1.40-13
@ -7,10 +7,10 @@ CATEGORIES=	editors
 MAINTAINER=	kevlo@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 MASTER_SITES=	ftp://ftp.debian.org/debian/dists/stable/main/source/editors/
 NEED_VERSION=	1.191
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2000/02/12 08:02:16 turan Exp $
+# $OpenBSD: Makefile,v 1.15 2000/02/15 05:04:16 turan Exp $

 VER=		20.3
 DISTNAME=	emacs-${VER}
@ -9,10 +9,10 @@ MASTER_SITE_SUBDIR= emacs
 MAINTAINER=	ports@OpenBSD.ORG

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
--- a/editors/hexedit/Makefile
+++ b/editors/hexedit/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2000/02/12 08:02:16 turan Exp $
+# $OpenBSD: Makefile,v 1.10 2000/02/15 05:04:16 turan Exp $
 # $FreeBSD: Makefile,v 1.1.1.1 1998/08/10 00:31:40 steve Exp $

 DISTNAME=	hexedit-1.1.0
@ -10,10 +10,10 @@ NEED_VERSION=	1.191
 MAINTAINER=	brad@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 GNU_CONFIGURE=	yes
 WRKDIST=	${WRKDIR}/hexedit
--- a/editors/jed/Makefile
+++ b/editors/jed/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2000/02/12 08:02:16 turan Exp $
+# $OpenBSD: Makefile,v 1.11 2000/02/15 05:04:17 turan Exp $

 DISTNAME=       jed-B0.99-10
 PKGNAME=        jed-0.99.10
@ -11,10 +11,10 @@ LIB_DEPENDS=	slang.13:${PORTSDIR}/devel/libslang
 MAINTAINER=     ports@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 GNU_CONFIGURE=  yes
 CONFIGURE_ENV=	JED_ROOT=${PREFIX}/lib/jed
--- a/editors/joe/Makefile
+++ b/editors/joe/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2000/02/12 08:02:16 turan Exp $
+# $OpenBSD: Makefile,v 1.15 2000/02/15 05:04:17 turan Exp $

 DISTNAME=	joe2.8
 PKGNAME=	joe-2.8
@ -10,10 +10,10 @@ NEED_VERSION=	1.191
 MAINTAINER=	ports@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 WRKDIST=	${WRKDIR}/joe
 ALL_TARGET=	joe
--- a/editors/uemacs/Makefile
+++ b/editors/uemacs/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2000/02/14 09:12:18 turan Exp $
+# $OpenBSD: Makefile,v 1.8 2000/02/15 05:04:17 turan Exp $

 DISTNAME=	uemacs
 PKGNAME=	uemacs-4.0
@ -13,10 +13,10 @@ NEED_VERSION=	1.191
 MAINTAINER=	ports@openbsd.org

 LICENSE_TYPE=		COPY
-PERMIT_PKG_CDROM=	"weird no fee license"
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	"wierd no fee license"
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	"weird no fee license"
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	"wierd no fee license"
+PERMIT_DISTFILES_FTP=	YES

 EXTRACT_BEFORE_ARGS=	-Laq

--- a/editors/xwpe/Makefile
+++ b/editors/xwpe/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2000/02/12 08:02:16 turan Exp $
+# $OpenBSD: Makefile,v 1.11 2000/02/15 05:04:18 turan Exp $

 DISTNAME=	xwpe-1.5.22a
 CATEGORIES=	editors
@ -9,10 +9,10 @@ MASTER_SITE_SUBDIR= apps/editors/X
 MAINTAINER=	yanick@fries.net

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 ALL_TARGET=	xwpe

--- a/emulators/linux_lib/Makefile
+++ b/emulators/linux_lib/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2000/02/12 08:02:17 turan Exp $
+# $OpenBSD: Makefile,v 1.18 2000/02/15 05:04:18 turan Exp $
 # $NetBSD: Makefile,v 1.10 1998/04/24 09:07:55 agc Exp $
 # $FreeBSD Id: Makefile,v 1.19 1997/12/04 17:34:28 asami Exp $

@ -12,10 +12,10 @@ NO_CDROM=	"GPL: must distribute with source"
 MAINTAINER=	brad@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 PREFIX=		/emul/linux
 NO_MTREE=	yes
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2000/02/12 06:29:52 turan Exp $
+# $OpenBSD: Makefile,v 1.14 2000/02/15 05:04:18 turan Exp $

 DATE= 		990225
 DISTNAME= 	Wine-${DATE}
@ -12,10 +12,10 @@ ONLY_FOR_ARCHS= i386
 MAINTAINER=	rohee@OpenBSD.ORG

 LICENSE_TYPE=		BSD
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 MASTER_SITES=		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	ALPHA/wine/development
--- a/emulators/x48/Makefile
+++ b/emulators/x48/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2000/02/12 08:02:17 turan Exp $
+# $OpenBSD: Makefile,v 1.5 2000/02/15 05:04:18 turan Exp $
 #

 DISTNAME=		x48-0.4.0
@ -7,10 +7,10 @@ CATEGORIES=		emulators
 MAINTAINER=		todd@OpenBSD.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 MASTER_SITES=		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	system/emulators
--- a/emulators/xcopilot/Makefile
+++ b/emulators/xcopilot/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2000/02/12 08:02:17 turan Exp $
+# $OpenBSD: Makefile,v 1.6 2000/02/15 05:04:19 turan Exp $

 DISTNAME=       xcopilot-0.6.6
 CATEGORIES=     emulators pilot
@ -6,10 +6,10 @@ CATEGORIES=     emulators pilot
 MAINTAINER=     angelos@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 MASTER_SITES=   http://xcopilot.cuspy.com/build/

--- a/games/abuse/Makefile
+++ b/games/abuse/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2000/02/12 08:58:16 turan Exp $
+# $OpenBSD: Makefile,v 1.14 2000/02/15 05:04:19 turan Exp $

 DISTNAME=	abuse-2.0
 CATEGORIES=	games x11
@ -14,10 +14,10 @@ HOMEPAGE=	http://www.crack.com/games/abuse/
 MAINTAINER=	rohee@openbsd.org

 LICENSE_TYPE=		PD
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 .if ${MACHINE_ARCH} == "sparc"
 BROKEN=		"Does not work on SPARC"
--- a/games/an/Makefile
+++ b/games/an/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2000/02/12 08:02:18 turan Exp $
+# $OpenBSD: Makefile,v 1.5 2000/02/15 05:04:20 turan Exp $

 DISTNAME=	an-0.93
 CATEGORIES=	games
@ -7,10 +7,10 @@ MASTER_SITES=	ftp://suburbia.net/pub/rmj/
 MAINTAINER=	angelos@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 MAKE_ENV=	DEFS=-DDEFDICT=\\\"/usr/share/dict/words\\\"
 ALL_TARGET=	with-getopt
--- a/games/bnetd/Makefile
+++ b/games/bnetd/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2000/02/12 08:02:18 turan Exp $
+# $OpenBSD: Makefile,v 1.11 2000/02/15 05:04:20 turan Exp $

 DISTNAME=	bnetd-0.4.19
 CATEGORIES=	games 
@ -8,10 +8,10 @@ NEED_VERSION=	1.195
 MAINTAINER=	kevlo@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 HAS_CONFIGURE=Yes
 WRKSRC=	${WRKDIST}/src
--- a/games/cgoban/Makefile
+++ b/games/cgoban/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2000/02/12 08:02:18 turan Exp $
+# $OpenBSD: Makefile,v 1.3 2000/02/15 05:04:20 turan Exp $

 DISTNAME=	cgoban-1.9.8
 CATEGORIES=	games
@ -6,10 +6,10 @@ CATEGORIES=	games
 MAINTAINER=	ports@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 MASTER_SITES=	http://www.inetarena.com/~wms/comp/cgoban/

--- a/games/connect4/Makefile
+++ b/games/connect4/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2000/02/12 08:41:09 turan Exp $
+# $OpenBSD: Makefile,v 1.7 2000/02/15 05:04:21 turan Exp $

 DISTNAME=	connect4
 PKGNAME=	connect4-3.2
@ -15,10 +15,10 @@ EXTRACT_AFTER_ARGS=	# empty
 MAINTAINER=	angelos@openbsd.org

 LICENSE_TYPE=		NONE
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 BUILD_DEPENDS=	gunshar:${PORTSDIR}/archivers/gshar+gunshar

--- a/games/freeciv/Makefile
+++ b/games/freeciv/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2000/02/15 02:38:18 turan Exp $
+# $OpenBSD: Makefile,v 1.13 2000/02/15 05:04:22 turan Exp $

 BROKEN=		sources missing

@ -9,10 +9,10 @@ MASTER_SITES=	ftp://ftp.freeciv.org/pub/freeciv/stable_version/
 MAINTAINER=	israfil@gmx.net

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 # If USE_GTK is defined, freeciv will be built with a prettier look and
 # feel:
--- a/games/gnuchess/Makefile
+++ b/games/gnuchess/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2000/02/12 08:02:18 turan Exp $
+# $OpenBSD: Makefile,v 1.9 2000/02/15 05:04:22 turan Exp $

 DISTNAME=	gnuchess-4.0.pl80
 PKGNAME=	gnuchess-4.0.80
@ -12,10 +12,10 @@ BROKEN=		"not available anymore"
 MAINTAINER=	angelos@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 HAS_CONFIGURE=	yes

--- a/games/gnugo/Makefile
+++ b/games/gnugo/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2000/02/12 08:02:18 turan Exp $
+# $OpenBSD: Makefile,v 1.6 2000/02/15 05:04:23 turan Exp $

 DISTNAME=	gnugo-2.4
 CATEGORIES=	games
@ -6,10 +6,10 @@ CATEGORIES=	games
 MAINTAINER=	ports@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR= gnugo
--- a/games/gnushogi/Makefile
+++ b/games/gnushogi/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2000/02/12 08:02:18 turan Exp $
+# $OpenBSD: Makefile,v 1.6 2000/02/15 05:04:23 turan Exp $
 #

 DISTNAME=	gnushogi-1.2p03
@ -8,10 +8,10 @@ CATEGORIES=	games
 MAINTAINER=	angelos@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR= gnushogi
--- a/games/nethack/Makefile
+++ b/games/nethack/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2000/02/12 08:02:19 turan Exp $
+# $OpenBSD: Makefile,v 1.8 2000/02/15 05:04:23 turan Exp $
 # $FreeBSD: Makefile,v 1.13 1997/12/25 22:29:17 asami Exp $

 DISTNAME=	nethack-3.2.3
@ -20,10 +20,10 @@ MASTER_SITE_SUBDIR= nethack
 MAINTAINER=	espie@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 USE_GMAKE=	Yes
 USE_X11=	Yes
--- a/games/netris/Makefile
+++ b/games/netris/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2000/02/12 08:02:19 turan Exp $
+# $OpenBSD: Makefile,v 1.5 2000/02/15 05:04:24 turan Exp $

 DISTNAME=	netris-0.5
 CATEGORIES=	games
@ -7,10 +7,10 @@ MASTER_SITES=	ftp://ftp.netris.org/pub/netris/
 MAINTAINER=	angelos@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT= Configure
--- a/games/slash/Makefile
+++ b/games/slash/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2000/02/12 08:02:19 turan Exp $
+# $OpenBSD: Makefile,v 1.11 2000/02/15 05:04:24 turan Exp $

 DISTNAME=	slash-e8
 CATEGORIES=	games
@ -12,10 +12,10 @@ NEED_VERSION=	1.121
 MAINTAINER=	espie@openbsd.org

 LICENSE_TYPE=		GPL
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PACKAGE_CDROM=	YES
+PERMIT_PACKAGE_FTP=	YES
+PERMIT_DISTFILES_CDROM=	YES
+PERMIT_DISTFILES_FTP=	YES

 USE_GMAKE=	yes
 USE_X11=	yes
--- a/Show More
+++ b/Show More