diff --git a/plan9/9menu/Makefile b/plan9/9menu/Makefile
index db748c43fd4..ab61154c4e8 100644
--- a/plan9/9menu/Makefile
+++ b/plan9/9menu/Makefile
@@ -1,10 +1,4 @@
-# OpenBSD makefile for:    9menu
-# Version required:     1.5
-# Date created:         December 1, 1997
-# Whom:                 Angelos D. Keromytis
-#
-# $OpenBSD: Makefile,v 1.2 1998/06/09 04:16:44 marc Exp $
-#
+# $OpenBSD: Makefile,v 1.3 1999/05/12 19:11:35 brad Exp $
 
 DISTNAME=	9menu-1.5
 CATEGORIES=	plan9
diff --git a/plan9/9wm/Makefile b/plan9/9wm/Makefile
index f8a472ad4a8..d2c67e4dba2 100644
--- a/plan9/9wm/Makefile
+++ b/plan9/9wm/Makefile
@@ -1,10 +1,4 @@
-# OpenBSD makefile for:    9wm
-# Version required:     1.1
-# Date created:         May 16 1998
-# Whom:                 Angelos D. Keromytis
-#
-# $OpenBSD: Makefile,v 1.1.1.1 1998/05/17 03:04:45 angelos Exp $
-#
+# $OpenBSD: Makefile,v 1.2 1999/05/12 19:11:35 brad Exp $
 
 DISTNAME=	9wm-1.1
 CATEGORIES=	plan9
diff --git a/plan9/sam/Makefile b/plan9/sam/Makefile
index 549f19f8f3f..455834e2cb1 100644
--- a/plan9/sam/Makefile
+++ b/plan9/sam/Makefile
@@ -1,32 +1,27 @@
-# $OpenBSD: Makefile,v 1.3 1999/04/06 19:12:38 rohee Exp $
-#
+# $OpenBSD: Makefile,v 1.4 1999/05/12 19:11:35 brad Exp $
 
 DISTNAME=		sam-4.3-19980506
 CATEGORIES=             plan9
 MAINTAINER=		markus.friedl@informatik.uni-erlangen.de
-
 MASTER_SITES=		ftp://netlib.bell-labs.com/netlib/research/ \
 			http://netlib.bell-labs.com/netlib/research/
 DISTFILES=		sam.shar.gz
 
+NO_WRKSUBDIR=		yes
 EXTRACT_SUFX=		.shar.gz
 EXTRACT_CMD=		gzip -d <
 EXTRACT_BEFORE_ARGS=
 EXTRACT_AFTER_ARGS=	|sh
 
-NO_WRKSUBDIR=		yes
-
 SAMDOCDIR=		${PREFIX}/share/doc/sam
 SAMDOCFILES=		sam.ps sam.tut.ms se.ps Sam.ad
 
 post-install:
 	${INSTALL_MAN} $(WRKSRC)/doc/sam.1 $(PREFIX)/man/man1
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${SAMDOCDIR}
 	set -e; for f in ${SAMDOCFILES}; do \
 		${INSTALL_DATA} ${WRKSRC}/doc/$${f} ${SAMDOCDIR}/$${f}; \
 	done
 	${INSTALL_DATA} ${WRKSRC}/README ${SAMDOCDIR}/
-.endif
 
 .include <bsd.port.mk>
diff --git a/plan9/tcs/Makefile b/plan9/tcs/Makefile
index 5043bc1a2bc..a402d875541 100644
--- a/plan9/tcs/Makefile
+++ b/plan9/tcs/Makefile
@@ -1,21 +1,18 @@
-# $OpenBSD: Makefile,v 1.3 1999/04/06 19:12:38 rohee Exp $
-#
+# $OpenBSD: Makefile,v 1.4 1999/05/12 19:11:35 brad Exp $
 
 DISTNAME=		tcs-19950325
 CATEGORIES=             plan9
 MAINTAINER=		markus.friedl@informatik.uni-erlangen.de
-
 MASTER_SITES= 		ftp://plan9.bell-labs.com/plan9/unixsrc/ \
 			ftp://ftp.gwdg.de/pub/gnu2/plan9/unixsrc/
-
 DISTFILES=		tcs.shar.Z
 
+NO_WRKSUBDIR=		yes
 EXTRACT_SUFX=		.shar.Z
 EXTRACT_CMD=		gzip -d <
 EXTRACT_BEFORE_ARGS=
 EXTRACT_AFTER_ARGS=	|sh
 
-NO_WRKSUBDIR=		yes
 ALL_TARGET=		tcs
 
 do-install: