Fix kputchar prototype. Merge patch-af into patch-ae.

4 files changed, 69 insertions, 61 deletions

diff --git a/textproc/kbanner/distinfo b/textproc/kbanner/distinfo
index f0ea59493a2..a0a982e3deb 100644
--- a/textproc/kbanner/distinfo
+++ b/textproc/kbanner/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.3 2009/07/07 21:33:08 joerg Exp $
+$NetBSD: distinfo,v 1.4 2012/12/20 21:33:06 joerg Exp $
 
 SHA1 (kbanner2.tar.Z) = a557fd49ef76797513894ac8f7e218be52efb219
 RMD160 (kbanner2.tar.Z) = 42cdc13bbc5defd5825303fd17d664b40b7bfcb9
 Size (kbanner2.tar.Z) = 240221 bytes
 SHA1 (patch-aa) = 707ed4b3f0b25d1f26db1dcb60d41822b7203a6d
-SHA1 (patch-ab) = a85c604703743047147e15a48705ad5f517e5273
+SHA1 (patch-ab) = 95970635b3fb6f3d6a254f3116c29b9f6d593617
 SHA1 (patch-ac) = 1f6964b8c936199e408ab5aceb06ddeb1a249751
 SHA1 (patch-ad) = 9f3a26d4ac3eab9e9c0094d02de09925f47b2b7b
-SHA1 (patch-ae) = d4a97bba0fac13b728335b98b7369d47e8aa9b8d
-SHA1 (patch-af) = 2d8c602ccc0990ffc0c5c1711b8e5c707e710126
+SHA1 (patch-ae) = 92bba1185f3f9523b98056a0cb628564b37c5a22
diff --git a/textproc/kbanner/patches/patch-ab b/textproc/kbanner/patches/patch-ab
index 685c6192228..73061bc54fd 100644
--- a/textproc/kbanner/patches/patch-ab
+++ b/textproc/kbanner/patches/patch-ab
@@ -1,17 +1,22 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/05/31 13:00:29 seb Exp $
+$NetBSD: patch-ab,v 1.2 2012/12/20 21:33:07 joerg Exp $
 
---- kbanner.c.orig	Fri Oct 15 17:43:31 1993
-+++ kbanner.c	Thu May 18 00:28:39 2000
-@@ -3,7 +3,7 @@
+--- kbanner.c.orig	1993-10-15 08:43:31.000000000 +0000
++++ kbanner.c
+@@ -1,9 +1,11 @@
+ /* Kanji Banner Version 2.1 by Koichi Yasuoka, October 15, 1993 */
+ 
  #include <stdio.h>
++#include <stdlib.h>
  
- extern char *malloc();
+-extern char *malloc();
 -extern unsigned short
++static void kputchar(unsigned int c);
++
 +extern const unsigned short
           font21[],font22[],font23[],font24[],font25[],font26[],font27[],
  font28[],
  font30[],font31[],font32[],font33[],font34[],font35[],font36[],font37[],
-@@ -16,7 +16,7 @@
+@@ -16,7 +18,7 @@ font60[],font61[],font62[],font63[],font
  font68[],font69[],font6a[],font6b[],font6c[],font6d[],font6e[],font6f[],
  font70[],font71[],font72[],font73[],font74[];
  
@@ -20,7 +25,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/05/31 13:00:29 seb Exp $
         font21,font22,font23,font24,font25,font26,font27,
  font28,  NULL,  NULL,  NULL,  NULL,  NULL,  NULL,  NULL,
  font30,font31,font32,font33,font34,font35,font36,font37,
-@@ -31,7 +31,7 @@
+@@ -31,7 +33,7 @@ font70,font71,font72,font73,font74,  NUL
    NULL,  NULL,  NULL,  NULL,  NULL,  NULL,  NULL
  };
  
@@ -29,7 +34,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/05/31 13:00:29 seb Exp $
  	 0x212a,0x2149,0x2174,0x2170,0x2173,0x2175,0x2147,
    0x214a,0x214b,0x2176,0x215c,0x2124,0x215d,0x2125,0x213f,
    0x2330,0x2331,0x2332,0x2333,0x2334,0x2335,0x2336,0x2337,
-@@ -55,10 +55,10 @@
+@@ -55,10 +57,10 @@ int table[]={
  };
  
  int landscape,small,column,col,mime,encoding,bufindex,buflength;
@@ -42,7 +47,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/05/31 13:00:29 seb Exp $
    -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
    -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
    -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,62,-1,-1,-1,63,
-@@ -121,7 +121,7 @@
+@@ -121,7 +123,7 @@ char *argv[];
    }
    if(landscape)
      column=1;
@@ -51,3 +56,13 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/05/31 13:00:29 seb Exp $
      fprintf(stderr,"%s: Not enough memory\n",com);
      exit(1);
    }
+@@ -199,8 +201,7 @@ FILE *fp;
+   kputchar(-1);
+ }
+ 
+-kputchar(c)
+-unsigned int c;
++static void kputchar(unsigned int c)
+ {
+   int i,j,k;
+   if((c==-1)||(column==col)){
diff --git a/textproc/kbanner/patches/patch-ae b/textproc/kbanner/patches/patch-ae
index 8d422d0651d..ee6b4a71d02 100644
--- a/textproc/kbanner/patches/patch-ae
+++ b/textproc/kbanner/patches/patch-ae
@@ -1,14 +1,14 @@
-$NetBSD: patch-ae,v 1.1.1.1 2002/05/31 13:00:29 seb Exp $
+$NetBSD: patch-ae,v 1.2 2012/12/20 21:33:07 joerg Exp $
 
---- font3.c.orig	Fri Oct 15 14:18:55 1993
-+++ font3.c	Thu May 18 00:27:03 2000
+--- font3.c.orig	1993-10-15 05:18:55.000000000 +0000
++++ font3.c
 @@ -1,4 +1,4 @@
 -unsigned short font5c[]={
 +const unsigned short font5c[]={
    0x100e,0x11f8,0x1110,0xfd10,0x11ff,0x1908,0x3508,0x31c5,
    0x3303,0x51fe,0x5102,0x9102,0x11fe,0x1102,0x1102,0x11fe,
    0x1048,0x1044,0x107e,0xfde0,0x1036,0x1018,0x386d,0x3587,
-@@ -188,7 +188,7 @@
+@@ -188,7 +188,7 @@ unsigned short font5c[]={
    0x2020,0x2020,0x27ff,0xf924,0x2124,0x32aa,0x6820,0x67ff,
    0xa000,0xa3fe,0x2202,0x22fa,0x228a,0x22fa,0x2202,0x23fe
  };
@@ -17,7 +17,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2002/05/31 13:00:29 seb Exp $
    0x0010,0x3e10,0x22fe,0x2244,0x3e28,0x20ff,0x7e10,0x52fe,
    0xd210,0x1e10,0x0100,0xffff,0x0540,0x0d60,0x3938,0xe10f,
    0x0420,0xffff,0x0420,0x0010,0x3efe,0x2244,0x3e28,0x20fe,
-@@ -378,7 +378,7 @@
+@@ -378,7 +378,7 @@ unsigned short font5d[]={
    0x0020,0x6020,0x3020,0x1020,0x003f,0xc020,0x6020,0x2020,
    0x0020,0x13fe,0x1202,0x3202,0x2202,0x6202,0x4202,0xc3fe
  };
@@ -26,7 +26,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2002/05/31 13:00:29 seb Exp $
    0x0000,0x67fe,0x3442,0x1442,0x0442,0xc442,0x6442,0x27fe,
    0x0442,0x1442,0x1442,0x3442,0x2442,0x6442,0x47fe,0xc000,
    0x0006,0x603c,0x37e0,0x1040,0x0040,0xc040,0x67fe,0x2002,
-@@ -568,7 +568,7 @@
+@@ -568,7 +568,7 @@ unsigned short font5e[]={
    0x0240,0x4240,0x66ff,0x2484,0x0dcc,0x8a78,0xda10,0x4a7c,
    0x0bc7,0x0a10,0x2bff,0x2a54,0x6a54,0x48d6,0x4993,0xc810
  };
@@ -35,7 +35,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2002/05/31 13:00:29 seb Exp $
    0x0104,0x6088,0x33fe,0x1020,0x01fc,0xc020,0x67ff,0x2040,
    0x0030,0x13e2,0x1026,0x37b4,0x20a8,0x6124,0x4623,0xc0e0,
    0x0020,0x6020,0x37ff,0x1000,0x0154,0xc124,0x6154,0x2104,
-@@ -758,7 +758,7 @@
+@@ -758,7 +758,7 @@ unsigned short font5f[]={
    0x1010,0x10fe,0x1012,0x15ff,0x5412,0x54fe,0xd010,0x91ff,
    0x10aa,0x1129,0x3800,0x28fe,0x2caa,0x64aa,0x40aa,0xc1ff
  };
@@ -44,7 +44,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2002/05/31 13:00:29 seb Exp $
    0x0000,0xfe7f,0x1008,0x2211,0xd46a,0x2814,0xdc6e,0x2a15,
    0xc864,0x391c,0x0100,0x138c,0x32d8,0x2660,0x1c38,0xf00f,
    0x2000,0x23de,0x2042,0x2bde,0xa842,0xabde,0xa088,0xa110,
-@@ -948,7 +948,7 @@
+@@ -948,7 +948,7 @@ unsigned short font60[]={
    0x0041,0x0263,0xfb22,0x2126,0x2104,0x2000,0x2040,0xf840,
    0x27ff,0x2084,0x2184,0x210c,0x39e8,0xe03c,0x00e6,0x0383
  };
@@ -53,7 +53,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2002/05/31 13:00:29 seb Exp $
    0x1006,0x101c,0xfef4,0x2884,0x2ca4,0x66a4,0xc3a4,0x3ca4,
    0x00a4,0xffa4,0x20a4,0x7ea4,0x02a6,0x02aa,0x06ba,0x1d6b,
    0x2034,0x27e4,0xfc3f,0x552a,0x552a,0x552a,0xfd3f,0x2524,
-@@ -1138,7 +1138,7 @@
+@@ -1138,7 +1138,7 @@ unsigned short font61[]={
    0x0080,0x0080,0x3fff,0xa540,0x6a8a,0x254a,0x201f,0x2fb4,
    0x6894,0xaf9f,0x2014,0x6f94,0x4a9f,0xcf94,0x0854,0x07df
  };
@@ -62,7 +62,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2002/05/31 13:00:29 seb Exp $
    0x0080,0x3fff,0x2200,0xafbf,0x6208,0x2fbe,0x28a2,0x2fbe,
    0x68a2,0xafbe,0x28a2,0x6fa2,0x403e,0xdfd4,0x0936,0x10a3,
    0x0000,0x0000,0x0000,0x0000,0x7fc8,0x0250,0x4662,0x2c34,
-@@ -1328,7 +1328,7 @@
+@@ -1328,7 +1328,7 @@ unsigned short font62[]={
    0x0800,0xffbc,0x0824,0x7f47,0x0000,0x7f7c,0x4924,0x7f18,
    0x40e7,0x8000,0x7ffe,0x0400,0x0ffc,0x3804,0xe804,0x0ffc
  };
@@ -71,7 +71,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2002/05/31 13:00:29 seb Exp $
    0x0020,0xfbfe,0x2020,0x21fc,0x2020,0x27ff,0x7800,0x49fc,
    0xc904,0x49fc,0x4904,0x49fc,0x4904,0x79fc,0x0088,0x0306,
    0x0020,0xfc20,0x23ff,0x2020,0x21fe,0x2122,0x79fe,0x4922,
-@@ -1518,7 +1518,7 @@
+@@ -1518,7 +1518,7 @@ unsigned short font63[]={
    0x1040,0x1040,0x3eff,0x6990,0xc408,0x3ffe,0x2000,0x27fc,
    0x2040,0x2040,0x23f8,0x2040,0x2040,0x2ffe,0x2000,0x3ffe
  };
@@ -80,7 +80,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2002/05/31 13:00:29 seb Exp $
    0x1040,0x1040,0x3eff,0x6990,0xc408,0x3ffe,0x2000,0x27fc,
    0x2040,0x23f8,0x2040,0x2050,0x2048,0x2ffe,0x2000,0x3ffe,
    0x1040,0x1040,0x3eff,0x69a0,0xc410,0x0000,0x7ffe,0x0420,
-@@ -1708,7 +1708,7 @@
+@@ -1708,7 +1708,7 @@ unsigned short font64[]={
    0x1000,0x30fe,0x6010,0xc410,0x6c10,0x1810,0x3010,0x65ff,
    0xfe10,0x1210,0x1010,0x5410,0x5610,0xd210,0x9010,0x1070
  };
@@ -89,7 +89,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2002/05/31 13:00:29 seb Exp $
    0x1004,0x3004,0x6004,0xc404,0x6cff,0x1804,0x3004,0x6444,
    0xfe64,0x1224,0x1004,0x5404,0x5604,0xd204,0x9004,0x101c,
    0x1000,0x30fe,0x6000,0xc400,0x6c00,0x1800,0x31ff,0x6420,
-@@ -1898,7 +1898,7 @@
+@@ -1898,7 +1898,7 @@ unsigned short font65[]={
    0x2020,0x2020,0x7c20,0xd1fc,0x1024,0x1024,0xfe24,0x1024,
    0x11ff,0x5450,0x5450,0x5458,0x54c8,0x7c8c,0x0186,0x0303
  };
@@ -98,7 +98,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2002/05/31 13:00:29 seb Exp $
    0x4020,0x403e,0xf820,0xa3ff,0x2221,0x223c,0xfae1,0x223f,
    0x2204,0xaa78,0xaa92,0xaa54,0xabff,0xfa10,0x0410,0x0070,
    0x0000,0x7e7e,0x4242,0x7e7e,0x4242,0x7e7e,0x4242,0x7e7e,
-@@ -2088,7 +2088,7 @@
+@@ -2088,7 +2088,7 @@ unsigned short font66[]={
    0x0020,0x7820,0x4fff,0x4890,0x4890,0x799e,0x4912,0x4b32,
    0x4d2a,0x7966,0x4914,0x491c,0x4908,0x491c,0xc936,0x9963
  };
@@ -107,7 +107,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2002/05/31 13:00:29 seb Exp $
    0x0020,0x7c20,0x45ff,0x4c40,0x48fe,0x5b10,0x50ff,0x4800,
    0x44fe,0x4482,0x44fe,0x4482,0x5cfe,0x4082,0x4082,0x408e,
    0x0050,0x7850,0x4850,0x49fc,0x4954,0x7954,0x4954,0x49fc,
-@@ -2278,7 +2278,7 @@
+@@ -2278,7 +2278,7 @@ unsigned short font67[]={
    0x0810,0x0810,0xffff,0x0810,0x0810,0x0100,0x0100,0x7ffe,
    0x0000,0x0810,0x0c30,0x0420,0x0460,0x0040,0xffff,0x0000
  };
@@ -116,7 +116,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2002/05/31 13:00:29 seb Exp $
    0x0810,0x0810,0xffff,0x0810,0x0000,0x7ffe,0x4002,0x4102,
    0x4ff2,0x4102,0x4382,0x42c2,0x4662,0x4c32,0x4002,0x7ffe,
    0x0810,0x0810,0xffff,0x0810,0x0000,0x7ffe,0x4002,0x4002,
-@@ -2468,7 +2468,7 @@
+@@ -2468,7 +2468,7 @@ unsigned short font68[]={
    0x0420,0xffff,0x0420,0x0000,0x7ffe,0x0440,0x3ffc,0x2444,
    0x3ffc,0x1008,0x1ff8,0x1008,0x1ff8,0x0100,0xffff,0x0100
  };
@@ -125,7 +125,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2002/05/31 13:00:29 seb Exp $
    0x0420,0xffff,0x0420,0x1ff8,0x0008,0x1ff8,0x0008,0x1ff8,
    0x0000,0x7cfe,0x1082,0xfefe,0x0008,0xffff,0x0808,0x0438,
    0x0420,0xffff,0x0420,0x0100,0x1288,0x1224,0x23e0,0x0810,
-@@ -2658,7 +2658,7 @@
+@@ -2658,7 +2658,7 @@ unsigned short font69[]={
    0x2000,0x21ff,0x2000,0xfcfe,0xa482,0xa482,0xa4fe,0xa480,
    0xfcff,0x20a9,0x21a9,0x29ff,0x2aa9,0x3ca9,0xe4a9,0x00ab
  };
@@ -134,7 +134,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2002/05/31 13:00:29 seb Exp $
    0x2020,0x2070,0x20d8,0xf98c,0xaf77,0xa800,0xabc2,0xaa52,
    0xaa52,0xfbd2,0x2252,0x2a52,0x2bc2,0x7a42,0xca42,0x02ce,
    0x2108,0x2108,0x2108,0xffdf,0xaa30,0xaa00,0xaa1f,0xabc2,
-@@ -2848,7 +2848,7 @@
+@@ -2848,7 +2848,7 @@ unsigned short font6a[]={
    0x0008,0x3f7f,0x2122,0x3f14,0x207f,0x7f08,0x517f,0xd108,
    0x1f08,0x0080,0xffff,0x0244,0x0c68,0xf830,0x0f9c,0x3807
  };
@@ -143,7 +143,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2002/05/31 13:00:29 seb Exp $
    0x2000,0x21fe,0x2020,0xfbff,0x0a21,0x1bad,0x3221,0x21ac,
    0x6800,0xb3ff,0x2820,0x23ff,0x2249,0x2249,0x2249,0x224b,
    0x2004,0x23e4,0x2284,0xfa8f,0x0be8,0x1a20,0x33e0,0x228f,
-@@ -3038,7 +3038,7 @@
+@@ -3038,7 +3038,7 @@ unsigned short font6b[]={
    0x0078,0x7890,0x03ff,0xfd24,0x01c7,0x793c,0x0100,0x01ff,
    0x7900,0x013c,0x0100,0x793c,0x4900,0x497e,0x4a42,0x787e
  };
@@ -152,7 +152,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2002/05/31 13:00:29 seb Exp $
    0x787c,0x0044,0xfc44,0x007c,0x0000,0x79ef,0x0129,0x0129,
    0x79ef,0x0010,0x01ff,0x7854,0x4854,0x48d6,0x4993,0x7810,
    0x3e10,0x22fe,0x3e44,0x20ff,0x7e10,0x52fe,0xd210,0x1e10,
-@@ -3228,7 +3228,7 @@
+@@ -3228,7 +3228,7 @@ unsigned short font6c[]={
    0x0006,0x7c1c,0x44f1,0x451b,0x458a,0x44a0,0x7c48,0x1090,
    0x5064,0x5c3e,0x51e3,0x5010,0x51ff,0x5c28,0x7044,0xc183
  };
@@ -161,7 +161,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2002/05/31 13:00:29 seb Exp $
    0x0100,0x7ffe,0x4422,0x5ffa,0x0420,0x1ff8,0x0420,0xffff,
    0x0810,0x3ffc,0xe817,0x0ff0,0x0480,0x0efc,0x3b80,0xe0ff,
    0x0084,0x7c48,0x45fe,0x4420,0x4420,0x44fc,0x7c20,0x1020,
-@@ -3418,7 +3418,7 @@
+@@ -3418,7 +3418,7 @@ unsigned short font6d[]={
    0x0104,0x618c,0x3088,0x13fe,0x0088,0x0088,0x0088,0xf7ff,
    0x1088,0x1088,0x1088,0x1188,0x1108,0x3308,0x6800,0xc7ff
  };
@@ -170,7 +170,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2002/05/31 13:00:29 seb Exp $
    0x0000,0x63fc,0x3204,0x13fc,0x0204,0x03fc,0x0080,0xf1fe,
    0x1302,0x1622,0x13c2,0x1212,0x11f6,0x300c,0x6800,0xc7ff,
    0x0000,0x479e,0x6482,0x2482,0x0482,0x079e,0x0400,0xe43e,
-@@ -3608,7 +3608,7 @@
+@@ -3608,7 +3608,7 @@ unsigned short font6e[]={
    0x1000,0x39ff,0x2d01,0x6511,0x4111,0xfd7d,0x1111,0x1111,
    0xfd7d,0x1145,0x9545,0xd545,0x517d,0x1d01,0x71ff,0xc000
  };
@@ -179,7 +179,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2002/05/31 13:00:29 seb Exp $
    0x1092,0x3892,0x2d24,0x6524,0x4092,0xfc92,0x1000,0x10fe,
    0xfc92,0x1092,0x9492,0xd4fe,0x5092,0x1c92,0x7092,0xc0fe,
    0x1048,0x3844,0x2c7e,0x65e0,0x4036,0xfc18,0x106d,0x1187,
-@@ -3798,7 +3798,7 @@
+@@ -3798,7 +3798,7 @@ unsigned short font6f[]={
    0x0024,0x7c64,0x45c4,0x4c44,0x49ff,0x5844,0x5044,0x48c4,
    0x4584,0x4420,0x4420,0x5dfe,0x4020,0x4020,0x43ff,0x4000
  };
@@ -188,7 +188,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2002/05/31 13:00:29 seb Exp $
    0x0010,0x7c10,0x45ff,0x4c10,0x4996,0x5892,0x5092,0x4955,
    0x4555,0x4438,0x4428,0x4428,0x5c6c,0x4044,0x40c6,0x4183,
    0x0010,0x7c90,0x449e,0x4c90,0x4890,0x5bff,0x5010,0x4854,
-@@ -3988,7 +3988,7 @@
+@@ -3988,7 +3988,7 @@ unsigned short font70[]={
    0x087f,0x2f08,0x283e,0xffa2,0x493e,0x88a2,0x3a3e,0x0422,
    0x1ffe,0xf10b,0x1ff8,0x1108,0x1ff8,0x0420,0xffff,0x0020
  };
@@ -197,7 +197,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2002/05/31 13:00:29 seb Exp $
    0x0800,0x0f7f,0x0808,0x7fbe,0x48a2,0x7e22,0x48be,0x5fa2,
    0x5522,0x5f3e,0x5522,0xffa2,0xaabe,0x2a94,0x7ff6,0x0023,
    0x2200,0xff7f,0x2208,0x773e,0x5522,0x7722,0x003e,0x2422,
-@@ -4178,7 +4178,7 @@
+@@ -4178,7 +4178,7 @@ unsigned short font71[]={
    0x3f04,0x2018,0x3e62,0x200c,0x3e31,0x2002,0xff8c,0x2230,
    0x7d00,0x0000,0x0440,0x3ffc,0x2444,0x3ffc,0x2444,0x3ffc
  };
@@ -206,7 +206,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2002/05/31 13:00:29 seb Exp $
    0x3f04,0x2018,0x3e62,0x200c,0xffb1,0x2206,0x7d38,0x0000,
    0x0100,0xffff,0x0100,0x3ffc,0x0000,0x1ff8,0x1008,0x1ff8,
    0x3f04,0x2018,0x3e62,0x200c,0x3e31,0x2002,0xff8c,0x2230,
-@@ -4368,7 +4368,7 @@
+@@ -4368,7 +4368,7 @@ unsigned short font72[]={
    0x0010,0xff20,0x24fe,0x2482,0x3cfe,0x2482,0x24fe,0x2480,
    0x3cff,0x2480,0x24ff,0x2401,0x3d55,0xe555,0x0603,0x0406
  };
@@ -215,7 +215,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2002/05/31 13:00:29 seb Exp $
    0x1408,0x3610,0xe57e,0x2442,0x247e,0xffc2,0x247e,0x2540,
    0x257f,0x3640,0x667f,0xa401,0x2c55,0x3555,0x2703,0x6206,
    0x7c58,0x1044,0xffff,0x1022,0x7e34,0x1099,0x712f,0x0ff0,
-@@ -4558,7 +4558,7 @@
+@@ -4558,7 +4558,7 @@ unsigned short font73[]={
    0x0100,0x07c0,0x1c78,0xf7cf,0x0000,0x7bde,0x4a52,0x7bde,
    0x0000,0x3ffc,0x2444,0x2444,0x3ffc,0x2444,0x2444,0x244c
  };
@@ -224,3 +224,18 @@ $NetBSD: patch-ae,v 1.1.1.1 2002/05/31 13:00:29 seb Exp $
    0x0100,0x1ff8,0x0100,0x7ffe,0x0000,0x0810,0x7f7e,0x0810,
    0x1f10,0xf0ff,0x0000,0x7ffe,0x0820,0x1821,0x3033,0xe01e,
    0x1086,0x10fc,0x1081,0xfc7f,0x1000,0x117e,0x3942,0x357e,
+@@ -4567,10 +4567,10 @@ unsigned short font74[]={
+   0x1320,0x1020,0x17ff,0x1020,0x1222,0x33fe,0x6800,0xc7ff,
+   0x0020,0x007c,0xf8c4,0x23ac,0x2058,0x2030,0xf8e0,0x2380,
+   0x20fe,0x2120,0x2020,0x3bff,0xe020,0x0122,0x0122,0x01fe,
+-  0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+-  0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+-  0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+-  0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
++  0x0020,0x67ff,0x3000,0x13fe,0x0202,0x02fa,0x028a,0x02fa,
++  0x1202,0x13fe,0x3018,0x21e0,0x6020,0x47ff,0xc0a8,0x0326,
++  0x0000,0x7f7e,0x4442,0x4442,0x5f42,0x5142,0x517e,0x5140,
++  0x5f40,0x4441,0x4463,0x7f3e,0x0000,0x2444,0x6666,0xc223,
+   0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+   0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+   0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
diff --git a/textproc/kbanner/patches/patch-af b/textproc/kbanner/patches/patch-af
deleted file mode 100644
index ffeb8a0193b..00000000000
--- a/textproc/kbanner/patches/patch-af
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:00:29 seb Exp $
-
-JIS X0208-1990 characters.
-
---- font3.c.orig	Thu May 18 00:27:03 2000
-+++ font3.c	Thu May 18 01:07:05 2000
-@@ -4567,10 +4567,10 @@
-   0x1320,0x1020,0x17ff,0x1020,0x1222,0x33fe,0x6800,0xc7ff,
-   0x0020,0x007c,0xf8c4,0x23ac,0x2058,0x2030,0xf8e0,0x2380,
-   0x20fe,0x2120,0x2020,0x3bff,0xe020,0x0122,0x0122,0x01fe,
--  0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
--  0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
--  0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
--  0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
-+  0x0020,0x67ff,0x3000,0x13fe,0x0202,0x02fa,0x028a,0x02fa,
-+  0x1202,0x13fe,0x3018,0x21e0,0x6020,0x47ff,0xc0a8,0x0326,
-+  0x0000,0x7f7e,0x4442,0x4442,0x5f42,0x5142,0x517e,0x5140,
-+  0x5f40,0x4441,0x4463,0x7f3e,0x0000,0x2444,0x6666,0xc223,
-   0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
-   0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
-   0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,