30 files changed, 63 insertions, 182 deletions

diff --git a/x11/emu/Makefile b/x11/emu/Makefile
index ba6dc3fcd647..77ee68ca75c1 100644
--- a/x11/emu/Makefile
+++ b/x11/emu/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	emu
-# Date created:		13 September 1994
-# Whom:			jkh
-#
+# Created by: jkh
 # $FreeBSD$
-#
 
 PORTNAME=	emu
 PORTVERSION=	1.31
@@ -13,14 +9,13 @@ MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	applications
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A terminal emulator for the X Window System
+COMMENT=	Terminal emulator for the X Window System
 
 BUILD_DEPENDS=	xrdb:${PORTSDIR}/x11/xrdb
 RUN_DEPENDS=	xrdb:${PORTSDIR}/x11/xrdb
 
-USE_IMAKE=	yes
+USES=		imake display
 USE_XORG=	ice sm x11 xaw xext xmu xpm xt
-USE_DISPLAY=	yes
 
 WRKSRC=		${WRKDIR}/emu
 
@@ -30,10 +25,6 @@ WRKSRC=		${WRKDIR}/emu
 BROKEN=		fails to build with new utmpx
 .endif
 
-.if (!defined(DISPLAY) || ${DISPLAY} == "") && !defined(PACKAGE_BUILDING)
-IGNORE=		requires an active X session (and DISPLAY variable) to run xrdb.  Please compile this while running X
-.endif
-
 MAN1=		emu.1
 
 pre-configure:
diff --git a/x11/kb2mb2/Makefile b/x11/kb2mb2/Makefile
index eefb4c745b44..3c18b0e86fac 100644
--- a/x11/kb2mb2/Makefile
+++ b/x11/kb2mb2/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	kb2mb2
-# Date created:		24 December 1997
-# Whom:			Tatsumi Hosokawa
-#
+# Created by: Tatsumi Hosokawa
 # $FreeBSD$
-#
 
 PORTNAME=	kb2mb2
 PORTVERSION=	1.0
@@ -15,7 +11,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Redirect any key to second mouse button
 
 PLIST_FILES=	bin/kb2mb2
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	x11 xext xtst
 
 .include <bsd.port.mk>
diff --git a/x11/mxico/Makefile b/x11/mxico/Makefile
index 422791339874..16c24a5afb18 100644
--- a/x11/mxico/Makefile
+++ b/x11/mxico/Makefile
@@ -1,9 +1,6 @@
-# New ports collection makefile for:    mxico
-# Date created:         25 October 2003
-# Whom:                 NAKATA, Maho <maho@FreeBSD.org>
-#
+# Created by: NAKATA, Maho <maho@FreeBSD.org>
 # $FreeBSD$
-#
+
 # NB: Do not delete or wrap post-install section, since we have to provide
 #     READMEj and README
 
@@ -16,7 +13,7 @@ MASTER_SITES=	http://people.freebsd.org/~maho/mxico/
 MAINTAINER=	maho@FreeBSD.org
 COMMENT=	Rotating Object on the screen (Zalgaller polyhedra)
 
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	x11 xext
 WRKSRC=		${WRKDIR}/${PORTNAME}
 MAN1=		mxico.1
diff --git a/x11/sxpc/Makefile b/x11/sxpc/Makefile
index 2e53e0bff912..161e291a8ddf 100644
--- a/x11/sxpc/Makefile
+++ b/x11/sxpc/Makefile
@@ -1,9 +1,5 @@
-# New ports collection Makefile for:	sxpc
-# Date created:		22nd March 1995
-# Whom:			jkh@FreeBSD.org
-#
+# Created by: jkh@FreeBSD.org
 # $FreeBSD$
-#
 
 PORTNAME=	sxpc
 PORTVERSION=	1.4
@@ -16,7 +12,7 @@ EXTRACT_SUFX=	.shar.Z
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The Simple X Protocol Compressor
 
