New USES imake to handle the dependency on imake.

This uses accept 'env' as an argument for ports that do use their own or a different do-configure target.

Modify xmkmf so it accept IMAKECPPFLAGS as default flags for imake and pass it to the called imake.
Modify xorg-cf-files (the FreeBSD.cf configuration file) to allow CppCmd to be overwritten.
Pass CppCmd CcCmd and CplusplusCmd via command line to each call of imake via IMAKECPPFLAGS
Pass IMAKE_DEFINE with the above arguments to MAKE_ARGS so that imake spawned from Makefile generated by a previous
imake also inherit the defined CppCmd CcCmd and CplusplusCmd.
Make imake use devel/tradcpp all the time, so that when buidling with clang we do not depend on gcc's cpp.
Make imake respect CC and CXX
Make imake respect USE_GCC (if set imake will use gcc's cpp).

While here:
- Remove a couple of indefinite articles from comments
- Trim headers
- Fix a couple of ports to build with clang or use: USE_GCC=any
- Fix a now useless redefinition of the extraction chain
- Fix a typo in japanese/Wnn7-lib bundled imake template definitions
- Fix some XMKMF execution with no env specified
- Use options helper in x11/xautolock to simplify the port

21 files changed, 27 insertions, 44 deletions

diff --git a/games/bugsx/Makefile b/games/bugsx/Makefile
index 77be96d93014..a23572c22b1b 100644
--- a/games/bugsx/Makefile
+++ b/games/bugsx/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:  bugsx
-# Date created:  7 December 1997
-# Whom:  Don Croyle <croyle@gelemna.org>
-#
+# Created by: Don Croyle <croyle@gelemna.org>
 # $FreeBSD$
-#
 
 PORTNAME=	bugsx
 PORTVERSION=	1.08
@@ -17,13 +13,9 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Breed bugs using genetic algorithms
 
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	x11 xext
 WRKSRC=		${WRKDIR}/bugsx
-# isn't really gzipped
-EXTRACT_CMD=		${TAR}
-EXTRACT_BEFORE_ARGS=	-xf
-EXTRACT_AFTER_ARGS=	# empty
 MAN1=		bugsx.1
 PLIST_FILES=	bin/bugsx
 
diff --git a/games/spider/Makefile b/games/spider/Makefile
index 49538e541ae3..08b57190f188 100644
--- a/games/spider/Makefile
+++ b/games/spider/Makefile
@@ -13,7 +13,7 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Challenging double decked solitaire game
 
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	x11 xext xaw xmu xt sm ice xpm
 INSTALL_TARGET=	install install.doc
 MAN1=		spider.1
diff --git a/games/xataxx/Makefile b/games/xataxx/Makefile
index 9a494ca662e2..320280ded8d1 100644
--- a/games/xataxx/Makefile
+++ b/games/xataxx/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Strategy game of position and movement for X Window System
 
 OPTIONS_DEFINE=	DOCS
 
+USES=		imake
 USE_XORG=	x11 xext
-USE_IMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 
 MAN6=		xataxx.6
diff --git a/games/xblackjack/Makefile b/games/xblackjack/Makefile
index 1b8ba01e5e23..0ee624c41d3e 100644
--- a/games/xblackjack/Makefile
+++ b/games/xblackjack/Makefile
@@ -14,7 +14,7 @@ COMMENT=	X11/Motif blackjack game
 
 LIB_DEPENDS=	Xm:${PORTSDIR}/x11-toolkits/lesstif
 
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	x11 xext xp xt xmu
 MAN1=		xblackjack.1
 CFLAGS+=	-Wno-error=return-type
diff --git a/games/xboing/Makefile b/games/xboing/Makefile
index 6f8d87685ce7..a7fa1d30e9ba 100644
--- a/games/xboing/Makefile
+++ b/games/xboing/Makefile
@@ -14,7 +14,7 @@ COMMENT=	X11 arcade game
 
 LICENSE=	MIT
 
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	xpm xext x11
 WRKSRC=		${WRKDIR}/xboing
 MAN1=		xboing.1
diff --git a/games/xchomp/Makefile b/games/xchomp/Makefile
index 717519a3ad4c..4adfdec7dd56 100644
--- a/games/xchomp/Makefile
+++ b/games/xchomp/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Pac-man-like game under X11
 
 WRKSRC=		${WRKDIR}/xchomp
 
+USES=		imake
 USE_XORG=	x11 xext
-USE_IMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 
 PLIST_FILES=	bin/xchomp
diff --git a/games/xflame/Makefile b/games/xflame/Makefile
index e72e23c11daf..bfe928c4854d 100644
--- a/games/xflame/Makefile
+++ b/games/xflame/Makefile
@@ -9,11 +9,11 @@ MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=kris
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A cool animated flame
+COMMENT=	cool animated flame
 
 DEPRECATED=	No more public distfiles
 
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	x11 xext
 
 NO_INSTALL_MANPAGES=	yes
diff --git a/games/xinfocom/Makefile b/games/xinfocom/Makefile
index a94d3e02aef7..d6b71d6de5e3 100644
--- a/games/xinfocom/Makefile
+++ b/games/xinfocom/Makefile
@@ -17,7 +17,7 @@ COMMENT=	An Infocom game interpreter for X11
 PLIST_FILES=	bin/xinfocom
 WRKSRC=		${WRKDIR}/xinfocom
 
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	xt sm ice xext x11
 
 .include <bsd.port.mk>
diff --git a/games/xjewel/Makefile b/games/xjewel/Makefile
index df2c015ced5e..27ba23778471 100644
--- a/games/xjewel/Makefile
+++ b/games/xjewel/Makefile
@@ -15,8 +15,8 @@ BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
 		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
 		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
+USES=		imake
 USE_XORG=	x11 xext
-USE_IMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 
 MAN6=		xjewel.6
diff --git a/games/xmille/Makefile b/games/xmille/Makefile
index 0a94633dd040..9bb837e027c5 100644
--- a/games/xmille/Makefile
+++ b/games/xmille/Makefile
@@ -14,7 +14,7 @@ COMMENT=	X window mille bourne game
 
 WRKSRC=		${WRKDIR}/Mille
 
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	x11 xext
 MAN1=		xmille.1
 MANCOMPRESSED=	no
diff --git a/games/xmine/Makefile b/games/xmine/Makefile
index ecb9f8f71e55..515ed2bc8ec2 100644
--- a/games/xmine/Makefile
+++ b/games/xmine/Makefile
@@ -1,7 +1,5 @@
 # Created by: joerg
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xmine
 PORTVERSION=	1.0.3
@@ -17,7 +15,7 @@ COMMENT=	The `Athena' port of the xminesweeper game
 
 LIB_DEPENDS=	Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
 
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	x11 xaw xext xmu xt xpm sm ice
 MAN6=		xmine.6
 MANCOMPRESSED=	no
diff --git a/games/xneko/Makefile b/games/xneko/Makefile
index b58693866ac2..76918e2b612a 100644
--- a/games/xneko/Makefile
+++ b/games/xneko/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	The classic cat-and-mouse
 
 NO_WRKSUBDIR=	yes
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	x11
 MAN6=		xneko.6
 PLIST_FILES=	bin/xneko
diff --git a/games/xpilot/Makefile b/games/xpilot/Makefile
index b3ff6fb0e3a8..b893610738a8 100644
--- a/games/xpilot/Makefile
+++ b/games/xpilot/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    xpilot
-# Date created:         18 July 1995
-# Whom:                 jmacd
-#
+# Created by: jmacd
 # $FreeBSD$
-#
 
 PORTNAME=	xpilot
 PORTVERSION=	4.5.5
@@ -14,8 +10,9 @@ MAINTAINER=	lme@FreeBSD.org
 COMMENT=	Xpilot(client) and xpilots(server)
 
 USE_BZIP2=	yes
-USE_IMAKE=	yes
 USE_XORG=	x11 xext
 MAN6=		xpilot.6 xpilots.6 xp-mapedit.6 xp-replay.6
+USE_GCC=	any
+USES=		imake
 
 .include <bsd.port.mk>
diff --git a/games/xpipeman/Makefile b/games/xpipeman/Makefile
index 47f92d5496cb..d2db5c33ed29 100644
--- a/games/xpipeman/Makefile
+++ b/games/xpipeman/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Connect the pipes to stop the leaks
 # LP64 issues
 ONLY_FOR_ARCHS=	i386 amd64
 
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	x11 xaw xext xmu xt sm ice
 MAN6=		xpipeman.6
 MANCOMPRESSED=	no
diff --git a/games/xpuzzletama/Makefile b/games/xpuzzletama/Makefile
index 6fa42afb2373..df5d2a743652 100644
--- a/games/xpuzzletama/Makefile
+++ b/games/xpuzzletama/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xpuzzletama
-# Date created:		18 January 1997
-# Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
-#
+# Created by: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 # $FreeBSD$
-#
 
 PORTNAME=	xpuzzletama
 PORTVERSION=	1.5b
@@ -21,7 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Puzzle tama, a Tetris like game
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	xpm
 NO_INSTALL_MANPAGES=	yes
 
diff --git a/games/xrisk/Makefile b/games/xrisk/Makefile
index 56c8764fc855..be5a26cb5b48 100644
--- a/games/xrisk/Makefile
+++ b/games/xrisk/Makefile
@@ -8,9 +8,9 @@ CATEGORIES=	games
 MASTER_SITES=	http://my.pages.de/pub/comp/unix/games/xrisk/old/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A game for X11, much like the popular board game
+COMMENT=	game for X11, much like the popular board game
 
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	x11 xext xt
 MAN6=		xrisk.6
 
diff --git a/games/xrubik/Makefile b/games/xrubik/Makefile
index 543d9215c45d..b1269535be94 100644
--- a/games/xrubik/Makefile
+++ b/games/xrubik/Makefile
@@ -12,7 +12,7 @@ MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	X-based rubik's cube(tm)
 
 WRKSRC=		${WRKDIR}/xrubik
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	xt sm ice xext x11
 MAN1=		xrubik.1
 XFREE86_HTML_MAN=	no
diff --git a/games/xscavenger/Makefile b/games/xscavenger/Makefile
index de066cfae8db..e9eee4b0d006 100644
--- a/games/xscavenger/Makefile
+++ b/games/xscavenger/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Lode Runner clone for X11
 
 WRKSRC_SUBDIR=	src
 
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	x11 xext
 MAN6=		scavenger.6
 
diff --git a/games/xscrabble/Makefile b/games/xscrabble/Makefile
index f36b2569dd06..59f62cca8b2b 100644
--- a/games/xscrabble/Makefile
+++ b/games/xscrabble/Makefile
@@ -11,8 +11,8 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${PORTNAME}_en${EXTRACT_SUFX}
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	X version of the popular board game
 
+USES=		imake
 USE_BZIP2=	yes
-USE_IMAKE=	yes
 USE_XORG=	xaw
 NO_INSTALL_MANPAGES=	yes
 
diff --git a/games/xskat/Makefile b/games/xskat/Makefile
index 6dd05734bdc2..4acee3da6b0d 100644
--- a/games/xskat/Makefile
+++ b/games/xskat/Makefile
@@ -16,7 +16,7 @@ DISTFILES+=	xskat-cards.tar.gz
 RESTRICTED=	The altenburger card file is NOT freely redistributable!
 .endif
 
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	x11
 MAN1=		xskat.1 xskat-de.1
 PLIST_FILES=	bin/xskat
diff --git a/games/xvmines/Makefile b/games/xvmines/Makefile
index e42749e91a52..73801fbc94fc 100644
--- a/games/xvmines/Makefile
+++ b/games/xvmines/Makefile
@@ -15,8 +15,8 @@ LIB_DEPENDS=	xview:${PORTSDIR}/x11-toolkits/xview
 
 OPTIONS_DEFINE=	DOCS
 
+USES=		imake
 USE_XORG=	x11
-USE_IMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 
 MANCOMPRESSED=	no