Convert from USE_MOTIF to USES=motif

While here:
- Trim headers
- Convert USE_GMAKE to USES=gmake
- Remove indefinite article from comment

31 files changed, 55 insertions, 134 deletions

diff --git a/java/openjdk6/Makefile b/java/openjdk6/Makefile
index 22467707432f..e17fcccd7687 100644
--- a/java/openjdk6/Makefile
+++ b/java/openjdk6/Makefile
@@ -131,13 +131,13 @@ FASTDEBUG_DESC=	Include fastdebug build
 TEST_DESC=	Add support for running regression test
 .endif
 
+USES=		gmake motif
+
 .include <bsd.port.options.mk>
 
 # java extracts directly to the cwd
 WRKSRC=		${WRKDIR}
 
-USE_GMAKE=	yes
-USE_MOTIF=	yes
 USE_XORG=	x11 xext xi xt xtst
 
 JAXP_BUILD=	144_05
diff --git a/lang/elk/Makefile b/lang/elk/Makefile
index 26dbc1a2fd66..37258f84d430 100644
--- a/lang/elk/Makefile
+++ b/lang/elk/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	elk
-# Date created:		08 March 1995
-# Whom:			Thomas Gellekum <tg@FreeBSD.org>
-#
+# Created by: Thomas Gellekum <tg@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	elk
 PORTVERSION=	3.99.8
@@ -11,13 +7,13 @@ CATEGORIES=	lang scheme
 MASTER_SITES=	http://sam.zoy.org/elk/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	An embeddable Scheme interpreter
+COMMENT=	Embeddable Scheme interpreter
 
 LIB_DEPENDS=	gdbm.4:${PORTSDIR}/databases/gdbm \
 		elf.0:${PORTSDIR}/devel/libelf
 
+USES=		motif
 USE_BZIP2=	yes
-USE_MOTIF=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=	yes
diff --git a/lang/xds-c/Makefile b/lang/xds-c/Makefile
index 6ceaf19fd66c..e516f770d26b 100644
--- a/lang/xds-c/Makefile
+++ b/lang/xds-c/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xds-c
-# Date created:		29 January 2007
-# Whom:			coumarin@gmail.com
-#
+# Created by: coumarin@gmail.com
 # $FreeBSD$
-#
 
 PORTNAME=	xds-c
 PORTVERSION=	2.51
@@ -20,9 +16,8 @@ RESTRICTED=	Excelsior forbids any redistribution
 
 ONLY_FOR_ARCHS=	i386
 ONLY_FOR_ARCHS_REASON=	uses assembly code
+USES=		gmake motif
 USE_LINUX=	yes
-USE_GMAKE=	yes
-USE_MOTIF=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 BUILD_WRKSRC=	${WRKSRC}/lib/C
 
diff --git a/mail/ml/Makefile b/mail/ml/Makefile
index 7202d7e946fa..a3223c29f7da 100644
--- a/mail/ml/Makefile
+++ b/mail/ml/Makefile
@@ -11,9 +11,8 @@ MAINTAINER=	mjl@luckie.org.nz
 COMMENT=	X11 IMAP client
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
-USES=		imake
+USES=		imake motif
 USE_XORG=	ice sm x11 xext xmu xp xt
-USE_MOTIF=	yes
 
 pre-configure:
 	@${ECHO_MSG} "===>  Building c-client"
diff --git a/math/grace/Makefile b/math/grace/Makefile
index 28e58780ebf1..c0260b768779 100644
--- a/math/grace/Makefile
+++ b/math/grace/Makefile
@@ -26,9 +26,8 @@ OPTIONS_DEFAULT=FFTW NETCDF PDF XMHTML
 PDF_DESC=	PDF output
 XMHTML_DESC=	Use XmHTML widget for on-line help
 
-USE_MOTIF=	yes
 USE_GCC=	any
-USE_GMAKE=	yes
+USES=		gmake motif
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-grace-home=${DATADIR} \
 		--with-extra-incpath=${LOCALBASE}/include \
diff --git a/math/ngraph/Makefile b/math/ngraph/Makefile
index 24a0c6dba540..6ae81069d8c6 100644
--- a/math/ngraph/Makefile
+++ b/math/ngraph/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: ngraph
-# Date created:         18 Aug 1999
-# Whom:                 nobu@rd.isac.co.jp
-#
+# Created by: nobu@rd.isac.co.jp
 # $FreeBSD$
