From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Aug 7 12:10:23 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6245716A4D0 for ; Sat, 7 Aug 2004 12:10:23 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4BEF943D46 for ; Sat, 7 Aug 2004 12:10:23 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i77CANab093909 for ; Sat, 7 Aug 2004 12:10:23 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i77CANB7093908; Sat, 7 Aug 2004 12:10:23 GMT (envelope-from gnats) Resent-Date: Sat, 7 Aug 2004 12:10:23 GMT Resent-Message-Id: <200408071210.i77CANB7093908@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 67C6A16A4CF for ; Sat, 7 Aug 2004 12:00:55 +0000 (GMT) Received: from hfep05.dion.ne.jp (hfep05.dion.ne.jp [203.181.105.71]) by mx1.FreeBSD.org (Postfix) with ESMTP id E677A43D55 for ; Sat, 7 Aug 2004 12:00:53 +0000 (GMT) (envelope-from tkato432@yahoo.com) Received: from localhost ([219.108.124.67]) by hfep05.dion.ne.jp with SMTP id <20040807120046749.YVW@hfep05.dion.ne.jp> for ; Sat, 7 Aug 2004 21:00:46 +0900 Message-Id: <20040807210007.64dde5f8.tkato432@yahoo.com> Date: Sat, 7 Aug 2004 21:00:07 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/70114: Update port: editors/hte X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Aug 2004 12:10:23 -0000 >Number: 70114 >Category: ports >Synopsis: Update port: editors/hte >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Aug 07 12:10:22 GMT 2004 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.10-RELEASE-p2 i386 >Organization: >Environment: >Description: - Fix build on -current after gcc 3.4 import New file: files/patch-cstream.cc files/patch-htle.cc files/patch-src::srt_x86.cc >How-To-Repeat: >Fix: diff -urN /usr/ports/editors/hte/files/patch-cstream.cc editors/hte/files/patch-cstream.cc --- /usr/ports/editors/hte/files/patch-cstream.cc Thu Jan 1 09:00:00 1970 +++ editors/hte/files/patch-cstream.cc Wed Aug 4 18:10:23 2004 @@ -0,0 +1,35 @@ +--- cstream.cc.orig Mon Jul 1 02:08:48 2002 ++++ cstream.cc Wed Aug 4 18:09:28 2004 +@@ -115,12 +115,13 @@ + return true; + } + +-UINT ht_compressed_stream::read(void *buf, UINT size) ++UINT ht_compressed_stream::read(void *aBuf, UINT size) + { + UINT ssize = size; ++ byte *buf = (byte *)aBuf; + while (size >= bufferpos) { + memcpy(buf, buffer+buffersize-bufferpos, bufferpos); +- ((byte *)buf) += bufferpos; ++ buf += bufferpos; + size -= bufferpos; + bufferpos = 0; + if (size) { +@@ -134,13 +135,14 @@ + return ssize; + } + +-UINT ht_compressed_stream::write(const void *buf, UINT size) ++UINT ht_compressed_stream::write(const void *aBuf, UINT size) + { + UINT ssize = size; ++ const byte *buf = (const byte *)aBuf; + while (bufferpos+size >= buffersize) { + memcpy(buffer+bufferpos, buf, buffersize-bufferpos); + size -= buffersize-bufferpos; +- ((byte *)buf) += buffersize-bufferpos; ++ buf += buffersize-bufferpos; + bufferpos = buffersize; + if (size) { + if (!flush_compressed()) return ssize - size; diff -urN /usr/ports/editors/hte/files/patch-htle.cc editors/hte/files/patch-htle.cc --- /usr/ports/editors/hte/files/patch-htle.cc Thu Jan 1 09:00:00 1970 +++ editors/hte/files/patch-htle.cc Wed Aug 4 18:15:35 2004 @@ -0,0 +1,46 @@ +--- htle.cc.orig Thu Oct 10 03:32:50 2002 ++++ htle.cc Wed Aug 4 18:14:34 2004 +@@ -475,19 +475,20 @@ + return false; + } + +-UINT ht_le_page_file::read(void *buf, UINT size) ++UINT ht_le_page_file::read(void *aBuf, UINT size) + { + FILEOFS mofs; + UINT msize; + int c = 0; + while (size) { + UINT s = size; ++ byte *buf = (byte *)aBuf; + if (!map_ofs(ofs, &mofs, &msize)) break; + if (s>msize) s = msize; + streamfile->seek(mofs); + s = streamfile->read(buf, s); + if (!s) break; +- ((byte*)buf) += s; ++ buf += s; + size -= s; + c += s; + ofs += s; +@@ -546,17 +547,18 @@ + return ht_layer_streamfile::vcntl(cmd, vargs); + } + +-UINT ht_le_page_file::write(const void *buf, UINT size) ++UINT ht_le_page_file::write(const void *aBuf, UINT size) + { + FILEOFS mofs; + UINT msize; + int c = 0; + while (size) { + UINT s = size; ++ const byte *buf = (const byte *)aBuf; + if (!map_ofs(ofs, &mofs, &msize)) break; + if (s>msize) s = msize; + streamfile->seek(mofs); +- ((byte*)buf) += streamfile->write(buf, s); ++ buf += streamfile->write(buf, s); + size -= s; + c += s; + ofs += s; diff -urN /usr/ports/editors/hte/files/patch-src::srt_x86.cc editors/hte/files/patch-src::srt_x86.cc --- /usr/ports/editors/hte/files/patch-src::srt_x86.cc Thu Jan 1 09:00:00 1970 +++ editors/hte/files/patch-src::srt_x86.cc Wed Aug 4 17:55:10 2004 @@ -0,0 +1,18 @@ +--- srt/srt_x86.cc.orig Mon Sep 2 02:05:13 2002 ++++ srt/srt_x86.cc Wed Aug 4 17:53:58 2004 +@@ -60,13 +60,13 @@ + k = &cpu->flags[(idx-8) % X86_FLAGS]; + (*k)->done(); + delete *k; +- ((Object*)*k) = o; ++ k = (sym_bool **)o; + } else { + sym_int **k; + k = &cpu->regs[idx & 7]; + (*k)->done(); + delete *k; +- ((Object*)*k) = o; ++ k = (sym_int **)o; + } + } + >Release-Note: >Audit-Trail: >Unformatted: