From owner-svn-ports-head@FreeBSD.ORG Thu Jan 1 14:35:04 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 93154A29; Thu, 1 Jan 2015 14:35:04 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7F57B698; Thu, 1 Jan 2015 14:35:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t01EZ4o0057640; Thu, 1 Jan 2015 14:35:04 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t01EZ4eh057637; Thu, 1 Jan 2015 14:35:04 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201501011435.t01EZ4eh057637@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Thu, 1 Jan 2015 14:35:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r375921 - in head/shells/zsh: . 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.18-1 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: Thu, 01 Jan 2015 14:35:04 -0000 Author: bapt Date: Thu Jan 1 14:35:03 2015 New Revision: 375921 URL: https://svnweb.freebsd.org/changeset/ports/375921 QAT: https://qat.redports.org/buildarchive/r375921/ Log: Correct time report after r367805 PR: 367805 Submitted by: peterj Modified: head/shells/zsh/Makefile head/shells/zsh/files/patch-Src_jobs.c Modified: head/shells/zsh/Makefile ============================================================================== --- head/shells/zsh/Makefile Thu Jan 1 13:42:14 2015 (r375920) +++ head/shells/zsh/Makefile Thu Jan 1 14:35:03 2015 (r375921) @@ -3,7 +3,7 @@ PORTNAME= zsh PORTVERSION= 5.0.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= shells MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} \ SF/${PORTNAME}/${PORTNAME}-doc/${PORTVERSION}:doc Modified: head/shells/zsh/files/patch-Src_jobs.c ============================================================================== --- head/shells/zsh/files/patch-Src_jobs.c Thu Jan 1 13:42:14 2015 (r375920) +++ head/shells/zsh/files/patch-Src_jobs.c Thu Jan 1 14:35:03 2015 (r375921) @@ -1,6 +1,6 @@ --- Src/jobs.c.orig 2014-08-23 20:40:52.000000000 +0200 +++ Src/jobs.c 2014-09-10 10:33:50.283018759 +0200 -@@ -694,15 +694,14 @@ +@@ -694,15 +694,15 @@ /* go ahead and compute these, since almost every TIMEFMT will have them */ elapsed_time = real->tv_sec + real->tv_usec / 1000000.0; @@ -8,7 +8,7 @@ #ifdef HAVE_GETRUSAGE user_time = ti->ru_utime.tv_sec + ti->ru_utime.tv_usec / 1000000.0; system_time = ti->ru_stime.tv_sec + ti->ru_stime.tv_usec / 1000000.0; -- total_time = user_time + system_time; + total_time = user_time + system_time; - percent = 100.0 * total_time - / (real->tv_sec + real->tv_usec / 1000000.0); + percent = 100.0 * total_time / elapsed_time;