-#
 
 PORTNAME=	ngraph
 PORTVERSION=	6.3.51
@@ -16,7 +12,6 @@ DISTNAME=	Ngraph-${PORTVERSION}-src
 MAINTAINER=	sanpei@FreeBSD.org
 COMMENT=	XY plotting tool for students, scientists, and engineers
 
-USE_MOTIF=	yes
-USE_GMAKE=	yes
+USES=		make motif
 
 .include <bsd.port.mk>
diff --git a/math/oleo/Makefile b/math/oleo/Makefile
index b404e286f9a8..2717e294d515 100644
--- a/math/oleo/Makefile
+++ b/math/oleo/Makefile
@@ -29,7 +29,7 @@ OPTIONS_DEFINE=	MOTIF NLS
 LIB_DEPENDS+=	plot:${PORTSDIR}/graphics/plotutils \
 		Xbae:${PORTSDIR}/x11-toolkits/xbae \
 		XmHTML:${PORTSDIR}/x11-toolkits/xmhtml
-USE_MOTIF=	yes
+USES+=		motif
 CONFIGURE_ARGS+=	--with-motif
 .else
 USE_XORG=	xt ice sm
diff --git a/misc/floatator/Makefile b/misc/floatator/Makefile
index d719585f5bb1..bead9abe7af8 100644
--- a/misc/floatator/Makefile
+++ b/misc/floatator/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Interactive fluid dynamics simulation
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 PORTCOUT=	skipv:0.9.1
-USE_MOTIF=	yes
+USES=		motif
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS} -DNDEBUG" \
 		X11INCLUDE="-I${LOCALBASE}/include" X11LIB="-L${LOCALBASE}/lib"
 PLIST_FILES=	bin/floatator bin/floatator_X_interface
diff --git a/misc/xtar/Makefile b/misc/xtar/Makefile
index 7fa3756179c3..0c0ba9c43fac 100644
--- a/misc/xtar/Makefile
+++ b/misc/xtar/Makefile
@@ -11,8 +11,7 @@ MASTER_SITE_SUBDIR=	utilities
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	View and manipulate contents of a tar file
 
-USES=		imake
-USE_MOTIF=	yes
+USES=		imake motif
 USE_XORG=	ice sm x11 xext xp xt
 MAKE_ARGS=	XMLIB="${MOTIFLIB}"
 MAN1=		xtar.1
diff --git a/multimedia/mpeg2play/Makefile b/multimedia/mpeg2play/Makefile
index 12a62ce63234..fefc9f37a504 100644
--- a/multimedia/mpeg2play/Makefile
+++ b/multimedia/mpeg2play/Makefile
@@ -10,9 +10,8 @@ MASTER_SITES=	ftp://ftp.funet.fi/pub/graphics/packages/mpeg/mpeg2play/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Program to play mpeg-2 movies on X displays
 
-USES=		imake
+USES=		imake motif
 USE_XORG=	x11 xext xp xt
-USE_MOTIF=	yes
 ALL_TARGET=	mpeg2play
 
 .include <bsd.port.options.mk>
diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile
index d58a65c3aaec..f057d9529a90 100644
--- a/multimedia/xawtv/Makefile
+++ b/multimedia/xawtv/Makefile
@@ -21,10 +21,9 @@ OPTIONS_DEFINE_i386=	MMX
 OPTIONS_DEFAULT=	AALIB
 ZVBI_DESC=	Enable libzvbi support
 
+USES=		gmake motif
 USE_BZIP2=	yes
-USE_MOTIF=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_XORG=	x11 xaw
 CONFIGURE_ENV=	LIBS="-L${PREFIX}/lib -L${LOCALBASE}/lib"
diff --git a/net/tcpillust/Makefile b/net/tcpillust/Makefile
index b9075f17acbb..91199308460a 100644
--- a/net/tcpillust/Makefile
+++ b/net/tcpillust/Makefile
@@ -9,12 +9,12 @@ CATEGORIES=	net tcl tk
 MASTER_SITES=	http://www.jp.nishida.org/tcpillust/
 
 MAINTAINER=	nishida@sfc.wide.ad.jp
-COMMENT=	A graphical TCP connection analysis tool
+COMMENT=	Graphical TCP connection analysis tool
 
+USES=		motif
 USE_TCL=	yes
 USE_TK=		yes
 USE_XORG=	xt
