5 files changed, 15 insertions, 31 deletions

diff --git a/x11-wm/afterstep-i18n/Makefile b/x11-wm/afterstep-i18n/Makefile
index edc67c4d83ae..6ace7ed4cd27 100644
--- a/x11-wm/afterstep-i18n/Makefile
+++ b/x11-wm/afterstep-i18n/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	afterstep-i18n
-# Date created:		23 October 1998
-# Whom:			issei@jp.FreeBSD.org
-#
+# Created by: issei@jp.FreeBSD.org
 # $FreeBSD$
-#
 
 PORTNAME=	afterstep-i18n
 PORTVERSION=	1.0
@@ -31,7 +27,7 @@ RUN_DEPENDS=	asclock:${PORTSDIR}/x11-clocks/asclock
 
 DIST_SUBDIR=	afterstep
 USE_XORG=	xpm
-USE_IMAKE=	yes
+USES=		imake
 INSTALL_TARGET=	install install.man
 MANCOMPRESSED=	yes
 MAN1=		afterstep.1 Animate.1 Audio.1 Auto.1 Banner.1 Pager.1 Wharf.1
diff --git a/x11-wm/ctwm/Makefile b/x11-wm/ctwm/Makefile
index e84c349e8fd8..c8036df34056 100644
--- a/x11-wm/ctwm/Makefile
+++ b/x11-wm/ctwm/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	ctwm
-# Date created:		13 November 1994
-# Whom:			torstenb
-#
+# Created by: torstenb
 # $FreeBSD$
-#
 
 PORTNAME=	ctwm
 PORTVERSION=	3.8.1
@@ -14,18 +10,16 @@ MASTER_SITES=	http://ctwm.free.lp.se/dist/ \
 		http://distfiles.over-yonder.net/ctwm/
 
 MAINTAINER=	fullermd@over-yonder.net
-COMMENT=	An extension to twm, with support for multiple virtual screens, etc
+COMMENT=	Extension to twm, with support for multiple virtual screens, etc
 
 LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg
 
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	xpm xmu
 MAN1=		ctwm.1
 
-.include <bsd.port.pre.mk>
-
 pre-configure:
 	${CP} ${WRKSRC}/Imakefile.local-template ${WRKSRC}/Imakefile.local
 	${CAT} ${FILESDIR}/Imakefile.local-additional >> ${WRKSRC}/Imakefile.local
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-wm/larswm/Makefile b/x11-wm/larswm/Makefile
index 292e4d7958a2..e9df01c5ff5d 100644
--- a/x11-wm/larswm/Makefile
+++ b/x11-wm/larswm/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: larswm
-# Date created: Sat Oct  7 21:25:11 EDT 2000
-# Whom: lab@fnurt.net
-#
+# Created by: lab@fnurt.net
 # $FreeBSD$
-#
 
 PORTNAME=	larswm
 PORTVERSION=	7.5.3
@@ -14,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tiling Window Manager for X
 
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	ice sm x11 xext xmu xt
 
 MAN1=		larsclock.1 larsmenu.1 larsremote.1 larswm.1
@@ -22,8 +18,10 @@ PORTDOCS=	ChangeLog README README.9menu README.9wm \
 		sample.larswmrc sample.xsession
 PLIST_FILES=	bin/larsclock bin/larsmenu bin/larsremote bin/larswm
 
+.include <bsd.port.options.mk>
+
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for file in ${PORTDOCS}
 	${INSTALL_DATA} $(WRKSRC)/${file} ${DOCSDIR}
diff --git a/x11-wm/tvtwm/Makefile b/x11-wm/tvtwm/Makefile
index c5f0033d21e1..f0a21206dcdf 100644
--- a/x11-wm/tvtwm/Makefile
+++ b/x11-wm/tvtwm/Makefile
@@ -13,7 +13,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Twm with a virtual desktop
 
 WRKSRC=		${WRKDIR}/tvtwm
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	xbitmaps xpm xmu
 MAN1=		tvtwm.1
 MANCOMPRESSED=	no
diff --git a/x11-wm/w9wm/Makefile b/x11-wm/w9wm/Makefile
index 2ee39bbf9051..cd4232c68fca 100644
--- a/x11-wm/w9wm/Makefile
+++ b/x11-wm/w9wm/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   w9wm
-# Date created:        25 February 2001
-# Whom:                George Reid <greid@ukug.uk.freebsd.org>
-#
+# Created by: George Reid <greid@ukug.uk.freebsd.org>
 # $FreeBSD$
-#
 
 PORTNAME=	w9wm
 PORTVERSION=	0.4.2
@@ -12,11 +8,11 @@ CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.drieu.org/code/w9wm/src/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A hack of 9wm to give virtual screens
+COMMENT=	Hack of 9wm to give virtual screens
 
 WRKSRC=		${WRKDIR}/${DISTNAME}.orig
 
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	x11 xext
 
 MAN1=		w9wm.1