From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Aug 18 17:40:10 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 E651B16A4CE for ; Wed, 18 Aug 2004 17:40:09 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C322343D2F for ; Wed, 18 Aug 2004 17:40:09 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i7IHe9IH050077 for ; Wed, 18 Aug 2004 17:40:09 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i7IHe9Ax050076; Wed, 18 Aug 2004 17:40:09 GMT (envelope-from gnats) Resent-Date: Wed, 18 Aug 2004 17:40:09 GMT Resent-Message-Id: <200408181740.i7IHe9Ax050076@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 E357616A4CE for ; Wed, 18 Aug 2004 17:31:52 +0000 (GMT) Received: from hfep06.dion.ne.jp (hfep06.dion.ne.jp [203.181.105.72]) by mx1.FreeBSD.org (Postfix) with ESMTP id A3AF543D5D for ; Wed, 18 Aug 2004 17:31:51 +0000 (GMT) (envelope-from tkato432@yahoo.com) Received: from localhost ([61.198.217.228]) by hfep06.dion.ne.jp with SMTP id <20040818173147785.HQRS@hfep06.dion.ne.jp> for ; Thu, 19 Aug 2004 02:31:47 +0900 Message-Id: <20040819023027.52efedc9.tkato432@yahoo.com> Date: Thu, 19 Aug 2004 02:30:27 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/70634: Update port: textproc/word2x 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: Wed, 18 Aug 2004 17:40:10 -0000 >Number: 70634 >Category: ports >Synopsis: Update port: textproc/word2x >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: Wed Aug 18 17:40:09 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 >How-To-Repeat: >Fix: diff -urN /usr/ports/textproc/word2x/Makefile textproc/word2x/Makefile --- /usr/ports/textproc/word2x/Makefile Mon Aug 16 22:46:06 2004 +++ textproc/word2x/Makefile Wed Aug 18 19:33:04 2004 @@ -22,10 +22,4 @@ MAN1= word2x.1 PLIST_FILES= bin/rtest2 bin/word2x -.include - -.if ${OSVERSION} >= 502126 -BROKEN= "Does not compile with gcc 3.4.2" -.endif - -.include +.include diff -urN /usr/ports/textproc/word2x/files/patch-fifo.h textproc/word2x/files/patch-fifo.h --- /usr/ports/textproc/word2x/files/patch-fifo.h Sat Apr 3 04:07:21 2004 +++ textproc/word2x/files/patch-fifo.h Wed Aug 18 22:28:09 2004 @@ -1,5 +1,5 @@ --- fifo.h.orig Fri Aug 6 09:09:02 1999 -+++ fifo.h Wed Mar 31 20:12:59 2004 ++++ fifo.h Wed Aug 18 22:28:00 2004 @@ -4,7 +4,8 @@ #ifndef __FIFO_H__ #define __FIFO_H__ @@ -10,3 +10,83 @@ #include #ifndef NULL #define NULL (void *) 0 +@@ -19,8 +20,8 @@ + const T *data; + struct queue *next; + } queue; +- struct queue *start; +- struct queue **end; ++ struct fifo::queue *start; ++ struct fifo::queue **end; + int length; + + public: +@@ -61,7 +62,7 @@ + template + void fifo::clear(void) + { +- struct queue *ptr, *next; ++ struct fifo::queue *ptr, *next; + + ptr=start; + while (ptr!=NULL) +@@ -79,7 +80,7 @@ + template + fifo::~fifo(void) + { +- struct queue *ptr, *next; ++ struct fifo::queue *ptr, *next; + + ptr=start; + while (ptr!=NULL) +@@ -94,12 +95,12 @@ + template + void fifo::enqueue(const T *d) + { +- struct queue *q; ++ struct fifo::queue *q; + + #ifdef DEBUG_FIFO + cerr<<"Queue "<<(void *) d<<"\n"; + #endif +- q=new(struct queue); ++ q=new(struct fifo::queue); + q->next=NULL; + q->data=d; + *end=q; +@@ -110,7 +111,7 @@ + template + void fifo::insert(const T *d) + { +- struct queue *q; ++ struct fifo::queue *q; + #ifdef CONSIST_CHECK + if (end==NULL) + { +@@ -119,7 +120,7 @@ + } + #endif + +- q=new(struct queue); ++ q=new(struct fifo::queue); + q->next=start; + q->data=d; + start=q; +@@ -132,7 +133,7 @@ + const T *fifo::dequeue(void) + { + const T *d; +- struct queue *q; ++ struct fifo::queue *q; + #ifdef CONSIST_CHECK + if (end==NULL) + { +@@ -206,7 +207,7 @@ + template + void fifo::rev(void) + { +- struct queue *p, *n, *hdr, **ep; ++ struct fifo::queue *p, *n, *hdr, **ep; + #ifdef CONSIST_CHECK + if (end==NULL || d->end==NULL) + { >Release-Note: >Audit-Trail: >Unformatted: