[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openpkg-cvs
Subject:    [CVS] OpenPKG: openpkg-src/ispell/ ispell.patch ispell.spec
From:       "Ralf S. Engelschall" <rse () openpkg ! org>
Date:       2009-11-28 23:46:26
Message-ID: 20091128234627.611A21B5067 () master ! openpkg ! org
[Download RAW message or body]

  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs                   Email:  rse@openpkg.org
  Module: openpkg-src                      Date:   29-Nov-2009 00:46:25
  Branch: HEAD                             Handle: 2009112823462400

  Modified files:
    openpkg-src/ispell      ispell.patch ispell.spec

  Log:
    fix building under FreeBSD >= 8

  Summary:
    Revision    Changes     Path
    1.5         +117 -6     openpkg-src/ispell/ispell.patch
    1.62        +1  -1      openpkg-src/ispell/ispell.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/ispell/ispell.patch
  ============================================================================
  $ cvs diff -u -r1.4 -r1.5 ispell.patch
  --- openpkg-src/ispell/ispell.patch	12 Jun 2005 19:23:13 -0000	1.4
  +++ openpkg-src/ispell/ispell.patch	28 Nov 2009 23:46:24 -0000	1.5
  @@ -1,6 +1,7 @@
  ---- 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 @@
  +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 <sys/param.h>
    #include <sys/types.h>
  @@ -10,9 +11,10 @@
    
    /*
    ** Things that normally go in a Makefile.  Define these just like you
  ---- 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 @@
  +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 */
  @@ -24,3 +26,112 @@
    		    (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 <termio.h>
  ++#include <unistd.h>
  ++#include <termios.h>
  + #else
  + #ifndef __DJGPP__
  + #include <sgtty.h>
  +@@ -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
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/ispell/ispell.spec
  ============================================================================
  $ cvs diff -u -r1.61 -r1.62 ispell.spec
  --- openpkg-src/ispell/ispell.spec	7 Oct 2009 17:49:15 -0000	1.61
  +++ openpkg-src/ispell/ispell.spec	28 Nov 2009 23:46:24 -0000	1.62
  @@ -36,7 +36,7 @@
   Group:        Writing
   License:      BSD
   Version:      %{V_ispell}
  -Release:      20091007
  +Release:      20091129
   
   #   list of sources
   Source0:      http://fmg-www.cs.ucla.edu/geoff/tars/ispell-%{V_ispell}.tar.gz
  @@ .
______________________________________________________________________
OpenPKG                                             http://openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org

[prev in list] [next in list] [prev in thread] [next in thread]