diff --git a/comms/conserver/Makefile b/comms/conserver/Makefile
index ff3b2c000c5..2a78cdf37c2 100644
--- a/comms/conserver/Makefile
+++ b/comms/conserver/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2000/05/27 23:49:39 espie Exp $
+# $OpenBSD: Makefile,v 1.11 2000/06/16 23:06:03 espie Exp $
 
 DISTNAME=	conserver-5.21-Beta
 PKGNAME=	conserver-5.21
@@ -6,7 +6,6 @@ CATEGORIES=	comms
 NEED_VERSION=	1.191
 
 MAINTAINER=	angelos@openbsd.org
-FAKE=Yes
 
 LICENSE_TYPE=		BSD
 PERMIT_PACKAGE_CDROM=	Yes
@@ -22,8 +21,6 @@ EXTRACT_CMD=	zcat
 EXTRACT_BEFORE_ARGS=
 EXTRACT_AFTER_ARGS=	|sh
 
-NO_CONFIGURE=	yes
-
 # Set this to where you want console(8) to connect to by default
 # or use something like ``make DEFAULTHOST=myserver.mydomain.net''
 DEFAULTHOST?=	localhost
diff --git a/comms/malsync/Makefile b/comms/malsync/Makefile
index 160ab99d660..ce4ce1010c1 100644
--- a/comms/malsync/Makefile
+++ b/comms/malsync/Makefile
@@ -1,11 +1,10 @@
-# $OpenBSD: Makefile,v 1.11 2000/05/31 13:36:18 espie Exp $
+# $OpenBSD: Makefile,v 1.12 2000/06/16 23:06:04 espie Exp $
 
 PKGNAME=	malsync-1.6
 DISTNAME=	malsync_1_6
 
 CATEGORIES=	comms
 NEED_VERSION=	 1.230
-FAKE=		Yes
 
 DISTFILES=	malsync_1_6.source.tar.gz \
 		mal-0_7_tar.gz:0
@@ -25,8 +24,6 @@ LIB_DEPENDS=	pisock.3::comms/pilot-link
 
 WRKDIST=	${WRKDIR}
 
-NO_CONFIGURE=	yes
-
 ALL_TARGET=	malsync
 
 do-install:
diff --git a/devel/jdk/Makefile b/devel/jdk/Makefile
index 23a4916e90c..6650778489f 100644
--- a/devel/jdk/Makefile
+++ b/devel/jdk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2000/06/16 05:25:28 chris Exp $
+# $OpenBSD: Makefile,v 1.5 2000/06/16 23:06:04 espie Exp $
 #
 # See http://www.freebsd.org/java/ for software updates, etc.
 
@@ -26,10 +26,7 @@ PERMIT_DISTFILES_FTP=	No
 ONLY_FOR_ARCHS=	i386
 
 NO_BUILD=	Yes
-NO_CONFIGURE=	Yes
-NO_PATCH=	Yes
 EXTRACT_ONLY=
-FAKE=		Yes
 
 DISTFILES=	jdk${JDK_VERSION}_AOUT.V1999-11-9.tar.gz
 
diff --git a/devel/tkcvs/Makefile b/devel/tkcvs/Makefile
index b12b0fd57f3..706eda2ff81 100644
--- a/devel/tkcvs/Makefile
+++ b/devel/tkcvs/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2000/03/27 18:17:27 espie Exp $
+# $OpenBSD: Makefile,v 1.13 2000/06/16 23:06:04 espie Exp $
 
 DISTNAME=	tkcvs-6.0
 CATEGORIES=	devel
@@ -16,8 +16,6 @@ MASTER_SITES=	http://www.neosoft.com/tcl/ftparchive/sorted/packages-7.6/apps/tkc
 RUN_DEPENDS=	/usr/local/bin/wish8.3::x11/tk/8.3 
 
 NO_BUILD=	Yes
-NO_CONFIGURE=	Yes
-FAKE=		Yes
 
 do-install:
 	cd $(WRKSRC)/tkcvs; ./doinstall
diff --git a/editors/wordperfect/Makefile b/editors/wordperfect/Makefile
index cf13a232dee..fb68b75a1e4 100644
--- a/editors/wordperfect/Makefile
+++ b/editors/wordperfect/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2000/05/29 23:21:45 reinhard Exp $
+# $OpenBSD: Makefile,v 1.11 2000/06/16 23:06:05 espie Exp $
 
 PKGNAME=	wordperfect-8.0
 CATEGORIES=     editors
@@ -27,7 +27,6 @@ ONLY_FOR_ARCHS=	i386
 IS_INTERACTIVE=	yes
 
 WRKDIST=	${WRKDIR}
-NO_CONFIGURE=	Yes
 NO_BUILD=	Yes
 NO_PACKAGE=	interactive port
 
diff --git a/emulators/freebsd_lib/Makefile b/emulators/freebsd_lib/Makefile
index 7fa0dc13541..99bf0eb0c18 100644
--- a/emulators/freebsd_lib/Makefile
+++ b/emulators/freebsd_lib/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2000/04/27 11:35:13 jakob Exp $
+# $OpenBSD: Makefile,v 1.11 2000/06/16 23:06:05 espie Exp $
 
 DISTNAME=	freebsd_lib-2.2.8
 CATEGORIES=	emulators
@@ -20,10 +20,7 @@ PERMIT_DISTFILES_FTP=	Yes
 PREFIX=		/emul/freebsd
 
 NO_BUILD=	Yes
-NO_CONFIGURE=	Yes
-NO_MTREE=	Yes
 NO_PACKAGE=	Yes
-NO_PATCH=	Yes
 
 WRKDIST=	${WRKDIR}
 
diff --git a/graphics/Mesa/Makefile b/graphics/Mesa/Makefile
index 822347cc657..cd92d635fb0 100644
--- a/graphics/Mesa/Makefile
+++ b/graphics/Mesa/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2000/03/24 22:11:44 espie Exp $
+# $OpenBSD: Makefile,v 1.10 2000/06/16 23:06:05 espie Exp $
 # $FreeBSD: Makefile,v 1.30 1998/11/11 05:37:18 asami Exp $
 
 PKGNAME=	Mesa-3.0
@@ -20,10 +20,6 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-FAKE=	Yes
-
-NO_CONFIGURE=	Yes
-
 WRKDIST=	${WRKDIR}/Mesa-3.0
 
 SHLIB_VERSION=	3.0
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 401caf6cb13..c46ba91e7d2 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2000/05/21 12:39:01 fgsch Exp $
+# $OpenBSD: Makefile,v 1.14 2000/06/16 23:06:05 espie Exp $
 # $NetBSD: Makefile,v 1.25 1999/03/04 14:18:54 tron Exp $
 
 DISTNAME=	netpbm-1mar1994
@@ -26,9 +26,7 @@ LIB_DEPENDS=	jpeg.62::graphics/jpeg \
 		tiff.35::graphics/tiff \
 		png.1.6::graphics/png
 
-NO_CONFIGURE=	Yes
 MAKE_ENV=	PREFIX=${PREFIX} MANCP="${INSTALL_MAN}"
-FAKE=		Yes
 FAKE_FLAGS= 	PREFIX=${WRKINST}${PREFIX} MANCP="${INSTALL_MAN}"
 
 WRKDIST=	${WRKDIR}/netpbm
diff --git a/mail/checkpassword/Makefile b/mail/checkpassword/Makefile
index 73c1d96330d..d68e614688a 100644
--- a/mail/checkpassword/Makefile
+++ b/mail/checkpassword/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2000/04/26 14:43:51 camield Exp $
+# $OpenBSD: Makefile,v 1.5 2000/06/16 23:06:05 espie Exp $
 
 DISTNAME=	checkpassword-0.81
 HOMEPAGE=	http://cr.yp.to/checkpwd.html
@@ -20,12 +20,9 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-NO_CONFIGURE=	Yes
 ALL_TARGET=	default
 INSTALL_TARGET=	setup check
 
-FAKE=	Yes
-
 pre-build:
 	@echo ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
 	@echo ${PREFIX} > ${WRKSRC}/conf-home
diff --git a/mail/dot-forward/Makefile b/mail/dot-forward/Makefile
index 487954e4a89..4298e3edb72 100644
--- a/mail/dot-forward/Makefile
+++ b/mail/dot-forward/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2000/04/26 15:18:30 camield Exp $
+# $OpenBSD: Makefile,v 1.12 2000/06/16 23:06:06 espie Exp $
 
 DISTNAME=	dot-forward-0.71
 HOMEPAGE=	http://cr.yp.to/dot-forward.html
@@ -22,12 +22,9 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 PREFIX=		/var/qmail
-NO_CONFIGURE=	Yes
 ALL_TARGET=	default
 INSTALL_TARGET=	setup check
 
-FAKE=	Yes
-
 RUN_DEPENDS=	${PREFIX}/bin/qmail-local::mail/qmail
 
 pre-build:
diff --git a/mail/ezmlm/Makefile b/mail/ezmlm/Makefile
index 3de7de5d5b0..10d662ff017 100644
--- a/mail/ezmlm/Makefile
+++ b/mail/ezmlm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2000/04/26 15:18:31 camield Exp $
+# $OpenBSD: Makefile,v 1.9 2000/06/16 23:06:06 espie Exp $
 
 DISTNAME=	ezmlm-0.53
 HOMEPAGE=	http://cr.yp.to/ezmlm.html
@@ -22,12 +22,9 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 QMAILDIR=	/var/qmail
-NO_CONFIGURE=	Yes
 ALL_TARGET=	it man
 INSTALL_TARGET=	setup
 
-FAKE=	Yes
-
 RUN_DEPENDS=	${QMAILDIR}/bin/qmail-local::mail/qmail
 
 pre-build:
diff --git a/mail/fastforward/Makefile b/mail/fastforward/Makefile
index 9ebc4e25a72..733e0ac2de0 100644
--- a/mail/fastforward/Makefile
+++ b/mail/fastforward/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2000/04/26 15:18:31 camield Exp $
+# $OpenBSD: Makefile,v 1.11 2000/06/16 23:06:07 espie Exp $
 
 DISTNAME=	fastforward-0.51
 HOMEPAGE=	http://cr.yp.to/fastforward.html
@@ -22,12 +22,9 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 PREFIX=		/var/qmail
-NO_CONFIGURE=	Yes
 ALL_TARGET=	default
 INSTALL_TARGET=	setup check
 
-FAKE=   Yes
-
 RUN_DEPENDS=	${PREFIX}/bin/qmail-local::mail/qmail
 
 pre-build:
diff --git a/mail/mess822/Makefile b/mail/mess822/Makefile
index 548cde88764..1779842bf7f 100644
--- a/mail/mess822/Makefile
+++ b/mail/mess822/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2000/04/26 15:18:32 camield Exp $
+# $OpenBSD: Makefile,v 1.9 2000/06/16 23:06:07 espie Exp $
 
 DISTNAME=	mess822-0.58
 HOMEPAGE=	http://cr.yp.to/mess822.html
@@ -22,12 +22,9 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 QMAILDIR=	/var/qmail
-NO_CONFIGURE=	Yes
 ALL_TARGET=	default
 INSTALL_TARGET=	setup check
 
-FAKE=	Yes
-
 RUN_DEPENDS=	${QMAILDIR}/bin/qmail-local::mail/qmail
 
 pre-build:
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index dc2dbdc487a..6d5e45e1dc6 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2000/05/29 06:31:18 jakob Exp $
+# $OpenBSD: Makefile,v 1.25 2000/06/16 23:06:07 espie Exp $
 
 DISTNAME=	postfix-19991231-pl08
 CATEGORIES=     mail
@@ -15,10 +15,6 @@ PERMIT_PACKAGE_FTP=	yes
 PERMIT_DISTFILES_CDROM=	yes
 PERMIT_DISTFILES_FTP=	yes
 
-FAKE=		yes
-
-NO_CONFIGURE=	yes
-
 MAKE_FLAGS=	CC="${CC}" DEBUG="" OPT="${CFLAGS}" \
 		OPTS="CC=\"${CC}\" DEBUG=\"\" OPT=\"${CFLAGS}\""
 
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index 0b3e353e068..f3efda48ecf 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2000/04/27 06:14:15 camield Exp $
+# $OpenBSD: Makefile,v 1.11 2000/06/16 23:06:08 espie Exp $
 
 DISTNAME=	qmail-1.03
 CATEGORIES=	mail
@@ -21,14 +21,10 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 PREFIX=		/var/qmail
-NO_CONFIGURE=	Yes
-NO_MTREE=	Yes
 ALL_TARGET=	it man
 INSTALL_TARGET=	setup check
 IS_INTERACTIVE= "if qmail users/groups do not exist yet"
 
-FAKE=	Yes
-
 RUN_DEPENDS=    tcpserver::net/ucspi-tcp
 
 SETUPBINARIES=	${WRKSRC}/dnsfq		${WRKSRC}/dnsip		\
