From owner-svn-ports-all@FreeBSD.ORG  Mon Dec 24 13:26:09 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 8FB24D84;
 Mon, 24 Dec 2012 13:26:09 +0000 (UTC)
 (envelope-from zeising@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 73C7B8FC12;
 Mon, 24 Dec 2012 13:26:09 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBODQ9fk013267;
 Mon, 24 Dec 2012 13:26:09 GMT (envelope-from zeising@svn.freebsd.org)
Received: (from zeising@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBODQ9ux013266;
 Mon, 24 Dec 2012 13:26:09 GMT (envelope-from zeising@svn.freebsd.org)
Message-Id: <201212241326.qBODQ9ux013266@svn.freebsd.org>
From: Niclas Zeising <zeising@FreeBSD.org>
Date: Mon, 24 Dec 2012 13:26:09 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r309460 - head/devel/imake
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 24 Dec 2012 13:26:09 -0000

Author: zeising
Date: Mon Dec 24 13:26:08 2012
New Revision: 309460
URL: http://svnweb.freebsd.org/changeset/ports/309460

Log:
  Attempt to fix build when clang is used.
  Add depenency on ucpp and use that as cpp when clang is cc. [1]
  While here, trim makefile headers. [2]
  
  Submitted by:	kevlo [1], zeising [2]
  Approved by:	kwm, miwi (mentors, implicit)

Modified:
  head/devel/imake/Makefile

Modified: head/devel/imake/Makefile
==============================================================================
--- head/devel/imake/Makefile	Mon Dec 24 13:25:33 2012	(r309459)
+++ head/devel/imake/Makefile	Mon Dec 24 13:26:08 2012	(r309460)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    imake-6
-# Date created:         18 Jun 2004
-# Whom:                 anholt
-#
+# Created by:				Eric Anholt <ahnholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	imake
 PORTVERSION=	1.0.4
@@ -41,9 +37,7 @@ post-patch:
 
 .include <bsd.port.pre.mk>
 
-# clang's cpp destroys whitespace, particularly hard tabs in makefiles,
-# which is fatal for imake.
-.if defined(CC) && ${CC} == "clang"
+.if defined(CC) && ${CC:T:M*clang*} == "clang" || ${OSVERSION} >= 1000024
 BUILD_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
 RUN_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
 CONFIGURE_ENV+=	ac_cv_path_RAWCPP="ucpp -s"