head 1.5; access; symbols OPENPKG_E1_MP_HEAD:1.4 OPENPKG_E1_MP:1.4 OPENPKG_E1_MP_2_STABLE:1.4 OPENPKG_E1_FP:1.4 OPENPKG_2_STABLE_MP:1.4 OPENPKG_2_STABLE_20061018:1.4 OPENPKG_2_STABLE_20060622:1.4 OPENPKG_2_STABLE:1.4.0.6 OPENPKG_2_STABLE_BP:1.4 OPENPKG_2_5_RELEASE:1.4 OPENPKG_2_5_SOLID:1.4.0.4 OPENPKG_2_5_SOLID_BP:1.4 OPENPKG_2_4_RELEASE:1.4 OPENPKG_2_4_SOLID:1.4.0.2 OPENPKG_2_4_SOLID_BP:1.4 OPENPKG_CW_FP:1.2 OPENPKG_2_3_RELEASE:1.2 OPENPKG_2_3_SOLID:1.2.0.6 OPENPKG_2_3_SOLID_BP:1.2 OPENPKG_2_2_RELEASE:1.2 OPENPKG_2_2_SOLID:1.2.0.4 OPENPKG_2_2_SOLID_BP:1.2 OPENPKG_2_1_RELEASE:1.2 OPENPKG_2_1_SOLID:1.2.0.2 OPENPKG_2_1_SOLID_BP:1.2 OPENPKG_2_0_RELEASE:1.1.1.1 OPENPKG_2_0_SOLID:1.1.1.1.0.12 OPENPKG_2_0_SOLID_BP:1.1.1.1 OPENPKG_1_3_RELEASE:1.1.1.1 OPENPKG_1_3_SOLID:1.1.1.1.0.10 OPENPKG_1_3_SOLID_BP:1.1.1.1 OPENPKG_1_STABLE_MP:1.1.1.1 OPENPKG_1_2_RELEASE:1.1.1.1 OPENPKG_1_2_SOLID:1.1.1.1.0.8 OPENPKG_1_2_SOLID_BP:1.1.1.1 OPENPKG_1_STABLE:1.1.1.1.0.6 OPENPKG_1_STABLE_BP:1.1.1.1 OPENPKG_1_1_RELEASE:1.1.1.1 OPENPKG_1_1_SOLID:1.1.1.1.0.4 OPENPKG_1_1_SOLID_BP:1.1.1.1 OPENPKG_1_0_RELEASE:1.1.1.1 OPENPKG_1_0_SOLID:1.1.1.1.0.2 OPENPKG_1_0_SOLID_BP:1.1.1.1 OPENPKG_0_0:1.1.1.1 OPENPKG:1.1.1; locks; strict; comment @# @; 1.5 date 2009.11.28.23.46.24; author rse; state Exp; branches; next 1.4; commitid DaH7Vi9xJ95Pmldu; 1.4 date 2005.06.12.19.23.13; author mk; state Exp; branches; next 1.3; 1.3 date 2005.06.11.06.03.54; author mk; state Exp; branches; next 1.2; 1.2 date 2004.05.20.20.25.37; author ms; state Exp; branches; next 1.1; 1.1 date 2001.09.18.09.48.30; author rse; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2001.09.18.09.48.30; author rse; state Exp; branches; next ; desc @@ 1.5 log @fix building under FreeBSD >= 8 @ text @Index: config.X --- config.X.orig 2005-05-25 16:13:53 +0200 +++ config.X 2009-11-29 00:43:10 +0100 @@@@ -214,9 +214,6 @@@@ #include #include -#ifndef USG -#include -#endif /* USG */ /* ** Things that normally go in a Makefile. Define these just like you Index: ispell.c --- ispell.c.orig 2005-05-25 16:13:53 +0200 +++ ispell.c 2009-11-29 00:43:10 +0100 @@@@ -511,6 +511,11 @@@@ #else /* MINIMENU */ (void) printf ("\t!MINIMENU\n"); #endif /* MINIMENU */ +#ifdef NO8BIT + (void) printf ("\tNO8BIT\n"); +#else /* NO8BIT */ + (void) printf ("\t!NO8BIT\n"); +#endif /* NO8BIT */ (void) printf ("\tMINWORD = %d\n", MINWORD); #ifdef MSDOS (void) printf ("\tMSDOS\n"); Index: term.c --- term.c.orig 2005-04-15 01:11:36 +0200 +++ term.c 2009-11-29 00:43:10 +0100 @@@@ -86,8 +86,12 @@@@ #include "ispell.h" #include "proto.h" #include "msgs.h" +#ifdef BSD4_4 +#define USG +#endif #ifdef USG -#include +#include +#include #else #ifndef __DJGPP__ #include @@@@ -166,8 +170,8 @@@@ } #ifdef USG -static struct termio sbuf; -static struct termio osbuf; +static struct termios sbuf; +static struct termios osbuf; #else static struct sgttyb sbuf; static struct sgttyb osbuf; @@@@ -276,7 +280,7 @@@@ (void) fprintf (stderr, TERM_C_NO_BATCH); exit (1); } - (void) ioctl (0, TCGETA, (char *) &osbuf); + tcgetattr(STDIN_FILENO, &osbuf); termchanged = 1; sbuf = osbuf; @@@@ -285,7 +289,7 @@@@ sbuf.c_iflag &= ~(INLCR | IGNCR | ICRNL); sbuf.c_cc[VMIN] = 1; sbuf.c_cc[VTIME] = 1; - (void) ioctl (0, TCSETAW, (char *) &sbuf); + tcsetattr(STDIN_FILENO, TCSANOW, &sbuf); uerasechar = osbuf.c_cc[VERASE]; ukillchar = osbuf.c_cc[VKILL]; @@@@ -373,7 +377,7 @@@@ if (te) tputs (te, 1, iputch); #ifdef USG - (void) ioctl (0, TCSETAW, (char *) &osbuf); + tcsetattr(STDIN_FILENO, TCSANOW, &osbuf); #else (void) ioctl (0, TIOCSETP, (char *) &osbuf); #ifdef TIOCSLTC @@@@ -394,7 +398,7 @@@@ if (te) tputs (te, 1, iputch); #ifdef USG - (void) ioctl (0, TCSETAW, (char *) &osbuf); + tcsetattr(STDIN_FILENO, TCSANOW, &osbuf); #else (void) ioctl (0, TIOCSETP, (char *) &osbuf); #ifdef TIOCSLTC @@@@ -413,7 +417,7 @@@@ if (termchanged) { #ifdef USG - (void) ioctl (0, TCSETAW, (char *) &sbuf); + tcsetattr(STDIN_FILENO, TCSANOW, &sbuf); #else (void) ioctl (0, TIOCSETP, (char *) &sbuf); #ifdef TIOCSLTC @@@@ -481,7 +485,7 @@@@ argv[i] = NULL; #ifdef USG - (void) ioctl (0, TCSETAW, (char *) &osbuf); + tcsetattr(STDIN_FILENO, TCSANOW, &osbuf); #else (void) ioctl (0, TIOCSETP, (char *) &osbuf); #ifdef TIOCSLTC @@@@ -527,7 +531,7 @@@@ #endif #ifdef USG - (void) ioctl (0, TCSETAW, (char *) &sbuf); + tcsetattr(STDIN_FILENO, TCSANOW, &sbuf); #else (void) ioctl (0, TIOCSETP, (char *) &sbuf); #ifdef TIOCSLTC @@@@ -563,7 +567,7 @@@@ #endif #ifdef USG - (void) ioctl (0, TCSETAW, (char *) &osbuf); + tcsetattr(STDIN_FILENO, TCSANOW, &osbuf); #else (void) ioctl (0, TIOCSETP, (char *) &osbuf); #ifdef TIOCSLTC @@@@ -611,7 +615,7 @@@@ #endif #ifdef USG - (void) ioctl (0, TCSETAW, (char *) &sbuf); + tcsetattr(STDIN_FILENO, TCSANOW, &sbuf); #else (void) ioctl (0, TIOCSETP, (char *) &sbuf); #ifdef TIOCSLTC @ 1.4 log @new release fixes reported problem @ text @d1 4 a4 3 --- config.X 10 Jun 2005 18:16:04 -0000 1.1.1.1 +++ config.X 10 Jun 2005 19:53:17 -0000 @@@@ -211,9 +211,6 @@@@ d14 4 a17 3 --- ispell.c 10 Jun 2005 18:16:05 -0000 1.1.1.1 +++ ispell.c 10 Jun 2005 19:53:17 -0000 @@@@ -507,6 +507,11 @@@@ d29 109 @ 1.3 log @fixing segfault caused by bad initialization @ text @a12 13 --- exp_table.c 10 Jun 2005 18:16:05 -0000 1.1.1.1 +++ exp_table.c 10 Jun 2005 19:54:09 -0000 @@@@ -36,8 +36,8 @@@@ e->size = 0; e->max_size = 1; - e->exps = malloc (e->size * sizeof (*e->exps)); - e->flags = malloc (e->size * sizeof (*e->flags) * MASKSIZE); + e->exps = malloc (e->max_size * sizeof (*e->exps)); + e->flags = malloc (e->max_size * sizeof (*e->flags) * MASKSIZE); e->orig_word = orig_word; } @ 1.2 log @not sure why this patch hack is needed, but it does satisfy some rather popular dictionaries who check the legacy (?) existance of a !NO8BIT identifier @ text @d1 3 a3 3 --- config.X.orig Mon Jan 23 19:28:24 1995 +++ config.X Sun Mar 18 13:11:18 2001 @@@@ -107,9 +107,6 @@@@ d13 16 a28 3 --- ispell.c.orig 2004-05-19 18:07:49.552575166 +0200 +++ ispell.c 2004-05-19 18:08:46.017820502 +0200 @@@@ -494,6 +494,11 @@@@ d38 2 a39 2 (void) printf ("\tMSDOS_BINARY_OPEN = 0x%x\n", (unsigned int) MSDOS_BINARY_OPEN); @ 1.1 log @Initial revision @ text @d13 14 @ 1.1.1.1 log @Import OpenPKG sources into CVS repository @ text @@