Convert from USE_MOTIF to USES=motif

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

6 files changed, 13 insertions, 43 deletions

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