-USE_MOTIF=	yes
 
 MAN1=		tcpillust.1
 PORTDOCS=	tcpclient.log tcpserver.log
diff --git a/net/tcpview/Makefile b/net/tcpview/Makefile
index cc008302b6bc..ea76cb66ebe9 100644
--- a/net/tcpview/Makefile
+++ b/net/tcpview/Makefile
@@ -9,10 +9,9 @@ MASTER_SITES=	ftp://ftp.cac.washington.edu/pub/noc-tools/tcpview/
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	cy@FreeBSD.org
-COMMENT=	A Motif-based TCP/IP protocol analyzer
+COMMENT=	Motif-based TCP/IP protocol analyzer
 
-USES=		bison
-USE_MOTIF=	yes
+USES=		bison motif
 
 MAN1=		tcpview.1
 
diff --git a/print/tex-xdvik/Makefile b/print/tex-xdvik/Makefile
index 7dcee076fba0..0de8c05afcdc 100644
--- a/print/tex-xdvik/Makefile
+++ b/print/tex-xdvik/Makefile
@@ -14,12 +14,10 @@ COMMENT=	DVI Previewer(kpathsearch) for X
 LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2 \
 		paper:${PORTSDIR}/print/libpaper
 
+USES=		iconv gmake motif
 USE_TEX=	texlive web2c kpathsea texmf texhash
 TEXHASHDIRS=	${TEXMFDIR}
-USE_MOTIF=	yes
-USE_GMAKE=	yes
 USE_XORG=	ice sm x11 xmu xpm xt
-USES=		iconv
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/xdvik
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared \
diff --git a/print/xmbibtex/Makefile b/print/xmbibtex/Makefile
index 5a5b23cd9f65..951489a96ace 100644
--- a/print/xmbibtex/Makefile
+++ b/print/xmbibtex/Makefile
@@ -13,8 +13,7 @@ COMMENT=	Reference manager based on the BibTeX file format
 
 WRKSRC_SUBDIR=	src
 
-USES=		imake
-USE_MOTIF=	yes
+USES=		imake motif
 USE_XORG=	ice sm x11 xext xmu xp xt xpm
 NO_INSTALL_MANPAGES=	yes
 
diff --git a/russian/xruskb/Makefile b/russian/xruskb/Makefile
index 1a78568512f5..56eaf12ad178 100644
--- a/russian/xruskb/Makefile
+++ b/russian/xruskb/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xruskb
-# Date created:		14 Jan 1998
-# Whom:			Igor Vinokurov <igor@zynaps.ru>
-#
+# Created by: Igor Vinokurov <igor@zynaps.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	xruskb
 PORTVERSION=	1.15.4
@@ -12,7 +8,7 @@ CATEGORIES=	russian x11
 MASTER_SITES=	ftp://ftp.yars.free.net/pub/source/xruskb/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A keyboard layout switcher and indicator
+COMMENT=	Keyboard layout switcher and indicator
 
 USE_XORG=	x11 ice xt xmu
 USE_BZIP2=	YES
@@ -25,14 +21,11 @@ DOCS=		FAQ NEWS README* TODO xrus.doc-*
 OPTIONS_DEFINE=	MOTIF DOCS
 MOTIF_DESC=	Support for pixmaps in indicator icon
 
-.include <bsd.port.options.mk>
+MOTIF_USES=	motif
+MOTIF_CONFIGURE_ON=	--with-toolkit=motif
+MOTIF_CONFIGURE_OFF=	--with-toolkit=none
 
-.if ${PORT_OPTIONS:MMOTIF}
-USE_MOTIF=	yes
-CONFIGURE_ARGS+=	--with-toolkit=motif
-.else
-CONFIGURE_ARGS+=	--with-toolkit=none
-.endif
+.include <bsd.port.options.mk>
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/Xrus.ad ${PREFIX}/lib/X11/app-defaults/Xrus
diff --git a/science/afni/Makefile b/science/afni/Makefile
index e490f4aee4ee..dc4605b41efe 100644
--- a/science/afni/Makefile
+++ b/science/afni/Makefile
@@ -23,8 +23,7 @@ EXTRACT_ONLY=	afni_src.tgz CA_EZ_v1.5-July3107.tgz
 MAINTAINER=	jwbacon@tds.net
 COMMENT=	Advanced Functional Neuro Imaging
 