diff --git a/mail/qmailanalog/Makefile b/mail/qmailanalog/Makefile
index a1ca9b0a05c..b6f40bae685 100644
--- a/mail/qmailanalog/Makefile
+++ b/mail/qmailanalog/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2000/04/26 15:18:32 camield Exp $
+# $OpenBSD: Makefile,v 1.10 2000/06/16 23:06:08 espie Exp $
 
 DISTNAME=	qmailanalog-0.70
 HOMEPAGE=	http://cr.yp.to/qmailanalog.html
@@ -24,12 +24,9 @@ PERMIT_PACKAGE_CDROM=	Yes
 # only used for RUN_DEPENDS, below
 QMAILDIR=	/var/qmail
 
-NO_CONFIGURE=	Yes
 ALL_TARGET=	default
 INSTALL_TARGET=	setup check
 
-FAKE=	Yes
-
 RUN_DEPENDS=	${QMAILDIR}/bin/qmail-local::mail/qmail
 
 pre-build:
diff --git a/mail/rblsmtpd/Makefile b/mail/rblsmtpd/Makefile
index 09b76ef8c7a..f531c9c57be 100644
--- a/mail/rblsmtpd/Makefile
+++ b/mail/rblsmtpd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2000/04/26 14:25:30 camield Exp $
+# $OpenBSD: Makefile,v 1.8 2000/06/16 23:06:08 espie Exp $
 
 BROKEN=		"obsoleted by net/ucspi-tcp"
 
@@ -23,12 +23,9 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-NO_CONFIGURE=	Yes
 ALL_TARGET=	it install WRKINST=${WRKINST}
 INSTALL_TARGET=	setup check
 
-FAKE=	Yes
-
 RUN_DEPENDS=	tcpserver::net/ucspi-tcp
 
 pre-build:
diff --git a/mail/serialmail/Makefile b/mail/serialmail/Makefile
index eb20817a9d5..7c72e550985 100644
--- a/mail/serialmail/Makefile
+++ b/mail/serialmail/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2000/04/26 15:18:32 camield Exp $
+# $OpenBSD: Makefile,v 1.8 2000/06/16 23:06:08 espie Exp $
 
 DISTNAME=	serialmail-0.75
 HOMEPAGE=	http://cr.yp.to/serialmail.html
@@ -22,12 +22,9 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 QMAILDIR=	/var/qmail
-NO_CONFIGURE=	Yes
 ALL_TARGET=	default
 INSTALL_TARGET=	setup check
 
-FAKE=	Yes
-
 RUN_DEPENDS=	tcpclient::net/ucspi-tcp
 RUN_DEPENDS+=	${QMAILDIR}/bin/qmail-local::mail/qmail
 
diff --git a/math/maple/Makefile b/math/maple/Makefile
index 49547ab6fa9..a191b9406b8 100644
--- a/math/maple/Makefile
+++ b/math/maple/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2000/04/01 17:47:42 espie Exp $
+# $OpenBSD: Makefile,v 1.10 2000/06/16 23:06:08 espie Exp $
 # Original from: Marc Espie
 # XXX This port installs in a somewhat unusual way.
 
@@ -28,8 +28,6 @@ PERMIT_PACKAGE_CDROM=	Commercial
 MAINTAINER=	espie@cvs.openbsd.org
 
 WRKDIST=	${WRKDIR}
-NO_PATCH=	Yes
-NO_CONFIGURE=	Yes
 
 # verify that it makes sense to install maple here
 pre-fetch:
@@ -67,7 +65,6 @@ do-fetch:
 
 MAPLE_SCRIPTS=maple march mint updtsrc xmaple
 
-FAKE=	Yes
 do-install:
 	@mkdir -p ${MAPLE_DIR} || echo "${MAPLE_DIR} already exists"
 	@cd ${MAPLE_DIR} && yes | ${FULLDISTDIR}/install
diff --git a/net/bind8/Makefile b/net/bind8/Makefile
index f87bc453ecf..e02b0812697 100644
--- a/net/bind8/Makefile
+++ b/net/bind8/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2000/04/23 15:40:01 jakob Exp $
+# $OpenBSD: Makefile,v 1.17 2000/06/16 23:06:09 espie Exp $
 
 DISTNAME=	bind-openbsd-8.2.2-P6-19991217
 PKGNAME=	bind-8.2.2-P6
@@ -11,9 +11,6 @@ MAINTAINER=	ho@openbsd.org,jakob@openbsd.org
 
 WRKDIST=	${WRKDIR}/named
 PREFIX=		/
-FAKE=		yes
-NO_MTREE=	yes
-NO_CONFIGURE=	yes
 SAMPLEDIR=	${DESTDIR}/usr/local/share/examples/bind8
 
 RESTRICTED=		"Unclear status of crypto components."
diff --git a/net/dnscache/Makefile b/net/dnscache/Makefile
index 7c4d0d87adc..f17398b6981 100644
--- a/net/dnscache/Makefile
+++ b/net/dnscache/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2000/04/26 14:06:47 camield Exp $
+# $OpenBSD: Makefile,v 1.3 2000/06/16 23:06:09 espie Exp $
 
 DISTNAME=	dnscache-1.00
 HOMEPAGE=	http://cr.yp.to/dnscache.html
@@ -13,12 +13,9 @@ PERMIT_PACKAGE_FTP=	'no license'
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-NO_CONFIGURE=	Yes
 ALL_TARGET=	default
 INSTALL_TARGET=	setup check
 
-FAKE=	Yes
-
 RUN_DEPENDS=	supervise:${PORTSDIR}/sysutils/daemontools \
 		tcpclient:${PORTSDIR}/net/ucspi-tcp
 
diff --git a/net/micq/Makefile b/net/micq/Makefile
index 89ec8d74b4d..1fb5598fe01 100644
--- a/net/micq/Makefile
+++ b/net/micq/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2000/04/03 16:01:31 form Exp $
+# $OpenBSD: Makefile,v 1.10 2000/06/16 23:06:09 espie Exp $
 # $FreeBSD: Makefile,v 1.6 1999/06/03 08:31:06 ache Exp $
 
 DISTNAME=       micq-0.4.5
@@ -14,9 +14,6 @@ PERMIT_PACKAGE_FTP=	YES
 PERMIT_DISTFILES_CDROM=	YES
 PERMIT_DISTFILES_FTP=	YES
 
-NO_CONFIGURE=	Yes
-FAKE=		Yes
-
 WRKDIST=	${WRKDIR}/micq-0.4.4
 
 # Please uncoment one of the following lines to
