svn commit: r367805 - in head/shells/zsh: . files

[Baptiste Daroussin]

Author: bapt
Date: Wed Sep 10 08:38:18 2014
New Revision: 367805
URL: http://svnweb.freebsd.org/changeset/ports/367805
QAT: https://qat.redports.org/buildarchive/r367805/

Log:
  Regenerate the patch that corrects memory report for builtin time command

Added:
  head/shells/zsh/files/patch-Src_jobs.c   (contents, props changed)
Modified:
  head/shells/zsh/Makefile

Modified: head/shells/zsh/Makefile
==============================================================================
--- head/shells/zsh/Makefile	Wed Sep 10 08:10:55 2014	(r367804)
+++ head/shells/zsh/Makefile	Wed Sep 10 08:38:18 2014	(r367805)
@@ -3,6 +3,7 @@
 
 PORTNAME=	zsh
 PORTVERSION=	5.0.6
+PORTREVISION=	1
 CATEGORIES=	shells
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} \
 		SF/${PORTNAME}/${PORTNAME}-doc/${PORTVERSION}:doc

Added: head/shells/zsh/files/patch-Src_jobs.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/shells/zsh/files/patch-Src_jobs.c	Wed Sep 10 08:38:18 2014	(r367805)
@@ -0,0 +1,30 @@
+--- 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 @@
+     /* go ahead and compute these, since almost every TIMEFMT will have them */
+     elapsed_time = real->tv_sec + real->tv_usec / 1000000.0;
+ 
++    long clktck = get_clktck();
+ #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;
+-    percent = 100.0 * total_time
+-	/ (real->tv_sec + real->tv_usec / 1000000.0);
++    percent = 100.0 * total_time / elapsed_time;
++    total_time *= (double) clktck;
+ #else
+     {
+-	long clktck = get_clktck();
+ 	user_time    = ti->ut / (double) clktck;
+ 	system_time  = ti->st / (double) clktck;
+ 	percent      =  100.0 * (ti->ut + ti->st)
+@@ -796,7 +795,7 @@
+ #endif
+ #ifdef HAVE_STRUCT_RUSAGE_RU_MAXRSS
+ 	    case 'M':
+-		fprintf(stderr, "%ld", ti->ru_maxrss / 1024);
++		fprintf(stderr, "%ld", ti->ru_maxrss);
+ 		break;
+ #endif
+ #ifdef HAVE_STRUCT_RUSAGE_RU_MAJFLT