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
svn path=/head/; revision=321957
2013-06-28 11:51:05 +00:00 · 2013-06-28 11:51:05 +00:00 · 932db7c46c · 2021-03-31 03:12:20 +00:00
commit 932db7c46c
parent b9b5e71f19
111 changed files with 282 additions and 373 deletions
--- a/12
+++ b/12
@ -10,6 +10,18 @@ in the release notes and/or placed into UPDATING.

 All ports committers are allowed to commit to this file.

+20130628:
+AUTHOR: bapt@FreeBSD.org
+
+ * New USES: imake
+
+ This uses replaces USE_IMAKE, it handles dependency on imake. Its only argument
+ is 'env', which prevent from defining the do-configure target.
+
+ * New LATE_INSTALL_TARGET
+
+ This content of this new macro is appended to INSTALL_TARGET
+
 20130620:
 AUTHOR: bapt@FreeBSD.org

--- a/Mk/Uses/imake.mk
+++ b/Mk/Uses/imake.mk
@ -0,0 +1,52 @@
+# $FreeBSD$
+#
+# Provide support for imake based projects
+#
+# MAINTAINER: x11@FreeBSD.org
+#
+# Feature:		imake
+# Usage:		USES=imake
+# Valid ARGS:		env: do not define any target
+#
+
+.if !defined(_INCLUDE_USES_IMAKE_MK)
+_INCLUDE_USES_IMAKE_MK=	yes
+
+.if defined(imake_ARGS)
+.if ${imake_ARGS} == env
+IMAKE_ENV_ONLY=	yes
+.else
+IGNORE=		USES=imake ${imake_ARGS} is not a valid argument
+.endif
+.endif
+
+.if !defined(NO_INSTALL_MANPAGES)
+MANCOMPRESSED?=	yes
+.endif
+
+BUILD_DEPENDS+=		imake:${PORTSDIR}/devel/imake
+
+.if defined(USE_GCC)
+IMAKECPP=		${CPP}
+IMAKECPPFLAGS=		-DCppCmd=${CPP} -DCcCmd=${CC} -DCplusplusCmd=${CXX}
+.else
+IMAKECPP=		tradcpp
+IMAKECPPFLAGS=		-DCppCmd=tradcpp -DCcCmd=${CC} -DCplusplusCmd=${CXX}
+BUILD_DEPENDS+=		tradcpp:${PORTSDIR}/devel/tradcpp
+.endif
+MAKE_ENV+=		IMAKECPP=${IMAKECPP} IMAKECPPFLAGS="${IMAKECPPFLAGS}"
+CONFIGURE_ENV+=		IMAKECPP=${IMAKECPP} IMAKECPPFLAGS="${IMAKECPPFLAGS}"
+MAKE_ARGS+=		IMAKE_DEFINES="${IMAKECPPFLAGS}"
+
+.if !defined(IMAKE_ENV_ONLY)
+.if !target(do-configure)
+do-configure:
+	@(cd ${CONFIGURE_WRKSRC}; ${SETENV} ${MAKE_ENV} ${XMKMF})
+.endif
+
+.if !defined(NO_INSTALL_MANPAGES)
+LATE_INSTALL_ARGS=	install.man
+.endif
+.endif
+
+.endif
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@ -1623,11 +1623,7 @@ check-makevars::
 .endif
 .endif

-.if defined(USE_IMAKE) && !defined(NO_INSTALL_MANPAGES)
-MANCOMPRESSED?=	yes
-.else
 MANCOMPRESSED?=	no
-.endif

 .if defined(PATCHFILES)
 .if ${PATCHFILES:M*.zip}x != x
@ -1908,7 +1904,6 @@ LIB_DEPENDS+=		Xm.4:${PORTSDIR}/x11-toolkits/open-motif
 .endif
 .endif

-X_IMAKE_PORT=		${PORTSDIR}/devel/imake
 X_FONTSERVER_PORT=	${PORTSDIR}/x11-fonts/xfs
 X_VFBSERVER_PORT=	${PORTSDIR}/x11-servers/xorg-vfbserver
 X_FONTS_ENCODINGS_PORT=	${PORTSDIR}/x11-fonts/encodings
@ -1920,19 +1915,6 @@ X_FONTS_TTF_PORT=	${PORTSDIR}/x11-fonts/xorg-fonts-truetype
 X_FONTS_TYPE1_PORT=	${PORTSDIR}/x11-fonts/xorg-fonts-type1
 X_FONTS_ALIAS_PORT=	${PORTSDIR}/x11-fonts/font-alias

-.if defined(USE_IMAKE)
-.if (${OSVERSION} >= 900506 && ${OSVERSION} < 1000000) || \
-	${OSVERSION} >= 1000010
-CONFIGURE_ENV+=		IMAKECPP="gcpp"
-MAKE_ENV+=		IMAKECPP="gcpp"
-.else
-CONFIGURE_ENV+=		IMAKECPP="${CPP}"
-MAKE_ENV+=		IMAKECPP="${CPP}"
-.endif
-MAKE_FLAGS?=		CC="${CC}" CXX="${CXX}"
-BUILD_DEPENDS+=		imake:${X_IMAKE_PORT}
-.endif
-
 .if defined(USE_DISPLAY) && !defined(DISPLAY)
 BUILD_DEPENDS+=	Xvfb:${X_VFBSERVER_PORT} \
 	${LOCALBASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT} \
@ -2423,6 +2405,7 @@ MOTIFLIB?=	-L${LOCALBASE}/lib -lXm -lXp

 ALL_TARGET?=		all
 INSTALL_TARGET?=	install
+INSTALL_TARGET+=	${LATE_INSTALL_ARGS}

 # Integrate with the license auditing framework
 .if !defined (DISABLE_LICENSES)
@ -3716,9 +3699,6 @@ do-configure:
 			 ${FALSE}; \
 		fi)
 .endif
-.if defined(USE_IMAKE)
-	@(cd ${CONFIGURE_WRKSRC}; ${SETENV} ${MAKE_ENV} ${XMKMF})
-.endif
 .endif

 # Build
@ -3864,14 +3844,8 @@ check-install-conflicts:
 do-install:
 .if defined(USE_GMAKE)
 	@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
-.if defined(USE_IMAKE) && !defined(NO_INSTALL_MANPAGES)
-	@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install.man)
-.endif
 .else # !defined(USE_GMAKE)
 	@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
-.if defined(USE_IMAKE) && !defined(NO_INSTALL_MANPAGES)
-	@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install.man)
-.endif
 .endif
 .endif

--- a/audio/ascd/Makefile
+++ b/audio/ascd/Makefile
@ -16,7 +16,8 @@ LICENSE=	BSD

 LIB_DEPENDS=	workman:${PORTSDIR}/audio/libworkman

-USE_IMAKE=	yes
+USES=		imake
+
 USE_XORG=	xpm

 DATAFILES=	ascd-0.13pr6-themes.tgz
--- a/audio/nas/Makefile
+++ b/audio/nas/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	nas (formerly netaudio)
-# Date created:		03 Nov 1994
-# Whom:			jkh
-#
+# Created by: jkh
 # $FreeBSD$
-#

 PORTNAME=	nas
 PORTVERSION=	1.9.3
@ -14,8 +10,8 @@ EXTRACT_SUFX=	.src.tar.gz
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Network Audio System

+USES=		imake
 USE_GCC=	any
-USE_IMAKE=	yes
 USE_XORG=	x11 xext xt xau sm ice xp xpm xmu xaw
 USE_LDCONFIG=	yes
 MAKE_ENV+=	COMPRESS_CMD="${COMPRESS_CMD:S/c//}"
--- a/audio/wmsmixer/Makefile
+++ b/audio/wmsmixer/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	wmsmixer
-# Date created:				2 April 2001
-# Whom:					Konstantinos Konstantinidis <kkonstan@daemon.gr>
-#
+# Created by: Konstantinos Konstantinidis <kkonstan@daemon.gr>
 # $FreeBSD$
-#

 PORTNAME=	wmsmixer
 PORTVERSION=	0.5.1
@ -16,8 +12,9 @@ COMMENT=	An audio mixer for the WindowMaker dock

 PLIST_FILES=	bin/wmsmixer
 PORTDOCS=	README
+
+USES=		imake
 USE_XORG=	xpm
-USE_IMAKE=	YES
 MAKE_ARGS=	CC="${CXX}" CFLAGS="${CXXFLAGS}"

 do-install:
--- a/audio/xcdplayer/Makefile
+++ b/audio/xcdplayer/Makefile
@ -11,8 +11,8 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	CD player for X

+USES=		imake
 USE_XORG=	xbitmaps xaw
-USE_IMAKE=	yes
 MAKE_JOBS_SAFE=	yes

 MAN1=		xcdplayer.1
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	xmcd
-# Date created:		16 February 1995
-# Whom:			Gennady Sorokopud <gena@NetVision.net.il>
-#
+# Created by: Gennady Sorokopud <gena@NetVision.net.il>
 # $FreeBSD$
-#

 PORTNAME=	xmcd
 PORTVERSION=	3.3.2
@ -18,8 +14,8 @@ LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis \
 		FLAC:${PORTSDIR}/audio/flac
 RUN_DEPENDS+=	lame:${PORTSDIR}/audio/lame

+USES=		imake
 USE_MOTIF=	yes
-USE_IMAKE=	yes
 USE_XORG=	x11 xext xaw xmu xp xpm xt sm ice
 MAN1=		cda.1 xmcd.1
 MANCOMPRESSED=	no
--- a/audio/xmmix/Makefile
+++ b/audio/xmmix/Makefile
@ -12,7 +12,7 @@ COMMENT=	Motif-based audio mixer

 WRKSRC=		${WRKDIR}/xmmix-1.2

-USE_IMAKE=	yes
+USES=		imake
 USE_MOTIF=	yes
 USE_XORG=	x11 xext sm ice xt xp

--- a/audio/xwave/Makefile
+++ b/audio/xwave/Makefile
@ -13,7 +13,7 @@ MAINTAINER=	a0516@marimga.de
 COMMENT=	Audio player/recorder/editor for the X Window System

 WRKSRC=		${WRKDIR}/${PORTNAME}2-981109
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	xaw
 MAKE_JOBS_UNSAFE=	yes

--- a/comms/acfax/Makefile
+++ b/comms/acfax/Makefile
@ -16,7 +16,7 @@ LIB_DEPENDS=	Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
 PLIST_FILES=	bin/acfax
 WRKSRC=		${WRKDIR}/${PORTNAME}

-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	x11 xext xmu xt sm ice

 post-extract:
--- a/deskutils/xmdiary/Makefile
+++ b/deskutils/xmdiary/Makefile
@ -15,12 +15,12 @@ COMMENT=	Personal and group calendar utility
 NO_CDROM=	Don't sell for profit
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
 USE_MOTIF=	yes
-USE_IMAKE=	yes
+USES=		imake
+USE_GCC=	any
 USE_XORG=	x11 xext xp xpm xt
 MAN1=		xdaclunix.1 xdalarm.1 xdcustom.1 xddump.1 xdiary.1 xdinitdb.1 \
 		xdlight.1 xdnotify.1 xdprformat.1 xdremind.1 xdremove.1 \
 		xdrestore.1
-CFLAGS+=	-Werror
 MAKE_JOBS_SAFE=	yes

 post-patch:
--- a/deskutils/xrolo/Makefile
+++ b/deskutils/xrolo/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:  xrolo
-# Date created:        17 January 1999
-# Whom:                Lars Koeller <Lars.Koeller@Uni-Bielefeld.DE>
-#
+# Created by: Lars Koeller <Lars.Koeller@Uni-Bielefeld.DE>
 # $FreeBSD$
-#

 PORTNAME=	xrolo
 PORTVERSION=	2.6
@ -21,7 +17,7 @@ LIB_DEPENDS=	xview.3:${PORTSDIR}/x11-toolkits/xview

 WRKSRC=		${WRKDIR}/xrolo

-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	x11 xext
 MAN1=		xrolo.1
 PLIST_FILES=	bin/xrolo
--- a/devel/imake/Makefile
+++ b/devel/imake/Makefile
@ -3,28 +3,27 @@

 PORTNAME=	imake
 PORTVERSION=	1.0.5
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel

 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Imake and other utilities from X.Org

+BUILD_DEPENDS=	tradcpp:${PORTSDIR}/devel/tradcpp
 RUN_DEPENDS=	gccmakedep:${PORTSDIR}/devel/gccmakedep \
 		makedepend:${PORTSDIR}/devel/makedepend \
 		${LOCALBASE}/lib/X11/config/xorg.cf:${PORTSDIR}/x11/xorg-cf-files

-USE_PERL5=	yes
+USES=	shebangfix
+USE_PERL5_RUN=	yes
+
+SHEBANG_FILES=	mkhtmlindex.pl

 XORG_CAT=	util
 USE_XORG=	xproto

-# clang's cpp destroys whitespace, particularly hard tabs in makefiles,
-# which is fatal for imake.
-CPPFLAGS+=	-DDEFAULT_CC=\\\"gcc\\\"
-
-.ifdef USE_IMAKE
-.error You have `USE_IMAKE' variable defined either in environment or in make(1) arguments. Please undefine and try again.
-.endif
+CONFIGURE_ENV=	ac_cv_path_RAWCPP=tradcpp

 MAN1=		ccmakedep.1 \
 		cleanlinks.1 \
@ -36,16 +35,4 @@ MAN1=		ccmakedep.1 \
 		revpath.1 \
 		xmkmf.1

-post-patch:
-	@${PERL} -pi -e 's,^#!/usr/bin/perl,#!${PERL},' ${WRKSRC}/mkhtmlindex.pl
-	@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' ${WRKSRC}/configure
-
-.include <bsd.port.pre.mk>
-
-# Attempt to force use of GNU cpp, if it is installed as /usr/bin/gcpp.
-.if (${OSVERSION} >= 900506 && ${OSVERSION} < 1000000) || \
-	${OSVERSION} >= 1000010
-CONFIGURE_ENV+=       ac_cv_path_RAWCPP="gcpp"
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/devel/imake/files/patch-imakemdep.h
+++ b/devel/imake/files/patch-imakemdep.h
@ -0,0 +1,11 @@
+--- ./imakemdep.h.orig	2012-03-08 06:47:32.000000000 +0100
+++ ./imakemdep.h	2013-06-12 20:22:52.058999526 +0200
+@@ -380,7 +383,7 @@
+     defined(__GNUC__) || defined(__GLIBC__)
+ #    ifdef __i386__
+ 	"-D__i386__",
+-#     if defined(__GNUC__) && (__GNUC__ >= 3)
+#     if defined(__GNUC__) && (__GNUC__ >= 3) && !defined(__FreeBSD__)
+ 	"-m32",
+ #     endif
+ #    endif
--- a/devel/imake/files/patch-xmkmf.cpp
+++ b/devel/imake/files/patch-xmkmf.cpp
@ -1,5 +1,14 @@
 --- xmkmf.cpp.orig	2012-03-08 06:47:32.000000000 +0100
-+++ xmkmf.cpp	2013-03-17 22:53:14.000000000 +0100
+++ xmkmf.cpp	2013-06-28 11:55:04.174394058 +0200
+@@ -8,7 +8,7 @@
+ topdir=
+ curdir=.
+ do_all=
+-imake_defines=
+imake_defines="${IMAKECPPFLAGS}"
+ 
+ while [ $# -gt 0 ]
+ do
@@ -64,3 +64,12 @@
     imake $imake_defines $args
     ;;
--- a/devel/xxgdb/Makefile
+++ b/devel/xxgdb/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	xxgdb
-# Date created:		2 May 1995
-# Whom:			jkh
-#
+# Created by: jkh
 # $FreeBSD$
-#

 PORTNAME=	xxgdb
 PORTVERSION=	1.12
@ -13,14 +9,12 @@ MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	utilities

 MAINTAINER=	cy@FreeBSD.org
-COMMENT=	An X window interface for gdb
+COMMENT=	X window interface for gdb

-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	ice sm x11 xaw xext xmu xt
 MAN1=		xxgdb.1

-.include <bsd.port.pre.mk>
-
 # This isn't included in the original Imakefile for some reason.
 #  Yes, I know this will recompile the program every time, but
 #  we have the cookie anyway and it's much easier this way
@ -31,4 +25,4 @@ post-build:
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xxgdbiowin ${PREFIX}/bin

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/emulators/spim/Makefile
+++ b/emulators/spim/Makefile
@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for:  spim
-# Date created:			  Mon Oct 28, 1996
-# Whom:				  David O'Brien (obrien@cs.ucdavis.edu)
-#
+# Created by: David O'Brien (obrien@cs.ucdavis.edu)
 # $FreeBSD$
-#

 PORTNAME=	spim
 PORTVERSION=	8.0
@ -31,14 +26,14 @@ PLIST_DIRS=	%%DATADIR%%

 .if ${PORT_OPTIONS:MGUI}
 USE_XORG=	x11 xaw
-BUILD_DEPENDS+=			imake:${PORTSDIR}/devel/imake
+USES+=		imake:env
 PLIST_FILES+=	bin/xspim
 MAN1+=		xspim.1
 .endif

 post-build:
 .if ${PORT_OPTIONS:MGUI}
-	@(cd ${WRKSRC}/xspim && ${XMKMF} && \
+	@(cd ${WRKSRC}/xspim && ${SETENV} ${MAKE_ENV} ${XMKMF} && \
 		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE})
 .endif

--- a/emulators/xzx/Makefile
+++ b/emulators/xzx/Makefile
@ -11,8 +11,7 @@ DISTNAME=	${PORTNAME}-pro-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	ZX Spectrum (48K/128K/+3) Emulator for X11

-# xmkmf is used in configure script; USE_IMAKE makes the build unhappy
-BUILD_DEPENDS=	xmkmf:${PORTSDIR}/devel/imake
+USES=		imake:env

 USE_MOTIF=	yes
 USE_XORG=	x11 ice sm xext xpm xt xxf86vm
--- a/ftp/llnlxdir/Makefile
+++ b/ftp/llnlxdir/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	llnlxdir
-# Date created:				9 November 1997
-# Whom: Dima Ruban <dima@FreeBSD.org>
-#
+# Created by: Dima Ruban <dima@FreeBSD.org>
 # $FreeBSD$
-#

 PORTNAME=	llnlxdir
 PORTVERSION=	2.1.2
@ -20,8 +16,8 @@ PLIST_FILES=	bin/xdir lib/X11/app-defaults/XDir
 MAN1=		xdir.1

 WRKSRC=		${WRKDIR}/llnlxdir2_1_2/sources
+USES=		imake
 USE_MOTIF=	yes
-USE_IMAKE=	yes
 USE_XORG=	ice sm x11 xext xp xt

 .include <bsd.port.mk>
--- a/ftp/llnlxftp/Makefile
+++ b/ftp/llnlxftp/Makefile
@ -14,8 +14,8 @@ COMMENT=	Motif FTP client

 PLIST_FILES=	bin/xftp lib/X11/app-defaults/XFtp
 WRKSRC=		${WRKDIR}/llnlxftp2.1/sources
+USES=		imake
 USE_MOTIF=	yes
-USE_IMAKE=	yes
 USE_XORG=	ice sm x11 xext xp xt

 CFLAGS+=	-Wno-implicit-int \
--- 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

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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>
--- 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
--- 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
--- 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
--- 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
--- 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>
--- 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
--- 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

--- 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

--- 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
--- 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

--- 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

--- 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
--- 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
--- a/graphics/ivtools/Makefile
+++ b/graphics/ivtools/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:   ivtools
-# Date created:        13 March 2002
-# Whom:                scott
-#
+# Created by: scott
 # $FreeBSD$
-#

 PORTNAME=	ivtools
 PORTVERSION=	1.2.9
@ -15,14 +11,15 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	sylvio@FreeBSD.org
 COMMENT=	Drawing editors derived from idraw

-BUILD_DEPENDS=	imake:${PORTSDIR}/devel/imake
 LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff

+USES=		imake:env
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	autoconf
 CONFIGURE_ARGS=	--with-tiff=${PREFIX}
+CONFIGURE_ENV=	IMAKECPP=${CPP}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 MAKE_ARGS=	ARCH=FREEBSD
 USE_XORG=	x11 xaw ice xext
--- a/graphics/libaux/Makefile
+++ b/graphics/libaux/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	libaux
-# Date created:				14 March 2001
-# Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
-#
+# Created by: Maxim Sobolev <sobomax@FreeBSD.org>
 # $FreeBSD$
-#

 PORTNAME=	libaux
 PORTVERSION=	1.0
@ -13,12 +9,12 @@ MASTER_SITES=	http://www.freebsdbrasil.com.br/~jmelo/
 DISTFILES=	libaux${EXTRACT_SUFX} libtk${EXTRACT_SUFX}

 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A Nano Window Toolkit and Auxiliary Library for OpenGL
+COMMENT=	Nano Window Toolkit and Auxiliary Library for OpenGL

 WRKSRC=		${WRKDIR}/${PORTNAME}

+USES=		imake
 USE_GL=		glut
-USE_IMAKE=	yes
 MAKE_JOBS_UNSAFE=	yes

 do-install:
--- a/graphics/tgif/Makefile
+++ b/graphics/tgif/Makefile
@ -18,8 +18,8 @@ RUN_DEPENDS=	giftopnm:${PORTSDIR}/graphics/netpbm
 OPTIONS_DEFINE=	NLS A4SIZE DOCS
 A4SIZE_DESC=	Set default paper size to A4

+USES=		imake
 USE_GCC=	any
-USE_IMAKE=	yes
 PORTDOCS=	HISTORY README
 USE_XORG=	x11 xext xt sm ice
 MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}"
--- a/graphics/vcg/Makefile
+++ b/graphics/vcg/Makefile
@ -13,14 +13,13 @@ DISTNAME=	${PORTNAME}.20050204
 EXTRACT_SUFX=	.tgz

 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A Visualization Tool for compiler graphs
+COMMENT=	Visualization Tool for compiler graphs

 LICENSE=	GPLv2 # (or later)

-BUILD_DEPENDS=	imake:${PORTSDIR}/devel/imake
-
 WRKSRC=		${WRKDIR}/${PORTNAME}.${PORTVERSION}

+USES=		imake:env
 USE_XORG=	x11 xext
 MAKE_JOBS_UNSAFE=	yes

--- a/graphics/xfig/Makefile
+++ b/graphics/xfig/Makefile
@ -20,7 +20,7 @@ CONFLICTS=	xfig-[12].* xfig-3.1* xfig-3.2.[1234]*

 WRKSRC=		${WRKDIR}/${PORTNAME}.${PORTVERSION}

-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	ice sm x11 xaw xext xi xmu xpm xt
 MAN1=		xfig.1
 MANCOMPRESSED=	yes
--- a/graphics/xfpovray/Makefile
+++ b/graphics/xfpovray/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:    xfpovray
-# Date created:         20 Sep 1997
-# Whom:                 Thomas Gellekum <tg@FreeBSD.org>
-#
+# Created by: Thomas Gellekum <tg@FreeBSD.org>
 # $FreeBSD$
-#

 PORTNAME=	xfpovray
 PORTVERSION=	1.3.1
@ -20,7 +16,7 @@ COMMENT=	Graphical interface to POV-Ray
 LIB_DEPENDS=	forms.2:${PORTSDIR}/x11-toolkits/xforms
 RUN_DEPENDS=	povray:${PORTSDIR}/graphics/povray-meta

-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	x11 xext xpm
 USE_GMAKE=	yes
 MAKE_JOBS_UNSAFE=	yes
--- a/graphics/xgrasp/Makefile
+++ b/graphics/xgrasp/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	xgrasp
-# Date created:		23 July 1995
-# Whom:			asami
-#
+# Created by: asami
 # $FreeBSD$
-#

 PORTNAME=	xgrasp
 PORTVERSION=	1.7d
@ -18,8 +14,8 @@ COMMENT=	Display GL animations on X screen

 NO_WRKSUBDIR=	yes

+USES=		imake
 USE_XORG=	x11 xext
-USE_IMAKE=	yes
 MAKE_JOBS_SAFE=	yes

 MAN1=		glib.1 xgrasp.1
--- a/graphics/xli/Makefile
+++ b/graphics/xli/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	xli
-# Date created:				24 November 1994
-# Whom:					Satoshi Asami <asami@FreeBSD.org>
-#
+# Created by: Satoshi Asami <asami@FreeBSD.org>
 # $FreeBSD$
-#

 PORTNAME=	xli
 PORTVERSION=	1.17.0
@ -20,9 +16,9 @@ CONFLICTS_INSTALL=	xloadimage-*
 LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 		jpeg.11:${PORTSDIR}/graphics/jpeg

+USES=		imake
 USE_XORG=	xi
 USE_GCC=	any
-USE_IMAKE=	yes
 WRKSRC=		${WRKDIR}/xli-${XLI_SNAPVER}

 MAN1=		xli.1 xlito.1
--- a/graphics/xmandel/Makefile
+++ b/graphics/xmandel/Makefile
@ -17,7 +17,7 @@ COMMENT=	Window based interface to Mandelbrot sets and Julia sets
 EXTRACT_CMD=	${SH}
 EXTRACT_BEFORE_ARGS=	# empty
 EXTRACT_AFTER_ARGS=	# empty
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	ice sm x11 xaw xext xmu xt
 USE_PERL5_BUILD=yes
 NO_WRKSUBDIR=	yes
--- a/graphics/xpx/Makefile
+++ b/graphics/xpx/Makefile
@ -1,9 +1,5 @@
-# ports collection makefile for:	xpx
-# Date created:		25 Oct 1998
-# Whom:			Seiichirou Hiraoka
-#
+# Created by: Seiichirou Hiraoka
 # $FreeBSD$
-#

 PORTNAME=	xpx
 PORTVERSION=	1.41
@ -17,8 +13,8 @@ COMMENT=	Simple pixel editing tool to generate data for KISS

 WRKSRC=		${WRKDIR}/${PORTNAME}

+USES=		imake
 USE_XORG=	x11 xext
-USE_IMAKE=	yes
 XMKMF=		xmkmf

 DOCSDIR=	${PREFIX}/share/doc/ja/${PORTNAME}
--- a/graphics/xv/Makefile
+++ b/graphics/xv/Makefile
@ -16,14 +16,14 @@ PATCH_SITES=	http://www.gregroelofs.com/code/
 PATCHFILES=	xv-3.10a-enhancements.20070520-20081216.diff

 MAINTAINER?=	dinoex@FreeBSD.org
-COMMENT?=	An X11 program that displays images of various formats
+COMMENT?=	X11 program that displays images of various formats

 LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
 		tiff:${PORTSDIR}/graphics/tiff \
 		png15:${PORTSDIR}/graphics/png \
 		jasper:${PORTSDIR}/graphics/jasper

-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	xext x11 xt
 .if !defined(NOMAN)
 MAN1=		bggen.1 vdcomp.1 xcmap.1 xv.1 xvp2p.1
--- a/japanese/Wnn7-lib/Makefile
+++ b/japanese/Wnn7-lib/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	head files and libraries of Wnn7
-# Date created:		01/07/16
-# Whom:			Satoshi Taoka <taoka@FreeBSD.org>
-#
+# Created by: Satoshi Taoka <taoka@FreeBSD.org>
 # $FreeBSD$
-#

 PORTNAME=	Wnn7-lib
 PORTVERSION=	2001.10.17
@ -16,8 +12,8 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Wnn7 client library

+USES=		imake
 USE_GCC=	any
-USE_IMAKE=	yes
 USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/src
 PORTDOCS=	README
@ -29,10 +25,11 @@ post-patch:
 		${WRKSRC}/config/Project.tmpl \
 		${WRKSRC}/config/X11.tmpl \
 		${WRKSRC}/Makefile.ini
+	@${REINPLACE_CMD} -e 's/((/(/' ${WRKSRC}/config/X11.tmpl

 # Warning: we cannot use USE_IMAKE.
 do-build:
-	cd ${WRKSRC} && make World -f Makefile.ini
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} make World -f Makefile.ini

 post-install:
 	${MKDIR} ${PREFIX}/include/wnn7/wnn
--- a/japanese/canna-lib/Makefile
+++ b/japanese/canna-lib/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	canna-lib
-# Date created:		7 September 2008
-# Whom:			hrs
-#
+# Created by: hrs
 # $FreeBSD$
-#

 PORTNAME=	canna
 PORTVERSION=	3.7p3
@ -17,9 +13,9 @@ DISTNAME=	Canna${PORTVERSION:S/.//g}
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	A Kana-to-Kanji conversion system, library part

+USES=		imake
 USE_BZIP2=	yes
 USE_GCC=	any
-USE_IMAKE=	yes
 USE_LDCONFIG=	yes
 NO_INSTALL_MANPAGES=yes
 MAKE_JOBS_UNSAFE=	yes
@ -28,12 +24,10 @@ PLIST_SUB=	METAFILE="${METAFILE}" \

 ALL_TARGET=	canna
 INSTALL_TARGET=	instsgs
+XMKMF=		xmkmf

 METAFILE=	${DATADIR_REL}/canna-lib-dic.meta

-post-configure:
-	@cd ${CONFIGURE_WRKSRC} && ${SETENV} ${MAKE_ENV} ${XMKMF}
-
 post-install:
 	${MTREE_CMD} -cdink uname,gname,mode,nochange \
 		-p ${DATADIR}/dic > ${PREFIX}/${METAFILE}
--- a/japanese/canna-server/Makefile
+++ b/japanese/canna-server/Makefile
@ -15,9 +15,10 @@ COMMENT=	A Kana-to-Kanji conversion system, binary part

 LIB_DEPENDS=	canna.1:${PORTSDIR}/japanese/canna-lib

+USES=		imake
+USE_GCC=	any
 USE_RC_SUBR=	canna
 USE_BZIP2=	yes
-USE_IMAKE=	yes
 ALL_TARGET=	canna
 INSTALL_TARGET=	instserver instclient
 PLIST_SUB=	METAFILE="${METAFILE}" \
--- a/japanese/kinput2/Makefile
+++ b/japanese/kinput2/Makefile
@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}-v${PORTVERSION}
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	A Japanese text input server for X11 applications

-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	ice sm x11 xaw xext xmu xpm xt
 SUB_FILES=	Kinput2.conf
 PLIST_FILES=	${PLIST_ALL}
--- a/japanese/kterm/Makefile
+++ b/japanese/kterm/Makefile
@ -36,7 +36,7 @@ COMMENT=	An xterm variant with Japanese support

 BUILD_DEPENDS=	nkf:${PORTSDIR}/japanese/nkf

-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	xaw
 CFLAGS+=	-Wno-return-type

--- a/japanese/sj3-lib/Makefile
+++ b/japanese/sj3-lib/Makefile
@ -13,10 +13,10 @@ PATCHFILES=	${PORTNAME}-qq-2.0.1.21.diff.gz
 PATCH_DIST_STRIP=	-p1

 MAINTAINER=	hrs@FreeBSD.org
-COMMENT=	A Japanese input method, library part
+COMMENT=	Japanese input method, library part

+USES=		imake
 USE_GCC=	any
-USE_IMAKE=	yes
 USE_LDCONFIG=	yes
 NO_INSTALL_MANPAGES=	yes
 SUB_FILES=	sj3_freebsd.tmpl
--- a/japanese/sj3-server/Makefile
+++ b/japanese/sj3-server/Makefile
@ -13,14 +13,15 @@ PATCHFILES=	${PORTNAME}-qq-2.0.1.21.diff.gz
 PATCH_DIST_STRIP=	-p1

 MAINTAINER=	hrs@FreeBSD.org
-COMMENT=	A Japanese input method, binary part
+COMMENT=	Japanese input method, binary part

 LIB_DEPENDS=	sj3lib:${PORTSDIR}/japanese/sj3-lib

+USES=		imake
 USE_RC_SUBR=	sj3
-USE_IMAKE=	yes
 SUB_FILES=	sj3_freebsd.tmpl
 SUB_LIST=	DESTDIR=${DESTDIR}
+CFLAGS+=	-Wno-return-type

 USERS=		_sj3
 GROUPS=		_sj3
--- a/japanese/skkinput/Makefile
+++ b/japanese/skkinput/Makefile
@ -11,7 +11,7 @@ MASTER_SITE_SUBDIR=	skkinput2/6273
 MAINTAINER=	koma2@lovepeers.org
 COMMENT=	SKK-like Japanese input method for X11

-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	ice sm x11 xext xt xmu

 OPTIONS_RADIO=	RG1
--- a/japanese/skkinput3/Makefile
+++ b/japanese/skkinput3/Makefile
@ -11,7 +11,8 @@ DISTNAME=	skkinput-${PORTVERSION}
 MAINTAINER=	koma2@lovepeers.org
 COMMENT=	SKK-like Japanese input method for X11

-USE_IMAKE=	yes
+USES=		imake
+USE_GCC=	any
 USE_XORG=	ice sm x11 xext xmu xt

 OPTIONS_DEFINE=	SKK10
@ -21,6 +22,7 @@ RG1_DESC=	Skkserver Selection
 DBSKKD_DESC=	Use ja-dbskkd-cdb as skkserver
 RSKKSERV_DESC=	Use ja-rskkserv as skkserver
 SKK10_DESC=	Use SKK10 elisps
+USE_CSTD=	gnu89

 NO_INSTALL_MANPAGES=	yes

--- a/mail/xfaces/Makefile
+++ b/mail/xfaces/Makefile
@ -24,8 +24,8 @@ LIB_DEPENDS=	compface:${PORTSDIR}/mail/faces

 # GNU make properly processes some overridden rules in the makefile that
 # imake generates.  Specifically, installing the html docs.
+USES=		imake
 USE_GMAKE=	yes
-USE_IMAKE=	yes
 USE_XORG=	ice sm x11 xaw xext xmu xt xpm

 MAN1=		xfaces.1
--- a/math/xgobi/Makefile
+++ b/math/xgobi/Makefile
@ -19,7 +19,7 @@ CONFIGURE_WRKSRC=	${PATCH_WRKSRC}
 BUILD_WRKSRC=	${PATCH_WRKSRC}
 CFLAGS+=	-Wno-return-type

-USE_IMAKE=	true
+USES=		imake
 USE_XORG=	xbitmaps xaw

 XFREE86_HTML_MAN=	no
--- a/misc/magicpoint/Makefile
+++ b/misc/magicpoint/Makefile
@ -14,7 +14,7 @@ LIB_DEPENDS+=	png15:${PORTSDIR}/graphics/png \
 		mng:${PORTSDIR}/graphics/libmng
 RUN_DEPENDS+=	pnmscale:${PORTSDIR}/graphics/netpbm

-USE_IMAKE=	yes
+USES=		imake:env
 USE_XORG=	x11 xext xmu xt sm ice xi xtst
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
@ -81,6 +81,7 @@ post-patch:
 		${WRKSRC}/configure

 post-configure:
+	(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${MAKE_ENV} ${XMKMF})
 	cd ${WRKSRC}/contrib/xmindpath && \
 		${SH} ${CONFIGURE_SCRIPT} --prefix=${PREFIX}

--- a/misc/xless/Makefile
+++ b/misc/xless/Makefile
@ -12,7 +12,7 @@ MASTER_SITE_SUBDIR=	applications
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X11 viewer for text files.  Useful as an add-on tool for other apps

-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	ice sm x11 xaw xext xmu xpm xt
 MAN1=		xless.1
 MANCOMPRESSED=	yes
--- a/multimedia/xanim/Makefile
+++ b/multimedia/xanim/Makefile
@ -19,8 +19,8 @@ NO_CDROM=	redistributed without fee

 # clang's cpp destroys whitespace, particularly hard tabs in makefiles,
 # which is fatal for imake.
+USES=		imake
 USE_GCC=	any
-USE_IMAKE=	yes
 USE_XORG=	xext xt sm ice xext x11
 MAN1=		xanim.1
 MAKE_ARGS+=	-j 2 # safe and helps even the single-CPU machines
--- a/net/ssvnc/Makefile
+++ b/net/ssvnc/Makefile
@ -13,7 +13,6 @@ COMMENT=	Enhanced TightVNC Viewer (SSVNC: SSL/SSH VNC viewer)
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING

-BUILD_DEPENDS=	imake:${PORTSDIR}/devel/imake
 LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg
 RUN_DEPENDS=	stunnel:${PORTSDIR}/security/stunnel \
 		xterm:${PORTSDIR}/x11/xterm
@ -21,6 +20,7 @@ RUN_DEPENDS=	stunnel:${PORTSDIR}/security/stunnel \
 OPTIONS_DEFINE=	ULTRAFTP DOCS
 ULTRAFTP_DESC=	UltraVNC File Transfer support (Java required)

+USES=		imake:env
 USE_XORG=	xi xmu xt xaw ice xpm xext sm
 USE_TK_WRAPPER=	yes
 USE_PERL5_RUN=	yes
@ -55,7 +55,7 @@ post-patch:
 .endif

 do-configure:
-	@cd ${WRKSRC} && ${GMAKE} config
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} config

 post-install:
 	@${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}
--- a/net/tightvnc/Makefile
+++ b/net/tightvnc/Makefile
@ -22,10 +22,11 @@ CONFLICTS=	tridiavnc-[0-9]* vnc-[0-9]*

 WRKSRC=		${WRKDIR}/vnc_unixsrc

+USES=		imake
+CFLAGS+=	-Wno-return-type
 USE_GCC=	yes
 USE_BZIP2=	yes
 USE_PERL5=	yes
-USE_IMAKE=	yes
 USE_XORG=	xaw
 ALL_TARGET=	World
 NO_INSTALL_MANPAGES=	yes
--- a/news/knews/Makefile
+++ b/news/knews/Makefile
@ -9,7 +9,7 @@ MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=dinoex

 MAINTAINER=	dinoex@FreeBSD.org
-COMMENT=	A threaded nntp newsreader for X
+COMMENT=	Threaded nntp newsreader for X

 LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
 		png15:${PORTSDIR}/graphics/png \
@ -18,7 +18,7 @@ RUN_DEPENDS=	newsp:${PORTSDIR}/print/mp-letter

 LICENSE=	GPLv2

-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	xmu xpm xt sm ice xext x11
 MAKE_FLAGS=	BINDIR=${PREFIX}/bin MANDIR=${PREFIX}/man/man1 CC="${CC}" \
 		XAPPLOADDIR=${PREFIX}/lib/X11/app-defaults  -f
--- a/print/bibview/Makefile
+++ b/print/bibview/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	bibview
-# Date created:		21 July 1997
-# Whom:			dbader@eece.unm.edu
-#
+# Created by: dbader@eece.unm.edu
 # $FreeBSD$
-#

 PORTNAME=	bibview
 PORTVERSION=	2.2
@ -17,7 +13,7 @@ COMMENT=	Graphical interface for manipulating BibTeX bibliography databases

 MAKE_JOBS_SAFE=	yes

-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	ice sm x11 xaw xext xmu xt
 WRKSRC=		${WRKDIR}/bibview-${PORTVERSION}
 MAN1=		bibview.1
--- a/print/ghostview/Makefile
+++ b/print/ghostview/Makefile
@ -13,7 +13,7 @@ COMMENT=	X11 front-end for ghostscript, the GNU postscript previewer

 LICENSE=	GPLv2 # (or later)

-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	xbitmaps xaw
 USE_GHOSTSCRIPT_RUN=	yes
 MAKE_JOBS_SAFE=	yes
--- a/print/transfig/Makefile
+++ b/print/transfig/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	transfig
-# Date created:		9 August 1996
-# Whom:			chuckr@freebsd.org
-#
+# Created by: chuckr@freebsd.org
 # $FreeBSD$
-#

 PORTNAME=	transfig
 PORTVERSION=	3.2.5d
@ -20,9 +16,9 @@ LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png

 MAKE_JOBS_SAFE=	yes

-USE_GCC=	any
+USES=		imake
+CFLAGS+=	-Wno-return-type
 USE_GHOSTSCRIPT_RUN=	yes
-USE_IMAKE=	yes
 USE_XORG=	xpm
 MAN1=		fig2dev.1 fig2ps2tex.1 pic2tpic.1 transfig.1

--- a/sysutils/contool/Makefile
+++ b/sysutils/contool/Makefile
@ -15,7 +15,7 @@ LIB_DEPENDS=	xview.3:${PORTSDIR}/x11-toolkits/xview

 NO_CDROM=	source code cannot be sold, nor can you incorporate the source code into a product which is subsequently sold
 NO_WRKSUBDIR=	yes
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	x11 xext

 MAN1=		contool.1
--- a/sysutils/xbattbar/Makefile
+++ b/sysutils/xbattbar/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:    xbattbar
-# Date created:		Fri Feb 18 10:05:12 JST 2000
-# Whom:                 sumikawa
-#
+# Created by: sumikawa
 # $FreeBSD$
-#

 PORTNAME=	xbattbar
 PORTVERSION=	1.4.2
@ -15,7 +11,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	sumikawa@FreeBSD.org
 COMMENT=	Simple battery meter

-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	x11 xext
 WRKSRC=		${WRKDIR}/xbattbar-${PORTVERSION}
 MAN1=		xbattbar.1
--- a/sysutils/xcpustate/Makefile
+++ b/sysutils/xcpustate/Makefile
@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for:  xcpustate
-# Date created:			  31-Dec-1995
-# Whom:				  David O'Brien <obrien@cs.ucdavis.edu>
-#
+# Created by: David O'Brien <obrien@cs.ucdavis.edu>
 # $FreeBSD$
-#

 PORTNAME=	xcpustate
 PORTVERSION=	2.9
@ -16,14 +11,14 @@ EXTRACT_SUFX=	.shar
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	System monitoring utility graphically showing cpu load and status

-EXTRACT_CMD=	${CAT}
+EXTRACT_CMD=	${SH}
 EXTRACT_BEFORE_ARGS=	# none
-EXTRACT_AFTER_ARGS=	| ${SH}
+EXTRACT_AFTER_ARGS=	# none

 NO_WRKSUBDIR=	yes

+USES=		imake
 USE_XORG=	ice sm x11 xaw xext xmu xt
-USE_IMAKE=	yes

 MAN1=		${PORTNAME}.1
 PLIST_FILES=	bin/${PORTNAME}
--- a/x11-clocks/asclock/Makefile
+++ b/x11-clocks/asclock/Makefile
@ -17,8 +17,8 @@ CONFLICTS=	asclock-gtk-[0-9]* asclock-xlib-[0-9]*

 # clang's cpp destroys whitespace, particularly hard tabs in makefiles,
 # which is fatal for imake.
+USES=		imake
 USE_GCC=	any
-USE_IMAKE=	yes
 USE_XORG=	xpm xext x11
 MAN1=		asclock.1
 PLIST_FILES=	bin/asclock
--- a/x11-clocks/bclock/Makefile
+++ b/x11-clocks/bclock/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	bclock
-# Date created:		13 May 1997
-# Whom:			Brian Handy <handy@physics.montana.edu>
-#
+# Created by: Brian Handy <handy@physics.montana.edu>
 # $FreeBSD$
-#

 PORTNAME=	bclock
 PORTVERSION=	1.0
@ -15,7 +11,7 @@ MASTER_SITE_SUBDIR=	X11/clocks
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Round, analog X11 clock with Bezier curve hands

-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	ice sm x11 xext xmu xt
 MAN1=		bclock.1

--- a/x11-clocks/lmclock/Makefile
+++ b/x11-clocks/lmclock/Makefile
@ -10,7 +10,7 @@ MASTER_SITES=	CRITICAL
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Xerox Lisp machine clock clone

-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	x11 xext
 MAKE_JOBS_SAFE=	yes

--- a/x11-clocks/mouseclock/Makefile
+++ b/x11-clocks/mouseclock/Makefile
@ -11,10 +11,9 @@ MASTER_SITE_SUBDIR=	X11/clocks
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Display the current time using the X root cursor

+USES=		imake
 USE_GMAKE=	yes
-USE_IMAKE=	yes
 USE_XORG=	x11 xext
-XMKMF=		xmkmf
 NO_INSTALL_MANPAGES=	yes

 post-configure:
--- a/x11-clocks/swisswatch/Makefile
+++ b/x11-clocks/swisswatch/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:    swisswatch
-# Date created:         16 December 1995
-# Whom:                 Yoshiro MIHIRA <sanpei@yy.cs.keio.ac.jp>
-#
+# Created by: Yoshiro MIHIRA <sanpei@yy.cs.keio.ac.jp>
 # $FreeBSD$
-#

 PORTNAME=	swisswatch
 PORTVERSION=	0.06
@ -13,10 +9,10 @@ MASTER_SITES=	${MASTER_SITE_PORTS_JP}
 EXTRACT_SUFX=	.tar.Z

 MAINTAINER=	sanpei@FreeBSD.org
-COMMENT=	A Swiss railway clock emulation, and a fancy default appearance
+COMMENT=	Swiss railway clock emulation, and a fancy default appearance

+USES=		imake
 USE_GCC=	any
-USE_IMAKE=	yes
 USE_XORG=	ice sm x11 xext xmu xt
 MAN1=		swisswatch.1

--- a/x11-clocks/t3d/Makefile
+++ b/x11-clocks/t3d/Makefile
@ -19,7 +19,7 @@ EXTRACT_BEFORE_ARGS=	-dc
 EXTRACT_AFTER_ARGS=	| ${SH}

 NO_WRKSUBDIR=	yes
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	x11 xext

 MAN1=		t3d.1
--- a/x11-fonts/jmk-x11-fonts/Makefile
+++ b/x11-fonts/jmk-x11-fonts/Makefile
@ -13,7 +13,7 @@ BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
 		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
 		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale

-USE_IMAKE=	yes
+USES=		imake

 do-install:
 	@${MKDIR} ${PREFIX}/lib/X11/fonts/jmk
--- a/x11-fonts/sgifonts/Makefile
+++ b/x11-fonts/sgifonts/Makefile
@ -19,7 +19,7 @@ BUILD_DEPENDS=		bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
 PLIST=		${WRKDIR}/pkg-plist
 PLIST_DIRS=	lib/X11/fonts/local/sgi
 PKGMESSAGE=	${WRKDIR}/pkg-message
-USE_IMAKE=	yes
+USES=		imake
 EXTRACT_CMD=	${TAR}
 EXTRACT_BEFORE_ARGS=	-O -xf
 EXTRACT_AFTER_ARGS=	sgi-fonts.tar.gz | ${TAR} -xf -
--- a/x11-toolkits/Xaw3d/Makefile
+++ b/x11-toolkits/Xaw3d/Makefile
@ -14,8 +14,8 @@ COMMENT=	3-D Athena Widget set that looks like Motif
 LICENSE=	MIT

 WRKSRC=		${WRKDIR}/xc/lib/Xaw3d
+USES=		imake
 USE_GCC=	any
-USE_IMAKE=	yes
 USE_XORG=	x11 xext xmu xt sm ice xpm
 USE_LDCONFIG=	yes

--- a/x11-toolkits/xview-clients/Makefile
+++ b/x11-toolkits/xview-clients/Makefile
@ -21,7 +21,7 @@ PATCH_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/x11-toolkits/xview:patch
 CONFIGURE_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/x11-toolkits/xview:configure
 LIB_DEPENDS=	xview.3:${PORTSDIR}/x11-toolkits/xview

-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	x11 xext
 WRKSRC=		${WRKDIRPREFIX}${.CURDIR}/../xview/work/${DISTNAME}
 ALL_TARGET=	Clients
--- a/x11-toolkits/xview/Makefile
+++ b/x11-toolkits/xview/Makefile
@ -20,7 +20,7 @@ BUILD_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \

 ONLY_FOR_ARCHS=	i386
 REINPLACE_ARGS=	-i ""
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	x11
 USE_LDCONFIG=	yes
 IMAKEINCLUDE=	"-I${WRKSRC}/config -I${LOCALBASE}/lib/X11/config"
--- a/x11-wm/afterstep/Makefile
+++ b/x11-wm/afterstep/Makefile
@ -16,7 +16,7 @@ RUN_DEPENDS=	asclock:${PORTSDIR}/x11-clocks/asclock

 NO_LATEST_LINK=	yes
 USE_XORG=	xpm xext x11
-USE_IMAKE=	yes
+USES=		imake
 INSTALL_TARGET=	install install.man
 MANCOMPRESSED=	yes
 MAN1=		afterstep.1 Animate.1 Audio.1 Auto.1 Banner.1 Pager.1 Wharf.1
@ -42,7 +42,7 @@ post-patch:
 		done

 pre-build:
-		@ cd ${WRKSRC}; ${SH} MakeMakefiles
+		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${SH} MakeMakefiles

 post-install:
 		@ ${MKDIR} ${PREFIX}/lib/X11/afterstep/backgrounds/
--- a/x11-wm/fvwm/Makefile
+++ b/x11-wm/fvwm/Makefile
@ -13,10 +13,9 @@ COMMENT=	The fvwm window manager
 NO_LATEST_LINK=	yes
 MAKE_JOBS_UNSAFE=	yes

-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	xbitmaps xpm xext x11 xmu
 # must overwrite the default from bsd.port.mk
-XMKMF=		xmkmf
 ALL_TARGET=	Makefiles all
 MAN1=		FvwmAudio.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 FvwmClean.1 \
 		FvwmDebug.1 FvwmIconBox.1 FvwmIdent.1 FvwmPager.1 FvwmSave.1 \
--- a/x11-wm/olvwm/Makefile
+++ b/x11-wm/olvwm/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	olvwm
-# Date created:		21 October 1994
-# Whom:			smace
-#
+# Created by: smace
 # $FreeBSD$
-#

 PORTNAME=	olvwm
 PORTVERSION=	4.2
@ -31,7 +27,7 @@ LIB_DEPENDS=	xview.3:${PORTSDIR}/x11-toolkits/xview

 REINPLACE_ARGS= -i ""
 NO_WRKSUBDIR=	yes
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	xpm
 MAN1=		olvwm.1 olvwmrc.1
 XFREE86_HTML_MAN=	no
--- a/x11-wm/piewm/Makefile
+++ b/x11-wm/piewm/Makefile
@ -8,10 +8,10 @@ CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.crynwr.com/piewm/

 MAINTAINER=	david@catwhisker.org
-COMMENT=	A tvtwm with pie (circular) menus
+COMMENT=	tvtwm with pie (circular) menus

+USES=		imake
 DISABLE_SIZE=	yes
-USE_IMAKE=	yes
 USE_XORG=	xbitmaps xpm xmu
 MAN1=		piewm.1

--- a/x11-wm/treewm/Makefile
+++ b/x11-wm/treewm/Makefile
@ -12,7 +12,7 @@ COMMENT=	Window manager that arranges windows in a tree

 LICENSE=	GPLv2

-BUILD_DEPENDS=	xmkmf:${PORTSDIR}/devel/imake
+USES=		imake:env

 USE_BZIP2=	yes
 USE_GMAKE=	yes
--- a/x11/bricons/Makefile
+++ b/x11/bricons/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	bricons
-# Date created:		31 Jul 1996
-# Whom:			shanee@augusta.de
-#
+# Created by: shanee@augusta.de
 # $FreeBSD$
-#

 PORTNAME=	bricons
 PORTVERSION=	3.0
@ -18,9 +14,9 @@ COMMENT=	Quick start up utility for applications on an X display

 WRKSRC=		${WRKDIR}/${PORTNAME}

+USES=		imake
 USE_PERL5_BUILD=yes
 USE_XORG=	xaw
-USE_IMAKE=	yes
 MAKE_JOBS_SAFE=	yes

 MAN1=		bricons.1
--- a/x11/dynamag/Makefile
+++ b/x11/dynamag/Makefile
@ -15,7 +15,7 @@ COMMENT=	Magnifying utility which updates continuously
 ALL_TARGET=	dynamag
 NO_INSTALL_MANPAGES=	yes
 PLIST_FILES=	bin/dynamag
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	x11 xaw xext xmu xt xpm sm ice
 WRKSRC=		${WRKDIR}/${PORTNAME}

--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@ -14,8 +14,7 @@ COMMENT=	Basic applications for the KDE system
 RUN_DEPENDS=	${KDE_PREFIX}/env/xdg-env.sh:${PORTSDIR}/misc/kde-xdg-env \
 		kompmgr:${PORTSDIR}/x11-wm/kompmgr \
 		${LOCALBASE}/etc/pam.d/kde:${PORTSDIR}/security/pam_kde
-BUILD_DEPENDS=	imake:${PORTSDIR}/devel/imake \
-		bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
+BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
 		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
 LIB_DEPENDS=	sasl2:${PORTSDIR}/security/cyrus-sasl2 \
 		smbclient:${PORTSDIR}/net/samba-libsmbclient
@ -27,6 +26,7 @@ EXPIRATION_DATE=	2013-07-01

 USE_KDELIBS_VER=3

+USES=		imake:env
 USE_OPENLDAP=	yes
 USE_OPENSSL=	yes

--- a/x11/props/Makefile
+++ b/x11/props/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	props
-# Date created:		3 January 1998
-# Whom:			jraynard
-#
+# Created by: jraynard
 # $FreeBSD$
-#

 PORTNAME=	props
 PORTVERSION=	1.0
@ -21,7 +17,7 @@ CONFLICTS=	xview-clients-3.2.1.4.19*
 LIB_DEPENDS=	xview.3:${PORTSDIR}/x11-toolkits/xview

 WRKSRC=		${WRKDIR}/props
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	x11 xext
 MAKE_ARGS=	INFOFILES=""

--- a/x11/x3270/Makefile
+++ b/x11/x3270/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	x3270
-# Date created:		31 January 1995
-# Whom:			janek
-#
+# Created by: janek
 # $FreeBSD$
-#

 PORTNAME=	x3270
 PORTVERSION=	3.3.10
@ -18,8 +14,7 @@ BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
 		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
 		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale

-USE_IMAKE=	yes
-USES=		iconv
+USES=		iconv imake:env
 USE_XORG=	ice sm x11 xaw xext xmu xt
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-fontdir=${PREFIX}/lib/X11/fonts/local --disable-dbcs
--- a/x11/xascii/Makefile
+++ b/x11/xascii/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	xascii
-# Date created:			10 April 2012
-# Whom:				Cy Schubert <cy@FreeBSD.org>
-#
+# Created by: Cy Schubert <cy@FreeBSD.org>
 # $FreeBSD$
-#

 PORTNAME=	xascii
 PORTVERSION=	1.0
@ -17,7 +13,7 @@ MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Display an ASCII table in decimal, octal, and hexadecimal.

 MAKE_ARGS+=	PREFIX=${PREFIX}
-USE_IMAKE=	YES
+USES=		imake
 USE_XORG=	x11 xt xaw
 MAN1=		xascii.1
 PLIST_FILES=	bin/xascii
--- a/x11/xautolock/Makefile
+++ b/x11/xautolock/Makefile
@ -16,13 +16,9 @@ OPTIONS_DEFINE=	XLOCK
 OPTIONS_DEFAULT=	XLOCK
 XLOCK_DESC=	Force dependency on x11/xlockmore

-.include <bsd.port.options.mk>
+XLOCK_RUN_DEPENDS=	xlock:${PORTSDIR}/x11/xlockmore

-.if ${PORT_OPTIONS:MXLOCK}
-RUN_DEPENDS+=	xlock:${PORTSDIR}/x11/xlockmore
-.endif
-
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	x11 xext xscrnsaver
 MAN1=		xautolock.1
 PLIST_FILES=	bin/xautolock
--- a/x11/xcb/Makefile
+++ b/x11/xcb/Makefile
@ -14,7 +14,7 @@ COMMENT=	Tool for managing x11 cut-buffers

 LICENSE=	MIT

-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	ice sm x11 xaw xext xmu xt

 MAN1=		xcb.1
--- a/Show More
+++ b/Show More