diff --git a/benchmarks/bytebench/Makefile b/benchmarks/bytebench/Makefile
index b8618c0809e..980b022aaab 100644
--- a/benchmarks/bytebench/Makefile
+++ b/benchmarks/bytebench/Makefile
@@ -1,28 +1,30 @@
-# $OpenBSD: Makefile,v 1.7 2000/02/15 05:04:03 turan Exp $
+# $OpenBSD: Makefile,v 1.8 2000/04/08 20:37:23 espie Exp $
 
 DISTNAME=       bytebench-3.1
 CATEGORIES=	benchmarks
+NEED_VERSION=	1.250
 
 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
+FAKE=			Yes
 
 MASTER_SITES=   ftp://ftp.inria.fr/system/benchmark/
 EXTRACT_SUFX=	.tar.Z
 
 do-install:
-		-mkdir -p $(PREFIX)/lib/bytebench
+		-${INSTALL_DATA_DIR} ${PREFIX}/lib/bytebench
 		for f in Makefile README Run doc pgms results testdir; \
 			do cp -R $(WRKSRC)/$$f $(PREFIX)/lib/bytebench; done
 		echo "#!/bin/sh"		   >  $(PREFIX)/bin/bytebench
 		echo "TMPDIR=\$${TMPDIR-/var/tmp}" >> $(PREFIX)/bin/bytebench
 		echo "RESULTDIR=/tmp"		   >> $(PREFIX)/bin/bytebench
 		echo "export TMPDIR RESULTDIR"	   >> $(PREFIX)/bin/bytebench
-		echo "cd $(PREFIX)/lib/bytebench"  >> $(PREFIX)/bin/bytebench
+		echo "cd $(TRUEPREFIX)/lib/bytebench"  >> $(PREFIX)/bin/bytebench
 		echo "exec ./Run \"\$$@\""	   >> $(PREFIX)/bin/bytebench
 		chmod 755 $(PREFIX)/bin/bytebench
 		chmod 644 $(PREFIX)/lib/bytebench/Makefile
diff --git a/benchmarks/bytebench/pkg/PLIST b/benchmarks/bytebench/pkg/PLIST
index 32c956709dd..18ff0495b0b 100644
--- a/benchmarks/bytebench/pkg/PLIST
+++ b/benchmarks/bytebench/pkg/PLIST
@@ -1,44 +1,44 @@
 bin/bytebench
+lib/bytebench/Makefile
+lib/bytebench/README
 lib/bytebench/Run
-lib/bytebench/pgms/looper
+lib/bytebench/doc/bench.doc
+lib/bytebench/doc/bench3.doc
+lib/bytebench/pgms/arithoh
+lib/bytebench/pgms/byte.logo
 lib/bytebench/pgms/cleanup.sh
+lib/bytebench/pgms/context1
+lib/bytebench/pgms/dhry2
+lib/bytebench/pgms/dhry2reg
+lib/bytebench/pgms/double
+lib/bytebench/pgms/execl
+lib/bytebench/pgms/float
 lib/bytebench/pgms/fs.awk
+lib/bytebench/pgms/fstime
+lib/bytebench/pgms/hanoi
 lib/bytebench/pgms/index.awk
 lib/bytebench/pgms/index.base
 lib/bytebench/pgms/index.sh
+lib/bytebench/pgms/int
+lib/bytebench/pgms/long
+lib/bytebench/pgms/looper
 lib/bytebench/pgms/loopm.awk
 lib/bytebench/pgms/loops.awk
 lib/bytebench/pgms/multi.sh
+lib/bytebench/pgms/pipe
+lib/bytebench/pgms/register
 lib/bytebench/pgms/report.awk
 lib/bytebench/pgms/report.sh
-lib/bytebench/pgms/tst.sh
-lib/bytebench/pgms/arithoh
-lib/bytebench/pgms/register
 lib/bytebench/pgms/short
-lib/bytebench/pgms/int
-lib/bytebench/pgms/long
-lib/bytebench/pgms/float
-lib/bytebench/pgms/double
-lib/bytebench/pgms/hanoi
-lib/bytebench/pgms/fstime
-lib/bytebench/pgms/syscall
-lib/bytebench/pgms/context1
-lib/bytebench/pgms/pipe
 lib/bytebench/pgms/spawn
-lib/bytebench/pgms/execl
-lib/bytebench/pgms/dhry2
-lib/bytebench/pgms/dhry2reg
-lib/bytebench/pgms/byte.logo
-lib/bytebench/Makefile
-lib/bytebench/README
-lib/bytebench/doc/bench3.doc
-lib/bytebench/doc/bench.doc
+lib/bytebench/pgms/syscall
+lib/bytebench/pgms/tst.sh
 lib/bytebench/results/reports.shar
-lib/bytebench/testdir/dc.dat
 lib/bytebench/testdir/cctest.c
+lib/bytebench/testdir/dc.dat
 lib/bytebench/testdir/sort.src
-@dirrm lib/bytebench/doc
+@dirrm lib/bytebench/testdir
 @dirrm lib/bytebench/results
 @dirrm lib/bytebench/pgms
-@dirrm lib/bytebench/testdir
+@dirrm lib/bytebench/doc
 @dirrm lib/bytebench
diff --git a/benchmarks/iozone/Makefile b/benchmarks/iozone/Makefile
index 460f9a43d2c..8a454bff2bf 100644
--- a/benchmarks/iozone/Makefile
+++ b/benchmarks/iozone/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2000/03/24 22:11:35 espie Exp $
+# $OpenBSD: Makefile,v 1.18 2000/04/08 20:37:25 espie Exp $
 
 DISTNAME=	iozone3_9
 PKGNAME=	iozone-3.9
@@ -13,6 +13,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+FAKE=			Yes
 
 MAKE_FILE=	makefile
 ALL_TARGET=	openbsd
diff --git a/benchmarks/netpipe/Makefile b/benchmarks/netpipe/Makefile
index fbdba907361..75f387f73e1 100644
--- a/benchmarks/netpipe/Makefile
+++ b/benchmarks/netpipe/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2000/03/31 19:07:48 brad Exp $
+# $OpenBSD: Makefile,v 1.8 2000/04/08 20:37:25 espie Exp $
 # $FreeBSD: Makefile,v 1.2 1999/03/03 03:48:56 jkoshy Exp $
 
 DISTNAME=	netpipe-2.3
@@ -12,5 +12,14 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+MAKE_FLAGS=		CC='${CC}' CFLAGS='${CFLAGS}'
+FAKE=			Yes
 
+ALL_TARGET=	NPtcp
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKBUILD}/NPtcp ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKBUILD}/netpipe.1 ${PREFIX}/man/man1
+	cd ${PREFIX}/bin && ln -sf NPtcp netpipe
+	
 .include <bsd.port.mk>
diff --git a/benchmarks/netpipe/patches/patch-ab b/benchmarks/netpipe/patches/patch-ab
deleted file mode 100644
index 82eeeba00a1..00000000000
--- a/benchmarks/netpipe/patches/patch-ab
+++ /dev/null
@@ -1,34 +0,0 @@
---- Makefile.orig	Wed Oct 28 09:42:43 1998
-+++ Makefile	Sat Jan 22 22:38:42 2000
-@@ -3,8 +3,6 @@
- # $Id: patch-ab,v 1.2 2000/01/23 04:18:02 brad Exp $
- #
- 
--# Default C compiler: must be an ANSI C compiler
--CC         = cc
- # File names for the main source files
- DRIV_SRC   = netpipe.c
- DRIV_OBJ   = netpipe.o
-@@ -13,7 +11,6 @@
- TARGETS    = NPtcp
- # If you have TCP, MPI and PVM
- #TARGETS    = NPtcp NPmpi NPpvm
--CFLAGS	   = -O
- # Adjust these for MPI (only used if you have MPI)
- MPI_HOME   = /home/mpich
- MPI_ARCH   = IRIX
-@@ -31,7 +28,14 @@
- # This section of the Makefile is for compiling the binaries
- #
- 
-+all:	NPtcp
-+
- TCP:	NPtcp
-+
-+install: NPtcp
-+	$(BSD_INSTALL_PROGRAM) NPtcp ${PREFIX}/bin
-+	$(BSD_INSTALL_MAN) netpipe.1 ${PREFIX}/man/man1
-+	@ln -sf ${PREFIX}/bin/NPtcp ${PREFIX}/bin/netpipe
- 
- NPtcp:	NPtcp.o TCP.o
- 	$(CC) $(CFLAGS) NPtcp.o TCP.o  -o NPtcp $(EXTRA_LIBS)
diff --git a/benchmarks/tcpblast/Makefile b/benchmarks/tcpblast/Makefile
index e6b01c891b2..173b0f39644 100644
--- a/benchmarks/tcpblast/Makefile
+++ b/benchmarks/tcpblast/Makefile
@@ -1,29 +1,28 @@
-# $OpenBSD: Makefile,v 1.9 2000/03/24 22:11:36 espie Exp $
+# $OpenBSD: Makefile,v 1.10 2000/04/08 20:37:26 espie Exp $
 
 DISTNAME=		tcpblast
 PKGNAME=		tcpblast-1.0
 CATEGORIES=		net benchmarks
-NEED_VERSION=		1.191
+NEED_VERSION=		1.230
 
 MAINTAINER=		ports@openbsd.org
 
 LICENSE_TYPE=		NONE
-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
-DISTFILES=		Makefile tcpblast.c
-EXTRACT_CMD=		ln
-EXTRACT_BEFORE_ARGS=	-sf
-EXTRACT_AFTER_ARGS=	${WRKSRC}
-
-NO_CHECKSUM=		yes
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
+NO_CHECKSUM=		Yes
 WRKDIST=		${WRKDIR}
+FAKE=			Yes
+FAKE_FLAGS=	BINDIR="${PREFIX}/bin" DESTDIR="${WRKINST}" 
 
-fetch:
-	@true
+# Nothing to fetch
+DISTFILES=
+
+# Just link the contained source files into the build environment
+
+post-extract:		
+	lndir ${.CURDIR}/src ${WRKDIR}
 
 .include <bsd.port.mk>
diff --git a/benchmarks/xengine/Makefile b/benchmarks/xengine/Makefile
index 23395af7c0c..a3385ae3f01 100644
--- a/benchmarks/xengine/Makefile
+++ b/benchmarks/xengine/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2000/03/24 23:28:03 espie Exp $
+# $OpenBSD: Makefile,v 1.12 2000/04/08 20:37:26 espie Exp $
 
 PKGNAME=	xengine-1.0.1
 CATEGORIES=	benchmarks x11
@@ -12,6 +12,7 @@ PERMIT_PACKAGE_CDROM=	"no fee"
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	"no fee"
 PERMIT_DISTFILES_FTP=	Yes
+FAKE=			Yes
 
 DIST_SUBDIR=	xengine
 EXTRACT_CMD=	zcat