Date: Thu, 19 Aug 2004 02:30:27 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/70634: Update port: textproc/word2x Message-ID: <20040819023027.52efedc9.tkato432@yahoo.com> Resent-Message-ID: <200408181740.i7IHe9Ax050076@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 502126
-BROKEN= "Does not compile with gcc 3.4.2"
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
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 <stddef.h>
#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<T>::queue *start;
++ struct fifo<T>::queue **end;
+ int length;
+
+ public:
+@@ -61,7 +62,7 @@
+ template<class T>
+ void fifo<T>::clear(void)
+ {
+- struct queue *ptr, *next;
++ struct fifo<T>::queue *ptr, *next;
+
+ ptr=start;
+ while (ptr!=NULL)
+@@ -79,7 +80,7 @@
+ template<class T>
+ fifo<T>::~fifo(void)
+ {
+- struct queue *ptr, *next;
++ struct fifo<T>::queue *ptr, *next;
+
+ ptr=start;
+ while (ptr!=NULL)
+@@ -94,12 +95,12 @@
+ template<class T>
+ void fifo<T>::enqueue(const T *d)
+ {
+- struct queue *q;
++ struct fifo<T>::queue *q;
+
+ #ifdef DEBUG_FIFO
+ cerr<<"Queue "<<(void *) d<<"\n";
+ #endif
+- q=new(struct queue);
++ q=new(struct fifo<T>::queue);
+ q->next=NULL;
+ q->data=d;
+ *end=q;
+@@ -110,7 +111,7 @@
+ template<class T>
+ void fifo<T>::insert(const T *d)
+ {
+- struct queue *q;
++ struct fifo<T>::queue *q;
+ #ifdef CONSIST_CHECK
+ if (end==NULL)
+ {
+@@ -119,7 +120,7 @@
+ }
+ #endif
+
+- q=new(struct queue);
++ q=new(struct fifo<T>::queue);
+ q->next=start;
+ q->data=d;
+ start=q;
+@@ -132,7 +133,7 @@
+ const T *fifo<T>::dequeue(void)
+ {
+ const T *d;
+- struct queue *q;
++ struct fifo<T>::queue *q;
+ #ifdef CONSIST_CHECK
+ if (end==NULL)
+ {
+@@ -206,7 +207,7 @@
+ template<class T>
+ void fifo<T>::rev(void)
+ {
+- struct queue *p, *n, *hdr, **ep;
++ struct fifo<T>::queue *p, *n, *hdr, **ep;
+ #ifdef CONSIST_CHECK
+ if (end==NULL || d->end==NULL)
+ {
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040819023027.52efedc9.tkato432>