svn commit: r321957 - in head: . Mk Mk/Uses audio/ascd audio/nas audio/wmsmixer audio/xcdplayer audio/xmcd audio/xmmix audio/xwave comms/acfax deskutils/xmdiary deskutils/xrolo devel/imake devel/im...

Baptiste Daroussin bapt at FreeBSD.org
Fri Jun 28 11:51:17 UTC 2013 

Author: bapt
Date: Fri Jun 28 11:51:05 2013
New Revision: 321957
URL: http://svnweb.freebsd.org/changeset/ports/321957

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

Added:
  head/Mk/Uses/imake.mk   (contents, props changed)
  head/devel/imake/files/patch-imakemdep.h   (contents, props changed)
Modified:
  head/CHANGES
  head/Mk/bsd.port.mk
  head/audio/ascd/Makefile
  head/audio/nas/Makefile
  head/audio/wmsmixer/Makefile
  head/audio/xcdplayer/Makefile
  head/audio/xmcd/Makefile
  head/audio/xmmix/Makefile
  head/audio/xwave/Makefile
  head/comms/acfax/Makefile
  head/deskutils/xmdiary/Makefile
  head/deskutils/xrolo/Makefile
  head/devel/imake/Makefile
  head/devel/imake/files/patch-xmkmf.cpp
  head/devel/xxgdb/Makefile
  head/emulators/spim/Makefile
  head/emulators/xzx/Makefile
  head/ftp/llnlxdir/Makefile
  head/ftp/llnlxftp/Makefile
  head/games/bugsx/Makefile
  head/games/spider/Makefile
  head/games/xataxx/Makefile
  head/games/xblackjack/Makefile
  head/games/xboing/Makefile
  head/games/xchomp/Makefile
  head/games/xflame/Makefile
  head/games/xinfocom/Makefile
  head/games/xjewel/Makefile
  head/games/xmille/Makefile
  head/games/xmine/Makefile
  head/games/xneko/Makefile
  head/games/xpilot/Makefile
  head/games/xpipeman/Makefile
  head/games/xpuzzletama/Makefile
  head/games/xrisk/Makefile
  head/games/xrubik/Makefile
  head/games/xscavenger/Makefile
  head/games/xscrabble/Makefile
  head/games/xskat/Makefile
  head/games/xvmines/Makefile
  head/graphics/ivtools/Makefile
  head/graphics/libaux/Makefile
  head/graphics/tgif/Makefile
  head/graphics/vcg/Makefile
  head/graphics/xfig/Makefile
  head/graphics/xfpovray/Makefile
  head/graphics/xgrasp/Makefile
  head/graphics/xli/Makefile
  head/graphics/xmandel/Makefile
  head/graphics/xpx/Makefile
  head/graphics/xv/Makefile
  head/japanese/Wnn7-lib/Makefile
  head/japanese/canna-lib/Makefile
  head/japanese/canna-server/Makefile
  head/japanese/kinput2/Makefile
  head/japanese/kterm/Makefile
  head/japanese/sj3-lib/Makefile
  head/japanese/sj3-server/Makefile
  head/japanese/skkinput/Makefile
  head/japanese/skkinput3/Makefile
  head/mail/xfaces/Makefile
  head/math/xgobi/Makefile
  head/misc/magicpoint/Makefile
  head/misc/xless/Makefile
  head/multimedia/xanim/Makefile
  head/net/ssvnc/Makefile
  head/net/tightvnc/Makefile
  head/news/knews/Makefile
  head/print/bibview/Makefile
  head/print/ghostview/Makefile
  head/print/transfig/Makefile
  head/sysutils/contool/Makefile
  head/sysutils/xbattbar/Makefile
  head/sysutils/xcpustate/Makefile
  head/x11-clocks/asclock/Makefile
  head/x11-clocks/bclock/Makefile
  head/x11-clocks/lmclock/Makefile
  head/x11-clocks/mouseclock/Makefile
  head/x11-clocks/swisswatch/Makefile
  head/x11-clocks/t3d/Makefile
  head/x11-fonts/jmk-x11-fonts/Makefile
  head/x11-fonts/sgifonts/Makefile
  head/x11-toolkits/Xaw3d/Makefile
  head/x11-toolkits/xview-clients/Makefile
  head/x11-toolkits/xview/Makefile
  head/x11-wm/afterstep/Makefile
  head/x11-wm/fvwm/Makefile
  head/x11-wm/olvwm/Makefile
  head/x11-wm/piewm/Makefile
  head/x11-wm/treewm/Makefile
  head/x11/bricons/Makefile
  head/x11/dynamag/Makefile
  head/x11/kdebase3/Makefile
  head/x11/props/Makefile
  head/x11/x3270/Makefile
  head/x11/xascii/Makefile
  head/x11/xautolock/Makefile
  head/x11/xcb/Makefile
  head/x11/xcoloredit/Makefile
  head/x11/xgrab/Makefile
  head/x11/xlogout/Makefile
  head/x11/xmotd/Makefile
  head/x11/xorg-cf-files/Makefile
  head/x11/xorg-cf-files/files/patch-FreeBSD.cf
  head/x11/xprompt/Makefile
  head/x11/xstroke/Makefile
  head/x11/xvkbd/Makefile
  head/x11/xwit/Makefile
  head/x11/xxkb/Makefile

Modified: head/CHANGES
==============================================================================
--- head/CHANGES	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/CHANGES	Fri Jun 28 11:51:05 2013	(r321957)
@@ -10,6 +10,18 @@ in the release notes and/or placed into 
 
 All ports committers are allowed to commit to this file.
 
+20130628:
+AUTHOR: bapt at 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 at FreeBSD.org
 

Added: head/Mk/Uses/imake.mk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/Mk/Uses/imake.mk	Fri Jun 28 11:51:05 2013	(r321957)
@@ -0,0 +1,52 @@
+# $FreeBSD$
+#
+# Provide support for imake based projects
+#
+# MAINTAINER: x11 at 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

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/Mk/bsd.port.mk	Fri Jun 28 11:51:05 2013	(r321957)
@@ -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-tool
 .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/
 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
 

Modified: head/audio/ascd/Makefile
==============================================================================
--- head/audio/ascd/Makefile	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/audio/ascd/Makefile	Fri Jun 28 11:51:05 2013	(r321957)
@@ -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

Modified: head/audio/nas/Makefile
==============================================================================
--- head/audio/nas/Makefile	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/audio/nas/Makefile	Fri Jun 28 11:51:05 2013	(r321957)
@@ -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 at 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//}"

Modified: head/audio/wmsmixer/Makefile
==============================================================================
--- head/audio/wmsmixer/Makefile	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/audio/wmsmixer/Makefile	Fri Jun 28 11:51:05 2013	(r321957)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	wmsmixer
-# Date created:				2 April 2001
-# Whom:					Konstantinos Konstantinidis <kkonstan at daemon.gr>
-#
+# Created by: Konstantinos Konstantinidis <kkonstan at daemon.gr>
 # $FreeBSD$
-#
 
 PORTNAME=	wmsmixer
 PORTVERSION=	0.5.1
@@ -16,8 +12,9 @@ COMMENT=	An audio mixer for the WindowMa
 
 PLIST_FILES=	bin/wmsmixer
 PORTDOCS=	README
+
+USES=		imake
 USE_XORG=	xpm
-USE_IMAKE=	YES
 MAKE_ARGS=	CC="${CXX}" CFLAGS="${CXXFLAGS}"
 
 do-install:

Modified: head/audio/xcdplayer/Makefile
==============================================================================
--- head/audio/xcdplayer/Makefile	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/audio/xcdplayer/Makefile	Fri Jun 28 11:51:05 2013	(r321957)
@@ -11,8 +11,8 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	CD player for X
 
+USES=		imake
 USE_XORG=	xbitmaps xaw
-USE_IMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 
 MAN1=		xcdplayer.1

Modified: head/audio/xmcd/Makefile
==============================================================================
--- head/audio/xmcd/Makefile	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/audio/xmcd/Makefile	Fri Jun 28 11:51:05 2013	(r321957)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xmcd
-# Date created:		16 February 1995
-# Whom:			Gennady Sorokopud <gena at NetVision.net.il>
-#
+# Created by: Gennady Sorokopud <gena at NetVision.net.il>
 # $FreeBSD$
-#
 
 PORTNAME=	xmcd
 PORTVERSION=	3.3.2
@@ -18,8 +14,8 @@ LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio
 		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

Modified: head/audio/xmmix/Makefile
==============================================================================
--- head/audio/xmmix/Makefile	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/audio/xmmix/Makefile	Fri Jun 28 11:51:05 2013	(r321957)
@@ -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
 

Modified: head/audio/xwave/Makefile
==============================================================================
--- head/audio/xwave/Makefile	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/audio/xwave/Makefile	Fri Jun 28 11:51:05 2013	(r321957)
@@ -13,7 +13,7 @@ MAINTAINER=	a0516 at 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
 

Modified: head/comms/acfax/Makefile
==============================================================================
--- head/comms/acfax/Makefile	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/comms/acfax/Makefile	Fri Jun 28 11:51:05 2013	(r321957)
@@ -16,7 +16,7 @@ LIB_DEPENDS=	Xaw3d:${PORTSDIR}/x11-toolk
 PLIST_FILES=	bin/acfax
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	x11 xext xmu xt sm ice
 
 post-extract:

Modified: head/deskutils/xmdiary/Makefile
==============================================================================
--- head/deskutils/xmdiary/Makefile	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/deskutils/xmdiary/Makefile	Fri Jun 28 11:51:05 2013	(r321957)
@@ -15,12 +15,12 @@ COMMENT=	Personal and group calendar uti
 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:

Modified: head/deskutils/xrolo/Makefile
==============================================================================
--- head/deskutils/xrolo/Makefile	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/deskutils/xrolo/Makefile	Fri Jun 28 11:51:05 2013	(r321957)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:  xrolo
-# Date created:        17 January 1999
-# Whom:                Lars Koeller <Lars.Koeller at Uni-Bielefeld.DE>
-#
+# Created by: Lars Koeller <Lars.Koeller at Uni-Bielefeld.DE>
 # $FreeBSD$
-#
 
 PORTNAME=	xrolo
 PORTVERSION=	2.6
@@ -21,7 +17,7 @@ LIB_DEPENDS=	xview.3:${PORTSDIR}/x11-too
 
 WRKSRC=		${WRKDIR}/xrolo
 
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	x11 xext
 MAN1=		xrolo.1
 PLIST_FILES=	bin/xrolo

Modified: head/devel/imake/Makefile
==============================================================================
--- head/devel/imake/Makefile	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/devel/imake/Makefile	Fri Jun 28 11:51:05 2013	(r321957)
@@ -3,28 +3,27 @@
 
 PORTNAME=	imake
 PORTVERSION=	1.0.5
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel
 
 MAINTAINER=	x11 at 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>

Added: head/devel/imake/files/patch-imakemdep.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/imake/files/patch-imakemdep.h	Fri Jun 28 11:51:05 2013	(r321957)
@@ -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

Modified: head/devel/imake/files/patch-xmkmf.cpp
==============================================================================
--- head/devel/imake/files/patch-xmkmf.cpp	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/devel/imake/files/patch-xmkmf.cpp	Fri Jun 28 11:51:05 2013	(r321957)
@@ -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
      ;;

Modified: head/devel/xxgdb/Makefile
==============================================================================
--- head/devel/xxgdb/Makefile	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/devel/xxgdb/Makefile	Fri Jun 28 11:51:05 2013	(r321957)
@@ -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 at 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>

Modified: head/emulators/spim/Makefile
==============================================================================
--- head/emulators/spim/Makefile	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/emulators/spim/Makefile	Fri Jun 28 11:51:05 2013	(r321957)
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for:  spim
-# Date created:			  Mon Oct 28, 1996
-# Whom:				  David O'Brien (obrien at cs.ucdavis.edu)
-#
+# Created by: David O'Brien (obrien at 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
 

Modified: head/emulators/xzx/Makefile
==============================================================================
--- head/emulators/xzx/Makefile	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/emulators/xzx/Makefile	Fri Jun 28 11:51:05 2013	(r321957)
@@ -11,8 +11,7 @@ DISTNAME=	${PORTNAME}-pro-${PORTVERSION}
 MAINTAINER=	ports at 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

Modified: head/ftp/llnlxdir/Makefile
==============================================================================
--- head/ftp/llnlxdir/Makefile	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/ftp/llnlxdir/Makefile	Fri Jun 28 11:51:05 2013	(r321957)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	llnlxdir
-# Date created:				9 November 1997
-# Whom: Dima Ruban <dima at FreeBSD.org>
-#
+# Created by: Dima Ruban <dima at FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	llnlxdir
 PORTVERSION=	2.1.2
@@ -20,8 +16,8 @@ PLIST_FILES=	bin/xdir lib/X11/app-defaul
 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>

Modified: head/ftp/llnlxftp/Makefile
==============================================================================
--- head/ftp/llnlxftp/Makefile	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/ftp/llnlxftp/Makefile	Fri Jun 28 11:51:05 2013	(r321957)
@@ -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 \

Modified: head/games/bugsx/Makefile
==============================================================================
--- head/games/bugsx/Makefile	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/games/bugsx/Makefile	Fri Jun 28 11:51:05 2013	(r321957)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:  bugsx
-# Date created:  7 December 1997
-# Whom:  Don Croyle <croyle at gelemna.org>
-#
+# Created by: Don Croyle <croyle at gelemna.org>
 # $FreeBSD$
-#
 
 PORTNAME=	bugsx
 PORTVERSION=	1.08
@@ -17,13 +13,9 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports at 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
 

Modified: head/games/spider/Makefile
==============================================================================
--- head/games/spider/Makefile	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/games/spider/Makefile	Fri Jun 28 11:51:05 2013	(r321957)
@@ -13,7 +13,7 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	ports at 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

Modified: head/games/xataxx/Makefile
==============================================================================
--- head/games/xataxx/Makefile	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/games/xataxx/Makefile	Fri Jun 28 11:51:05 2013	(r321957)
@@ -14,8 +14,8 @@ COMMENT=	Strategy game of position and m
 
 OPTIONS_DEFINE=	DOCS
 
+USES=		imake
 USE_XORG=	x11 xext
-USE_IMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 
 MAN6=		xataxx.6

Modified: head/games/xblackjack/Makefile
==============================================================================
--- head/games/xblackjack/Makefile	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/games/xblackjack/Makefile	Fri Jun 28 11:51:05 2013	(r321957)
@@ -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

Modified: head/games/xboing/Makefile
==============================================================================
--- head/games/xboing/Makefile	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/games/xboing/Makefile	Fri Jun 28 11:51:05 2013	(r321957)
@@ -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

Modified: head/games/xchomp/Makefile
==============================================================================
--- head/games/xchomp/Makefile	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/games/xchomp/Makefile	Fri Jun 28 11:51:05 2013	(r321957)
@@ -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

Modified: head/games/xflame/Makefile
==============================================================================
--- head/games/xflame/Makefile	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/games/xflame/Makefile	Fri Jun 28 11:51:05 2013	(r321957)
@@ -9,11 +9,11 @@ MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=kris
 
 MAINTAINER=	ports at 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

Modified: head/games/xinfocom/Makefile
==============================================================================
--- head/games/xinfocom/Makefile	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/games/xinfocom/Makefile	Fri Jun 28 11:51:05 2013	(r321957)
@@ -17,7 +17,7 @@ COMMENT=	An Infocom game interpreter for
 PLIST_FILES=	bin/xinfocom
 WRKSRC=		${WRKDIR}/xinfocom
 
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	xt sm ice xext x11
 
 .include <bsd.port.mk>

Modified: head/games/xjewel/Makefile
==============================================================================
--- head/games/xjewel/Makefile	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/games/xjewel/Makefile	Fri Jun 28 11:51:05 2013	(r321957)
@@ -15,8 +15,8 @@ BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-
 		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