-USE_IMAKE=	yes
+USES=		imake
 NO_WRKSUBDIR=	yes
 EXTRACT_CMD=		${GZIP_CMD}
 EXTRACT_BEFORE_ARGS=	-dc
diff --git a/x11/tycoon/Makefile b/x11/tycoon/Makefile
index a178ed2c51bb..73a900f2b247 100644
--- a/x11/tycoon/Makefile
+++ b/x11/tycoon/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	tycoon
-# Date created:		19 September 1997
-# Whom:			steve@farrell.org
-#
+# Created by: steve@farrell.org
 # $FreeBSD$
-#
 
 PORTNAME=	tycoon
 PORTVERSION=	1.07o
@@ -13,11 +9,11 @@ MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	X11/desktop
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A nifty set of desktop apps, including floating buttons
+COMMENT=	Nifty set of desktop apps, including floating buttons
 
 LIB_DEPENDS=	forms.2:${PORTSDIR}/x11-toolkits/xforms
 
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	xaw
 REINPLACE_ARGS=	-i ""
 
diff --git a/x11/xantfarm/Makefile b/x11/xantfarm/Makefile
index 0e8b20c257b2..c23d1b4e067b 100644
--- a/x11/xantfarm/Makefile
+++ b/x11/xantfarm/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xantfarm
-# Date created:		13 February 1997
-# Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
-#
+# Created by: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 # $FreeBSD$
-#
 
 PORTNAME=	xantfarm
 PORTVERSION=	1.16
@@ -16,7 +12,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Ant hill simulation on X11 root window
 
 WRKSRC=		${WRKDIR}/xantfarm
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	x11 xext xt
 MAN1=		xantfarm.1
 PLIST_FILES=	bin/xantfarm
diff --git a/x11/xbelld/Makefile b/x11/xbelld/Makefile
index 5bfb4cffb551..1491aafb2691 100644
--- a/x11/xbelld/Makefile
+++ b/x11/xbelld/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xbelld
-# Date created:				17 September 2004
-# Whom:					Nosov Artem <chip-set@mail.ru>
-#
+# Created by: Nosov Artem <chip-set@mail.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	xbelld
 PORTVERSION=	0.2b2
@@ -18,7 +14,7 @@ COMMENT=	XBellD is a small daemon for replacing the standard X terminal bell
 
 LIB_DEPENDS=	audiofile.0:${PORTSDIR}/audio/libaudiofile
 
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	ice sm xtrap xmu xt
 USE_GNOME=	esound
 
diff --git a/x11/xbrightness/Makefile b/x11/xbrightness/Makefile
index 5c822b1ef117..eaa493a33fae 100644
--- a/x11/xbrightness/Makefile
+++ b/x11/xbrightness/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xbrightness
-# Date Created:				30 January 2010
-# Whom:					Michiel Overtoom <motoom@xs4all.nl>
-#
+# Created by: Michiel Overtoom <motoom@xs4all.nl>
 # $FreeBSD$
-#
 
 PORTNAME=	xbrightness
 PORTVERSION=	0.3
@@ -14,7 +10,7 @@ MAINTAINER=	motoom@xs4all.nl
 COMMENT=	Brightness and gamma correction through the X server
 
 USE_XORG=	x11 xxf86vm ice xmu xt xaw
-USE_IMAKE=	yes
+USES=		imake
 
 PLIST_FILES=	bin/xbrightness
 
diff --git a/x11/xcmd/Makefile b/x11/xcmd/Makefile
index 2bdf8d2b32db..b31d68652079 100644
--- a/x11/xcmd/Makefile
+++ b/x11/xcmd/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   xcmd
-# Date created:        30 Jul 2001
-# Whom:                Oliver Breuninger <ob@breuninger.org>
-#
+# Created by: Oliver Breuninger <ob@breuninger.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xcmd
 PORTVERSION=	1.8
