From owner-svn-ports-head@FreeBSD.ORG Sun Aug 4 15:57:41 2013 Return-Path: Delivered-To: svn-ports-head@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 5C96EAC1; Sun, 4 Aug 2013 15:57:41 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4A2C72D7E; Sun, 4 Aug 2013 15:57:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r74FvfkT004396; Sun, 4 Aug 2013 15:57:41 GMT (envelope-from ehaupt@svn.freebsd.org) Received: (from ehaupt@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r74FvfUE004395; Sun, 4 Aug 2013 15:57:41 GMT (envelope-from ehaupt@svn.freebsd.org) Message-Id: <201308041557.r74FvfUE004395@svn.freebsd.org> From: Emanuel Haupt Date: Sun, 4 Aug 2013 15:57:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r324242 - 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-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Aug 2013 15:57:41 -0000 Author: ehaupt Date: Sun Aug 4 15:57:40 2013 New Revision: 324242 URL: http://svnweb.freebsd.org/changeset/ports/324242 Log: Change the clang detector to use a pattern match instead of a conditional define and always test. This fixes build on 9-STABLE and saves some shell commands. PR: 181007 Submitted by: "r4721@tormail.org" Modified: head/net/socat/Makefile Modified: head/net/socat/Makefile ============================================================================== --- head/net/socat/Makefile Sun Aug 4 15:43:18 2013 (r324241) +++ head/net/socat/Makefile Sun Aug 4 15:57:40 2013 (r324242) @@ -33,11 +33,9 @@ CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib .endif -.if(${OSVERSION} >= 1000024) -CCISCLANG!= ${CC} --version | ${HEAD} -1 | ${GREP} 'clang' -.endif +CCISCLANG!= ${CC} --version -.if ${CC} == clang || !empty(CCISCLANG) +.if !empty(CCISCLANG:M*clang*) CFLAGS+= -Wno-unused-comparison .endif