From owner-svn-ports-all@FreeBSD.ORG  Sat Aug  3 20:34:25 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 0315B7C3;
 Sat,  3 Aug 2013 20:34:25 +0000 (UTC)
 (envelope-from ehaupt@FreeBSD.org)
Received: from mx.critical.ch (mx.critical.ch [62.2.45.171])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8E0292D05;
 Sat,  3 Aug 2013 20:34:24 +0000 (UTC)
Received: from beaver.home.critical.ch (77-59-132-3.dclient.hispeed.ch
 [77.59.132.3]) (authenticated bits=0)
 by mx.critical.ch (8.14.5/8.14.5/critical-1.0) with ESMTP id r73KYLOL000757;
 Sat, 3 Aug 2013 22:34:21 +0200 (CEST)
 (envelope-from ehaupt@FreeBSD.org)
Date: Sat, 3 Aug 2013 22:34:21 +0200
From: Emanuel Haupt <ehaupt@FreeBSD.org>
To: Chris Rees <crees@FreeBSD.org>
Subject: Re: svn commit: r319300 - head/net/socat
Message-Id: <20130803223421.3ab76cbd67172446cde8c208@FreeBSD.org>
In-Reply-To: <CADLo839f-JZYTrPoJntE_6joB6bGG8-P_AOnp3uBGJ2SE-BMnA@mail.gmail.com>
References: <201305280927.r4S9RKWE003856@svn.freebsd.org>
 <CADLo839f-JZYTrPoJntE_6joB6bGG8-P_AOnp3uBGJ2SE-BMnA@mail.gmail.com>
X-Mailer: Sylpheed 3.3.0 (GTK+ 2.24.19; amd64-portbld-freebsd9.2)
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
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-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: Sat, 03 Aug 2013 20:34:25 -0000

Chris Rees <crees@FreeBSD.org> wrote:
> 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
> 

Good catch! I've just fixed it.

Emanuel