Convert to USES=imake

Trim headers
Convert to USE_GCC=any where needed
Remove indefinite article

6 files changed, 21 insertions, 43 deletions

diff --git a/mail/ml/Makefile b/mail/ml/Makefile
index 4be0d7b..7202d7e 100644
--- a/mail/ml/Makefile
+++ b/mail/ml/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	YACL
-# Date created:		15 March 1998
-# Whom:			Jeroen Hogeveen <albast@xs4all.nl>
-#
+# Created by: Jeroen Hogeveen <albast@xs4all.nl>
 # $FreeBSD$
-#
 
 PORTNAME=	ml
 PORTVERSION=	3.4
@@ -12,10 +8,10 @@ CATEGORIES=	mail
 MASTER_SITES=	http://ftp.uni-koeln.de/windows/xcontrib/
 
 MAINTAINER=	mjl@luckie.org.nz
-COMMENT=	An X11 IMAP client
+COMMENT=	X11 IMAP client
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	ice sm x11 xext xmu xp xt
 USE_MOTIF=	yes
 
diff --git a/mail/xlbiff/Makefile b/mail/xlbiff/Makefile
index 4e3c04c..97c745b 100644
--- a/mail/xlbiff/Makefile
+++ b/mail/xlbiff/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for:  xlbiff
-# Date created:			  23-Aug-1995
-# Whom:				  David O'Brien <obrien@cs.ucdavis.edu>
-#
+# Created by: David O'Brien <obrien@cs.ucdavis.edu>
 # $FreeBSD$
-#
 
 PORTNAME=	xlbiff
 PORTVERSION=	3.0
@@ -16,7 +11,7 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	obrien@FreeBSD.org
 COMMENT=	The X Literate Biff - displays the from and subject from incoming mails
 
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	ice sm x11 xaw xext xmu xpm xt
 MAN1=		xlbiff.1
 
diff --git a/mail/xmail/Makefile b/mail/xmail/Makefile
index c07159c..5aa903e 100644
--- a/mail/xmail/Makefile
+++ b/mail/xmail/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: xmail
-# Date created:		15 July 1997
-# Whom:			Stephen Roznowski <sjr1@flash.net>
-#
+# Created by: Stephen Roznowski <sjr1@flash.net>
 # $FreeBSD$
-#
 
 PORTNAME=	xmail
 PORTVERSION=	1.6
@@ -14,9 +10,9 @@ MASTER_SITE_SUBDIR=	applications
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	sjroz@verizon.net
-COMMENT=	An X-based interface to the Berkeley mail program
+COMMENT=	X-based interface to the Berkeley mail program
 
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	xbitmaps xaw
 MAN1=		xmail.1
 
diff --git a/mail/xmailbox/Makefile b/mail/xmailbox/Makefile
index 815eb21..7f5993d 100644
--- a/mail/xmailbox/Makefile
+++ b/mail/xmailbox/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xmailbox
-# Date created:				23 May 1998
-# Whom:					Andrey Zakhvatov
-#
+# Created by: Andrey Zakhvatov
 # $FreeBSD$
-#
 
 PORTNAME=		xmailbox
 PORTVERSION=		2.5
@@ -15,9 +11,11 @@ MASTER_SITE_SUBDIR=	applications
 MAINTAINER=		ports@FreeBSD.org
 COMMENT=	Mailbox checker with sound and animation for X Window System
 
-USE_IMAKE=		yes
-USE_XORG=		xaw
-MAN1=			xmailbox.1
+USES=		imake
+USE_XORG=	xaw
+MAN1=		xmailbox.1
+
+.include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/XMailbox.ad
@@ -26,7 +24,7 @@ post-install:
 	@${MKDIR} ${PREFIX}/share/xmailbox
 	${INSTALL_DATA} ${WRKSRC}/dingdong.au ${PREFIX}/share/xmailbox
 	${INSTALL_DATA} ${WRKSRC}/ugotmail.au ${PREFIX}/share/xmailbox
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${PREFIX}/share/doc/xmailbox
 	${INSTALL_DATA} ${WRKSRC}/DISCLAIMER ${PREFIX}/share/doc/xmailbox
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xmailbox
diff --git a/mail/xmailwatcher/Makefile b/mail/xmailwatcher/Makefile
index 2981e8e..ef9d433 100644
--- a/mail/xmailwatcher/Makefile
+++ b/mail/xmailwatcher/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: 	xmailwatcher
-# Date created:				14 II 2001
-# Whom:					Harry Newton
-#
+# Created by: Harry Newton
 # $FreeBSD$
-#
 
 PORTNAME=	xmailwatcher
 PORTVERSION=	1.6
@@ -17,7 +13,7 @@ COMMENT=	Mailbox checker which displays sender and subject lines of mails
 
 MAN1=		xmailwatcher.1
 PLIST_FILES=	bin/xmailwatcher
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	ice sm x11 xaw xext xmu xpm xt
 
 post-install:
diff --git a/mail/xpbiff/Makefile b/mail/xpbiff/Makefile
index 16cc249..1aaf8cb 100644
--- a/mail/xpbiff/Makefile
+++ b/mail/xpbiff/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    xpbiff
-# Date created:         2 April 1997
-# Whom:                 Yoshiro MIHIRA <sanpei@yy.cs.keio.ac.jp>
-#
+# Created by: Yoshiro MIHIRA <sanpei@yy.cs.keio.ac.jp>
 # $FreeBSD$
-#
 
 PORTNAME?=	xpbiff
 PORTVERSION?=	1.27
@@ -16,9 +12,10 @@ DISTNAME=	xpbiff
 DISTFILES=	xpbiff-1.27-with-YOUBIN.tar.gz.uu
 
 MAINTAINER?=	sanpei@FreeBSD.org
-COMMENT?=	A replacement for xbiff that handles popup window with mail header
+COMMENT?=	Replacement for xbiff that handles popup window with mail header
 
-USE_IMAKE=	yes
+USES=		imake
+USE_GCC=	any
 USE_XORG=	xpm xaw xmu
 NO_INSTALL_MANPAGES=	yes
 PLIST_FILES=	bin/xpbiff