Date: Sat, 3 Apr 2004 01:30:50 +0900 From: KATO Tsuguru <tkato@prontomail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/65090: Update port: textproc/word2x Message-ID: <20040403013050.15f546ad.tkato@prontomail.com> Resent-Message-ID: <200404021640.i32GeOhm033628@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 65090
>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: Fri Apr 02 08:40:24 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.9-RELEASE-p4 i386
>Organization:
>Environment:
>Description:
- Fix build on -current
New file:
files/patch-Makefile.in
files/patch-col-align.cc
files/patch-fifo.h
files/patch-html-table.cc
files/patch-latex-table.cc
files/patch-map_chars.cc
files/patch-reader.cc
files/patch-reader.h
files/patch-rtest2.cc
files/patch-strip.cc
files/patch-strip.h
files/patch-tblock.cc
files/patch-tblock.h
files/patch-text-table.cc
Remove file:
files/patch-aa
files/patch-ab
files/patch-ae
files/patch-af
pkg-plist
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/textproc/word2x/Makefile textproc/word2x/Makefile
--- /usr/ports/textproc/word2x/Makefile Wed Mar 31 22:58:53 2004
+++ textproc/word2x/Makefile Wed Mar 31 23:09:08 2004
@@ -7,23 +7,19 @@
PORTNAME= word2x
PORTVERSION= 0.005
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= word2x
+MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Converter from MS Word to text, HTML or LaTeX
+USE_GETOPT_LONG= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-MAN1= word2x.1
+MAN1= word2x.1
+PLIST_FILES= bin/rtest2 bin/word2x
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN= "Does not compile (bad C++ code)"
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -urN /usr/ports/textproc/word2x/files/patch-Makefile.in textproc/word2x/files/patch-Makefile.in
--- /usr/ports/textproc/word2x/files/patch-Makefile.in Thu Jan 1 09:00:00 1970
+++ textproc/word2x/files/patch-Makefile.in Wed Mar 31 21:10:51 2004
@@ -0,0 +1,45 @@
+--- Makefile.in.orig Tue Dec 29 06:17:43 1998
++++ Makefile.in Wed Mar 31 21:10:43 2004
+@@ -2,14 +2,15 @@
+ #
+ # My test system is Linux 2.1.30, gcc 2.7.2, libc 5.4.27
+
+-CC=@CC@
+-CPP=@CXX@
++CC=@CC@ @CFLAGS@
++CPP=@CXX@ @CXXFLAGS@
+
+ #seek_set_hdr is a hack for Sun OS (and others? I hope not)
+-CPPFLAGS=-g -Wall @DEFS@ @seek_set_hdr@
++CPPFLAGS=@CPPFLAGS@ @DEFS@ @seek_set_hdr@
+ LD=@ld@
++LDFLAGS=@LDFLAGS@
+
+-CCFLAGS=-O3 @DEFS@
++CCFLAGS=@DEFS@
+ LIBOBJS=wordwrap.o nullproc.o tblock.o scan_num.o map_chars.o col-align.o \
+ compat.o num_unit_probe.o part_num_probe.o
+ AR=ar
+@@ -86,7 +87,7 @@
+ $(RANLIB) $@
+
+ rtest2: rtest2.o $(READER) tblock.o
+- g++ -o rtest2 rtest2.o $(READER) tblock.o
++ $(CPP) -o rtest2 rtest2.o $(READER) tblock.o
+
+ fmt-text.o: text-fmt.o text-table.o
+ $(LD) -r -o $@ text-fmt.o text-table.o
+@@ -107,10 +108,10 @@
+ $(LD) -r -o gopt.o getopt.o getopt1.o
+
+ word2x: $(PROGOBJS)
+- $(CPP) -o $@ $(PROGOBJS)
++ $(CPP) -o $@ $(PROGOBJS) $(LDFLAGS)
+
+ install: $(TARGETS) $(MANP)
+- @INSTALL@ $(MANP) -m 644 @mandir@/man1
++ @INSTALL_DATA@ $(MANP) @mandir@/man1
+ for I in $(TARGETS); do \
+- @INSTALL@ $${I} -m 755 @bindir@; \
++ @INSTALL_PROGRAM@ $${I} @bindir@; \
+ done
diff -urN /usr/ports/textproc/word2x/files/patch-aa textproc/word2x/files/patch-aa
--- /usr/ports/textproc/word2x/files/patch-aa Mon Sep 14 11:45:47 1998
+++ textproc/word2x/files/patch-aa Thu Jan 1 09:00:00 1970
@@ -1,25 +0,0 @@
---- Makefile.in.orig Mon Aug 24 01:01:15 1998
-+++ Makefile.in Mon Sep 14 10:30:36 1998
-@@ -6,10 +6,10 @@
- CPP=@CXX@
-
- #seek_set_hdr is a hack for Sun OS (and others? I hope not)
--CPPFLAGS=-g -Wall @DEFS@ @seek_set_hdr@
-+CPPFLAGS=@CXXFLAGS@ @DEFS@ @seek_set_hdr@
- LD=@ld@
-
--CCFLAGS=-O3 @DEFS@
-+CCFLAGS=@CFLAGS@ @DEFS@
- LIBOBJS=wordwrap.o nullproc.o tblock.o scan_num.o map_chars.o col-align.o \
- compat.o ukdate.o usdate.o num_unit_probe.o part_num_probe.o
- AR=ar
-@@ -89,7 +89,7 @@
- $(CPP) -o $@ $(PROGOBJS)
-
- install: $(TARGETS) $(MANP)
-- @INSTALL@ $(MANP) -m 644 @mandir@/man1
-+ @INSTALL_DATA@ $(MANP) @mandir@/man1
- for I in $(TARGETS); do \
-- @INSTALL@ $${I} -m 755 @bindir@; \
-+ @INSTALL_PROGRAM@ $${I} @bindir@; \
- done
diff -urN /usr/ports/textproc/word2x/files/patch-ab textproc/word2x/files/patch-ab
--- /usr/ports/textproc/word2x/files/patch-ab Mon Sep 14 11:45:47 1998
+++ textproc/word2x/files/patch-ab Thu Jan 1 09:00:00 1970
@@ -1,20 +0,0 @@
---- col-align.cc.orig Fri Jul 24 06:59:12 1998
-+++ col-align.cc Mon Sep 14 10:30:36 1998
-@@ -50,7 +50,7 @@
- }
- if (strlen(cdp)>(unsigned) max_wd[2])
- max_wd[2]=strlen(cdp);
-- for (lt_sp=0, sc=cdp; isspace(*sc); sc++, lt_sp++)
-+ for (lt_sp=0, sc=cdp; isspace((unsigned char)*sc); sc++, lt_sp++)
- {
- if (*sc==CH_SUSPECT)
- align_set=1;
-@@ -62,7 +62,7 @@
- {
- if (*sc==CH_SUSPECT)
- align_set=1;
-- if (isspace(*sc))
-+ if (isspace((unsigned char)*sc))
- rt_sp++;
- else
- rt_sp=0;
diff -urN /usr/ports/textproc/word2x/files/patch-ae textproc/word2x/files/patch-ae
--- /usr/ports/textproc/word2x/files/patch-ae Sat Mar 11 10:47:07 2000
+++ textproc/word2x/files/patch-ae Thu Jan 1 09:00:00 1970
@@ -1,12 +0,0 @@
---- html-table.cc.orig Fri Mar 10 20:26:06 2000
-+++ html-table.cc Fri Mar 10 20:27:21 2000
-@@ -17,7 +17,8 @@
- #define __EXCLUDE_READER_CLASSES
- #include "lib.h"
- #ifndef HAVE_ALLOCA_H
--extern "C" char *alloca(int);
-+/* extern "C" char *alloca(int); */
-+#include <stdlib.h> /* stupid linux specific weenie code. */
- #else
- #include <alloca.h>
- #endif /* HAVE_ALLOCA_H */
diff -urN /usr/ports/textproc/word2x/files/patch-af textproc/word2x/files/patch-af
--- /usr/ports/textproc/word2x/files/patch-af Sat Mar 11 10:47:08 2000
+++ textproc/word2x/files/patch-af Thu Jan 1 09:00:00 1970
@@ -1,11 +0,0 @@
---- map_chars.cc.orig Fri Mar 10 20:32:25 2000
-+++ map_chars.cc Fri Mar 10 20:33:59 2000
-@@ -1,7 +1,7 @@
- /* $Id: map_chars.cc,v 1.2 1997/03/23 13:19:26 dps Exp $ */
-
- #include "tblock.h"
--#ifndef NULL
-+#ifdef EXCESS_COCAINE_USAGE_BY_AUTHOR
- #define NULL (void *) 0
- #endif
- #define __EXCLUDE_READER_CLASSES
diff -urN /usr/ports/textproc/word2x/files/patch-col-align.cc textproc/word2x/files/patch-col-align.cc
--- /usr/ports/textproc/word2x/files/patch-col-align.cc Thu Jan 1 09:00:00 1970
+++ textproc/word2x/files/patch-col-align.cc Wed Mar 31 19:50:04 2004
@@ -0,0 +1,20 @@
+--- col-align.cc.orig Fri Jul 24 06:59:12 1998
++++ col-align.cc Mon Sep 14 10:30:36 1998
+@@ -50,7 +50,7 @@
+ }
+ if (strlen(cdp)>(unsigned) max_wd[2])
+ max_wd[2]=strlen(cdp);
+- for (lt_sp=0, sc=cdp; isspace(*sc); sc++, lt_sp++)
++ for (lt_sp=0, sc=cdp; isspace((unsigned char)*sc); sc++, lt_sp++)
+ {
+ if (*sc==CH_SUSPECT)
+ align_set=1;
+@@ -62,7 +62,7 @@
+ {
+ if (*sc==CH_SUSPECT)
+ align_set=1;
+- if (isspace(*sc))
++ if (isspace((unsigned char)*sc))
+ rt_sp++;
+ else
+ rt_sp=0;
diff -urN /usr/ports/textproc/word2x/files/patch-fifo.h textproc/word2x/files/patch-fifo.h
--- /usr/ports/textproc/word2x/files/patch-fifo.h Thu Jan 1 09:00:00 1970
+++ textproc/word2x/files/patch-fifo.h Wed Mar 31 20:13:08 2004
@@ -0,0 +1,12 @@
+--- fifo.h.orig Fri Aug 6 09:09:02 1999
++++ fifo.h Wed Mar 31 20:12:59 2004
+@@ -4,7 +4,8 @@
+ #ifndef __FIFO_H__
+ #define __FIFO_H__
+
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ #include <stddef.h>
+ #ifndef NULL
+ #define NULL (void *) 0
diff -urN /usr/ports/textproc/word2x/files/patch-html-table.cc textproc/word2x/files/patch-html-table.cc
--- /usr/ports/textproc/word2x/files/patch-html-table.cc Thu Jan 1 09:00:00 1970
+++ textproc/word2x/files/patch-html-table.cc Wed Mar 31 20:10:17 2004
@@ -0,0 +1,22 @@
+--- html-table.cc.orig Fri Aug 6 09:12:08 1999
++++ html-table.cc Wed Mar 31 20:10:02 2004
+@@ -3,7 +3,8 @@
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif /* HAVE_CONFIG_H */
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ #include <stdio.h>
+ #include <stdlib.h>
+ #ifdef HAVE_STRING_H
+@@ -17,7 +18,8 @@
+ #define __EXCLUDE_READER_CLASSES
+ #include "lib.h"
+ #ifndef HAVE_ALLOCA_H
+-extern "C" char *alloca(int);
++/* extern "C" char *alloca(int); */
++#include <stdlib.h> /* stupid linux specific weenie code. */
+ #else
+ #include <alloca.h>
+ #endif /* HAVE_ALLOCA_H */
diff -urN /usr/ports/textproc/word2x/files/patch-latex-table.cc textproc/word2x/files/patch-latex-table.cc
--- /usr/ports/textproc/word2x/files/patch-latex-table.cc Thu Jan 1 09:00:00 1970
+++ textproc/word2x/files/patch-latex-table.cc Wed Mar 31 20:15:09 2004
@@ -0,0 +1,12 @@
+--- latex-table.cc.orig Thu Oct 8 03:12:09 1998
++++ latex-table.cc Wed Mar 31 20:14:59 2004
+@@ -18,7 +18,8 @@
+ #endif /* HAVE_ALLOCA_H */
+ #endif /* __GNUC__ */
+
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ #include <stdio.h>
+ #include <stdlib.h>
+ #ifdef HAVE_STRING_H
diff -urN /usr/ports/textproc/word2x/files/patch-map_chars.cc textproc/word2x/files/patch-map_chars.cc
--- /usr/ports/textproc/word2x/files/patch-map_chars.cc Thu Jan 1 09:00:00 1970
+++ textproc/word2x/files/patch-map_chars.cc Wed Mar 31 19:50:04 2004
@@ -0,0 +1,11 @@
+--- map_chars.cc.orig Fri Mar 10 20:32:25 2000
++++ map_chars.cc Fri Mar 10 20:33:59 2000
+@@ -1,7 +1,7 @@
+ /* $Id: map_chars.cc,v 1.2 1997/03/23 13:19:26 dps Exp $ */
+
+ #include "tblock.h"
+-#ifndef NULL
++#ifdef EXCESS_COCAINE_USAGE_BY_AUTHOR
+ #define NULL (void *) 0
+ #endif
+ #define __EXCLUDE_READER_CLASSES
diff -urN /usr/ports/textproc/word2x/files/patch-reader.cc textproc/word2x/files/patch-reader.cc
--- /usr/ports/textproc/word2x/files/patch-reader.cc Thu Jan 1 09:00:00 1970
+++ textproc/word2x/files/patch-reader.cc Wed Mar 31 21:01:20 2004
@@ -0,0 +1,21 @@
+--- reader.cc.orig Thu Oct 8 03:12:09 1998
++++ reader.cc Wed Mar 31 21:00:36 2004
+@@ -18,7 +18,8 @@
+ #endif /* HAVE_ALLOCA_H */
+ #endif /* __GNUC__ */
+
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ #include <stdio.h>
+ #ifdef HAVE_STRING_H
+ #include <string.h>
+@@ -40,7 +41,7 @@
+ /* Please be aware that the junk should be stripped from in */
+ static int read_character(istream *in)
+ {
+- unsigned char c,d;
++ char c,d;
+ static int s_ch=-1;
+
+ if (s_ch==-1)
diff -urN /usr/ports/textproc/word2x/files/patch-reader.h textproc/word2x/files/patch-reader.h
--- /usr/ports/textproc/word2x/files/patch-reader.h Thu Jan 1 09:00:00 1970
+++ textproc/word2x/files/patch-reader.h Wed Mar 31 20:12:37 2004
@@ -0,0 +1,12 @@
+--- reader.h.orig Thu Oct 8 03:12:09 1998
++++ reader.h Wed Mar 31 20:12:28 2004
+@@ -13,7 +13,8 @@
+ #ifdef HAVE_STRINGS_H
+ #include <strings.h>
+ #endif /* HAVE_STRINGS_H */
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ #include "tblock.h"
+ #include "interface.h"
+ #include "fifo.h"
diff -urN /usr/ports/textproc/word2x/files/patch-rtest2.cc textproc/word2x/files/patch-rtest2.cc
--- /usr/ports/textproc/word2x/files/patch-rtest2.cc Thu Jan 1 09:00:00 1970
+++ textproc/word2x/files/patch-rtest2.cc Wed Mar 31 20:13:44 2004
@@ -0,0 +1,12 @@
+--- rtest2.cc.orig Thu Oct 8 03:12:09 1998
++++ rtest2.cc Wed Mar 31 20:13:32 2004
+@@ -3,7 +3,8 @@
+
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ #include "strip.h"
+ #include "interface.h"
+
diff -urN /usr/ports/textproc/word2x/files/patch-strip.cc textproc/word2x/files/patch-strip.cc
--- /usr/ports/textproc/word2x/files/patch-strip.cc Thu Jan 1 09:00:00 1970
+++ textproc/word2x/files/patch-strip.cc Wed Mar 31 21:15:53 2004
@@ -0,0 +1,15 @@
+--- strip.cc.orig Sun May 9 23:50:49 1999
++++ strip.cc Wed Mar 31 21:15:43 2004
+@@ -16,9 +16,9 @@
+ #ifdef HAVE_CTYPE_H
+ #include <ctype.h>
+ #endif /* HAVE_CTYPE_H */
+-#include <stream.h>
+-#include <iostream.h>
+-#include <fstream.h>
++#include <iostream>
++#include <fstream>
++using namespace std;
+ #include "strip.h"
+ #include "tune.h"
+
diff -urN /usr/ports/textproc/word2x/files/patch-strip.h textproc/word2x/files/patch-strip.h
--- /usr/ports/textproc/word2x/files/patch-strip.h Thu Jan 1 09:00:00 1970
+++ textproc/word2x/files/patch-strip.h Wed Mar 31 20:15:43 2004
@@ -0,0 +1,14 @@
+--- strip.h.orig Fri Aug 6 09:09:27 1999
++++ strip.h Wed Mar 31 20:15:31 2004
+@@ -2,8 +2,9 @@
+
+ #ifndef __JUNK_FILTER_H__
+ #define __JUNK_FILTER_H__
+-#include <iostream.h>
+-#include <fstream.h>
++#include <iostream>
++#include <fstream>
++using namespace std;
+ #include <stdlib.h>
+ #include "tune.h"
+
diff -urN /usr/ports/textproc/word2x/files/patch-tblock.cc textproc/word2x/files/patch-tblock.cc
--- /usr/ports/textproc/word2x/files/patch-tblock.cc Thu Jan 1 09:00:00 1970
+++ textproc/word2x/files/patch-tblock.cc Wed Mar 31 20:11:39 2004
@@ -0,0 +1,12 @@
+--- tblock.cc.orig Thu Oct 8 03:12:09 1998
++++ tblock.cc Wed Mar 31 20:11:29 2004
+@@ -11,7 +11,8 @@
+ #ifdef HAVE_STRINGS_H
+ #include <strings.h>
+ #endif /* HAVE_STRINGS_H */
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ #include "tblock.h"
+
+ const struct tblock::block tblock::dummy_init={0,0,NULL,NULL};
diff -urN /usr/ports/textproc/word2x/files/patch-tblock.h textproc/word2x/files/patch-tblock.h
--- /usr/ports/textproc/word2x/files/patch-tblock.h Thu Jan 1 09:00:00 1970
+++ textproc/word2x/files/patch-tblock.h Wed Mar 31 21:06:53 2004
@@ -0,0 +1,16 @@
+--- tblock.h.dist Thu Oct 8 03:12:09 1998
++++ tblock.h Wed Mar 31 21:06:40 2004
+@@ -4,6 +4,13 @@
+ #ifndef __tblock_h__
+ #define __tblock_h__
+
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++#ifdef HAVE_STRING_H
++#include <string.h>
++#endif
++
+ class tblock
+ {
+ private:
diff -urN /usr/ports/textproc/word2x/files/patch-text-table.cc textproc/word2x/files/patch-text-table.cc
--- /usr/ports/textproc/word2x/files/patch-text-table.cc Thu Jan 1 09:00:00 1970
+++ textproc/word2x/files/patch-text-table.cc Wed Mar 31 20:14:32 2004
@@ -0,0 +1,12 @@
+--- text-table.cc.orig Thu Oct 8 03:12:09 1998
++++ text-table.cc Wed Mar 31 20:14:23 2004
+@@ -18,7 +18,8 @@
+ #endif /* HAVE_ALLOCA_H */
+ #endif /* __GNUC__ */
+
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ #include <stdio.h>
+ #include <stdlib.h>
+ #ifdef HAVE_STRING_H
diff -urN /usr/ports/textproc/word2x/pkg-plist textproc/word2x/pkg-plist
--- /usr/ports/textproc/word2x/pkg-plist Thu Aug 20 05:48:45 1998
+++ textproc/word2x/pkg-plist Thu Jan 1 09:00:00 1970
@@ -1,2 +0,0 @@
-bin/rtest2
-bin/word2x
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040403013050.15f546ad.tkato>