From owner-svn-ports-branches@freebsd.org  Mon Oct 31 21:52:52 2016
Return-Path: <owner-svn-ports-branches@freebsd.org>
Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A99D0C28644;
 Mon, 31 Oct 2016 21:52:52 +0000 (UTC)
 (envelope-from jhale@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 785E91E16;
 Mon, 31 Oct 2016 21:52:52 +0000 (UTC)
 (envelope-from jhale@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9VLqp7u000768;
 Mon, 31 Oct 2016 21:52:51 GMT (envelope-from jhale@FreeBSD.org)
Received: (from jhale@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9VLqpqX000767;
 Mon, 31 Oct 2016 21:52:51 GMT (envelope-from jhale@FreeBSD.org)
Message-Id: <201610312152.u9VLqpqX000767@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jhale set sender to
 jhale@FreeBSD.org using -f
From: "Jason E. Hale" <jhale@FreeBSD.org>
Date: Mon, 31 Oct 2016 21:52:51 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r425032 - in branches/2016Q4/games/xmris: . files
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 31 Oct 2016 21:52:52 -0000

Author: jhale
Date: Mon Oct 31 21:52:51 2016
New Revision: 425032
URL: https://svnweb.freebsd.org/changeset/ports/425032

Log:
  MFH: r424989
  
  Fix 100% CPU utilization (runtime tested on FreeBSD 11.0, i386)
  Bump PORTREVISION
  
  PR:		211791
  Submitted by:	<steven@freebsd-bugzilla.sdwmail.homeunix.org>
  
  Approved by:	ports-secteam (feld)

Modified:
  branches/2016Q4/games/xmris/Makefile
  branches/2016Q4/games/xmris/files/patch-timer.c
Directory Properties:
  branches/2016Q4/   (props changed)

Modified: branches/2016Q4/games/xmris/Makefile
==============================================================================
--- branches/2016Q4/games/xmris/Makefile	Mon Oct 31 21:51:26 2016	(r425031)
+++ branches/2016Q4/games/xmris/Makefile	Mon Oct 31 21:52:51 2016	(r425032)
@@ -3,7 +3,7 @@
 
 PORTNAME=	xmris
 PORTVERSION=	4.04
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	XCONTRIB/games
 DISTNAME=	${PORTNAME}.${PORTVERSION}

Modified: branches/2016Q4/games/xmris/files/patch-timer.c
==============================================================================
--- branches/2016Q4/games/xmris/files/patch-timer.c	Mon Oct 31 21:51:26 2016	(r425031)
+++ branches/2016Q4/games/xmris/files/patch-timer.c	Mon Oct 31 21:52:51 2016	(r425032)
@@ -9,3 +9,14 @@
  #else
  #  ifdef __hpux /* hpux is a weird mixture of BSD & SYSV */
  /* don't know if this is right */
+@@ -572,7 +572,10 @@ extern VOIDFUNC timer_wait FUNCARGVOID
+       else
+ 	{
+ 	  while(!tickafter(now, timer.timeout))
++	  {
++	    usleep(tickdelta(timer.timeout, now) * TICKTIME);
+ 	    gettick(&now);
++	  }
+ 	  timer.timeout = tickadd(timer.timeout, timer.delay);
+ 	  point = -1;
+ 	}