Collect the pkgsrc patches, plus a lot of other more or less needed

cleanup, into a jumbo distfile patch. I've almost got a clean WARNS
build; the remaining warnings are almost certainly bugs and need
investigation by someone with deeper knowledge of rtf and/or troff
than I have.

PKGREVISION -> 3

12 files changed, 18 insertions, 805 deletions

diff --git a/textproc/rtf-tools/Makefile b/textproc/rtf-tools/Makefile
index 668a35b3dce..4cb18876b80 100644
--- a/textproc/rtf-tools/Makefile
+++ b/textproc/rtf-tools/Makefile
@@ -1,13 +1,17 @@
-# $NetBSD: Makefile,v 1.22 2009/07/07 20:49:20 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2011/10/06 21:56:15 dholland Exp $
 #
 
 DISTNAME=		RTF-1.10
 PKGNAME=		rtf-tools-1.10
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		textproc
 MASTER_SITES=		http://www.snake.net/software/RTF/
 EXTRACT_SUFX=		.tar.Z
 
+PATCHFILES=		rtf-tools-jumbo-patch-20111006.gz
+PATCH_SITES=		http://www.NetBSD.org/~dholland/patchkits/rtf-tools/
+PATCH_DIST_STRIP=	-p1
+
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		${MASTER_SITES}
 COMMENT=		RTF to troff/groff/text converter
@@ -27,6 +31,14 @@ SUBST_SED.rtf+=		-e 's|/usr/local|${PREFIX}|g'
 SUBST_SED.rtf+=		-e 's|/usr/man|${PREFIX}/man|'
 SUBST_SED.rtf+=		-e 's|\(LOCALBINDIR =.*\)|\1/bin|'
 
+# turn this on when hacking or debugging the package
+#WARNFLAGS=		-O2 -Wall -Wextra -Wwrite-strings -Wmissing-prototypes
+#SUBST_CLASSES+= 	warn
+#SUBST_STAGE.warn=	pre-build
+#SUBST_MESSAGE.warn=	Enabling lots of warnings.
+#SUBST_FILES.warn=	Makefile */Makefile
+#SUBST_SED.warn= 	-e '/CDEBUGFLAGS/s/-O/${WARNFLAGS}/'
+
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/h/standard-names ${DESTDIR}${PREFIX}/lib/rtf-tools
 	cd ${WRKSRC}/lib && ${INSTALL_DATA} ansi-gen ansi-sym \
diff --git a/textproc/rtf-tools/distinfo b/textproc/rtf-tools/distinfo
index 56d1a77891c..d975b65629b 100644
--- a/textproc/rtf-tools/distinfo
+++ b/textproc/rtf-tools/distinfo
@@ -1,15 +1,8 @@
-$NetBSD: distinfo,v 1.7 2011/10/03 07:21:15 dholland Exp $
+$NetBSD: distinfo,v 1.8 2011/10/06 21:56:15 dholland Exp $
 
 SHA1 (RTF-1.10.tar.Z) = 1fcf63e52bd2d57b2841e32667ab76bb6c2998c6
 RMD160 (RTF-1.10.tar.Z) = 0fdacb6df5779a343d419e1e3bf007f8d8cabbda
 Size (RTF-1.10.tar.Z) = 312224 bytes
-SHA1 (patch-aa) = 9a2863b144a8364284a92af720c365034ec4d055
-SHA1 (patch-ab) = 14bc41ea0d16fa03dfd32d2b89799483cc65924b
-SHA1 (patch-ac) = ab10d20e7457c978a51288391064d7baef403304
-SHA1 (patch-ad) = b937d18bfac4c9b10a119a72b627bb023011de06
-SHA1 (patch-ae) = 1444e82b880d4a415ee288fc30a70433aa828c0e
-SHA1 (patch-af) = 428112205e1cf6466c6f97de6102ecd52ae39781
-SHA1 (patch-ag) = 2c5fd9db3c011bb0648b738d09e1342fb6c76003
-SHA1 (patch-ah) = 6a7f28d28bd6b8058c77ae57c5a5d88e1152258e
-SHA1 (patch-ai) = ae6e9f46c93ff653f7a728dd78da508883feac4a
-SHA1 (patch-aj) = 30ee5d5f3b8c283bca4d7959d3d3be3a241de653
+SHA1 (rtf-tools-jumbo-patch-20111006.gz) = f99a0dc6729733a58561006acdd7ddbf284621bb
+RMD160 (rtf-tools-jumbo-patch-20111006.gz) = d4aef13640f3c0ba39ad2a3811db74e8ed42f66b
+Size (rtf-tools-jumbo-patch-20111006.gz) = 31427 bytes
diff --git a/textproc/rtf-tools/patches/patch-aa b/textproc/rtf-tools/patches/patch-aa
deleted file mode 100644
index 57e522368cd..00000000000
--- a/textproc/rtf-tools/patches/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/04/27 12:18:33 agc Exp $
-
---- h/stdnames.awk.orig	Sun Apr  8 12:04:27 2001
-+++ h/stdnames.awk	Sun Apr  8 12:08:22 2001
-@@ -3,9 +3,9 @@
- 	printf "\n/* The following defines are automatically generated.  Do not edit. */\n\n"
- 	printf "\n/* These must be sequential beginning from zero */\n\n"
- }
--/^$/ { continue }
--/^#/ { continue }
--{
-+# /^$/ { continue }
-+# /^#/ { continue }
-+/^[^#].*$/ {
- 	printf "#define rtfSC_%s\t%d\n", $1, count++
- }
- END { printf "\n#define rtfSC_MaxChar\t%d\n", count }
diff --git a/textproc/rtf-tools/patches/patch-ab b/textproc/rtf-tools/patches/patch-ab
deleted file mode 100644
index b4cf11996d2..00000000000
--- a/textproc/rtf-tools/patches/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2011/10/03 07:21:15 dholland Exp $
-
---- lib/Makefile.orig	Tue Apr  5 19:32:40 1994
-+++ lib/Makefile	Sun Apr  8 12:52:36 2001
-@@ -422,5 +422,4 @@
- # DO NOT DELETE
- 
- reader.o: /usr/include/stdio.h /usr/include/ctype.h /usr/include/string.h
--reader.o: /usr/include/sys/stdtypes.h /usr/include/varargs.h
--reader.o: /usr/local/include/tokenscan.h .././h/rtf.h .././h/stdcharnames.h
-+reader.o: .././h/rtf.h .././h/stdcharnames.h
diff --git a/textproc/rtf-tools/patches/patch-ac b/textproc/rtf-tools/patches/patch-ac
deleted file mode 100644
index b7f7a7a83ae..00000000000
--- a/textproc/rtf-tools/patches/patch-ac
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/04/27 12:18:33 agc Exp $
-
---- util/Makefile.orig	Sun Apr  8 12:57:28 2001
-+++ util/Makefile	Sun Apr  8 13:13:46 2001
-@@ -309,7 +309,8 @@
- rtfstrike:: rtfstrike.pl
- 	$(RM) $@
- 	echo "#!"$(PERLPATH) > $@
--	$(MSUB) rtfstrike.pl >> $@
-+	$(CAT) rtfstrike.pl >> $@
-+#	$(MSUB) rtfstrike.pl >> $@
- 	$(CHMOD) a+x $@
- 
- clean::
-@@ -337,7 +338,15 @@
- rtfchkmap:: rtfchkmap.sh
- 	$(RM) $@
- 	echo "#!"$(SHELL) > $@
--	$(MSUB) rtfchkmap.sh >> $@
-+	$(SED) <rtfchkmap.sh >> $@ \
-+		-e 's|\$$(LIBDIR)|$(LIBDIR)|g' \
-+		-e 's|\$$(TMPDIR)|$(TMPDIR)|g' \
-+		-e 's|\$$(SED)|$(SED)|g' \
-+		-e 's|\$$(SORT)|$(SORT)|g' \
-+		-e 's|\$$(UNIQ)|$(UNIQ)|g' \
-+		-e 's|\$$(RM)|$(RM)|g' \
-+		-e 's|\$$(COMM)|$(COMM)|g'
-+#	$(MSUB) rtfchkmap.sh >> $@
- 	$(CHMOD) a+x $@
- 
- clean::
-@@ -355,7 +364,10 @@
- rtfmaptortf:: rtfmaptortf.sh
- 	$(RM) $@
- 	echo "#!"$(SHELL) > $@
--	$(MSUB) rtfmaptortf.sh >> $@
-+	$(SED) <rtfmaptortf.sh >> $@ \
-+		-e 's|\$$(CAT)|$(CAT)|g' \
-+		-e 's|\$$(SED)|$(SED)|g'
-+#	$(MSUB) rtfmaptortf.sh >> $@
- 	$(CHMOD) a+x $@
- 
- clean::
diff --git a/textproc/rtf-tools/patches/patch-ad b/textproc/rtf-tools/patches/patch-ad
deleted file mode 100644
index 95e097ea81e..00000000000
--- a/textproc/rtf-tools/patches/patch-ad
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2011/10/03 07:21:15 dholland Exp $
-
---- rtf2troff/Makefile.orig	Sun Apr  8 13:16:06 2001
-+++ rtf2troff/Makefile	Sun Apr  8 13:18:24 2001
-@@ -381,7 +381,8 @@
- rtf2groff:: rtf2groff.sh
- 	$(RM) $@
- 	echo "#!"$(SHELL) > $@
--	$(MSUB) rtf2groff.sh >> $@
-+	$(CAT) rtf2groff.sh >> $@
-+#	$(MSUB) rtf2groff.sh >> $@
- 	$(CHMOD) a+x $@
- 
- clean::
-@@ -444,7 +445,5 @@
- # DO NOT DELETE
- 
--trf-unix.o: /usr/include/stdio.h /usr/include/sys/types.h
--trf-unix.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
--trf-unix.o: /usr/include/ctype.h .././h/rtf.h .././h/rtf-unix.h rtf2troff.h
--trf-writer.o: /usr/include/stdio.h /usr/include/ctype.h .././h/rtf.h
-+trf-unix.o: .././h/rtf.h .././h/rtf-unix.h rtf2troff.h
-+trf-writer.o: .././h/rtf.h
- trf-writer.o: rtf2troff.h
diff --git a/textproc/rtf-tools/patches/patch-ae b/textproc/rtf-tools/patches/patch-ae
deleted file mode 100644
index 50cf9e20231..00000000000
--- a/textproc/rtf-tools/patches/patch-ae
+++ /dev/null
@@ -1,252 +0,0 @@
-$NetBSD: patch-ae,v 1.6 2011/10/03 07:21:15 dholland Exp $
-
-- use stdlib.h instead of customized wrong malloc declaration
-- disable varargs code
-- use snprintf where obvious
-- ...?
-
---- lib/reader.c.orig	1994-04-05 19:14:55.000000000 +0000
-+++ lib/reader.c
-@@ -43,10 +43,11 @@
- # define STRING_H <string.h>
- # endif
- 
-+#include <stdlib.h>
- # include	<stdio.h>
- # include	<ctype.h>
- # include	STRING_H
--# ifdef STDARG
-+# if 1
- # include	<stdarg.h>
- # else
- # ifdef	VARARGS
-@@ -78,12 +79,6 @@
- # define	maxCSStack		10
- 
- 
--#ifndef THINK_C
--extern char	*malloc ();
--#else
--extern void	*malloc(size_t);
--#endif
--
- static void	_RTFGetToken ();
- static void	_RTFGetToken2 ();
- static int	GetChar ();
-@@ -137,7 +132,7 @@ static RTFColor	*colorList = (RTFColor *
- static RTFStyle	*styleList = (RTFStyle *) NULL;
- 
- 
--static FILE	*rtffp = stdin;
-+static FILE	*rtffp;
- 
- static char	*inputName = (char *) NULL;
- static char	*outputName = (char *) NULL;
-@@ -207,6 +202,9 @@ RTFFont		*fp;
- RTFStyle	*sp;
- RTFStyleElt	*eltList, *ep;
- 
-+	if (rtffp == NULL)
-+		rtffp = stdin;
-+
- 	if (rtfTextBuf == (char *) NULL)	/* initialize the text buffers */
- 	{
- 		rtfTextBuf = RTFAlloc (rtfBufSiz);
-@@ -587,38 +585,45 @@ RTFFont	*fp;
- 	if (autoCharSetFlags == 0)
- 		return;
- 
--	if ((autoCharSetFlags & rtfReadCharSet)
--		&& RTFCheckCM (rtfControl, rtfCharSet))
--	{
--		ReadCharSetMaps ();
--	}
--	else if ((autoCharSetFlags & rtfSwitchCharSet)
--		&& RTFCheckCMM (rtfControl, rtfCharAttr, rtfFontNum))
-+	if (autoCharSetFlags & rtfReadCharSet)
- 	{
--		if ((fp = RTFGetFont (rtfParam)) != (RTFFont *) NULL)
-+		if (RTFCheckCM (rtfControl, rtfCharSet))
- 		{
--			if (strncmp (fp->rtfFName, "Symbol", 6) == 0)
--				curCharSet = rtfCSSymbol;
--			else
--				curCharSet = rtfCSGeneral;
--			RTFSetCharSet (curCharSet);
-+			ReadCharSetMaps ();
- 		}
--	}
--	else if ((autoCharSetFlags & rtfSwitchCharSet) && rtfClass == rtfGroup)
--	{
--		switch (rtfMajor)
-+		else if (RTFCheckCMM (rtfControl, rtfCharAttr, rtfFontNum))
- 		{
--		case rtfBeginGroup:
--			if (csTop >= maxCSStack)
--				RTFPanic ("_RTFGetToken: stack overflow");
--			csStack[csTop++] = curCharSet;
--			break;
--		case rtfEndGroup:
--			if (csTop <= 0)
--				RTFPanic ("_RTFGetToken: stack underflow");
--			curCharSet = csStack[--csTop];
-+			if ((fp = RTFGetFont (rtfParam)) != (RTFFont *) NULL)
-+			{
-+				if (strncmp (fp->rtfFName, "Symbol", 6) == 0)
-+					curCharSet = rtfCSSymbol;
-+				else
-+					curCharSet = rtfCSGeneral;
-+				RTFSetCharSet (curCharSet);
-+			}
-+		}
-+		/* so \plain will revert to normal character set -Ben */
-+		else if (RTFCheckCMM (rtfControl, rtfCharAttr, rtfPlain))
-+		{
-+			curCharSet = rtfCSGeneral;
- 			RTFSetCharSet (curCharSet);
--			break;
-+		}
-+		else if (rtfClass == rtfGroup)
-+		{
-+			switch (rtfMajor)
-+			{
-+			case rtfBeginGroup:
-+				if (csTop >= maxCSStack)
-+					RTFPanic ("_RTFGetToken: stack overflow");
-+				csStack[csTop++] = curCharSet;
-+				break;
-+			case rtfEndGroup:
-+				if (csTop <= 0)
-+					RTFPanic ("_RTFGetToken: stack underflow");
-+				curCharSet = csStack[--csTop];
-+				RTFSetCharSet (curCharSet);
-+				break;
-+			}
- 		}
- 	}
- }
-@@ -1194,6 +1199,7 @@ RTFFont	*fp;
- char	buf[rtfBufSiz], *bp;
- int	old = -1;
- char	*fn = "ReadFontTbl";
-+int	i;
- 
- 	for (;;)
- 	{
-@@ -1311,11 +1317,30 @@ char	*fn = "ReadFontTbl";
- 				RTFPanic ("%s: missing \"}\"", fn);
- 		}
- 	}
--	if (fp->rtfFNum == -1)
--		RTFPanic ("%s: missing font number", fn);
-+
- /*
-  * Could check other pieces of structure here, too, I suppose.
-  */
-+
-+/*
-+ * I think that would be a good idea because I ran across a program that
-+ * generates incorrect RTF that specifies a font family but not a font
-+ * name.  This was ignored and caused rtf2xxx to coredump when it tried
-+ * to strncmp() the NULL name.
-+ *
-+ * Better to leave no doubt about who's at fault.  -Ben
-+ */
-+	i = 0;
-+	fp = fontList;
-+	while (fp != (RTFFont *)NULL) {
-+		if (fp->rtfFNum == -1)
-+			RTFPanic ("%s: missing font number, entry %d in font table", fn, i);
-+		if (fp->rtfFName == (char *) NULL)
-+			RTFPanic ("%s: missing font name, font number %d", fn, fp->rtfFNum);
-+		fp = fp->rtfNextFont;
-+		i++;
-+	}
-+
- 	RTFRouteToken ();	/* feed "}" back to router */
- }
- 
-@@ -1375,6 +1400,7 @@ ReadStyleSheet ()
- RTFStyle	*sp;
- RTFStyleElt	*sep, *sepLast;
- char		buf[rtfBufSiz], *bp;
-+char		*bs;
- char		*fn = "ReadStyleSheet";
- 
- 	for (;;)
-@@ -1507,8 +1533,10 @@ char		*fn = "ReadStyleSheet";
- 			RTFPanic ("%s: missing style name", fn);
- 		if (sp->rtfSNum < 0)
- 		{
--			if (strncmp (buf, "Normal", 6) != 0
--				&& strncmp (buf, "Standard", 8) != 0)
-+			/* skip leading spaces */
-+			for (bs = buf; *bs == ' '; bs++);
-+			if (strncmp (bs, "Normal", 6) != 0
-+				&& strncmp (bs, "Standard", 8) != 0)
- 				RTFPanic ("%s: missing style number", fn);
- 			sp->rtfSNum = rtfNormalStyleNum;
- 		}
-@@ -2260,6 +2288,7 @@ static RTFKey	rtfKey[] =
- 
- 	rtfCharSet,	rtfMacCharSet,		"mac",		0,
- 	rtfCharSet,	rtfAnsiCharSet,		"ansi",		0,
-+	rtfCharSet,	rtfAnsiCpCharSet,	"ansicpg",	0,
- 	rtfCharSet,	rtfPcCharSet,		"pc",		0,
- 	rtfCharSet,	rtfPcaCharSet,		"pca",		0,
- 
-@@ -2896,20 +2925,20 @@ RTFFuncPtr	proc;
- }
- 
- 
--# ifdef STDARG
-+# if 1
- 
- /*
-  * This version is for systems with stdarg
-  */
- 
- void
--RTFMsg (char *fmt, ...)
-+RTFMsg (const char *fmt, ...)
- {
- char	buf[rtfBufSiz];
- 
- 	va_list args;
- 	va_start (args,fmt);
--	vsprintf (buf, fmt, args);
-+	vsnprintf (buf, sizeof(buf), fmt, args);
- 	va_end (args);
- 	(*msgProc) (buf);
- }
-@@ -2989,25 +3018,25 @@ RTFFuncPtr	proc;
- }
- 
- 
--# ifdef STDARG
-+# if 1
- 
- /*
-  * This version is for systems with stdarg
-  */
- 
- void
--RTFPanic (char *fmt, ...)
-+RTFPanic (const char *fmt, ...)
- {
- char	buf[rtfBufSiz];
- 
- 	va_list args;
- 	va_start (args,fmt);
--	vsprintf (buf, fmt, args);
-+	vsnprintf (buf, sizeof(buf), fmt, args);
- 	va_end (args);
--	(void) strcat (buf, "\n");
-+	(void) snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "\n");
- 	if (prevChar != EOF && rtfTextBuf != (char *) NULL)
- 	{
--		sprintf (buf + strlen (buf),
-+		snprintf(buf + strlen (buf), sizeof(buf) - strlen(buf),
- 			"Last token read was \"%s\" near line %ld, position %d.\n",
- 			rtfTextBuf, rtfLineNum, rtfLinePos);
- 	}
diff --git a/textproc/rtf-tools/patches/patch-af b/textproc/rtf-tools/patches/patch-af
deleted file mode 100644
index a011ff19cb3..00000000000
--- a/textproc/rtf-tools/patches/patch-af
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-af,v 1.1 2001/05/31 11:06:01 agc Exp $
-
---- rtf2troff/trf-table.c.orig	Wed May 16 18:24:58 2001
-+++ rtf2troff/trf-table.c	Wed May 16 18:26:07 2001
-@@ -120,7 +120,9 @@
- 		if (i > 0)
- 			cwid -= its->cellPos[i-1];
- 		cwid -= EnWidth ();
--		fprintf (f, "l1w(%gi) ", cwid);
-+		fprintf (f, "l%sw(%gi) ",
-+			(i + 1 == its->nCells) ? "" : "1",
-+			cwid);
- 	}
- 	if ((p = VCellBorderStr (VCellBorderType (its->nCells)))
- 							!= (char *) NULL)
diff --git a/textproc/rtf-tools/patches/patch-ag b/textproc/rtf-tools/patches/patch-ag
deleted file mode 100644
index 467837695af..00000000000
--- a/textproc/rtf-tools/patches/patch-ag
+++ /dev/null
@@ -1,244 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2005/03/27 18:22:35 ben Exp $
-
---- lib/ansicpg1252-gen.orig	2005-03-27 09:44:09.000000000 -0800
-+++ lib/ansicpg1252-gen
-@@ -0,0 +1,239 @@
-+# RTF ANSI character set (\ansi) general map
-+# These are taken from the ISO-Latin-1 (ISO-8859-1) encodings, with
-+# a few additions
-+
-+# Field 1 is the standard character name which the character value in
-+# field 2 maps onto.  (It doesn't mean "to produce the character in field 1,
-+# use the value in field 2.)
-+
-+# The character value may be given either as a single character (which will be
-+# converted to the ASCII value of the character), or in numeric format, either
-+# in decimal or 0xyy as hex yy.  Single or double quotes may be used to quote
-+# characters.
-+
-+# characters in ASCII range (00-127)
-+
-+formula		0x06
-+nobrkhyphen	0x1e
-+opthyphen	0x1f
-+
-+space		" "
-+exclam		!
-+quotedbl	'"'
-+numbersign	#
-+dollar		$
-+percent		%
-+ampersand	&
-+quoteright	"'"
-+parenleft	(
-+parenright	)
-+asterisk	*
-+plus		+
-+comma		,
-+hyphen		-
-+period		.
-+slash		/
-+zero		0
-+one		1
-+two		2
-+three		3
-+four		4
-+five		5
-+six		6
-+seven		7
-+eight		8
-+nine		9
-+colon		:
-+semicolon	;
-+less		<
-+equal		=
-+greater		>
-+question	?
-+at		@
-+A		A
-+B		B
-+C		C
-+D		D
-+E		E
-+F		F
-+G		G
-+H		H
-+I		I
-+J		J
-+K		K
-+L		L
-+M		M
-+N		N
-+O		O
-+P		P
-+Q		Q
-+R		R
-+S		S
-+T		T
-+U		U
-+V		V
-+W		W
-+X		X
-+Y		Y
-+Z		Z
-+bracketleft	[
-+backslash	\
-+bracketright	]
-+asciicircum	^
-+underscore	_
-+quoteleft	"`"
-+a		a
-+b		b
-+c		c
-+d		d
-+e		e
-+f		f
-+g		g
-+h		h
-+i		i
-+j		j
-+k		k
-+l		l
-+m		m
-+n		n
-+o		o
-+p		p
-+q		q
-+r		r
-+s		s
-+t		t
-+u		u
-+v		v
-+w		w
-+x		x
-+y		y
-+z		z
-+braceleft	{
-+bar		|
-+braceright	}
-+asciitilde	~
-+
-+# non-ASCII characters (128-255)
-+
-+#euro			0x80
-+quotesinglbase		0x82
-+florin			0x83
-+quotedblbase		0x84
-+ellipsis		0x85
-+dagger			0x86
-+daggerdbl		0x87
-+perthousand		0x89
-+Scaron			0x8a
-+guilsinglleft		0x8b
-+OE			0x8c
-+#Zcaron			0x8e
-+quoteleft		0x91
-+quoteright		0x92
-+quotedblleft		0x93
-+quotedblright		0x94
-+bullet			0x95
-+endash			0x96
-+emdash			0x97
-+tilde			0x98
-+trademark		0x99
-+#scaron			0x9a
-+guilsinglright		0x9b
-+oe			0x9c
-+#zcaron			0x9e
-+Ydieresis		0x9f
-+nobrkspace		0xa0
-+exclamdown		0xa1
-+cent			0xa2
-+sterling		0xa3
-+currency		0xa4
-+yen			0xa5
-+brokenbar		0xa6
-+section			0xa7
-+dieresis		0xa8
-+copyright		0xa9
-+ordfeminine		0xaa
-+guillemotleft		0xab
-+logicalnot		0xac
-+opthyphen		0xad
-+registered		0xae
-+macron			0xaf
-+degree			0xb0
-+plusminus		0xb1
-+twosuperior		0xb2
-+threesuperior		0xb3
-+acute			0xb4
-+mu			0xb5
-+paragraph		0xb6
-+periodcentered		0xb7
-+cedilla			0xb8
-+onesuperior		0xb9
-+ordmasculine		0xba
-+guillemotright		0xbb
-+onequarter		0xbc
-+onehalf			0xbd
-+threequarters		0xbe
-+questiondown		0xbf
-+Agrave			0xc0
-+Aacute			0xc1
-+Acircumflex		0xc2
-+Atilde			0xc3
-+Adieresis		0xc4
-+Aring			0xc5
-+AE			0xc6
-+Ccedilla		0xc7
-+Egrave			0xc8
-+Eacute			0xc9
-+Ecircumflex		0xca
-+Edieresis		0xcb
-+Igrave			0xcc
-+Iacute			0xcd
-+Icircumflex		0xce
-+Idieresis		0xcf
-+Eth			0xd0
-+Ntilde			0xd1
-+Ograve			0xd2
-+Oacute			0xd3
-+Ocircumflex		0xd4
-+Otilde			0xd5
-+Odieresis		0xd6
-+multiply		0xd7
-+Oslash			0xd8
-+Ugrave			0xd9
-+Uacute			0xda
-+Ucircumflex		0xdb
-+Udieresis		0xdc
-+Yacute			0xdd
-+Thorn			0xde
-+germandbls		0xdf
-+agrave			0xe0
-+aacute			0xe1
-+acircumflex		0xe2
-+atilde			0xe3
-+adieresis		0xe4
-+aring			0xe5
-+ae			0xe6
-+ccedilla		0xe7
-+egrave			0xe8
-+eacute			0xe9
-+ecircumflex		0xea
-+edieresis		0xeb
-+igrave			0xec
-+iacute			0xed
-+icircumflex		0xee
-+idieresis		0xef
-+eth			0xf0
-+ntilde			0xf1
-+ograve			0xf2
-+oacute			0xf3
-+ocircumflex		0xf4
-+otilde			0xf5
-+odieresis		0xf6
-+divide			0xf7
-+oslash			0xf8
-+ugrave			0xf9
-+uacute			0xfa
-+ucircumflex		0xfb
-+udieresis		0xfc
-+yacute			0xfd
-+thorn			0xfe
-+ydieresis		0xff
diff --git a/textproc/rtf-tools/patches/patch-ah b/textproc/rtf-tools/patches/patch-ah
deleted file mode 100644
index 79e4b1cbbf4..00000000000
--- a/textproc/rtf-tools/patches/patch-ah
+++ /dev/null
@@ -1,120 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2005/03/27 18:22:35 ben Exp $
-
---- lib/ansicpg1252-sym.orig	2005-03-27 09:01:54.000000000 -0800
-+++ lib/ansicpg1252-sym
-@@ -0,0 +1,115 @@
-+# RTF ANSI character set (\ansi) Symbol font map
-+
-+# Field 1 is the standard character name which the character value in
-+# field 2 maps onto.  (It doesn't mean "to produce the character in field 1,
-+# use the value in field 2.)
-+
-+# The character value may be given either as a single character (which will be
-+# converted to the ASCII value of the character), or in numeric format, either
-+# in decimal or 0xyy as hex yy.  Single or double quotes may be used to quote
-+# characters.
-+
-+# characters in ASCII range (00-127)
-+
-+formula		0x06
-+nobrkhyphen	0x1e
-+opthyphen	0x1f
-+
-+space		" "
-+exclam		!
-+universal	'"'
-+mathnumbersign	#
-+existential	$
-+percent		%
-+ampersand	&
-+suchthat	"'"
-+parenleft	(
-+parenright	)
-+mathasterisk	*
-+mathplus	+
-+comma		,
-+mathminus	-
-+period		.
-+slash		/
-+zero		0
-+one		1
-+two		2
-+three		3
-+four		4
-+five		5
-+six		6
-+seven		7
-+eight		8
-+nine		9
-+colon		:
-+semicolon	;
-+less		<
-+mathequal	=
-+greater		>
-+question	?
-+congruent	@
-+Alpha		A
-+Beta		B
-+Chi		C
-+Delta		D
-+Epsilon		E
-+Phi		F
-+Gamma		G
-+Eta		H
-+Iota		I
-+# J		J
-+Kappa		K
-+Lambda		L
-+Mu		M
-+Nu		N
-+Omicron		O
-+Pi		P
-+Theta		Q
-+Rho		R
-+Sigma		S
-+Tau		T
-+Upsilon		U
-+varsigma	V
-+Omega		W
-+Xi		X
-+Psi		Y
-+Zeta		Z
-+bracketleft	[
-+backslash	\
-+bracketright	]
-+asciicircum	^
-+underscore	_
-+quoteleft	"`"
-+alpha		a
-+beta		b
-+chi		c
-+delta		d
-+epsilon		e
-+phi		f
-+gamma		g
-+eta		h
-+iota		i
-+# j		j
-+kappa		k
-+lambda		l
-+mu		m
-+nu		n
-+omicron		o
-+pi		p
-+theta		q
-+rho		r
-+sigma		s
-+tau		t
-+upsilon		u
-+# xxx		v
-+omega		w
-+xi		x
-+psi		y
-+zeta		z
-+braceleft	{
-+bar		|
-+braceright	}
-+mathtilde	~
-+
-+# non-ASCII characters (128-255)
-+
diff --git a/textproc/rtf-tools/patches/patch-ai b/textproc/rtf-tools/patches/patch-ai
deleted file mode 100644
index 21fc56ac26e..00000000000
--- a/textproc/rtf-tools/patches/patch-ai
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2011/10/03 07:21:15 dholland Exp $
-
-- remove varargs decls
-- ...?
-
---- h/rtf.h.dist.orig	1994-04-05 19:53:31.000000000 +0000
-+++ h/rtf.h.dist
-@@ -109,6 +109,7 @@ extern int	rtfLinePos;		/* input line po
- # define		rtfMacCharSet		1
- # define		rtfPcCharSet		2
- # define		rtfPcaCharSet		3
-+# define		rtfAnsiCpCharSet	4
- 
- 
- /* destination minor numbers should be zero-based and sequential */
-@@ -1058,25 +1059,8 @@ int		RTFHexToChar ();
- void		RTFSetMsgProc ();
- void		RTFSetPanicProc ();
- 
--/*
-- * The following messing around is used to allow RTFMsg() and RTFPanic()
-- * to be variable-argument functions that are declared publicly but
-- * without generating prototype-mismatch errors on systems that have
-- * stdarg.h.
-- */
--
--# ifndef rtfInternal
--void		RTFMsg ();
--void		RTFPanic ();
--# else
--# ifdef STDARG
--void	RTFMsg (char *fmt, ...);
--void	RTFPanic (char *fmt, ...);
--# else
--void		RTFMsg ();
--void		RTFPanic ();
--# endif	/* STDARG */
--# endif /* rtfInternal */
-+void		RTFMsg (const char *fmt, ...);
-+void		RTFPanic (const char *fmt, ...);
- 
- int		RTFReadCharSetMap ();
- void		RTFSetCharSetMap ();
diff --git a/textproc/rtf-tools/patches/patch-aj b/textproc/rtf-tools/patches/patch-aj
deleted file mode 100644
index d6b951532be..00000000000
--- a/textproc/rtf-tools/patches/patch-aj
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2006/01/08 20:52:57 joerg Exp $
-
---- rtf2text/text-writer.c.orig	2006-01-08 20:50:34.000000000 +0000
-+++ rtf2text/text-writer.c
-@@ -53,7 +53,7 @@ static void	PutLitStr ();
- 
- static char	*outMap[rtfSC_MaxChar];
- 
--static FILE	*ostream = stdout;
-+static FILE	*ostream;
- 
- 
- /*
-@@ -63,6 +63,9 @@ static FILE	*ostream = stdout;
- void
- WriterInit ()
- {
-+	if (ostream == NULL)
-+		ostream = stdout;
-+
- 	if (RTFReadOutputMap (outputMapName, outMap, 1) == 0)
- 		RTFPanic ("Cannot read output map %s", outputMapName);
- }