diff --git a/net/nsping/Makefile b/net/nsping/Makefile
index 365b8a536e8..b4fe5827e56 100644
--- a/net/nsping/Makefile
+++ b/net/nsping/Makefile
@@ -3,7 +3,7 @@
 # Date created:		12 Nov 1999
 # Whom:			dugsong@monkey.org
 #
-# $OpenBSD: Makefile,v 1.6 2000/04/21 16:05:40 kevlo Exp $
+# $OpenBSD: Makefile,v 1.7 2000/06/16 23:06:09 espie Exp $
 
 PKGNAME=	nsping-0.8
 
@@ -23,9 +23,6 @@ PERMIT_DISTFILES_FTP=	Yes
 
 WRKDIST=		${WRKDIR}/${PKGNAME}
 
-NO_CONFIGURE=	Yes
-FAKE=		Yes
-
 do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/nsping ${PREFIX}/sbin
 		${INSTALL_DATA} ${WRKSRC}/nsping.8 ${PREFIX}/man/man8
diff --git a/net/popa3d/Makefile b/net/popa3d/Makefile
index d954d571850..6a70d48a8f8 100644
--- a/net/popa3d/Makefile
+++ b/net/popa3d/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2000/06/14 07:30:45 camield Exp $
+# $OpenBSD: Makefile,v 1.12 2000/06/16 23:06:09 espie Exp $
 
 DISTNAME=	popa3d-0.4
 HOMEPAGE=	http://www.openwall.com/popa3d/
@@ -16,7 +16,6 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-NO_CONFIGURE=	Yes
 ALL_TARGET=	popa3d
 MAKE_FLAGS=	CC=${CC} LD=${CC} CFLAGS="-c ${CFLAGS}"
 
diff --git a/net/publicfile/Makefile b/net/publicfile/Makefile
index dabedbf8230..87e9b833570 100644
--- a/net/publicfile/Makefile
+++ b/net/publicfile/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2000/04/26 14:39:29 camield Exp $
+# $OpenBSD: Makefile,v 1.6 2000/06/16 23:06:09 espie Exp $
 
 DISTNAME=	publicfile-0.52
 HOMEPAGE=	http://cr.yp.to/publicfile.html
@@ -15,12 +15,9 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-NO_CONFIGURE=	Yes
 ALL_TARGET=	default
 INSTALL_TARGET=	setup check
 
-FAKE=	Yes
-
 RUN_DEPENDS=	supervise::sysutils/daemontools \
 		tcpserver::net/ucspi-tcp
 
diff --git a/net/snort/Makefile b/net/snort/Makefile
index 4e044e3a519..82af0a5c931 100644
--- a/net/snort/Makefile
+++ b/net/snort/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.6 2000/05/29 07:31:38 kevlo Exp $
+# $OpenBSD: Makefile,v 1.7 2000/06/16 23:06:10 espie Exp $
 
 DISTNAME=	snort-1.6
 CATEGORIES=	net security
+NEED_VERSION=	1.302
 MASTER_SITES=	http://www.clark.net/~roesch/ \
 		ftp://gd.tuwien.ac.at/infosys/security/snort/ \
 		http://snort.whitehats.com/
@@ -16,9 +17,7 @@ PERMIT_PACKAGE_FTP=   	Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP= 	Yes
 
-NO_PATCH=     	Yes
-GNU_CONFIGURE=	Yes
-FAKE=		Yes
+CONFIGURE_STYLE=	gnu
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/snort.8 ${PREFIX}/man/man8
diff --git a/net/ucspi-tcp/Makefile b/net/ucspi-tcp/Makefile
index 46b68230361..8f1d4da7a98 100644
--- a/net/ucspi-tcp/Makefile
+++ b/net/ucspi-tcp/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2000/04/26 14:12:14 camield Exp $
+# $OpenBSD: Makefile,v 1.9 2000/06/16 23:06:10 espie Exp $
 
 DISTNAME=	ucspi-tcp-0.88
 HOMEPAGE=	http://cr.yp.to/ucspi-tcp.html
@@ -20,12 +20,9 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-NO_CONFIGURE=	Yes
 ALL_TARGET=	default
 INSTALL_TARGET=	setup check
 
-FAKE=	Yes
-
 pre-build:
 	@echo ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
 	@echo ${PREFIX} > ${WRKSRC}/conf-home
diff --git a/print/pkfonts/Makefile b/print/pkfonts/Makefile
index fba01fc849d..81d15a680be 100644
--- a/print/pkfonts/Makefile
+++ b/print/pkfonts/Makefile
@@ -2,7 +2,7 @@
 # Date created:		May 17 1998
 # Whom:			Angelos D. Keromytis
 #
-# $OpenBSD: Makefile,v 1.9 2000/04/09 17:37:53 espie Exp $
+# $OpenBSD: Makefile,v 1.10 2000/06/16 23:06:10 espie Exp $
 #
 
 DISTNAME=	pkfonts
@@ -14,20 +14,18 @@ MASTER_SITES=	ftp://ftp.eos.hokudai.ac.jp/pub/TeX/fonts/ \
 		ftp://ftp.wg.omron.co.jp/pub/tex/
 DISTFILES=	pk${RESOLUTION}.tar.gz
 # see below for RESOLUTION definition
+EXTRACT_ONLY=	
 
 MAINTAINER=	angelos@openbsd.org
 
 LICENSE_TYPE=		NONE
-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
 
 MANUAL_PACKAGE_BUILD=	RESOLUTION has to be set to 118 240 300 360 400 600
 DIST_SUBDIR=	pkfonts
-# NO_EXTRACT is waiting for a bsd.port.mk fix to be approved.
-# For the interim, redefine do-extract.
-#NO_EXTRACT=	extracted in install target
 NO_BUILD=	yes
 
 .if !defined(RESOLUTION)
@@ -55,9 +53,6 @@ pre-fetch:
 .endif
 .endif
 
-do-extract:
-	mkdir -p ${WRKDIR}
-
 do-install:
 	mkdir -p ${PREFIX}/lib/fonts
 	tar -C ${PREFIX}/lib/fonts -xzf ${FULLDISTDIR}/${DISTFILES}
diff --git a/print/teTeX/texmf/Makefile b/print/teTeX/texmf/Makefile
index b0dd893485f..e1f3ef6d503 100644
--- a/print/teTeX/texmf/Makefile
+++ b/print/teTeX/texmf/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2000/03/11 00:07:37 espie Exp $
+# $OpenBSD: Makefile,v 1.7 2000/06/16 23:06:10 espie Exp $
 # Original from: Marc Espie
 
 PKGNAME=	teTeX_texmf-1.0.2
