From owner-freebsd-x11@FreeBSD.ORG  Mon Nov 26 10:09:02 2012
Return-Path: <owner-freebsd-x11@FreeBSD.ORG>
Delivered-To: freebsd-x11@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id B3D96DBD
 for <freebsd-x11@FreeBSD.org>; Mon, 26 Nov 2012 10:09:02 +0000 (UTC)
 (envelope-from kevlo@FreeBSD.org)
Received: from ns.kevlo.org (kevlo.org [220.128.136.52])
 by mx1.freebsd.org (Postfix) with ESMTP id 36C1C8FC15
 for <freebsd-x11@FreeBSD.org>; Mon, 26 Nov 2012 10:09:01 +0000 (UTC)
Received: from srg.kevlo.org (git.kevlo.org [220.128.136.52])
 by ns.kevlo.org (8.14.5/8.14.5) with ESMTP id qAQA8gMN048426
 for <freebsd-x11@freebsd.org>; Mon, 26 Nov 2012 18:08:42 +0800 (CST)
 (envelope-from kevlo@FreeBSD.org)
Message-ID: <50B33FBC.40306@FreeBSD.org>
Date: Mon, 26 Nov 2012 18:09:00 +0800
From: Kevin Lo <kevlo@FreeBSD.org>
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64;
 rv:15.0) Gecko/20121009 Thunderbird/15.0.1
MIME-Version: 1.0
To: freebsd-x11@FreeBSD.org
Subject: [PATCH] devel/imake: fix build with clang
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
X-BeenThere: freebsd-x11@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: X11 on FreeBSD -- maintaining and support <freebsd-x11.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-x11>,
 <mailto:freebsd-x11-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-x11>
List-Post: <mailto:freebsd-x11@freebsd.org>
List-Help: <mailto:freebsd-x11-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-x11>,
 <mailto:freebsd-x11-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Nov 2012 10:09:02 -0000

Here's the trivial patch that fixes build with clang. Ok?

Index: devel/imake/Makefile
===================================================================
--- devel/imake/Makefile        (revision 307768)
+++ devel/imake/Makefile        (working copy)
@@ -43,7 +43,7 @@ post-patch:

  # clang's cpp destroys whitespace, particularly hard tabs in makefiles,
  # which is fatal for imake.
-.if defined(CC) && ${CC} == "clang"
+.if ${OSVERSION} >= 1000024 || (${OSVERSION} < 1000024 && ${CC} == "clang")
  BUILD_DEPENDS+=        ucpp:${PORTSDIR}/devel/ucpp
  RUN_DEPENDS+=  ucpp:${PORTSDIR}/devel/ucpp
  CONFIGURE_ENV+=        ac_cv_path_RAWCPP="ucpp -s"