Convert from USE_MOTIF to USES=motif

While here:
- Trim headers
- Convert some USE_GMAKE to USES=gmake

8 files changed, 15 insertions, 30 deletions

diff --git a/games/CaribbeanStud/Makefile b/games/CaribbeanStud/Makefile
index c99fbfcf73b7..88079faa4f28 100644
--- a/games/CaribbeanStud/Makefile
+++ b/games/CaribbeanStud/Makefile
@@ -1,6 +1,4 @@
-# New ports collection makefile for:	CaribbeanStud
-# Date created:				4 July 1998
-# Whom:					Andrey Zakhvatov
+# Created by: Andrey Zakhvatov
 #
 # $FreeBSD$
 #
@@ -17,7 +15,7 @@ MAINTAINER=		ports@FreeBSD.org
 COMMENT=	Caribbean Stud gambling game for X Window System
 
 MAKEFILE=		Xmakefile
-USE_MOTIF=		yes
+USES=			motif
 CFLAGS+=		-Wno-deprecated
 
 do-install:
diff --git a/games/d2x-xl/Makefile b/games/d2x-xl/Makefile
index 6fddcaab2841..c125a1d6ad74 100644
--- a/games/d2x-xl/Makefile
+++ b/games/d2x-xl/Makefile
@@ -24,9 +24,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-debug --enable-release=yes \
 		--with-sharepath=${PREFIX}/share/d2x-xl
 USE_SDL=	sdl mixer image
-USE_GMAKE=	yes
+USES=		gmake motif
 USE_AUTOTOOLS=	aclocal autoheader automake autoconf
-USE_MOTIF=	yes
 MAKE_JOBS_SAFE=	yes
 AUTOMAKE_ARGS=	--add-missing --copy
 
diff --git a/games/imaze/Makefile b/games/imaze/Makefile
index 6c4f99694612..9758797acbbe 100644
--- a/games/imaze/Makefile
+++ b/games/imaze/Makefile
@@ -49,7 +49,7 @@ TOOLKIT=	athena
 .endif
 
 .if ${PORT_OPTIONS:MMOTIF}
-USE_MOTIF=	yes
+USES+=		motif
 TOOLKIT=	motif
 .endif
 
diff --git a/games/xabacus/Makefile b/games/xabacus/Makefile
index 168be3847972..2f30a3777bf8 100644
--- a/games/xabacus/Makefile
+++ b/games/xabacus/Makefile
@@ -26,7 +26,7 @@ MAN6=		xabacus.6
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMOTIF}
-USE_MOTIF=	yes
+USES=		motif
 .else
 CONFIGURE_ARGS+=	--without-motif
 .endif
diff --git a/games/xbill/Makefile b/games/xbill/Makefile
index d9ac2b16fe50..5c6feb51f22f 100644
--- a/games/xbill/Makefile
+++ b/games/xbill/Makefile
@@ -35,7 +35,7 @@ ATHENA_DESC=	Athena widget set
 GTK_DESC=	GTK widget set
 MOTIF_DESC=	Motif widget set
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MATHENA}
 CONFIGURE_ARGS+=	--disable-gtk --disable-motif
@@ -43,7 +43,7 @@ USE_XORG=	xaw xmu xt x11 sm ice
 .elif ${PORT_OPTIONS:MMOTIF}
 CONFIGURE_ARGS+=	--disable-athena --disable-gtk
 USE_XORG=	xt x11 sm ice xpm
-USE_MOTIF=	yes
+USES=		motif
 .else # ${PORT_OPTIONS:MGTK}
 CONFIGURE_ARGS+=	--disable-athena --disable-motif
 USE_GNOME=	gtk12
@@ -54,4 +54,4 @@ post-patch:
 	@${REINPLACE_CMD} -e '/WIDGET_LIBS=/ s|-lXm"$$|-lXm -lXpm"|' \
 		${WRKSRC}/configure
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/xminehunter/Makefile b/games/xminehunter/Makefile
index 9e36449a8b66..25eb38fd0f8b 100644
--- a/games/xminehunter/Makefile
+++ b/games/xminehunter/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xminehunter
-# Date created:		09 January 1997
-# Whom:			Thomas Gellekum <tg@FreeBSD.org>
-#
+# Created by: Thomas Gellekum <tg@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xminehunter
 PORTVERSION=	0.4
@@ -13,11 +9,11 @@ MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A Motif minesweeper game
+COMMENT=	Motif minesweeper game
 
+USES=		motif
 USE_XORG=	xpm
 WRKSRC=		${WRKDIR}/xminehunter
-USE_MOTIF=	yes
 ALL_TARGET=	xminehunter
 
 .include <bsd.port.mk>
diff --git a/games/xshisen/Makefile b/games/xshisen/Makefile
index 717492c453ad..ebed99cca06b 100644
--- a/games/xshisen/Makefile
+++ b/games/xshisen/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   xshisen
-# Date created:               9 Oct 1996
-# Whom:                 Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
-#
+# Created by: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 # $FreeBSD$
-#
 
 PORTNAME=	xshisen
 PORTVERSION=	1.51
@@ -24,7 +20,7 @@ MANLANG=	"" ja
 MAN6=		xshisen.6
 
 .if !defined(WITHOUT_MOTIF)
-USE_MOTIF=	yes
+USES=		motif
 CONFIGURE_ARGS+=	--with-motif
 .endif
 
diff --git a/games/znibbles/Makefile b/games/znibbles/Makefile
index 5beea89c4e2e..4a2c9cbd07ef 100644
--- a/games/znibbles/Makefile
+++ b/games/znibbles/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	znibbles
-# Date created:		21 Aug 1999
-# Whom:			Yin-Jieh Chen <yinjieh@csie.nctu.edu.tw>
-#
+# Created by: Yin-Jieh Chen <yinjieh@csie.nctu.edu.tw>
 # $FreeBSD$
-#
 
 PORTNAME=	znibbles
 PORTVERSION=	0.0.7
@@ -21,7 +17,7 @@ LICENSE_COMB=	dual
 OPTIONS_DEFINE=	GTK1
 OPTIONS_DEFAULT=	GTK1
 
-USE_MOTIF=	yes
+USES=		motif
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes