8 files changed, 19 insertions, 49 deletions

diff --git a/x11-clocks/asclock-xlib/Makefile b/x11-clocks/asclock-xlib/Makefile
index 61675a482569..3fd7b8b0dcc1 100644
--- a/x11-clocks/asclock-xlib/Makefile
+++ b/x11-clocks/asclock-xlib/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	asclock-xlib
-# Date created:		24 April 1999
-# Whom:			Jun Kuriyama <kuriyama@FreeBSD.org>
-#
+# Created by: Jun Kuriyama <kuriyama@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	asclock-xlib
 PORTVERSION=	2.0.11
@@ -19,7 +15,7 @@ MAKE_JOBS_UNSAFE=	yes
 
 WRKSRC=		${WRKDIR}/asclock-xlib
 USE_XORG=	xpm x11
-USE_IMAKE=	YES
+USES=		imake
 
 .if !defined(BATCH) && !defined(PACKAGE_BUILDING)
 IS_INTERACTIVE=	YES
diff --git a/x11-clocks/astzclock/Makefile b/x11-clocks/astzclock/Makefile
index 1a155e353305..bf6744064d07 100644
--- a/x11-clocks/astzclock/Makefile
+++ b/x11-clocks/astzclock/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   astzclock
-# Date created:        3 August 2004
-# Whom:                Greg Lewis <glewis@FreeBSD.org>
-#
+# Created by: Greg Lewis <glewis@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	astzclock
 PORTVERSION=	1.0
@@ -14,7 +10,7 @@ MASTER_SITES=	http://www.eyesbeyond.com/freebsddom/astzclock/
 MAINTAINER=	glewis@FreeBSD.org
 COMMENT=	Afterstep clock with some timezone extensions
 
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	xpm
 MAN1=		astzclock.1
 PLIST_FILES=	bin/astzclock
diff --git a/x11-clocks/emiclock/Makefile b/x11-clocks/emiclock/Makefile
index d966770ab91f..a6fff6e6399b 100644
--- a/x11-clocks/emiclock/Makefile
+++ b/x11-clocks/emiclock/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	EmiClock
-# Date created:		15 March 1995
-# Whom:			Nobuhiro Yasutomi
-#
+# Created by: Nobuhiro Yasutomi
 # $FreeBSD$
-#
 
 PORTNAME=	emiclock
 PORTVERSION=	2.0.2
@@ -14,7 +10,7 @@ MASTER_SITES=	http://ftp.vector.co.jp/pack/unix/personal/tokei/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Hyper-animated face analog clock for X11
 
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	ice sm x11 xaw xext xmu xpm xt
 MAN1=		emiclock.1
 
diff --git a/x11-clocks/tclock/Makefile b/x11-clocks/tclock/Makefile
index 5b85e53ec19d..62f61d364d0f 100644
--- a/x11-clocks/tclock/Makefile
+++ b/x11-clocks/tclock/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    tclock
-# Date created:		So   7 Feb 1999 20:50:43 MET
-# Whom:			Lars Koeller <lkoeller@cc.fh-lippe.de>
-#
+# Created by: Lars Koeller <lkoeller@cc.fh-lippe.de>
 # $FreeBSD$
-#
 
 PORTNAME=	tclock
 PORTVERSION=	1.0.1
@@ -17,7 +13,7 @@ MAINTAINER=	aehlig@linta.de
 COMMENT=	Transparent analog clock for x11
 
 NO_WRKSUBDIR=	yes
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	x11 xext
 MAN1=		tclock.1
 PLIST_FILES=	bin/tclock
diff --git a/x11-clocks/wmclock/Makefile b/x11-clocks/wmclock/Makefile
index 35f5fb844895..2a08cbf02da5 100644
--- a/x11-clocks/wmclock/Makefile
+++ b/x11-clocks/wmclock/Makefile
@@ -9,9 +9,9 @@ MASTER_SITES=	http://www.bluestop.org/wmclock/ \
 MASTER_SITE_SUBDIR=	distfiles
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A dockable clock applet for Window Maker
+COMMENT=	Dockable clock applet for Window Maker
 
-USE_IMAKE=	yes
+USES=		imake
 MAKE_JOBS_SAFE=	yes
 USE_XORG=	xpm
 MAN1=		wmclock.1
diff --git a/x11-clocks/wmtime/Makefile b/x11-clocks/wmtime/Makefile
index f1c648b052ee..a82c447915b5 100644
--- a/x11-clocks/wmtime/Makefile
+++ b/x11-clocks/wmtime/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   wmtime
-# Date created:        1 July 1998
-# Whom:                Rich Neswold <rneswold@mcs.net>
-#
+# Created by: Rich Neswold <rneswold@mcs.net>
 # $FreeBSD$
-#
 
 PORTNAME=	wmtime
 PORTVERSION=	1.0b2
@@ -18,7 +14,7 @@ COMMENT=	Time/Date applet for WindowMaker
 
 PLIST_FILES=	bin/wmtime
 WRKSRC=		${WRKDIR}/wmtime.app/wmtime
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	xpm
 
 post-extract:
diff --git a/x11-clocks/xalarm/Makefile b/x11-clocks/xalarm/Makefile
index 441ad46a0e9b..468ee12d0355 100644
--- a/x11-clocks/xalarm/Makefile
+++ b/x11-clocks/xalarm/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xalarm
-# Date created:		4 December 1996
-# Whom:			desmo@bandwidth.org
-#
+# Created by: desmo@bandwidth.org
 # $FreeBSD$
-#
 
 PORTNAME=	xalarm
 PORTVERSION=	3.06
@@ -13,17 +9,15 @@ MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	utilities
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	An X based alarm clock
+COMMENT=	X based alarm clock
 
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	ice sm x11 xaw xext xmu xpm xt
 IS_INTERACTIVE=	yes
 
-.include <bsd.port.pre.mk>
-
 MAN1=		xalarm.1 xmemo.1 xfortune.1 xyow.1
 
 pre-install:
 	(cd ${WRKSRC} ; ${CP} XAlarm.ad XAlarm-color.ad)
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-clocks/xtimer/Makefile b/x11-clocks/xtimer/Makefile
index e4405053f405..6e578c84a19f 100644
--- a/x11-clocks/xtimer/Makefile
+++ b/x11-clocks/xtimer/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xtimer
-# Date created:		19 May 2000
-# Whom:			candy@kgc.co.jp
-#
+# Created by: candy@kgc.co.jp
 # $FreeBSD$
-#
 
 PORTNAME=	xtimer
 PORTVERSION=	0.8089
@@ -13,9 +9,9 @@ MASTER_SITES=	http://www.bsddiary.net/xtimer/
 DISTNAME=	${PORTNAME}-8089
 
 MAINTAINER=	candy@kgc.co.jp
-COMMENT=	A simple digital timer for X11
+COMMENT=	Simple digital timer for X11
 
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	ice sm x11 xaw xext xmu xpm xt
 MAN1=		xtimer.1
 PLIST_FILES=	bin/xtimer