@@ -16,7 +12,7 @@ MASTER_SITE_SUBDIR=	X11/xutils
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Xcmd is a front-end for starting programs under X11
 
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	ice sm x11 xext xmu xt
 
 MANCOMPRESSED=	yes
diff --git a/x11/xco/Makefile b/x11/xco/Makefile
index bdfaaf903ac1..c04f60d6de7a 100644
--- a/x11/xco/Makefile
+++ b/x11/xco/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xco
-# Date created:		6 Jun 1997
-# Whom:			Satoshi TAOKA
-#
+# Created by: Satoshi TAOKA
 # $FreeBSD$
-#
 
 PORTNAME=	xco
 PORTVERSION=	1.3
@@ -14,7 +10,7 @@ DISTNAME=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Display X11 color names and colors
 
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	x11 xext
 MAN1=		xco.1
 MANCOMPRESSED=	yes
diff --git a/x11/xcolors/Makefile b/x11/xcolors/Makefile
index e3e409c72105..8c7afa8f9b85 100644
--- a/x11/xcolors/Makefile
+++ b/x11/xcolors/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xcolors
-# Date created:		10 May 1995
-# Whom:			asami
-#
+# Created by: asami
 # $FreeBSD$
-#
 
 PORTNAME=	xcolors
 PORTVERSION=	1.3
@@ -20,7 +16,7 @@ RUN_DEPENDS=	showrgb:${PORTSDIR}/x11/rgb
 
 WRKSRC=		${WRKDIR}/xcolors
 USE_XORG=	xaw xmu xt sm ice xpm xp xext x11
-USE_IMAKE=	yes
+USES=		imake
 MAN1=		xcolors.1
 
 .include <bsd.port.mk>
diff --git a/x11/xcolorsel/Makefile b/x11/xcolorsel/Makefile
index 2b4bcf6e8489..ae98028b093a 100644
--- a/x11/xcolorsel/Makefile
+++ b/x11/xcolorsel/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xcolorsel
-# Date Created:			11 November 1998
-# Whom:				Wayne Cuddy <wayne@crb-web.com>
-#
+# Created by: Wayne Cuddy <wayne@crb-web.com>
 # $FreeBSD$
-#
 
 PORTNAME=	xcolorsel
 PORTVERSION=	1.1a
@@ -20,7 +16,7 @@ LIB_DEPENDS=	Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
 RUN_DEPENDS=	rgb>=1.0.3:${PORTSDIR}/x11/rgb
 
 WRKSRC=		${WRKDIR}/xcolorsel
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	xpm
 
 .if !defined(NO_INSTALL_MANPAGES)
diff --git a/x11/xcut/Makefile b/x11/xcut/Makefile
index 629c750a6326..a92139807475 100644
--- a/x11/xcut/Makefile
+++ b/x11/xcut/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xcut
-# Date created:			23 September 1999
-# Whom:				Cy Schubert <Cy.Schubert@uumail.gov.bc.ca>
-#
+# Created by: Cy Schubert <Cy.Schubert@uumail.gov.bc.ca>
 # $FreeBSD$
-#
 
 PORTNAME=	xcut
 PORTVERSION=	0.2
@@ -16,7 +12,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-src/${PORTVERSION} \
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Manipulate X cut buffers from the commandline
 
-USE_IMAKE=	YES
+USES=		imake
 USE_XORG=	x11
 MAN1=		xcut.1
 PLIST_FILES=	bin/xcut
diff --git a/x11/xdtm/Makefile b/x11/xdtm/Makefile
index a1f154219d41..1926b46d8c33 100644
--- a/x11/xdtm/Makefile
+++ b/x11/xdtm/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Graphical shell for the X Window System
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_XORG=	xaw
-USE_IMAKE=	yes
+USES=		imake
 MAKE_JOBS_UNSAFE=	yes
 
 MAN1=		xdtm.1
