From owner-freebsd-ports@FreeBSD.ORG  Wed Feb  1 22:44:58 2006
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
X-Original-To: ports@FreeBSD.org
Delivered-To: freebsd-ports@FreeBSD.ORG
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 8C30616A420;
	Wed,  1 Feb 2006 22:44:58 +0000 (GMT)
	(envelope-from CPE1704TKS@bellsouth.net)
Received: from imf00aec.mail.bellsouth.net (imf00aec.mail.bellsouth.net
	[205.152.59.48])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7923843D58;
	Wed,  1 Feb 2006 22:44:55 +0000 (GMT)
	(envelope-from CPE1704TKS@bellsouth.net)
Received: from ibm62aec.bellsouth.net ([65.7.181.160])
	by imf20aec.mail.bellsouth.net with ESMTP id
	<20060201224200.RLOF26591.imf20aec.mail.bellsouth.net@ibm62aec.bellsouth.net>;
	Wed, 1 Feb 2006 17:42:00 -0500
Received: from offworld.cqasys.com ([65.7.181.160])
	by ibm62aec.bellsouth.net with ESMTP id
	<20060201224200.NASU20766.ibm62aec.bellsouth.net@offworld.cqasys.com>;
	Wed, 1 Feb 2006 17:42:00 -0500
Received: from [192.168.0.125] (unknown [192.168.0.125])
	by offworld.cqasys.com (Postfix) with ESMTP id F3A173981B;
	Wed,  1 Feb 2006 17:41:58 -0500 (EST)
Date: Wed, 01 Feb 2006 17:41:58 -0500
From: "Jeffrey H. Johnson" <CPE1704TKS@bellsouth.net>
To: Larry Rosenman <ler@lerctr.org>, FreeBSD-gnats-submit@freebsd.org
Message-ID: <83FCC49FA606CF7B7FB5302E@046BC845B756A9F9584BDE56>
X-Mailer: Mulberry/4.0.4 (Mac OS X Demo)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Cc: mnag@FreeBSD.org, ports@FreeBSD.org, CPE1704TKS@bellsouth.net,
	ports-amd64@FreeBSD.org, kris@obsecurity.org
Subject: Re: ports/92658: [PATCH] sysutils/heirloom: [Unbreak AMD64 build] 
X-BeenThere: freebsd-ports@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: "Jeffrey H. Johnson" <CPE1704TKS@bellsouth.net>
List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports>
List-Post: <mailto:freebsd-ports@freebsd.org>
List-Help: <mailto:freebsd-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Feb 2006 22:44:58 -0000

OK, I have an update here:

-----------------------------------
--- spell/spellin.c.orig      Wed Feb  1 23:34:58 2006
+++ spell/spellin.c   Wed Feb  1 23:27:02 2006
@@ -103,7 +103,7 @@
        z = huff((1L<<HASHWIDTH)/atof(argv[1]));
        fprintf(stderr, "%s: expected code widths = %f\n",
            argv[0], z);
-       for (count = 0; scanf("%lo", (long *)&h) == 1; ++count) {
+       for (count = 0; scanf("%o", (long *)&h) == 1; ++count) {
                if ((t = h >> (HASHWIDTH - INDEXWIDTH)) != u) {
                        if (bp != B)
                                wp++;
-----------------------------------

This should work on all architectures where int32_t is the same size
as int, which I *believe* should cover all current FreeBSD platforms.

If someone has a better solution, I'd be glad to hear it.  I'm also
puzzled as to why this seems to work on pointyhat without the 
modifications but I don't have access to AMD64 running 5 to examine. 

If someone who knows what they are doing can apply a more proper fix,
please do. :p

--
Jeffrey H. Johnson
CPE1704TKS@bellsouth.net