-LIB_DEPENDS=	Xm:${PORTSDIR}/x11-toolkits/open-motif \
-		R:${PORTSDIR}/math/R \
+LIB_DEPENDS=	R:${PORTSDIR}/math/R \
 		gsl:${PORTSDIR}/math/gsl
 RUN_DEPENDS=	cjpeg:${PORTSDIR}/graphics/jpeg \
 		mpeg_encode:${PORTSDIR}/multimedia/mpeg_encode \
@@ -32,6 +31,8 @@ RUN_DEPENDS=	cjpeg:${PORTSDIR}/graphics/jpeg \
 		ppmtogif:${PORTSDIR}/graphics/netpbm \
 		endian:${PORTSDIR}/sysutils/endian
 
+USES=		gettext iconv gmake motif
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "sparc64"
@@ -40,9 +41,6 @@ BROKEN=	Does not compile on sparc64: "undefined reference to '_mcount'"
 
 USE_GL=		glw glu
 USE_XORG=	xi
-USE_GMAKE=	yes
-USES=		gettext iconv
-USE_MOTIF=	yes
 MAKE_ENV=	CC="${CC}"
 MAKE_JOBS_UNSAFE=yes
 
diff --git a/science/felt/Makefile b/science/felt/Makefile
index 469fbcf6b48e..ef0562f7ae3c 100644
--- a/science/felt/Makefile
+++ b/science/felt/Makefile
@@ -16,8 +16,8 @@ OPTIONS_DEFINE=	DOCS EXAMPLES
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
+USES=		motif
 USE_BZIP2=	yes
-USE_MOTIF=	yes
 USE_GL=		glu glw
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix="${PREFIX}" \
diff --git a/science/xmakemol/Makefile b/science/xmakemol/Makefile
index 32dda8928c72..f937d825376e 100644
--- a/science/xmakemol/Makefile
+++ b/science/xmakemol/Makefile
@@ -1,8 +1,5 @@
-# New ports collection makefile for: xmakemol
-# Date created:	8 June, 2001
-# Whom:		Chi
+# Created by: Chi
 # $FreeBSD$
-#
 
 PORTNAME=	xmakemol
 PORTVERSION=	5.16
@@ -13,10 +10,9 @@ MASTER_SITES=	SAVANNAH
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Molecule Viewer Program Based on Motif Widget
 
+USES=		gmake motif
 USE_XORG=	xpm
 USE_GL=		glut glw
-USE_MOTIF=	yes
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
 MAN1=		xmakemol.1
diff --git a/sysutils/graphicboot/Makefile b/sysutils/graphicboot/Makefile
index c8c412b8c92e..9d19234e3d10 100644
--- a/sysutils/graphicboot/Makefile
+++ b/sysutils/graphicboot/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	graphicboot
-# Date created:		8 July 2005
-# Whom:			Matthew Holder <sixxgate@hotmail.com>
-#
+# Created by: Matthew Holder <sixxgate@hotmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	graphicboot
 PORTVERSION=	1.1
@@ -19,10 +15,9 @@ BUILD_DEPENDS=	xloadimage:${PORTSDIR}/x11/xloadimage \
 		xsetroot:${PORTSDIR}/x11/xsetroot
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USE_MOTIF=	yes
+USES=		motif gmake
 USE_BZIP2=	yes
 USE_XORG=	x11
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
 MAN8=		graphicboot.8 sendgbmsg.8
diff --git a/sysutils/mmore/Makefile b/sysutils/mmore/Makefile
index a00a95ab8998..c4b1335bf0be 100644
--- a/sysutils/mmore/Makefile
+++ b/sysutils/mmore/Makefile
@@ -10,8 +10,7 @@ MASTER_SITES=	http://matt.sixxgate.com/files/
 MAINTAINER=	sixxgate@hotmail.com
 COMMENT=	Motif/X file/stream viewer
 
-USES=		imake
-USE_MOTIF=	yes
+USES=		imake motif
 USE_BZIP2=	yes
 USE_XORG=	x11 xmu xt
 MAN1=		mmore.1
diff --git a/textproc/mgdiff/Makefile b/textproc/mgdiff/Makefile
index 93caf2c6d581..45ec040f0351 100644
--- a/textproc/mgdiff/Makefile
+++ b/textproc/mgdiff/Makefile
@@ -12,8 +12,7 @@ DISTNAME=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphical front end to the Unix diff command
 
