From owner-svn-ports-head@FreeBSD.ORG  Sat Aug  3 16:53:49 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 5A849DA0;
 Sat,  3 Aug 2013 16:53:49 +0000 (UTC)
 (envelope-from utisoft@gmail.com)
Received: from mail-ea0-x235.google.com (mail-ea0-x235.google.com
 [IPv6:2a00:1450:4013:c01::235])
 (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6ACBF2776;
 Sat,  3 Aug 2013 16:53:48 +0000 (UTC)
Received: by mail-ea0-f181.google.com with SMTP id d10so859625eaj.40
 for <multiple recipients>; Sat, 03 Aug 2013 09:53:45 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:sender:in-reply-to:references:from:date
 :x-google-sender-auth:message-id:subject:to:cc:content-type;
 bh=UaQ3dLHYkc1W2fw/Zzs6FyYozgGVlGor2VDux4j30Jg=;
 b=BZu2vsIpF7C7KQaw1rrZBp3sFutKSNxhjfhLSiVM5Hmu1DnFI9eex2xzUtcR7pmpMo
 zC0KodbPuej9BtUaDuGgjArWFBUrPUZSZu4AXI2nzQK+DleCCAwL8QFfSxKVHSAsISp0
 CJ0qSrhHipMl7ChRbAEIGvh8omJehEmj4Ia/+0QUWQ46MMWhCxRyJKdrVzwTtR9dSj7B
 uGDFhFy4drjYCqmARwAYJO0P71PPJ00og+Oie5EXRpuvmxWXZoLVtpQWOPBNR8iNfa++
 OlVuPNtJ2sjZxka3XxlsEiISm3cO2PBJhFXWG8q4zXrWzL+QLn3SjKbUeLeEBcqZgfBL
 VVVQ==
X-Received: by 10.14.105.195 with SMTP id k43mr10227302eeg.2.1375548825586;
 Sat, 03 Aug 2013 09:53:45 -0700 (PDT)
MIME-Version: 1.0
Sender: utisoft@gmail.com
Received: by 10.14.86.67 with HTTP; Sat, 3 Aug 2013 09:53:15 -0700 (PDT)
In-Reply-To: <201305280927.r4S9RKWE003856@svn.freebsd.org>
References: <201305280927.r4S9RKWE003856@svn.freebsd.org>
From: Chris Rees <crees@FreeBSD.org>
Date: Sat, 3 Aug 2013 17:53:15 +0100
X-Google-Sender-Auth: SI8Rebb2mENZ0GpmVb1v9v-GQAU
Message-ID: <CADLo839f-JZYTrPoJntE_6joB6bGG8-P_AOnp3uBGJ2SE-BMnA@mail.gmail.com>
Subject: Re: svn commit: r319300 - head/net/socat
To: Emanuel Haupt <ehaupt@freebsd.org>
Content-Type: text/plain; charset=ISO-8859-1
Cc: "svn-ports-head@freebsd.org" <svn-ports-head@freebsd.org>,
 svn-ports-all@freebsd.org,
 "ports-committers@freebsd.org" <ports-committers@freebsd.org>
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 03 Aug 2013 16:53:49 -0000

On 28 May 2013 10:27, Emanuel Haupt <ehaupt@freebsd.org> wrote:
> Author: ehaupt
> Date: Tue May 28 09:27:19 2013
> New Revision: 319300
> URL: http://svnweb.freebsd.org/changeset/ports/319300
>
> Log:
>   Rework previous commit. The problem is not clang 3.3 but rather the fact that
>   with 1000024 CC became 'cc' rather than 'clang'.
>
> Modified:
>   head/net/socat/Makefile
>
> Modified: head/net/socat/Makefile
> ==============================================================================
> --- head/net/socat/Makefile     Tue May 28 09:12:07 2013        (r319299)
> +++ head/net/socat/Makefile     Tue May 28 09:27:19 2013        (r319300)
> @@ -28,16 +28,11 @@ OPTIONS_DEFINE=     DOCS
>
>  .include <bsd.port.options.mk>
>
> -# we could be on HEAD where CC is in fact clang 3.3 but since we have no
> -# __FreeBSD_version tag from when the 3.3 import happened we have to do some
> -# probing
> -#
> -.if(${OSVERSION} >= 1000000)
> -_CLANG!=       cc --version | ${HEAD} -1 | ${SED} -e 's/.*clang version \([0-9]\)\.\([0-9]\).*/\1\2/'
> -CFLAGS+=       -Wno-unused-comparison
> +.if(${OSVERSION} >= 1000024)
> +CCISCLANG!=    ${CC} --version | ${HEAD} -1 | ${GREP} 'clang'
>  .endif
>
> -.if ${CC} == clang
> +.if ${CC} == clang || defined(CCISCLANG)
>  CFLAGS+=       -Wno-unused-comparison
>  .endif
>

This code is rather strange.  The contents of CCISCLANG are totally
irrelevant to the code, and if OSVERSION >= 1000024 then CCISCLANG is
always defined.

You probably want

.if ${CC} == clang || !empty(CCISCLANG)

Chris