From 1da9e070b80021ad7a0933e446215f292b29786c Mon Sep 17 00:00:00 2001 From: rodent Date: Wed, 14 May 2014 02:28:13 +0000 Subject: Fix build for OpenBSD. Defuzz patches. --- textproc/ispell/distinfo | 22 +++++++++++----------- textproc/ispell/patches/patch-aa | 8 ++++---- textproc/ispell/patches/patch-ab | 6 +++--- textproc/ispell/patches/patch-ac | 4 ++-- textproc/ispell/patches/patch-ad | 4 ++-- textproc/ispell/patches/patch-ae | 4 ++-- textproc/ispell/patches/patch-ai | 10 +++++----- textproc/ispell/patches/patch-ak | 6 +++--- textproc/ispell/patches/patch-al | 4 ++-- textproc/ispell/patches/patch-ar | 8 ++++---- textproc/ispell/patches/patch-as | 16 ++++++++-------- 11 files changed, 46 insertions(+), 46 deletions(-) (limited to 'textproc/ispell') diff --git a/textproc/ispell/distinfo b/textproc/ispell/distinfo index 7544f098ebe..b6af7fc0f13 100644 --- a/textproc/ispell/distinfo +++ b/textproc/ispell/distinfo @@ -1,15 +1,15 @@ -$NetBSD: distinfo,v 1.2 2014/04/17 21:30:14 asau Exp $ +$NetBSD: distinfo,v 1.3 2014/05/14 02:28:13 rodent Exp $ SHA1 (ispell-3.3.02.tar.gz) = c0d98e1af3afb8e0b642717c03439ff8881e3d60 RMD160 (ispell-3.3.02.tar.gz) = 12edc94ebb7c1f4040bd8f5b0dbb8f40326aa781 Size (ispell-3.3.02.tar.gz) = 619813 bytes -SHA1 (patch-aa) = cf8e0863e62103526d75ba5f0f25c760d4ee8e32 -SHA1 (patch-ab) = 0a0569521b73761e969794e64d8ba8822c705720 -SHA1 (patch-ac) = 02b94c918164c19ec7cba5c9b88b7168a6f37925 -SHA1 (patch-ad) = 86bcb4c4b34a970b5f3eba6d406a8b8204fccf39 -SHA1 (patch-ae) = 0b19b5f4f2a0faf74ce130b7414bdf85b7588954 -SHA1 (patch-ai) = 210d80ca55fc1d4fb5aa308205d8630a7f4bfb67 -SHA1 (patch-ak) = 40b2c656bae16a6bfd6bada3574a02ec0789167a -SHA1 (patch-al) = 27d87b52dc5507e9dbab73bb9643fa490920216d -SHA1 (patch-ar) = 872cfc47e3652716afab9561fcf4a1bda2cee61a -SHA1 (patch-as) = fd3b2ec1788a7ffc4c871f5564742aad41fadda9 +SHA1 (patch-aa) = 7617574ae1c53aa7b9389f0e75ddcab99dbeb07c +SHA1 (patch-ab) = 94a33a906de66a55d4aa46beec4df9c8dde9546d +SHA1 (patch-ac) = 4faa82bdd628500aa35d94b2d4a1860919097b72 +SHA1 (patch-ad) = c47a406acf52244868e7a561ab7f1c9d394d4034 +SHA1 (patch-ae) = adc803bd66f62236a2b879713f326b4c7ac7199f +SHA1 (patch-ai) = 1fbf9385818e0a0fcd4049d0407212b1456d2744 +SHA1 (patch-ak) = c2f0d7749869f0bfd21f94b5fe57534259218b89 +SHA1 (patch-al) = ea63fc7dbc2200794157d9be781210cd8a4e671f +SHA1 (patch-ar) = c5082129f55fb232db34e0796423e60fcd4ed5c2 +SHA1 (patch-as) = b459c015b33f6fb1aa71a3cc05cf40a7e445d0ca diff --git a/textproc/ispell/patches/patch-aa b/textproc/ispell/patches/patch-aa index 9400e998cf3..a9fc084596a 100644 --- a/textproc/ispell/patches/patch-aa +++ b/textproc/ispell/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.4 2013/04/24 02:20:36 rodent Exp $ +$NetBSD: patch-aa,v 1.5 2014/05/14 02:28:13 rodent Exp $ ---- languages/english/english.2-orig Mon Jan 23 19:28:44 1995 -+++ languages/english/english.2 Thu Apr 16 14:34:21 1998 -@@ -1867,7 +1867,6 @@ +--- languages/english/english.2.orig Wed Apr 27 00:25:52 2005 ++++ languages/english/english.2 +@@ -1865,7 +1865,6 @@ auxinically auxotroph auxotrophic auxotrophy diff --git a/textproc/ispell/patches/patch-ab b/textproc/ispell/patches/patch-ab index fdaac685a92..b01ad8daec4 100644 --- a/textproc/ispell/patches/patch-ab +++ b/textproc/ispell/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.8 2013/04/24 02:20:36 rodent Exp $ +$NetBSD: patch-ab,v 1.9 2014/05/14 02:28:13 rodent Exp $ ---- Makefile.orig 2005-05-25 15:57:02.000000000 +0200 +--- Makefile.orig Wed May 25 13:57:02 2005 +++ Makefile @@ -373,13 +373,10 @@ install-dictbuild: rm -f fixispell-a$$MAN1EXT @@ -31,7 +31,7 @@ $NetBSD: patch-ab,v 1.8 2013/04/24 02:20:36 rodent Exp $ MSGLANG POUNDBANG REGLIB STATSUFFIX \ SPELL_XREF TERMLIB TIB_XREF WORDS YACC \ ; do \ -@@ -518,6 +515,12 @@ config.sh: config.X defhash.h local.h M +@@ -518,6 +515,12 @@ config.sh: config.X defhash.h local.h Makefile | sed -e 's/"[^"]*$$/'"'/" -e "s/=/='/" -e 's/\\"/"/g' \ | sed -n -e '$$p'; \ done > config.sh; \ diff --git a/textproc/ispell/patches/patch-ac b/textproc/ispell/patches/patch-ac index e930cd2094e..54b9e6ad77b 100644 --- a/textproc/ispell/patches/patch-ac +++ b/textproc/ispell/patches/patch-ac @@ -1,6 +1,6 @@ -$NetBSD: patch-ac,v 1.3 2013/04/24 02:20:36 rodent Exp $ +$NetBSD: patch-ac,v 1.4 2014/05/14 02:28:13 rodent Exp $ ---- ispell.h.orig 2005-04-29 02:46:51.000000000 +1200 +--- ispell.h.orig Thu Apr 28 14:46:51 2005 +++ ispell.h @@ -144,6 +144,16 @@ #include "config.h" diff --git a/textproc/ispell/patches/patch-ad b/textproc/ispell/patches/patch-ad index 2ae6ef107a8..ca03f5e8d98 100644 --- a/textproc/ispell/patches/patch-ad +++ b/textproc/ispell/patches/patch-ad @@ -1,6 +1,6 @@ -$NetBSD: patch-ad,v 1.3 2013/04/24 02:20:36 rodent Exp $ +$NetBSD: patch-ad,v 1.4 2014/05/14 02:28:13 rodent Exp $ ---- buildhash.c.orig 2005-04-28 12:26:06.000000000 +1200 +--- buildhash.c.orig Thu Apr 28 00:26:06 2005 +++ buildhash.c @@ -248,7 +248,7 @@ static void output () { diff --git a/textproc/ispell/patches/patch-ae b/textproc/ispell/patches/patch-ae index 9a952c6f70b..f6c0b157a4b 100644 --- a/textproc/ispell/patches/patch-ae +++ b/textproc/ispell/patches/patch-ae @@ -1,6 +1,6 @@ -$NetBSD: patch-ae,v 1.3 2013/04/24 02:20:36 rodent Exp $ +$NetBSD: patch-ae,v 1.4 2014/05/14 02:28:13 rodent Exp $ ---- lookup.c.orig 2005-04-15 09:25:52.000000000 +1200 +--- lookup.c.orig Thu Apr 14 21:25:52 2005 +++ lookup.c @@ -247,11 +247,11 @@ int linit () if (dp->word == (unsigned char *) -1) diff --git a/textproc/ispell/patches/patch-ai b/textproc/ispell/patches/patch-ai index 418a4ae18d7..5fea924f387 100644 --- a/textproc/ispell/patches/patch-ai +++ b/textproc/ispell/patches/patch-ai @@ -1,7 +1,7 @@ -$NetBSD: patch-ai,v 1.3 2013/04/24 02:20:36 rodent Exp $ ---- languages/english/english.3.orig Tue Oct 27 22:26:48 1998 -+++ languages/english/english.3 Tue Oct 27 22:27:35 1998 -@@ -5202,6 +5202,7 @@ +$NetBSD: patch-ai,v 1.4 2014/05/14 02:28:13 rodent Exp $ +--- languages/english/english.3.orig Thu Apr 28 22:53:07 2005 ++++ languages/english/english.3 +@@ -5175,6 +5175,7 @@ dirk dirndl disaccredit disafforest @@ -9,7 +9,7 @@ $NetBSD: patch-ai,v 1.3 2013/04/24 02:20:36 rodent Exp $ disbranch disbud discalced -@@ -5236,7 +5237,6 @@ +@@ -5209,7 +5210,6 @@ dispersity dispersoid displayable disproven diff --git a/textproc/ispell/patches/patch-ak b/textproc/ispell/patches/patch-ak index b061e54815f..1bf3a07ac85 100644 --- a/textproc/ispell/patches/patch-ak +++ b/textproc/ispell/patches/patch-ak @@ -1,13 +1,13 @@ -$NetBSD: patch-ak,v 1.2 2014/04/17 21:30:14 asau Exp $ +$NetBSD: patch-ak,v 1.3 2014/05/14 02:28:13 rodent Exp $ ---- term.c.orig 2005-04-14 23:11:36.000000000 +0000 +--- term.c.orig Thu Apr 14 23:11:36 2005 +++ term.c @@ -86,7 +86,10 @@ static char Rcs_Id[] = #include "ispell.h" #include "proto.h" #include "msgs.h" -#ifdef USG -+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(linux) || defined(__sgi) || defined(__INTERIX) ++#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(linux) || defined(__sgi) || defined(__INTERIX) || defined(__OpenBSD__) +#define USE_TERMIOS +#include +#elif defined(USG) diff --git a/textproc/ispell/patches/patch-al b/textproc/ispell/patches/patch-al index 83411fb67ce..c83320cfdbe 100644 --- a/textproc/ispell/patches/patch-al +++ b/textproc/ispell/patches/patch-al @@ -1,6 +1,6 @@ -$NetBSD: patch-al,v 1.1 2013/04/24 02:20:36 rodent Exp $ +$NetBSD: patch-al,v 1.2 2014/05/14 02:28:13 rodent Exp $ ---- config.X.orig 2005-05-26 02:13:53.000000000 +1200 +--- config.X.orig Wed May 25 14:13:53 2005 +++ config.X @@ -274,7 +274,7 @@ ** -lcurses, or -lncurses on most systems. diff --git a/textproc/ispell/patches/patch-ar b/textproc/ispell/patches/patch-ar index b2b1d650d77..e5aad9290ac 100644 --- a/textproc/ispell/patches/patch-ar +++ b/textproc/ispell/patches/patch-ar @@ -1,8 +1,8 @@ -$NetBSD: patch-ar,v 1.1 2013/04/24 02:20:37 rodent Exp $ +$NetBSD: patch-ar,v 1.2 2014/05/14 02:28:13 rodent Exp $ ---- ijoin.c.orig Fri Mar 19 15:00:19 2004 -+++ ijoin.c Fri Mar 19 15:01:51 2004 -@@ -133,8 +133,6 @@ +--- ijoin.c.orig Thu Apr 14 14:38:23 2005 ++++ ijoin.c +@@ -169,8 +169,6 @@ static char * tabchar = " \t"; /* Field separator cha static int unpairable1 = 0; /* NZ if -a1 */ static int unpairable2 = 0; /* NZ if -a2 */ diff --git a/textproc/ispell/patches/patch-as b/textproc/ispell/patches/patch-as index 95245e3bc14..949aa4c25ab 100644 --- a/textproc/ispell/patches/patch-as +++ b/textproc/ispell/patches/patch-as @@ -1,11 +1,11 @@ -$NetBSD: patch-as,v 1.1 2013/04/24 02:20:37 rodent Exp $ +$NetBSD: patch-as,v 1.2 2014/05/14 02:28:13 rodent Exp $ Avoid conflit with system getline. Fixes PR pkg/41746, thanks to Tom Stejskal. ---- correct.c.orig 2009-07-17 09:14:29.000000000 +0100 -+++ correct.c 2009-07-17 09:14:46.000000000 +0100 -@@ -245,7 +245,7 @@ +--- correct.c.orig Thu Apr 28 14:46:51 2005 ++++ correct.c +@@ -245,7 +245,7 @@ static void save_root_cap P ((ichar_t * word, ichar_t struct flagent * sufent, ichar_t savearea[MAX_CAPS][INPUTWORDLEN + MAXAFFIXLEN], int * nsaved)); @@ -14,7 +14,7 @@ Fixes PR pkg/41746, thanks to Tom Stejskal. void askmode P ((void)); void copyout P ((unsigned char ** cc, int cnt)); static void lookharder P ((unsigned char * string)); -@@ -571,7 +571,7 @@ +@@ -571,7 +571,7 @@ checkagain: imove (li - 1, 0); (void) putchar ('!'); @@ -23,7 +23,7 @@ Fixes PR pkg/41746, thanks to Tom Stejskal. { (void) putchar (7); ierase (); -@@ -596,7 +596,7 @@ +@@ -596,7 +596,7 @@ checkagain: (void) printf ("%s ", CORR_C_READONLY); } (void) printf (CORR_C_REPLACE_WITH); @@ -32,7 +32,7 @@ Fixes PR pkg/41746, thanks to Tom Stejskal. { (void) putchar (7); /* Put it back */ -@@ -664,7 +664,7 @@ +@@ -664,7 +664,7 @@ checkagain: unsigned char buf[100]; imove (li - 1, 0); (void) printf (CORR_C_LOOKUP_PROMPT); @@ -41,7 +41,7 @@ Fixes PR pkg/41746, thanks to Tom Stejskal. { (void) putchar (7); ierase (); -@@ -1583,7 +1583,7 @@ +@@ -1583,7 +1583,7 @@ static void save_root_cap (word, pattern, prestrip, pr return; } -- cgit v1.2.3