diff --git a/x11/xfishtank/Makefile b/x11/xfishtank/Makefile
index c89b077401eb..c42d59a1e5af 100644
--- a/x11/xfishtank/Makefile
+++ b/x11/xfishtank/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   xfishtank
-# Date created:        24th April 1997
-# Whom:                jacs
-#
+# Created by: jacs
 # $FreeBSD$
-#
 
 PORTNAME=	xfishtank
 PORTVERSION=	2.2
@@ -15,7 +11,7 @@ MAINTAINER=	jacs@gnome.co.uk
 COMMENT=	Make fish swim in the background of your screen
 
 PLIST_FILES=	bin/xfishtank
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	x11 xext
 WRKSRC=		${WRKDIR}/xfishtank2.0
 
diff --git a/x11/xkbctrl/Makefile b/x11/xkbctrl/Makefile
index 18e3fc912a2e..21f015317430 100644
--- a/x11/xkbctrl/Makefile
+++ b/x11/xkbctrl/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xkbctrl
-# Date created:		9 January 2000
-# Whom:			Yoshiro MIHIRA <sanpei@sanpei.org>
-#
+# Created by: Yoshiro MIHIRA <sanpei@sanpei.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xkbctrl
 PORTVERSION=	1.0
@@ -18,7 +14,7 @@ COMMENT=	Display and manipulate XKB keyboard controls from the commandline
 
 DIST_SUBDIR=	xkbctrl
 PLIST_FILES=	bin/xkbctrl
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	x11 xkbfile
 NO_WRKSUBDIR=	yes
 
diff --git a/x11/xkeycaps/Makefile b/x11/xkeycaps/Makefile
index a81ca4057327..fb5db84662b5 100644
--- a/x11/xkeycaps/Makefile
+++ b/x11/xkeycaps/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    xkeycaps
-# Date created:         12 February 1995
-# Whom:                 jmz
-#
+# Created by: jmz
 # $FreeBSD$
-#
 
 PORTNAME=	xkeycaps
 PORTVERSION=	2.46
@@ -15,7 +11,7 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphically display and edit the keyboard mapping
 
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	xbitmaps xaw
 MAN1=		xkeycaps.1
 PLIST_FILES=	bin/xkeycaps
diff --git a/x11/xlupe/Makefile b/x11/xlupe/Makefile
index 0ce34d194e26..a926eb1a438c 100644
--- a/x11/xlupe/Makefile
+++ b/x11/xlupe/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xlupe
-# Date created:		17 Apr 1999
-# Whom:			runge@rostock.zgdv.de
-#
+# Created by: runge@rostock.zgdv.de
 # $FreeBSD$
-#
 
 PORTNAME=	xlupe
 PORTVERSION=	1.1
@@ -14,7 +10,7 @@ MASTER_SITES=	http://coto.marsrakete.de/projects/xlupe/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Magnifying glass for X. like xmag but with continously updates
 
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	xaw
 
 PLIST_FILES=	bin/xlupe
diff --git a/x11/xmascot/Makefile b/x11/xmascot/Makefile
index 0ffe4a230eed..530e5717eaea 100644
--- a/x11/xmascot/Makefile
+++ b/x11/xmascot/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xmascot
-# Date created:		20 November 1996
-# Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
-#
+# Created by: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 # $FreeBSD$
-#
 
 PORTNAME=	xmascot
 PORTVERSION=	2.6a
