Convert from USE_MOTIF to USES=motif

While here:
Convert to USES=gmake as well
Trim headers

9 files changed, 16 insertions, 33 deletions

diff --git a/astro/xephem/Makefile b/astro/xephem/Makefile
index 9a6805a7e35a..5e3fd9eed5ee 100644
--- a/astro/xephem/Makefile
+++ b/astro/xephem/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    xephem
-# Date created:         Thu Aug  1 09:10:22 CDT 1996
-# Whom:                 erich@FreeBSD.org
-#
+# Created by: erich@FreeBSD.org
 # $FreeBSD$
-#
 
 PORTNAME=	xephem
 PORTVERSION=	3.7.5
@@ -17,8 +13,7 @@ COMMENT=	An interactive astronomical ephemeris program
 LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 		jpeg.11:${PORTSDIR}/graphics/jpeg
 
-USE_MOTIF=	yes
-USE_GMAKE=	yes
+USES=		gmake motif
 USE_XORG=	xp xt xext xmu x11 xft
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/audio/praat/Makefile b/audio/praat/Makefile
index 57a5af455278..b0ee0bb26996 100644
--- a/audio/praat/Makefile
+++ b/audio/praat/Makefile
@@ -1,9 +1,5 @@
-# New ports collection Makefile for:	praat
-# Date created:		21-Feb-2006
-# Whom:			Jason Bacon <jwbacon@tds.net>
-#
+# Created by: Jason Bacon <jwbacon@tds.net>
 # $FreeBSD$
-#
 
 PORTNAME=	praat
 PORTVERSION=	4.6.39
@@ -17,7 +13,7 @@ COMMENT=	Phonetics by Computer
 
 USE_DOS2UNIX=	yes
 DOS2UNIX_REGEX=	.*Makefile
-USE_MOTIF=	yes
+USES=		motif
 WRKSRC=		${WRKDIR}/sources_4639
 MAKEFILE=	makefile
 PLIST_FILES=	bin/praat
diff --git a/audio/snd/Makefile b/audio/snd/Makefile
index 3ff7ea4dcd8d..db975be103b3 100644
--- a/audio/snd/Makefile
+++ b/audio/snd/Makefile
@@ -29,7 +29,7 @@ CFLAGS+=	-I${LOCALBASE}/include
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${ARCH} == "sparc64"
 BROKEN=		does not compile on sparc64
@@ -65,7 +65,7 @@ USE_GNOME+=	gtk20
 CONFIGURE_ARGS+=	--with-gtk
 .endif
 .if ${PORT_OPTIONS:MMOTIF}
-USE_MOTIF=	yes
+USES+=		motif
 CONFIGURE_ARGS+=	--with-motif
 .endif
 
@@ -108,4 +108,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/DotEmacs ${EXAMPLESDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/timidity++/Makefile b/audio/timidity++/Makefile
index 58ab81710ff5..9891dde47240 100644
--- a/audio/timidity++/Makefile
+++ b/audio/timidity++/Makefile
@@ -19,9 +19,9 @@ RUN_DEPENDS=	${LOCALBASE}/share/timidity/timidity.cfg:${PORTSDIR}/audio/eawpats
 CONFLICTS=	timidity-0.*
 .endif
 
+USES=		gmake
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 
 MAKE_JOBS_SAFE=	yes
 
@@ -43,7 +43,7 @@ LDFLAGS+=	-export-dynamic
 DOCFILES=	README.alsaseq README.dl README.m2m README.mts README.sf
 DOCLANG=	C ja_JP.eucJP
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 MANLANG=	"" ja
 MAN1=		timidity.1
@@ -89,4 +89,4 @@ post-install::
 	@${CAT} ${PKGMESSAGE}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/timidity++/Makefile.interface b/audio/timidity++/Makefile.interface
index f8c81cd18e00..63aafe0ee597 100644
--- a/audio/timidity++/Makefile.interface
+++ b/audio/timidity++/Makefile.interface
@@ -47,7 +47,7 @@ USE_GNOME=	gtk12
 .if ${INTERFACE} == "motif"
 LINK=		xmmidi
 
-USE_MOTIF=	yes
+USES+=		motif
 
 CONFIGURE_ENV+=	MOTIFLIB="${MOTIFLIB}"
 .endif
diff --git a/audio/xanalyser/Makefile b/audio/xanalyser/Makefile
index 344f4996ef1a..fe27056b512f 100644
--- a/audio/xanalyser/Makefile
+++ b/audio/xanalyser/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xanalyser
-# Date created:				October 29 2006
-# Whom:					Diane Bruce <db@db.net
-#
+# Created by: Diane Bruce <db@db.net
 # $FreeBSD$
-#
 
 PORTNAME=	xanalyser
 PORTVERSION=	1.32
@@ -16,9 +12,8 @@ MASTER_SITE_SUBDIR=	db
 MAINTAINER=	db@FreeBSD.org
 COMMENT=	Spectrum analyser
 
+USES=		gmake motif
 USE_BZIP2=	yes
-USE_MOTIF=	yes
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	libtool
 MAN1=		xanalyser.1
diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index a58199a53a67..265cda8bfd15 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -14,8 +14,7 @@ LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis \
 		FLAC:${PORTSDIR}/audio/flac
 RUN_DEPENDS+=	lame:${PORTSDIR}/audio/lame
 
-USES=		imake
-USE_MOTIF=	yes
+USES=		imake motif
 USE_XORG=	x11 xext xaw xmu xp xpm xt sm ice
 MAN1=		cda.1 xmcd.1
 MANCOMPRESSED=	no
diff --git a/audio/xmmix/Makefile b/audio/xmmix/Makefile
index cc28f44edc2a..bf28b9e794c3 100644
--- a/audio/xmmix/Makefile
+++ b/audio/xmmix/Makefile
@@ -12,8 +12,7 @@ COMMENT=	Motif-based audio mixer
 
 WRKSRC=		${WRKDIR}/xmmix-1.2
 
-USES=		imake
-USE_MOTIF=	yes
+USES=		imake motif
 USE_XORG=	x11 xext sm ice xt xp
 
 MAN1=		xmmix.1
diff --git a/audio/xmradio/Makefile b/audio/xmradio/Makefile
index e24fbd47bd77..648e18d14d30 100644
--- a/audio/xmradio/Makefile
+++ b/audio/xmradio/Makefile
@@ -14,9 +14,8 @@ COMMENT=	Motif based FM tuner (for use with bt848 driver)
 # useful if you are into digital audio recording and playback.
 #RUN_DEPENDS=   sox:${PORTSDIR}/audio/sox
 
-USES=		imake
+USES=		imake motif
 USE_XORG=	xpm
-USE_MOTIF=	yes
 ONLY_FOR_ARCHS=	i386 ia64
 
 PLIST_FILES=	bin/xmradio lib/X11/app-defaults/XMradio