From owner-svn-ports-all@FreeBSD.ORG  Tue May 28 09:12:08 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id CAF9CBEF;
 Tue, 28 May 2013 09:12:08 +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 BD9FC6B5;
 Tue, 28 May 2013 09:12:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4S9C8h6099470;
 Tue, 28 May 2013 09:12:08 GMT (envelope-from ehaupt@svn.freebsd.org)
Received: (from ehaupt@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4S9C8Tt099469;
 Tue, 28 May 2013 09:12:08 GMT (envelope-from ehaupt@svn.freebsd.org)
Message-Id: <201305280912.r4S9C8Tt099469@svn.freebsd.org>
From: Emanuel Haupt <ehaupt@FreeBSD.org>
Date: Tue, 28 May 2013 09:12:08 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r319299 - 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:12:08 -0000

Author: ehaupt
Date: Tue May 28 09:12:07 2013
New Revision: 319299
URL: http://svnweb.freebsd.org/changeset/ports/319299

Log:
  Handle clang 3.3 fallout. I wish we had a __FreeBSD_version tag from when the
  clang 3.3 import happened, that way we wouldn't have to resort to such hacks.

Modified:
  head/net/socat/Makefile

Modified: head/net/socat/Makefile
==============================================================================
--- head/net/socat/Makefile	Tue May 28 08:41:18 2013	(r319298)
+++ head/net/socat/Makefile	Tue May 28 09:12:07 2013	(r319299)
@@ -24,14 +24,23 @@ MAN1=		socat.1
 PLIST_FILES=	bin/filan bin/procan bin/socat
 PORTDOCS=	EXAMPLES README SECURITY FAQ
 
-.if ${CC} == clang
-CFLAGS+=	-Wno-unused-comparison
-.endif
-
 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
+.endif
+
+.if ${CC} == clang
+CFLAGS+=	-Wno-unused-comparison
+.endif
+
 do-install:
 .for f in filan procan socat
 	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/bin