From owner-svn-ports-head@FreeBSD.ORG Mon Jun 10 12:07:10 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]) by hub.freebsd.org (Postfix) with ESMTP id 4A435F9A; Mon, 10 Jun 2013 12:07:10 +0000 (UTC) (envelope-from danfe@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 3C8BC1235; Mon, 10 Jun 2013 12:07:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5AC7AJa059484; Mon, 10 Jun 2013 12:07:10 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5AC7A5U059483; Mon, 10 Jun 2013 12:07:10 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201306101207.r5AC7A5U059483@svn.freebsd.org> From: Alexey Dokuchaev Date: Mon, 10 Jun 2013 12:07:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r320464 - head/editors/biew/files 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: Mon, 10 Jun 2013 12:07:10 -0000 Author: danfe Date: Mon Jun 10 12:07:09 2013 New Revision: 320464 URL: http://svnweb.freebsd.org/changeset/ports/320464 Log: Simplify compiler name and version gathering code. Modified: head/editors/biew/files/patch-configure Modified: head/editors/biew/files/patch-configure ============================================================================== --- head/editors/biew/files/patch-configure Mon Jun 10 11:35:00 2013 (r320463) +++ head/editors/biew/files/patch-configure Mon Jun 10 12:07:09 2013 (r320464) @@ -9,7 +9,7 @@ } # Use this to echo the results of a check -@@ -493,20 +493,21 @@ +@@ -493,20 +493,20 @@ echores "$_target_system" @@ -21,8 +21,7 @@ -cc_name=`$_cc -v 2>&1 | tail -n 1 | cut -d ' ' -f 1` -cc_version=`$_cc -dumpversion` +eval `$_cc -v 2>&1 | sed -En \ -+ '/version/s,(FreeBSD )?(.*) version ([0-9.]*).*,\2 \3,p' | (read cc_name \ -+ cc_version ; echo cc_name=$cc_name \; cc_version=$cc_version)` ++ '/version/s,(.* )?(.*) version ([0-9.]*).*,cc_name=\2 ; cc_version=\3,p'` echocheck "C compiler name" echores $cc_name @@ -36,7 +35,7 @@ ;; esac -@@ -583,10 +584,10 @@ +@@ -583,10 +583,10 @@ _osldef="$_debug $_profile $_osldef" elif test -z "$CFLAGS" ; then _cdefos="-DNDEBUG=1 -O2 -ffast-math -fomit-frame-pointer $_cdefos" @@ -48,7 +47,7 @@ test -n "$LDFLAGS" && _osldef="$LDFLAGS $_osldef" test -n "$LIBS" && _osldef="$LIBS $_osldef" -@@ -656,10 +657,10 @@ +@@ -656,10 +656,10 @@ echocheck "slang.h" check_header slang.h enabled slang_h && _cdefos="-D_SLANG_ -D__OS_NAME__='\"Unix/Slang\"' $_cdefos" @@ -61,7 +60,7 @@ echocheck "curses.h" cat > $TMPC << EOF #include -@@ -678,8 +679,10 @@ +@@ -678,8 +678,10 @@ fi echores "$_curses" fi