diff options
author | Kirill Ponomarev <krion@FreeBSD.org> | 2004-04-02 19:07:21 +0000 |
---|---|---|
committer | Kirill Ponomarev <krion@FreeBSD.org> | 2004-04-02 19:07:21 +0000 |
commit | b07f78a5a0bd887500cf1ad3b7c0453e4c1b3467 (patch) | |
tree | ce9ea10d8d7e4366a2b345792d203605392574c4 /textproc/word2x | |
parent | - Update to version 1.9.13 (diff) |
- Fix build on -current
PR: ports/65090
Submitted by: Ports Fury
Notes
Notes:
svn path=/head/; revision=105987
Diffstat (limited to 'textproc/word2x')
-rw-r--r-- | textproc/word2x/Makefile | 16 | ||||
-rw-r--r-- | textproc/word2x/files/patch-Makefile.in | 45 | ||||
-rw-r--r-- | textproc/word2x/files/patch-aa | 25 | ||||
-rw-r--r-- | textproc/word2x/files/patch-ae | 12 | ||||
-rw-r--r-- | textproc/word2x/files/patch-col-align.cc (renamed from textproc/word2x/files/patch-ab) | 0 | ||||
-rw-r--r-- | textproc/word2x/files/patch-fifo.h | 12 | ||||
-rw-r--r-- | textproc/word2x/files/patch-html-table.cc | 22 | ||||
-rw-r--r-- | textproc/word2x/files/patch-latex-table.cc | 12 | ||||
-rw-r--r-- | textproc/word2x/files/patch-map_chars.cc (renamed from textproc/word2x/files/patch-af) | 0 | ||||
-rw-r--r-- | textproc/word2x/files/patch-reader.cc | 21 | ||||
-rw-r--r-- | textproc/word2x/files/patch-reader.h | 12 | ||||
-rw-r--r-- | textproc/word2x/files/patch-rtest2.cc | 12 | ||||
-rw-r--r-- | textproc/word2x/files/patch-strip.cc | 15 | ||||
-rw-r--r-- | textproc/word2x/files/patch-strip.h | 14 | ||||
-rw-r--r-- | textproc/word2x/files/patch-tblock.cc | 12 | ||||
-rw-r--r-- | textproc/word2x/files/patch-tblock.h | 16 | ||||
-rw-r--r-- | textproc/word2x/files/patch-text-table.cc | 12 | ||||
-rw-r--r-- | textproc/word2x/pkg-plist | 2 |
18 files changed, 211 insertions, 49 deletions
diff --git a/textproc/word2x/Makefile b/textproc/word2x/Makefile index 78bce0770428..31e80af34c8b 100644 --- a/textproc/word2x/Makefile +++ b/textproc/word2x/Makefile @@ -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 --git a/textproc/word2x/files/patch-Makefile.in b/textproc/word2x/files/patch-Makefile.in new file mode 100644 index 000000000000..4c3fb3526605 --- /dev/null +++ b/textproc/word2x/files/patch-Makefile.in @@ -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 --git a/textproc/word2x/files/patch-aa b/textproc/word2x/files/patch-aa deleted file mode 100644 index 3db5813bb32e..000000000000 --- a/textproc/word2x/files/patch-aa +++ /dev/null @@ -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 --git a/textproc/word2x/files/patch-ae b/textproc/word2x/files/patch-ae deleted file mode 100644 index 4f6e42e728eb..000000000000 --- a/textproc/word2x/files/patch-ae +++ /dev/null @@ -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 --git a/textproc/word2x/files/patch-ab b/textproc/word2x/files/patch-col-align.cc index 5d8bd38cfa41..5d8bd38cfa41 100644 --- a/textproc/word2x/files/patch-ab +++ b/textproc/word2x/files/patch-col-align.cc diff --git a/textproc/word2x/files/patch-fifo.h b/textproc/word2x/files/patch-fifo.h new file mode 100644 index 000000000000..87925cf21709 --- /dev/null +++ b/textproc/word2x/files/patch-fifo.h @@ -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 --git a/textproc/word2x/files/patch-html-table.cc b/textproc/word2x/files/patch-html-table.cc new file mode 100644 index 000000000000..f53a03cdaccd --- /dev/null +++ b/textproc/word2x/files/patch-html-table.cc @@ -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 --git a/textproc/word2x/files/patch-latex-table.cc b/textproc/word2x/files/patch-latex-table.cc new file mode 100644 index 000000000000..ff73d775b356 --- /dev/null +++ b/textproc/word2x/files/patch-latex-table.cc @@ -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 --git a/textproc/word2x/files/patch-af b/textproc/word2x/files/patch-map_chars.cc index 099335f705c3..099335f705c3 100644 --- a/textproc/word2x/files/patch-af +++ b/textproc/word2x/files/patch-map_chars.cc diff --git a/textproc/word2x/files/patch-reader.cc b/textproc/word2x/files/patch-reader.cc new file mode 100644 index 000000000000..a739c2a0c15d --- /dev/null +++ b/textproc/word2x/files/patch-reader.cc @@ -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 --git a/textproc/word2x/files/patch-reader.h b/textproc/word2x/files/patch-reader.h new file mode 100644 index 000000000000..7b9a59ac59b3 --- /dev/null +++ b/textproc/word2x/files/patch-reader.h @@ -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 --git a/textproc/word2x/files/patch-rtest2.cc b/textproc/word2x/files/patch-rtest2.cc new file mode 100644 index 000000000000..b04cdd65ab7d --- /dev/null +++ b/textproc/word2x/files/patch-rtest2.cc @@ -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 --git a/textproc/word2x/files/patch-strip.cc b/textproc/word2x/files/patch-strip.cc new file mode 100644 index 000000000000..8532cbb51a66 --- /dev/null +++ b/textproc/word2x/files/patch-strip.cc @@ -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 --git a/textproc/word2x/files/patch-strip.h b/textproc/word2x/files/patch-strip.h new file mode 100644 index 000000000000..ada73e931c3b --- /dev/null +++ b/textproc/word2x/files/patch-strip.h @@ -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 --git a/textproc/word2x/files/patch-tblock.cc b/textproc/word2x/files/patch-tblock.cc new file mode 100644 index 000000000000..3b09ace90296 --- /dev/null +++ b/textproc/word2x/files/patch-tblock.cc @@ -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 --git a/textproc/word2x/files/patch-tblock.h b/textproc/word2x/files/patch-tblock.h new file mode 100644 index 000000000000..f9b447752e47 --- /dev/null +++ b/textproc/word2x/files/patch-tblock.h @@ -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 --git a/textproc/word2x/files/patch-text-table.cc b/textproc/word2x/files/patch-text-table.cc new file mode 100644 index 000000000000..ca8d7684f365 --- /dev/null +++ b/textproc/word2x/files/patch-text-table.cc @@ -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 --git a/textproc/word2x/pkg-plist b/textproc/word2x/pkg-plist deleted file mode 100644 index bb0789208b26..000000000000 --- a/textproc/word2x/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -bin/rtest2 -bin/word2x |