-USES=		imake
-USE_MOTIF=	yes
+USES=		imake motif
 USE_XORG=	ice sm x11 xext xmu xp xt
 MAN1=		mgdiff.1
 
diff --git a/x11-fm/xplore/Makefile b/x11-fm/xplore/Makefile
index 34aa3b409deb..548907e91986 100644
--- a/x11-fm/xplore/Makefile
+++ b/x11-fm/xplore/Makefile
@@ -12,9 +12,8 @@ COMMENT=	Yet another Motif file manager
 
 LICENSE=	GPLv2
 
-USES=		imake
+USES=		imake motif
 USE_GCC=	any
-USE_MOTIF=	yes
 USE_XORG=	xpm
 MAKE_JOBS_UNSAFE=yes
 CFLAGS+=	-Wno-return-type
diff --git a/x11-toolkits/SoXt/Makefile b/x11-toolkits/SoXt/Makefile
index c6a4167dda4b..db036ce0e802 100644
--- a/x11-toolkits/SoXt/Makefile
+++ b/x11-toolkits/SoXt/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	SoXt
-# Date created:				24 April 2003
-# Whom:					roland.jesse@gmx.net
-#
+# Created by: roland.jesse@gmx.net
 # $FreeBSD$
-#
 
 PORTNAME=	SoXt
 PORTVERSION=	1.3.0
@@ -16,14 +12,13 @@ COMMENT=	GUI binding for using Open Inventor with Xt/Motif
 
 LIB_DEPENDS=	Coin.61:${PORTSDIR}/graphics/Coin
 
+USES=		motif pathfix
 USE_GL=		yes
-USE_MOTIF=	yes
 USE_PERL5_BUILD=	yes
 USE_XORG=	xi
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	LIBS="${PTHREAD_LIBS}"
 CONFIGURE_ARGS+=	--with-pthread=yes --with-coin=${LOCALBASE}
-USES=	pathfix
 # avoid renaming of soxt-config and soxt-config.1
 USE_LDCONFIG=	yes
 MAN1=		soxt-config.1
diff --git a/x11-toolkits/movingmotif/Makefile b/x11-toolkits/movingmotif/Makefile
index 0c4efb8c9fb1..8106b5a14c44 100644
--- a/x11-toolkits/movingmotif/Makefile
+++ b/x11-toolkits/movingmotif/Makefile
@@ -1,8 +1,4 @@
-# ex:ts=8
-# Ports collection makefile for:	movingmotif
-# Date created:			Sep 13, 2002
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
 
 PORTNAME=	movingmotif
@@ -14,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}_2_1/movingmotiv-2.3.1
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	Display scientific data as dynamic plot
 
-USE_MOTIF=	yes
+USES=		motif
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 
diff --git a/x11-toolkits/open-motif/Makefile b/x11-toolkits/open-motif/Makefile
index afc3181b5bd1..d260a550d6d5 100644
--- a/x11-toolkits/open-motif/Makefile
+++ b/x11-toolkits/open-motif/Makefile
@@ -23,9 +23,8 @@ CONFLICTS=	lesstif-[0-9]*
 # WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 WRKSRC=		${WRKDIR}/motif-${PORTVERSION}
 
-USES=		iconv
+USES=		iconv gmake
 USE_AUTOTOOLS=	libtool autoconf:env automake:env
-USE_GMAKE=	yes
 USE_XORG=	xaw xbitmaps xft
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
@@ -35,10 +34,6 @@ USE_CSTD=	gnu89
 
 DEMOS_SRC=	${WRKSRC}/demos/programs
 
-.ifdef USE_MOTIF
-.error You have `USE_MOTIF' variable defined either in environment or in make(1) arguments. Please undefine and try again.
-.endif
-
 .if defined(WITH_JDK_PATCH)
 
 PKGNAMESUFFIX=	-jdk
diff --git a/x11-toolkits/viewklass/Makefile b/x11-toolkits/viewklass/Makefile
index 5291d345e5b0..08c3c8938613 100644
--- a/x11-toolkits/viewklass/Makefile
+++ b/x11-toolkits/viewklass/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for:	viewklass
-# Date created:			Jun 4, 2002
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	viewklass
 PORTVERSION=	0.7.2
@@ -18,7 +13,7 @@ COMMENT=	C++ Framework for Motif
 
 BUILD_DEPENDS=	imake:${PORTSDIR}/devel/imake
 
-USE_MOTIF=	yes
+USES=		motif
 GNU_CONFIGURE=	yes
 
 post-patch:
diff --git a/x11-toolkits/xbae/Makefile b/x11-toolkits/xbae/Makefile
index 89363bef9db3..c36c2adf74b1 100644
--- a/x11-toolkits/xbae/Makefile
+++ b/x11-toolkits/xbae/Makefile
@@ -1,11 +1,5 @@
-# New ports collection makefile for:	Xbae
-# Date created:		11 December 96
-# Whom:			Lars Koeller <Lars.Koeller@Uni-Bielefeld.de>
-# With some
-# modifications from:	Andreas Klemm <andreas@FreeBSD.ORG>
-#
+# Created by: Lars Koeller <Lars.Koeller@Uni-Bielefeld.de>
 # $FreeBSD$
-#
 
 PORTNAME=	Xbae
 PORTVERSION=	4.60.4
@@ -15,11 +9,11 @@ MASTER_SITES=	SF
 DISTNAME=	xbae-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A Motif-based widget which displays a grid of cells as a spreadsheet
+COMMENT=	Motif-based widget which displays a grid of cells as a spreadsheet
 
+USES=		motif
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
-USE_MOTIF=	yes
 CONFIGURE_ARGS=--enable-production --enable-static
 
 MAN3=		XbaeCaption.3 XbaeInput.3 XbaeMatrix.3
diff --git a/x11-toolkits/xmhtml/Makefile b/x11-toolkits/xmhtml/Makefile
index 541322ac14b1..67cfaae1d860 100644
--- a/x11-toolkits/xmhtml/Makefile
+++ b/x11-toolkits/xmhtml/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xmhtml
-# Date created:		18 Feb 1999
-# Whom:			Peter Hawkins <thepish@freebsd.org>
-#
+# Created by: Peter Hawkins <thepish@freebsd.org>
 # $FreeBSD$
-#
 
 PORTNAME=	XmHTML
 PORTVERSION=	1.1.7
@@ -12,14 +8,13 @@ CATEGORIES=	x11-toolkits www
 MASTER_SITES=	${MASTER_SITE_NETBSD}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A Motif widget set for displaying HTML 3.2 documents
+COMMENT=	Motif widget set for displaying HTML 3.2 documents
 
 LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 		jpeg.11:${PORTSDIR}/graphics/jpeg
 
+USES=		gmake motif
 USE_AUTOTOOLS=	libtool:env
-USE_MOTIF=	yes
-USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_XORG=	xmu
 CFLAGS+=	-I${LOCALBASE}/include/libpng15
diff --git a/x11/xforward/Makefile b/x11/xforward/Makefile
index c6edaac0598a..12d1c1f57150 100644
--- a/x11/xforward/Makefile
+++ b/x11/xforward/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xforward
-# Date created:			27 April 2012
-# Whom:				Cy Schubert <cy@FreeBSD.org>
-#
+# Created by: Cy Schubert <cy@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xforward
 PORTVERSION=	1.0
@@ -21,7 +17,7 @@ LICENSE_FILE=	${WRKSRC}/NOTICE
 
 MAKE_ARGS+=	PREFIX=${PREFIX} LOCALBASE=${LOCALBASE}
 USE_XORG=	x11 xt xaw
-USE_MOTIF=	yes
+USES=		motif
 MAN1=		xforward.1
 PLIST_FILES=	bin/xforward
 
diff --git a/x11/xmotd/Makefile b/x11/xmotd/Makefile
index 87dbef6bf9b9..ce642e066104 100644
--- a/x11/xmotd/Makefile
+++ b/x11/xmotd/Makefile
@@ -21,7 +21,6 @@ PLIST_FILES=	bin/xmotd
 OPTIONS_DEFINE=	HTML MOTIF XPM
 HTML_DESC=	Use HTML widget instead of ASCII text
 
-
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MHTML}
@@ -31,7 +30,7 @@ BROKEN=		Does not compile when WITH_HTML is set
 
 .if ${PORT_OPTIONS:MMOTIF}
 MAKE_ARGS+=	-DMOTIF
-USE_MOTIF=	yes
+USES+=		motif
 .endif
 
 .if ${PORT_OPTIONS:MXPM}