Modified: head/games/xmille/Makefile
==============================================================================
--- head/games/xmille/Makefile	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/games/xmille/Makefile	Fri Jun 28 11:51:05 2013	(r321957)
@@ -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

Modified: head/games/xmine/Makefile
==============================================================================
--- head/games/xmine/Makefile	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/games/xmine/Makefile	Fri Jun 28 11:51:05 2013	(r321957)
@@ -1,7 +1,5 @@
 # Created by: joerg
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xmine
 PORTVERSION=	1.0.3
@@ -17,7 +15,7 @@ COMMENT=	The `Athena' port of the xmines
 
 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

Modified: head/games/xneko/Makefile
==============================================================================
--- head/games/xneko/Makefile	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/games/xneko/Makefile	Fri Jun 28 11:51:05 2013	(r321957)
@@ -14,7 +14,7 @@ MAINTAINER=	dinoex at 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

Modified: head/games/xpilot/Makefile
==============================================================================
--- head/games/xpilot/Makefile	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/games/xpilot/Makefile	Fri Jun 28 11:51:05 2013	(r321957)
@@ -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 at 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>

Modified: head/games/xpipeman/Makefile
==============================================================================
--- head/games/xpipeman/Makefile	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/games/xpipeman/Makefile	Fri Jun 28 11:51:05 2013	(r321957)
@@ -16,7 +16,7 @@ COMMENT=	Connect the pipes to stop the l
 # 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

Modified: head/games/xpuzzletama/Makefile
==============================================================================
--- head/games/xpuzzletama/Makefile	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/games/xpuzzletama/Makefile	Fri Jun 28 11:51:05 2013	(r321957)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xpuzzletama
-# Date created:		18 January 1997
-# Whom:			Yukihiro Nakai <Nakai at Mlab.t.u-tokyo.ac.jp>
-#
+# Created by: Yukihiro Nakai <Nakai at Mlab.t.u-tokyo.ac.jp>
 # $FreeBSD$
-#
 
 PORTNAME=	xpuzzletama
 PORTVERSION=	1.5b
@@ -21,7 +17,7 @@ MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Puzzle tama, a Tetris like game
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	xpm
 NO_INSTALL_MANPAGES=	yes
 

Modified: head/games/xrisk/Makefile
==============================================================================
--- head/games/xrisk/Makefile	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/games/xrisk/Makefile	Fri Jun 28 11:51:05 2013	(r321957)
@@ -8,9 +8,9 @@ CATEGORIES=	games
 MASTER_SITES=	http://my.pages.de/pub/comp/unix/games/xrisk/old/
 
 MAINTAINER=	ports at 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
 

Modified: head/games/xrubik/Makefile
==============================================================================
--- head/games/xrubik/Makefile	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/games/xrubik/Makefile	Fri Jun 28 11:51:05 2013	(r321957)
@@ -12,7 +12,7 @@ MAINTAINER=	dinoex at 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

Modified: head/games/xscavenger/Makefile
==============================================================================
--- head/games/xscavenger/Makefile	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/games/xscavenger/Makefile	Fri Jun 28 11:51:05 2013	(r321957)
@@ -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
 

Modified: head/games/xscrabble/Makefile
==============================================================================
--- head/games/xscrabble/Makefile	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/games/xscrabble/Makefile	Fri Jun 28 11:51:05 2013	(r321957)
@@ -11,8 +11,8 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${
 MAINTAINER=	dinoex at 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
 

Modified: head/games/xskat/Makefile
==============================================================================
--- head/games/xskat/Makefile	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/games/xskat/Makefile	Fri Jun 28 11:51:05 2013	(r321957)
@@ -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

Modified: head/games/xvmines/Makefile
==============================================================================
--- head/games/xvmines/Makefile	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/games/xvmines/Makefile	Fri Jun 28 11:51:05 2013	(r321957)
@@ -15,8 +15,8 @@ LIB_DEPENDS=	xview:${PORTSDIR}/x11-toolk
 
 OPTIONS_DEFINE=	DOCS
 
+USES=		imake
 USE_XORG=	x11
-USE_IMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 
 MANCOMPRESSED=	no

Modified: head/graphics/ivtools/Makefile
==============================================================================
--- head/graphics/ivtools/Makefile	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/graphics/ivtools/Makefile	Fri Jun 28 11:51:05 2013	(r321957)
@@ -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 at 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

Modified: head/graphics/libaux/Makefile
==============================================================================
--- head/graphics/libaux/Makefile	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/graphics/libaux/Makefile	Fri Jun 28 11:51:05 2013	(r321957)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	libaux
-# Date created:				14 March 2001
-# Whom:					Maxim Sobolev <sobomax at FreeBSD.org>
-#
+# Created by: Maxim Sobolev <sobomax at FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libaux
 PORTVERSION=	1.0
@@ -13,12 +9,12 @@ MASTER_SITES=	http://www.freebsdbrasil.c
 DISTFILES=	libaux${EXTRACT_SUFX} libtk${EXTRACT_SUFX}
 
 MAINTAINER=	ports at 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:

Modified: head/graphics/tgif/Makefile
==============================================================================
--- head/graphics/tgif/Makefile	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/graphics/tgif/Makefile	Fri Jun 28 11:51:05 2013	(r321957)
@@ -18,8 +18,8 @@ RUN_DEPENDS=	giftopnm:${PORTSDIR}/graphi
 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}"

Modified: head/graphics/vcg/Makefile
==============================================================================
--- head/graphics/vcg/Makefile	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/graphics/vcg/Makefile	Fri Jun 28 11:51:05 2013	(r321957)
@@ -13,14 +13,13 @@ DISTNAME=	${PORTNAME}.20050204
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports at 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
 

Modified: head/graphics/xfig/Makefile
==============================================================================
--- head/graphics/xfig/Makefile	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/graphics/xfig/Makefile	Fri Jun 28 11:51:05 2013	(r321957)
@@ -20,7 +20,7 @@ CONFLICTS=	xfig-[12].* xfig-3.1* xfig-3.
 
 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

Modified: head/graphics/xfpovray/Makefile
==============================================================================
--- head/graphics/xfpovray/Makefile	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/graphics/xfpovray/Makefile	Fri Jun 28 11:51:05 2013	(r321957)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    xfpovray
-# Date created:         20 Sep 1997
-# Whom:                 Thomas Gellekum <tg at FreeBSD.org>
-#
+# Created by: Thomas Gellekum <tg at 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

Modified: head/graphics/xgrasp/Makefile
==============================================================================
--- head/graphics/xgrasp/Makefile	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/graphics/xgrasp/Makefile	Fri Jun 28 11:51:05 2013	(r321957)
@@ -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 scre
 
 NO_WRKSUBDIR=	yes
 
+USES=		imake
 USE_XORG=	x11 xext
-USE_IMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 
 MAN1=		glib.1 xgrasp.1

Modified: head/graphics/xli/Makefile
==============================================================================
--- head/graphics/xli/Makefile	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/graphics/xli/Makefile	Fri Jun 28 11:51:05 2013	(r321957)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xli
-# Date created:				24 November 1994
-# Whom:					Satoshi Asami <asami at FreeBSD.org>
-#
+# Created by: Satoshi Asami <asami at 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

Modified: head/graphics/xmandel/Makefile
==============================================================================
--- head/graphics/xmandel/Makefile	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/graphics/xmandel/Makefile	Fri Jun 28 11:51:05 2013	(r321957)
@@ -17,7 +17,7 @@ COMMENT=	Window based interface to Mande
 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

Modified: head/graphics/xpx/Makefile
==============================================================================
--- head/graphics/xpx/Makefile	Fri Jun 28 11:39:19 2013	(r321956)
+++ head/graphics/xpx/Makefile	Fri Jun 28 11:51:05 2013	(r321957)
@@ -1,9 +1,5 @@
-# ports collection makefile for:	xpx
-# Date created:		25 Oct 1998
-# Whom:			Seiichirou Hiraoka
-#
+# Created by: Seiichirou Hiraoka

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-ports-all mailing list