@@ -15,7 +11,7 @@ DISTNAME=	${PORTNAME}${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Moving mascot on your X11 screen
 
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	ice sm x11 xaw xext xmu xpm xt
 MAN1=		xmascot.1
 
diff --git a/x11/xmon/Makefile b/x11/xmon/Makefile
index 6a386cd2194e..5493ead47d79 100644
--- a/x11/xmon/Makefile
+++ b/x11/xmon/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    xmon
-# Date created:         27 December 2001
-# Whom:                 Bruce M Simpson <bms@spc.org>
-#
+# Created by: Bruce M Simpson <bms@spc.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xmon
 PORTVERSION=	1.5.6
@@ -17,7 +13,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Raw X11 protocol analyser
 
 WRKSRC=		${WRKDIR}/xmon.${PORTVERSION}
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	ice sm x11 xaw xext xmu xt
 
 MAN1=		xmon.1 xmond.1 xmonui.1
diff --git a/x11/xmove/Makefile b/x11/xmove/Makefile
index 192da732e44f..f6c9048d2147 100644
--- a/x11/xmove/Makefile
+++ b/x11/xmove/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   xmove
-# Date created:        16 Jan 1997
-# Whom:                Stefan Zehl <sec@42.org>
-#
+# Created by: Stefan Zehl <sec@42.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xmove
 PORTVERSION=	2.0b2
@@ -17,7 +13,7 @@ COMMENT=	Pseudoserver to support mobile X11 clients
 
 WRKSRC=		${WRKDIR}/xmove
 
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	x11
 
 MAN1=		xmove.1 xmovectrl.1
diff --git a/x11/xmsg/Makefile b/x11/xmsg/Makefile
index a9da63966c2b..5c23e8d5b029 100644
--- a/x11/xmsg/Makefile
+++ b/x11/xmsg/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   xmsg
-# Date created:        21 September 1999
-# Whom:                jsellens
-#
+# Created by: jsellens
 # $FreeBSD$
-#
 
 PORTNAME=	xmsg
 PORTVERSION=	1.1
@@ -17,7 +13,7 @@ COMMENT=	The X11R4 version of xmessage updated for X11R5 and renamed
 MAN1=		xmsg.1
 MANCOMPRESSED=	yes
 PLIST_FILES=	bin/xmsg
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	x11 xext xaw xmu xt sm ice
 
 .include <bsd.port.mk>
diff --git a/x11/xrsh/Makefile b/x11/xrsh/Makefile
index 2ca9677a6a10..f6c923e093ec 100644
--- a/x11/xrsh/Makefile
+++ b/x11/xrsh/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xrsh
-# Date created: 	30 May 2004
-# Whom:			KIMURA Yasuhiro <yasu@utahime.org>
-#
+# Created by: KIMURA Yasuhiro <yasu@utahime.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xrsh
 PORTVERSION=	5.92
@@ -16,7 +12,7 @@ EXTRACT_SUFX=	.shar
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Launcher which starts an X program on a remote machine
 
-USE_IMAKE=	yes
+USES=		imake
 NO_WRKSUBDIR=	yes
 EXTRACT_CMD=	${SH}
 EXTRACT_BEFORE_ARGS=
diff --git a/x11/xskyroot/Makefile b/x11/xskyroot/Makefile
index 626cf2bf17cd..a24f3574f837 100644
--- a/x11/xskyroot/Makefile
+++ b/x11/xskyroot/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xskyroot
-# Date created:		20 April 1997
-# Whom:			nkazushi@highway.or.jp
-#
+# Created by: nkazushi@highway.or.jp
 # $FreeBSD$
-#
 
 PORTNAME=	xskyroot
 PORTVERSION=	920428
@@ -21,7 +17,7 @@ EXTRACT_AFTER_ARGS=	| ${SED} -e "/^...bin.sh/,/exit 0/!d" | ${SH}
 
 DIST_SUBDIR=	${PORTNAME}
 NO_WRKSUBDIR=	yes
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	x11
 NO_INSTALL_MANPAGES=	yes
 PLIST_FILES=	bin/xskyroot
diff --git a/x11/xsnow/Makefile b/x11/xsnow/Makefile
index 0d16741506d5..554961623ad1 100644
--- a/x11/xsnow/Makefile
+++ b/x11/xsnow/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    xsnow
-# Date created:         12 November 1994
-# Whom:                 jmz
-#
+# Created by: jmz
 # $FreeBSD$
-#
 
 PORTNAME=	xsnow
 PORTVERSION=	1.42
@@ -14,7 +10,7 @@ MASTER_SITES=	http://dropmix.xs4all.nl/rick/Xsnow/
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Create a snowy and Santa-y desktop
 
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	xpm
 MAN6=		xsnow.6
 PLIST_FILES=	bin/xsnow
diff --git a/x11/xtacy/Makefile b/x11/xtacy/Makefile
index a68424635ac0..b326530e1b24 100644
--- a/x11/xtacy/Makefile
+++ b/x11/xtacy/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    xtacy
-# Date created:         25 July 1996
-# Whom:                 matt@bdd.net
-#
+# Created by: matt@bdd.net
 # $FreeBSD$
-#
 
 PORTNAME=	xtacy
 PORTVERSION=	1.14
@@ -15,9 +11,9 @@ MASTER_SITE_SUBDIR=	apps/graphics/hacks/X
 DISTNAME=	${PORTNAME}114
 
 MAINTAINER=	matt@bdd.net
-COMMENT=	An X11 trippy color-cycling toy
+COMMENT=	X11 trippy color-cycling toy
 
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	x11 xext
 MAN1=		xtacy.1
 PLIST_FILES=	bin/xtacy
diff --git a/x11/xtestpicture/Makefile b/x11/xtestpicture/Makefile
index 1d2a8b8085dc..a902fb0a11b6 100644
--- a/x11/xtestpicture/Makefile
+++ b/x11/xtestpicture/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    xtestpicture
-# Date created:         11 March 1997
-# Whom:                 joerg
-#
+# Created by: joerg
 # $FreeBSD$
-#
 
 PORTNAME=	xtestpicture
 PORTVERSION=	1.2
@@ -14,7 +10,7 @@ MASTER_SITES=	ftp://ftp.interface-business.de/pub/outgoing/
 MAINTAINER=	joerg@FreeBSD.org
 COMMENT=	Create a full-screen image to adjust your monitor
 
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	x11 xext
 MAN1=		xtestpicture.1
 PLIST_FILES=	bin/xtestpicture
diff --git a/x11/xtoolwait/Makefile b/x11/xtoolwait/Makefile
index 37d571dd2693..7c9aba4c6a80 100644
--- a/x11/xtoolwait/Makefile
+++ b/x11/xtoolwait/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xtoolwait
-# Date created:		31 May 1997
-# Whom:			jonny
-#
+# Created by: jonny
 # $FreeBSD$
-#
 
 PORTNAME=	xtoolwait
 PORTVERSION=	1.3
@@ -15,7 +11,7 @@ MASTER_SITE_SUBDIR=	utilities
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool startup utility for X11
 
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	x11 xext
 MAN1=		xtoolwait.1
 PLIST_FILES=	bin/xtoolwait
diff --git a/x11/xwatchwin/Makefile b/x11/xwatchwin/Makefile
index b4e43deccabd..b49597e609d6 100644
--- a/x11/xwatchwin/Makefile
+++ b/x11/xwatchwin/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	xwatchwin
-# Date created:		1 Sep 2000
-# Whom:			Kris Kennaway <kris@FreeBSD.org>
-#
+# Created by: Kris Kennaway <kris@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	xwatchwin
@@ -19,7 +16,7 @@ COMMENT=	Watch a window on another X server
 MAN1=		xwatchwin.1
 PLIST_FILES=	bin/xwatchwin
 
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	x11 xext
 
 .include <bsd.port.mk>
diff --git a/x11/xzoom/Makefile b/x11/xzoom/Makefile
index 8b3f4d81d095..eb655c0f2f90 100644
--- a/x11/xzoom/Makefile
+++ b/x11/xzoom/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   xzoom
-# Date created:        30 June 1997
-# Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
-#
+# Created by: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 # $FreeBSD$
-#
 
 PORTNAME=	xzoom
 PORTVERSION=	0.3
@@ -16,7 +12,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Magnify, rotate, mirror the image on the X screen
 
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	x11 xext
 MAN1=		xzoom.1
 PLIST_FILES=	bin/xzoom