From owner-svn-ports-all@FreeBSD.ORG  Tue May 28 09:27:20 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])
 by hub.freebsd.org (Postfix) with ESMTP id 598AB13C;
 Tue, 28 May 2013 09:27:20 +0000 (UTC)
 (envelope-from ehaupt@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 4C2FE782;
 Tue, 28 May 2013 09:27:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4S9RK6M003857;
 Tue, 28 May 2013 09:27:20 GMT (envelope-from ehaupt@svn.freebsd.org)
Received: (from ehaupt@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4S9RKWE003856;
 Tue, 28 May 2013 09:27:20 GMT (envelope-from ehaupt@svn.freebsd.org)
Message-Id: <201305280927.r4S9RKWE003856@svn.freebsd.org>
From: Emanuel Haupt <ehaupt@FreeBSD.org>
Date: Tue, 28 May 2013 09:27:20 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r319300 - head/net/socat
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: Tue, 28 May 2013 09:27:20 -0000

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