From owner-svn-ports-head@FreeBSD.ORG Fri Oct 25 15:08:37 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id D901432B; Fri, 25 Oct 2013 15:08:37 +0000 (UTC) (envelope-from dinoex@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 AC6F02C8A; Fri, 25 Oct 2013 15:08:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9PF8bh0006082; Fri, 25 Oct 2013 15:08:37 GMT (envelope-from dinoex@svn.freebsd.org) Received: (from dinoex@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9PF8bWT006080; Fri, 25 Oct 2013 15:08:37 GMT (envelope-from dinoex@svn.freebsd.org) Message-Id: <201310251508.r9PF8bWT006080@svn.freebsd.org> From: Dirk Meyer Date: Fri, 25 Oct 2013 15:08:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331595 - in head/x11-toolkits/Xaw3d: . 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: Fri, 25 Oct 2013 15:08:37 -0000 Author: dinoex Date: Fri Oct 25 15:08:37 2013 New Revision: 331595 URL: http://svnweb.freebsd.org/changeset/ports/331595 Log: - fix a bug that causes xfig to hang Reported by: Cejka Rudolf Obtained from: debian Added: head/x11-toolkits/Xaw3d/files/patch-Box.c (contents, props changed) Modified: head/x11-toolkits/Xaw3d/Makefile Modified: head/x11-toolkits/Xaw3d/Makefile ============================================================================== --- head/x11-toolkits/Xaw3d/Makefile Fri Oct 25 15:06:30 2013 (r331594) +++ head/x11-toolkits/Xaw3d/Makefile Fri Oct 25 15:08:37 2013 (r331595) @@ -3,7 +3,7 @@ PORTNAME= Xaw3d PORTVERSION= 1.5E -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-toolkits MASTER_SITES= ftp://ftp.visi.com/users/hawkeyd/X/ \ ftp.slackware.com/pub/slackware/slackware_source/x/xaw3d/ Added: head/x11-toolkits/Xaw3d/files/patch-Box.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/Xaw3d/files/patch-Box.c Fri Oct 25 15:08:37 2013 (r331595) @@ -0,0 +1,24 @@ +*** Box.c~ 1996-10-15 10:41:18.000000000 -0400 +--- Box.c 2007-04-21 14:12:44.000000000 -0400 +*************** +*** 353,360 **** + else { + width = preferred_width; + do { /* find some width big enough to stay within this height */ +! width *= 2; +! if (width > constraint->width) width = constraint->width; + DoLayout(w, width, 0, &preferred_width, &preferred_height, FALSE); + } while (preferred_height > constraint->height && + width < constraint->width); +--- 353,363 ---- + else { + width = preferred_width; + do { /* find some width big enough to stay within this height */ +! if (width > constraint->width/2) /* avoid short int overflow */ +! width = constraint->width; +! else +! width *= 2; +! + DoLayout(w, width, 0, &preferred_width, &preferred_height, FALSE); + } while (preferred_height > constraint->height && + width < constraint->width);