14 files changed, 0 insertions, 316 deletions
diff --git a/textproc/word2x/files/patch-Makefile.in b/textproc/word2x/files/patch-Makefile.in
deleted file mode 100644
index 25179c29ecd3..000000000000
--- a/textproc/word2x/files/patch-Makefile.in
+++ /dev/null
@@ -1,45 +0,0 @@
---- Makefile.in.orig	1998-12-29 05:17:43.000000000 +0800
-+++ Makefile.in	2014-06-11 20:35:12.384582119 +0800
-@@ -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 @@ liboutfmt.a: $(LIBOBJS)
- 	$(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 @@ gopt.o: getopt.o getopt1.o
- 	$(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) $(DESTDIR)@mandir@/man1
- 	for I in $(TARGETS); do \
--		@INSTALL@ $${I} -m 755 @bindir@; \
-+		@INSTALL_PROGRAM@ $${I} $(DESTDIR)@bindir@; \
- 	done
diff --git a/textproc/word2x/files/patch-col-align.cc b/textproc/word2x/files/patch-col-align.cc
deleted file mode 100644
index 5d8bd38cfa41..000000000000
--- a/textproc/word2x/files/patch-col-align.cc
+++ /dev/null
@@ -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 --git a/textproc/word2x/files/patch-fifo.h b/textproc/word2x/files/patch-fifo.h
deleted file mode 100644
index cc80ff4338c6..000000000000
--- a/textproc/word2x/files/patch-fifo.h
+++ /dev/null
@@ -1,92 +0,0 @@
---- fifo.h.orig	Fri Aug  6 09:09:02 1999
-+++ fifo.h	Wed Aug 18 22:28:00 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
-@@ -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)
-     {
diff --git a/textproc/word2x/files/patch-html-table.cc b/textproc/word2x/files/patch-html-table.cc
deleted file mode 100644
index f53a03cdaccd..000000000000
--- a/textproc/word2x/files/patch-html-table.cc
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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
deleted file mode 100644
index ff73d775b356..000000000000
--- a/textproc/word2x/files/patch-latex-table.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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-map_chars.cc b/textproc/word2x/files/patch-map_chars.cc
deleted file mode 100644
index 099335f705c3..000000000000
--- a/textproc/word2x/files/patch-map_chars.cc
+++ /dev/null
@@ -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 --git a/textproc/word2x/files/patch-reader.cc b/textproc/word2x/files/patch-reader.cc
deleted file mode 100644
index a739c2a0c15d..000000000000
--- a/textproc/word2x/files/patch-reader.cc
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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
deleted file mode 100644
index 7b9a59ac59b3..000000000000
--- a/textproc/word2x/files/patch-reader.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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
deleted file mode 100644
index b04cdd65ab7d..000000000000
--- a/textproc/word2x/files/patch-rtest2.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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
deleted file mode 100644
index 8532cbb51a66..000000000000
--- a/textproc/word2x/files/patch-strip.cc
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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
deleted file mode 100644
index ada73e931c3b..000000000000
--- a/textproc/word2x/files/patch-strip.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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
deleted file mode 100644
index 3b09ace90296..000000000000
--- a/textproc/word2x/files/patch-tblock.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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
deleted file mode 100644
index f9b447752e47..000000000000
--- a/textproc/word2x/files/patch-tblock.h
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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
deleted file mode 100644
index ca8d7684f365..000000000000
--- a/textproc/word2x/files/patch-text-table.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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