@@ -20,11 +20,8 @@ TETEX_TEXMF=	teTeX-texmf-1.0.2.tar.gz
 WRKDIST=	${WRKDIR}
 # better than NO_EXTRACT, as this builds WRKDIR correctly for us.
 EXTRACT_ONLY=
-NO_PATCH=	Yes
-NO_CONFIGURE=	Yes
 NO_BUILD=	Yes
 
-FAKE=		Yes
 TEXMF_DIR=	${PREFIX}/share/texmf
 
 do-install:
diff --git a/security/ADMfzap/Makefile b/security/ADMfzap/Makefile
index 80f9909392b..c463fd81ed4 100644
--- a/security/ADMfzap/Makefile
+++ b/security/ADMfzap/Makefile
@@ -3,7 +3,7 @@
 # Date created:		14 Mar 1999
 # Whom:			dugsong@monkey.org
 #
-# $OpenBSD: Makefile,v 1.1.1.1 2000/04/06 20:45:01 dugsong Exp $
+# $OpenBSD: Makefile,v 1.2 2000/06/16 23:06:10 espie Exp $
 
 PKGNAME=	ADMfzap-0.1
 
@@ -16,14 +16,10 @@ DISTNAME=	ADMfzap
 MASTER_SITES=	http://ADM.isp.at/ADM/ \
 		ftp://ADM.isp.at/ADM/
 
-NO_CONFIGURE=	yes
-
 MAKE_ENV+=	LIB_PATH=`/bin/ls -1 /usr/lib/libc.so.* | tail -1`
 
 ALL_TARGET=	openbsd
 
-FAKE=		yes
-
 # these should really just be defaults.
 PERMIT_PACKAGE_CDROM=	yes
 PERMIT_PACKAGE_FTP=	yes
diff --git a/security/antisniff/Makefile b/security/antisniff/Makefile
index f766c86f6de..70c5d1ba579 100644
--- a/security/antisniff/Makefile
+++ b/security/antisniff/Makefile
@@ -3,7 +3,7 @@
 # Date created:		27 Oct 1999
 # Whom:			dugsong@monkey.org
 #
-# $OpenBSD: Makefile,v 1.9 2000/05/17 18:48:34 dugsong Exp $
+# $OpenBSD: Makefile,v 1.10 2000/06/16 23:06:11 espie Exp $
 
 PKGNAME=	antisniff-1.1
 
@@ -23,12 +23,8 @@ PERMIT_DISTFILES_FTP=	Yes
 
 WRKDIST=	${WRKDIR}/anti_sniff
 
-NO_CONFIGURE=	Yes
-
 ALL_TARGET=	OpenBSD-all
 
-FAKE=		yes
-
 do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/anti_sniffer \
 			${PREFIX}/bin/antisniff
diff --git a/security/cgichk/Makefile b/security/cgichk/Makefile
index ad85adc0c69..6d97d90f5d0 100644
--- a/security/cgichk/Makefile
+++ b/security/cgichk/Makefile
@@ -3,7 +3,7 @@
 # Date created:		27 Oct 1999
 # Whom:			dugsong@monkey.org
 #
-# $OpenBSD: Makefile,v 1.5 2000/04/30 09:20:18 kevlo Exp $
+# $OpenBSD: Makefile,v 1.6 2000/06/16 23:06:11 espie Exp $
 
 PKGNAME=	cgichk-3.0
 
@@ -23,7 +23,4 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-NO_CONFIGURE=	Yes
-FAKE=		Yes
-
 .include <bsd.port.mk>
diff --git a/security/dsniff/Makefile b/security/dsniff/Makefile
index 5447dd0e769..a207800e97d 100644
--- a/security/dsniff/Makefile
+++ b/security/dsniff/Makefile
@@ -3,11 +3,12 @@
 # Date created:		17 Dec 1999
 # Whom:			dugsong@monkey.org
 #
-# $OpenBSD: Makefile,v 1.11 2000/05/23 15:15:54 dugsong Exp $
+# $OpenBSD: Makefile,v 1.12 2000/06/16 23:06:11 espie Exp $
 
 DISTNAME=	dsniff-2.1
 
 CATEGORIES=	security
+NEED_VERSION=	1.301
 
 MAINTAINER=	dugsong@monkey.org
 
@@ -21,11 +22,8 @@ MASTER_SITES=	http://www.monkey.org/~dugsong/dsniff/
 BUILD_DEPENDS=	${PREFIX}/lib/libnet.a::net/libnet \
 		${PREFIX}/lib/libnids.a::net/libnids
 
-GNU_CONFIGURE=	Yes
+CONFIGURE_STYLE=	gnu
 
-NO_PATCH=	Yes
-
-FAKE=		Yes
 FAKE_FLAGS=	install_prefix=${WRKINST}
 
 .include <bsd.port.mk>
diff --git a/security/isic/Makefile b/security/isic/Makefile
index 9825393be18..aeb64b7516b 100644
--- a/security/isic/Makefile
+++ b/security/isic/Makefile
@@ -3,12 +3,12 @@
 # Date created:		24 Jan 2000
 # Whom:			dugsong@monkey.org
 #
-# $OpenBSD: Makefile,v 1.8 2000/04/30 10:07:49 kevlo Exp $
+# $OpenBSD: Makefile,v 1.9 2000/06/16 23:06:11 espie Exp $
 
 DISTNAME=	isic-0.05
 
 CATEGORIES=	security
-NEED_VERSION=	 1.230
+NEED_VERSION=	 1.301
 
 MASTER_SITES=	http://expert.cc.purdue.edu/~frantzen/
 
@@ -23,9 +23,6 @@ PERMIT_DISTFILES_FTP=	Yes
 
 BUILD_DEPENDS=	${PREFIX}/lib/libnet.a::net/libnet
 
-NO_PATCH=	Yes
-
-GNU_CONFIGURE=	Yes
-FAKE=		Yes
+CONFIGURE_STYLE=	gnu
 
 .include <bsd.port.mk>
diff --git a/security/john/Makefile b/security/john/Makefile
index f8b6b369f7e..518fb0b9368 100644
--- a/security/john/Makefile
+++ b/security/john/Makefile
@@ -3,7 +3,7 @@
 # Date created:		1999-Apr-7
 # Whom:			dugsong@OpenBSD.ORG
 #
-# $OpenBSD: Makefile,v 1.9 2000/04/09 17:38:02 espie Exp $
+# $OpenBSD: Makefile,v 1.10 2000/06/16 23:06:11 espie Exp $
 
 DISTNAME=	john-1.6
 
@@ -25,8 +25,6 @@ MASTER_SITES=	http://www.openwall.com/john/ \
 
 WRKDIST=	${WRKDIR}/${DISTNAME}/src
 
-NO_CONFIGURE=	yes
-
 .if (${MACHINE_ARCH} == "i386")
 PTYPE!=		uname -p | cut -f2 -d' '
 .if (${PTYPE} == "K6")
diff --git a/security/l0phtcrack/Makefile b/security/l0phtcrack/Makefile
index b1cdc7721ba..afcb87fa62f 100644
--- a/security/l0phtcrack/Makefile
+++ b/security/l0phtcrack/Makefile
@@ -3,7 +3,7 @@
 # Date created:		25 Nov 1999
 # Whom:			dugsong@monkey.org
 #
-# $OpenBSD: Makefile,v 1.6 2000/04/30 10:08:03 kevlo Exp $
+# $OpenBSD: Makefile,v 1.7 2000/06/16 23:06:12 espie Exp $
 
 PKGNAME=	l0phtcrack-2.52
 
@@ -26,9 +26,6 @@ MASTER_SITES=	http://www.l0pht.com/l0phtcrack/dist/
 
 WRKDIST=	${WRKDIR}
 
-NO_CONFIGURE=	Yes
-FAKE=		Yes
-
 post-extract:
 		@cp ${FULLDISTDIR}/readsmb.c ${WRKSRC}
 		@(cd ${WRKSRC} ; \
diff --git a/security/lxnb/Makefile b/security/lxnb/Makefile
index 5efe2198932..5b275b62e67 100644
--- a/security/lxnb/Makefile
+++ b/security/lxnb/Makefile
@@ -3,7 +3,7 @@
 # Date created:		10 Feb 2000
 # Whom:			dugsong@monkey.org
 #
-# $OpenBSD: Makefile,v 1.6 2000/04/30 10:00:12 kevlo Exp $
+# $OpenBSD: Makefile,v 1.7 2000/06/16 23:06:12 espie Exp $
 
 PKGNAME=	lxnb-0.4
 
@@ -23,9 +23,6 @@ EXTRACT_SUFX=	.tgz
 
 WRKDIST=	${WRKDIR}/${PKGNAME}
 
-NO_CONFIGURE=	Yes
-FAKE=		Yes
-
 pre-build:
 	rm -f ${WRKSRC}/lxnetbus
 
diff --git a/security/nfsshell/Makefile b/security/nfsshell/Makefile
index b1a3a2db015..3bd3428ee88 100644
--- a/security/nfsshell/Makefile
+++ b/security/nfsshell/Makefile
@@ -3,7 +3,7 @@
 # Date created:		10 Jun 1999
 # Whom:			dugsong@monkey.org
 #
-# $OpenBSD: Makefile,v 1.6 2000/04/30 10:21:48 kevlo Exp $
+# $OpenBSD: Makefile,v 1.7 2000/06/16 23:06:13 espie Exp $
 
 PKGNAME=	nfsshell-1.0
 
@@ -23,9 +23,6 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	"no obvious license"
 PERMIT_DISTFILES_FTP=	Yes
 
-NO_CONFIGURE=	Yes
-FAKE=		Yes
-
 ALL_TARGET=	nfs
 
 do-install:
diff --git a/security/parse/Makefile b/security/parse/Makefile
index ca0ddcaa8b0..31ded87f51d 100644
--- a/security/parse/Makefile
+++ b/security/parse/Makefile
@@ -3,7 +3,7 @@
 # Date created:		27 Jan 2000
 # Whom:			dugsong@monkey.org
 #
-# $OpenBSD: Makefile,v 1.3 2000/04/30 10:22:49 kevlo Exp $
+# $OpenBSD: Makefile,v 1.4 2000/06/16 23:06:13 espie Exp $
 
 PKGNAME=	parse-1.0
 
@@ -24,7 +24,4 @@ DISTNAME=	parse
 
 EXTRACT_SUFX=	.t.gz
 
-NO_CONFIGURE=	Yes
-FAKE=		Yes
-
 .include <bsd.port.mk>
diff --git a/security/radiusniff/Makefile b/security/radiusniff/Makefile
index 7f5af8b11fb..ed51f96705c 100644
--- a/security/radiusniff/Makefile
+++ b/security/radiusniff/Makefile
@@ -1,11 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2000/04/21 18:45:13 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2000/06/16 23:06:13 espie Exp $
 # Original from: FreeLSD <freelsd@freelsd.net>
 
 DISTNAME=		radiusniff-0.2
 CATEGORIES=     	security
 
 MAINTAINER=		nny@sinister.com
-FAKE=			Yes
 
 PERMIT_PACKAGE_CDROM=	"not specified, vague license"
 PERMIT_PACKAGE_FTP=	Yes
@@ -17,10 +16,8 @@ MASTER_SITES=		http://adm.freelsd.net/ADM/
 
 WRKSRC=			${WRKDIR}/radiusniff-0.2
 
-NO_CONFIGURE=		yes
-
 do-build:
-			(cd ${WRKSRC} ; ${CC} -DOPENBSD -DDICTIONARY_FILENAME='"dictionary"' -I/usr/local/include -L/usr/local/lib -o radiusniff radiusniff.c md5.c -lpcap -lresolv)
+			cd ${WRKSRC} ; ${CC} -DOPENBSD -DDICTIONARY_FILENAME='"dictionary"' -I/usr/local/include -L/usr/local/lib -o radiusniff radiusniff.c md5.c -lpcap -lresolv
 
 do-install:
 			${INSTALL_PROGRAM} ${WRKSRC}/radiusniff ${PREFIX}/bin
diff --git a/security/rdp/Makefile b/security/rdp/Makefile
index b0b8ef71e62..0b06864285c 100644
--- a/security/rdp/Makefile
+++ b/security/rdp/Makefile
@@ -3,7 +3,7 @@
 # Date created:		25 Nov 1999
 # Whom:			dugsong@monkey.org
 #
-# $OpenBSD: Makefile,v 1.7 2000/05/06 07:14:55 kevlo Exp $
+# $OpenBSD: Makefile,v 1.8 2000/06/16 23:06:14 espie Exp $
 
 PKGNAME=	rdp-1.0
 
@@ -25,9 +25,6 @@ BUILD_DEPENDS=	${PREFIX}/lib/libnet.a::net/libnet
 
 WRKDIST=	${WRKDIR}
 
-NO_CONFIGURE=	Yes
-FAKE=		Yes
-
 do-build:
 		cd ${WRKSRC} && ${CC} ${CFLAGS} -I${PREFIX}/include -o rdp \
 		icmp_rdp.c -L${PREFIX}/lib -lnet -lpcap
diff --git a/sysutils/daemontools/Makefile b/sysutils/daemontools/Makefile
index 527c66afa23..a8208a55c0a 100644
--- a/sysutils/daemontools/Makefile
+++ b/sysutils/daemontools/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2000/04/26 14:20:18 camield Exp $
+# $OpenBSD: Makefile,v 1.6 2000/06/16 23:06:14 espie Exp $
 
 DISTNAME=	daemontools-0.70
 HOMEPAGE=	http://cr.yp.to/daemontools.html
@@ -13,12 +13,9 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-NO_CONFIGURE=	Yes
 ALL_TARGET=	default
 INSTALL_TARGET=	setup check
 
-FAKE=	Yes
-
 pre-build:
 	@echo ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
 	@echo ${PREFIX} > ${WRKSRC}/conf-home
diff --git a/textproc/TclXML/Makefile b/textproc/TclXML/Makefile
index d94d1bff396..23f96d79b9c 100644
--- a/textproc/TclXML/Makefile
+++ b/textproc/TclXML/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2000/03/28 13:58:41 kevlo Exp $
+# $OpenBSD: Makefile,v 1.7 2000/06/16 23:06:14 espie Exp $
 
 DISTNAME=	TclXML-1.2.1
 CATEGORIES=	textproc
@@ -7,16 +7,14 @@ 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
+PERMIT_PACKAGE_CDROM=	No
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	No
+PERMIT_DISTFILES_FTP=	Yes
 
 RUN_DEPENDS=	tclsh8.3::lang/tcl/8.3
 
-FAKE=		Yes
 NO_BUILD=       Yes
-NO_CONFIGURE=	Yes
 
 INSTDIR=	${PREFIX}/lib/tcl8.3/TclXML
 DOCDIR=		${PREFIX}/share/doc/TclXML
diff --git a/textproc/docbook/Makefile b/textproc/docbook/Makefile
index 331489bbfcf..9f68788992a 100644
--- a/textproc/docbook/Makefile
+++ b/textproc/docbook/Makefile
@@ -3,7 +3,7 @@
 # Date created:		May 17 1998
 # Whom:			Angelos D. Keromytis
 #
-# $OpenBSD: Makefile,v 1.6 2000/03/24 23:28:35 espie Exp $
+# $OpenBSD: Makefile,v 1.7 2000/06/16 23:06:14 espie Exp $
 #
 
 DISTNAME=	docbook-3.0
@@ -21,14 +21,10 @@ PERMIT_DISTFILES_FTP=	Yes
 
 RUN_DEPENDS=	${ISOCAT}::textproc/iso8879
 
-NO_MTREE=       Yes
 EXTRACT_ONLY=	# empty
 NO_BUILD=       Yes
-NO_PATCH=	Yes
-NO_CONFIGURE=	Yes
 WRKDIST=	${WRKDIR}
 
-FAKE=		Yes
 INSTDIR=	${PREFIX}/share/sgml/docbook
 ISOCAT=		${PREFIX}/share/sgml/iso8879/catalog
 
diff --git a/textproc/html/Makefile b/textproc/html/Makefile
index ccdddbf4349..f156978cbf1 100644
--- a/textproc/html/Makefile
+++ b/textproc/html/Makefile
@@ -3,7 +3,7 @@
 # Date created:		December 1, 1997
 # Whom:			Angelos D. Keromytis
 #
-# $OpenBSD: Makefile,v 1.9 2000/04/21 23:24:53 espie Exp $
+# $OpenBSD: Makefile,v 1.10 2000/06/16 23:06:14 espie Exp $
 #
 
 DISTNAME=	html-4.0b
@@ -21,10 +21,7 @@ PERMIT_DISTFILES_FTP=	Yes
 
 EXTRACT_ONLY=	# empty
 NO_BUILD=       Yes
-NO_PATCH=	Yes
-NO_CONFIGURE=	Yes
 WRKDIST=	${WRKDIR}
-FAKE=		Yes
 
 INSTDIR=	${PREFIX}/share/sgml/html
 
diff --git a/textproc/iso12083/Makefile b/textproc/iso12083/Makefile
index 9645630b791..bdf6212425f 100644
--- a/textproc/iso12083/Makefile
+++ b/textproc/iso12083/Makefile
@@ -3,7 +3,7 @@
 # Date created:		May 17 1998
 # Whom:			Angelos D. Keromytis
 #
-# $OpenBSD: Makefile,v 1.7 2000/04/21 23:43:57 espie Exp $
+# $OpenBSD: Makefile,v 1.8 2000/06/16 23:06:15 espie Exp $
 #
 
 DISTNAME=	iso12083-1993
@@ -22,11 +22,8 @@ PERMIT_DISTFILES_FTP=	Yes
 DIST_SUBDIR=	iso12083
 
 NO_BUILD=	Yes
-NO_PATCH=	Yes
-NO_CONFIGURE=	Yes
 WRKDIST=	${WRKDIR}
 EXTRACT_ONLY=	# empty
-FAKE=		Yes
 
 INSTDIR=	${PREFIX}/share/sgml/iso12083
 
diff --git a/textproc/iso8879/Makefile b/textproc/iso8879/Makefile
index 935f66893f0..987e21f4ea7 100644
--- a/textproc/iso8879/Makefile
+++ b/textproc/iso8879/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2000/04/21 23:43:57 espie Exp $
+# $OpenBSD: Makefile,v 1.9 2000/06/16 23:06:15 espie Exp $
 # $FreeBSD: Makefile,v 1.4 1997/07/10 03:25:28 jfieber Exp $
 
 DISTNAME=	isoENTS
@@ -16,11 +16,8 @@ PERMIT_DISTFILES_FTP=	Yes
 
 EXTRACT_ONLY=	# empty
 NO_BUILD=       Yes
-NO_PATCH=	Yes
-NO_CONFIGURE=	Yes
 WRKDIST=	${WRKDIR}
 USE_ZIP=	Yes
-FAKE=		Yes
 
 INSTDIR=	${PREFIX}/share/sgml/iso8879
 
diff --git a/textproc/latex2html/Makefile b/textproc/latex2html/Makefile
index f2e18b55104..7194e88ffca 100644
--- a/textproc/latex2html/Makefile
+++ b/textproc/latex2html/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.10 2000/04/22 00:33:12 espie Exp $
+# $OpenBSD: Makefile,v 1.11 2000/06/16 23:06:15 espie Exp $
 
 DISTNAME=	latex2html-97.1
 CATEGORIES=	textproc www
 NEED_VERSION=	 1.230
-FAKE=No
 
 MAINTAINER=	angelos@openbsd.org
 
@@ -18,7 +17,6 @@ RUN_DEPENDS=	ppmtogif::graphics/netpbm \
 		pnmtopng::graphics/netpbm \
 		gs::print/ghostscript/gnu
 
-NO_CONFIGURE=	Yes
 NO_BUILD=	Yes
 FAKE=		Yes
 
diff --git a/textproc/linuxdoc/Makefile b/textproc/linuxdoc/Makefile
index f5a01f0ec16..2da77effe50 100644
--- a/textproc/linuxdoc/Makefile
+++ b/textproc/linuxdoc/Makefile
@@ -4,7 +4,7 @@
 # Whom:			jfieber
 #
 # $FreeBSD: Makefile,v 1.4 1998/01/17 17:25:46 jfieber Exp $
-# $OpenBSD: Makefile,v 1.8 2000/06/10 00:35:20 espie Exp $
+# $OpenBSD: Makefile,v 1.9 2000/06/16 23:06:15 espie Exp $
 #
 
 DISTNAME=	linuxdoc-1.1
@@ -22,9 +22,7 @@ PERMIT_DISTFILES_FTP=	Yes
 
 RUN_DEPENDS=    ${ISOCAT}::textproc/iso8879
 
-NO_MTREE=       Yes
 NO_BUILD=       Yes
-NO_CONFIGURE=	Yes
 WRKDIST=	${WRKDIR}
 
 INSTDIR=	${PREFIX}/share/sgml/linuxdoc
diff --git a/textproc/xml2rfc/Makefile b/textproc/xml2rfc/Makefile
index eb16a550adc..d46ae31abed 100644
--- a/textproc/xml2rfc/Makefile
+++ b/textproc/xml2rfc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2000/03/29 02:07:08 kevlo Exp $
+# $OpenBSD: Makefile,v 1.10 2000/06/16 23:06:15 espie Exp $
 #
 
 DISTNAME=	xml2rfc
@@ -16,9 +16,7 @@ PERMIT_DISTFILES_FTP=	Yes
 RUN_DEPENDS=	wish8.3::x11/tk/8.3 \
 		${PREFIX}/lib/tcl8.3/TclXML::textproc/TclXML \
 
-FAKE=		Yes
 NO_BUILD=       Yes
-NO_CONFIGURE=	Yes
 
 DOCS=		README.xml README.txt \
 		rfc2629-author.xml rfc2629-author.txt \
diff --git a/www/amaya/english-dict/Makefile b/www/amaya/english-dict/Makefile
index 399027d9ec8..4008591d5fa 100644
--- a/www/amaya/english-dict/Makefile
+++ b/www/amaya/english-dict/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2000/04/11 20:47:23 rohee Exp $
+# $OpenBSD: Makefile,v 1.3 2000/06/16 23:06:16 espie Exp $
 # Original from: Bruno Rohee <rohee@OpenBSD.ORG>
 #
 # Many variables moved to ../Makefile.inc
@@ -9,12 +9,8 @@ NEED_VERSION=		1.223
 
 RUN_DEPENDS=		${PREFIX}/bin/amaya:www/amaya/browser
 
-NO_PATCH=		Yes
-NO_CONFIGURE=		Yes
 NO_BUILD=		Yes
 
-FAKE=			Yes
-
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/Amaya/dicopar
 	${INSTALL_DATA} ${WRKDIR}/Eprinc.dic ${PREFIX}/Amaya/dicopar
diff --git a/www/amaya/french-dict/Makefile b/www/amaya/french-dict/Makefile
index 5c07f800107..e7a93df3c0f 100644
--- a/www/amaya/french-dict/Makefile
+++ b/www/amaya/french-dict/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2000/04/11 20:47:23 rohee Exp $
+# $OpenBSD: Makefile,v 1.3 2000/06/16 23:06:16 espie Exp $
 # Original from: Bruno Rohee <rohee@OpenBSD.ORG>
 #
 # Many variables moved to ../Makefile.inc
@@ -9,12 +9,8 @@ NEED_VERSION=		1.223
 
 RUN_DEPENDS=		${PREFIX}/bin/amaya:www/amaya/browser
 
-NO_PATCH=		Yes
-NO_CONFIGURE=		Yes
 NO_BUILD=		Yes
 
-FAKE=			Yes	
-
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/Amaya/dicopar
 	${INSTALL_DATA} ${WRKDIR}/Fprinc.dic ${PREFIX}/Amaya/dicopar
diff --git a/www/hotjava/Makefile b/www/hotjava/Makefile
index 8e5de8dd882..97f098d1beb 100644
--- a/www/hotjava/Makefile
+++ b/www/hotjava/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2000/04/23 14:42:15 maja Exp $
+# $OpenBSD: Makefile,v 1.6 2000/06/16 23:06:16 espie Exp $
 
 #
 # From:
@@ -28,8 +28,6 @@ EXTRACT_ONLY=
 WRKSRC=		${WRKDIR}
 JDK_VERSION=    1.1.8
 NO_BUILD=	Yes
-NO_PATCH=	Yes
-NO_CONFIGURE=	Yes
 NO_PACKAGE=	Yes
 
 HOMEPAGE= http://java.sun.com/products/hotjava/
diff --git a/x11/dclock/Makefile b/x11/dclock/Makefile
index 655caa64bf8..c85f8a39f20 100644
--- a/x11/dclock/Makefile
+++ b/x11/dclock/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2000/04/01 03:47:24 kevlo Exp $
+# $OpenBSD: Makefile,v 1.7 2000/06/16 23:06:16 espie Exp $
 # $FreeBSD: Makefile,v 1.9 1999/08/31 06:52:30 mharo Exp $
 
 PKGNAME=	dclock-pl4
@@ -18,15 +18,12 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	"no obvious license"
 PERMIT_DISTFILES_FTP=	Yes
 
-FAKE=		Yes
 USE_X11=	Yes
 
 EXTRACT_CMD=		${GZIP_CMD}
 EXTRACT_BEFORE_ARGS=	-cd
 EXTRACT_AFTER_ARGS=	|sh -
 
-NO_CONFIGURE=	Yes
-
 WRKDIST=	${WRKDIR}
 
 ALL_TARGET=	dclock