1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-06 06:30:19 +00:00

Update to version 3.3.02.

Update the URL for the italian dictionary.

PR:		ports/125267:
Submitted by:	"Pedro F. Giffuni" <pfgshield-freebsd@yahoo.com>
This commit is contained in:
Jean-Marc Zucconi 2008-07-21 11:54:12 +00:00
parent c4074d8032
commit 5908184784
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=217249
9 changed files with 75 additions and 95 deletions

View File

@ -6,29 +6,28 @@
#
PORTNAME?= ispell
PORTVERSION?= 3.2.06
PORTREVISION?= 22
PORTVERSION?= 3.3.02
CATEGORIES+= textproc
MASTER_SITES= http://fmg-www.cs.ucla.edu/geoff/tars/ \
http://distfiles.opendarwin.org/
DISTNAME= ispell-3.2.06 # needed for slave ports / options
DISTFILES= ispell-3.2.06.tar.gz # needed for slave ports / options
DISTNAME= ispell-3.3.02 # needed for slave ports / options
DISTFILES= ispell-3.3.02.tar.gz # needed for slave ports / options
EXTRACT_ONLY= ${ISPELL_FILES}
MAINTAINER?= jmz@FreeBSD.org
COMMENT= An interactive spelling checker for multiple languages
ISPELL_FILES= ispell-3.2.06.tar.gz
MAN1= ispell.1
MAN4= ispell.4 english.4
MAN5= ispell.5 english.5
MLINKS= ispell.1 buildhash.1 \
ispell.1 findaffix.1 \
ispell.1 munchlist.1 \
ispell.1 tryaffix.1 \
ispell.1 spell.1
EXTRACT_ONLY= ${ISPELL_FILES}
ISPELL_FILES= ${PORTNAME}-${PORTVERSION}.tar.gz
EXTRA_DICT=
MAKE_FLAGS= TMPDIR=${WRKDIR} -f
ALL_TARGET=
@ -73,7 +72,7 @@ SCRIPTS_ENV+= ISPELL_INCLAMERICAN=${ISPELL_INCLAMERICAN}
.endif
.if defined(ISPELL_IT)
ITDISTFILE= ispell-it2001.tgz
MASTER_SITES+= http://members.xoom.virgilio.it/trasforma/ispell/:it
MASTER_SITES+= http://members.xoom.alice.it/trasforma/ispell/:it
EXTRA_DICT+= ${ITDISTFILE}:it
.endif
.if defined(ISPELL_FR)

View File

@ -1,6 +1,6 @@
MD5 (ispell-3.2.06.tar.gz) = d434e1aef1a815294d5012c60c4c414a
SHA256 (ispell-3.2.06.tar.gz) = 34a27fc4a2089bd5074aacf69323731770e5b605a2fc9a053d389f45b01c7966
SIZE (ispell-3.2.06.tar.gz) = 580742
MD5 (ispell-3.3.02.tar.gz) = 12087d7555fc2b746425cd167af480fe
SHA256 (ispell-3.3.02.tar.gz) = 7ff5aad2722ad80fa86766218b7bc622b25bad2d765ea942ba93c996b113ecb4
SIZE (ispell-3.3.02.tar.gz) = 619813
MD5 (ispell-it2001.tgz) = 559ab52451fec91068f11d40f5f919b2
SHA256 (ispell-it2001.tgz) = bac0714ff3f89b89de82b9f03e0e5958be1c99eb4f5324aec5a1cc246df8a548
SIZE (ispell-it2001.tgz) = 1115411

View File

@ -1,12 +0,0 @@
--- correct.c.orig Wed Jul 25 23:51:47 2001
+++ correct.c Thu Feb 21 21:15:51 2002
@@ -1600,7 +1600,9 @@
ch = getc (stdin);
if (ch == EOF)
break;
+ contextbufs[0][bufsize] = (char) ch;
filteredbuf[bufsize++] = (char) ch;
+ contextbufs[0][bufsize] = '\0';
filteredbuf[bufsize] = '\0';
}
}

View File

@ -1,22 +1,22 @@
--- ispell.c.orig Thu Jul 26 07:51:46 2001
+++ ispell.c Sat Dec 17 22:21:26 2005
@@ -209,6 +209,7 @@
--- ispell.c.orig 2005-05-25 09:13:53.000000000 -0500
+++ ispell.c 2008-07-04 12:12:02.000000000 -0500
@@ -235,6 +235,7 @@
#include <fcntl.h>
#endif /* NO_FCNTL_H */
#include <sys/stat.h>
+#include <libgen.h>
static void usage P ((void));
static void initckch P ((char * wchars));
@@ -327,6 +328,7 @@
int main P ((int argc, char * argv[]));
@@ -272,6 +273,7 @@
char ** versionp;
char * wchars = NULL;
char * preftype = NULL;
+ char * cmdname;
static char libdictname[sizeof DEFHASH];
char logfilename[MAXPATHLEN];
static char outbuf[BUFSIZ];
int argno;
@@ -334,6 +336,11 @@
@@ -280,6 +282,11 @@
Cmd = *argv;
@ -27,8 +27,8 @@
+
Trynum = 0;
p = getenv ("DICTIONARY");
@@ -792,6 +799,11 @@
p = getenv (LIBRARYVAR);
@@ -851,6 +858,11 @@
LibDict = p + 1;
}
break;
@ -40,7 +40,7 @@
case 'V': /* Display 8-bit characters as M-xxx */
if (arglen > 2)
usage ();
@@ -827,7 +839,7 @@
@@ -886,7 +898,7 @@
argc--;
}
@ -49,8 +49,8 @@
{
if (argc != 0)
usage ();
@@ -848,7 +860,7 @@
if (access (argv[argno], 4) >= 0)
@@ -907,7 +919,7 @@
if (access (argv[argno], R_OK) >= 0)
break;
}
- if (argno >= argc && !lflag && !aflag && !eflag && !dumpflag)
@ -58,18 +58,28 @@
{
(void) fprintf (stderr,
argc == 1 ? ISPELL_C_NO_FILE : ISPELL_C_NO_FILES);
@@ -935,6 +947,35 @@
outfile = stdout;
checkfile ();
@@ -988,9 +1000,9 @@
exit (0);
+ }
+
}
-#ifndef __bsdi__
+#ifndef BSD_4_4
setbuf (stdout, outbuf);
-#endif /* __bsdi__ */
+#endif /* BSD_4_4 */
if (lflag)
{
infile = setupdefmt(NULL, NULL);
@@ -999,6 +1011,35 @@
exit (0);
}
+ if (uflag)
+ {
+ lflag++;
+ if (!argc)
+ {
+ infile = setupdefmt(NULL);
+ infile = setupdefmt(NULL, NULL);
+ outfile = stdout;
+ checkfile ();
+ exit (0);
@ -78,7 +88,7 @@
+ {
+ while (argc--)
+ {
+ if ((infile = setupdefmt (*argv)) == NULL)
+ if ((infile = setupdefmt (*argv, NULL)) == NULL)
+ {
+ (void) fprintf (stderr, CANT_OPEN, *argv);
+ (void) sleep ((unsigned) 2);
@ -91,6 +101,8 @@
+ }
+ exit (0);
+ }
}
terminit ();
+ }
+
/*
* If there is a log directory, open a log file. If the open
* fails, we just won't log.

View File

@ -1,10 +0,0 @@
--- local.h.samp.orig Sun Apr 21 16:58:43 2002
+++ local.h.samp Sun Apr 21 16:58:54 2002
@@ -105,7 +105,6 @@
*/
#define MINIMENU /* Display a mini-menu at the bottom of the screen */
-#define NO8BIT /* Remove this if you use ISO character sets */
#undef USG /* Define on System V or if term.c won't compile */
#undef NO_FCNTL_H /* Define if you get compile errors on fcntl.h */
#undef NO_MKSTEMP /* Define if you get compile or link errors */

View File

@ -1,11 +0,0 @@
--- munchlist.X.orig Sun Apr 21 16:52:41 2002
+++ munchlist.X Sun Apr 21 16:53:03 2002
@@ -160,7 +160,7 @@
set -vx
fi
LIBDIR=!!LIBDIR!!
-TDIR=${TMPDIR-/usr/tmp}
+TDIR=${TMPDIR-/tmp}
TMP=${TDIR}/munch$$
SORTTMP="-T ${TDIR}" # !!SORTTMP!!

View File

@ -1,18 +1,20 @@
--- term.c Wed Jul 25 23:51:46 2001
+++ term.c Fri Mar 16 10:52:35 2007
@@ -80,8 +80,10 @@
--- term.c.orig 2008-07-04 11:42:14.000000000 -0500
+++ term.c 2008-07-04 11:55:44.000000000 -0500
@@ -86,8 +86,12 @@
#include "ispell.h"
#include "proto.h"
#include "msgs.h"
+#ifdef BSD_4_4
+#define USG
+#endif
#ifdef USG
-#include <termio.h>
+#include <unistd.h>
+#include <termios.h>
#else
#ifndef __DJGPP__
#include <sgtty.h>
#endif
@@ -152,8 +154,8 @@
@@ -166,8 +170,8 @@
}
#ifdef USG
@ -23,7 +25,7 @@
#else
static struct sgttyb sbuf;
static struct sgttyb osbuf;
@@ -263,7 +265,7 @@
@@ -276,7 +280,7 @@
(void) fprintf (stderr, TERM_C_NO_BATCH);
exit (1);
}
@ -32,7 +34,7 @@
termchanged = 1;
sbuf = osbuf;
@@ -272,7 +274,7 @@
@@ -285,7 +289,7 @@
sbuf.c_iflag &= ~(INLCR | IGNCR | ICRNL);
sbuf.c_cc[VMIN] = 1;
sbuf.c_cc[VTIME] = 1;
@ -41,34 +43,34 @@
uerasechar = osbuf.c_cc[VERASE];
ukillchar = osbuf.c_cc[VKILL];
@@ -360,7 +362,7 @@
@@ -373,7 +377,7 @@
if (te)
tputs (te, 1, putch);
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
@@ -376,7 +378,7 @@
int signo;
{
@@ -394,7 +398,7 @@
if (te)
tputs (te, 1, iputch);
#ifdef USG
- (void) ioctl (0, TCSETAW, (char *) &osbuf);
+ tcsetattr(STDIN_FILENO, TCSANOW, &osbuf);
- (void) ioctl (0, TCSETAW, (char *) &osbuf);
+ tcsetattr(STDIN_FILENO, TCSANOW, &osbuf);
#else
(void) ioctl (0, TIOCSETP, (char *) &osbuf);
(void) ioctl (0, TIOCSETP, (char *) &osbuf);
#ifdef TIOCSLTC
@@ -391,7 +393,7 @@
/* stop here until continued */
(void) signal (signo, onstop);
@@ -413,7 +417,7 @@
if (termchanged)
{
#ifdef USG
- (void) ioctl (0, TCSETAW, (char *) &sbuf);
+ tcsetattr(STDIN_FILENO, TCSANOW, &sbuf);
- (void) ioctl (0, TCSETAW, (char *) &sbuf);
+ tcsetattr(STDIN_FILENO, TCSANOW, &sbuf);
#else
(void) ioctl (0, TIOCSETP, (char *) &sbuf);
(void) ioctl (0, TIOCSETP, (char *) &sbuf);
#ifdef TIOCSLTC
@@ -451,7 +453,7 @@
@@ -481,7 +485,7 @@
argv[i] = NULL;
#ifdef USG
@ -77,7 +79,7 @@
#else
(void) ioctl (0, TIOCSETP, (char *) &osbuf);
#ifdef TIOCSLTC
@@ -497,7 +499,7 @@
@@ -527,7 +531,7 @@
#endif
#ifdef USG
@ -86,7 +88,7 @@
#else
(void) ioctl (0, TIOCSETP, (char *) &sbuf);
#ifdef TIOCSLTC
@@ -530,7 +532,7 @@
@@ -563,7 +567,7 @@
#endif
#ifdef USG
@ -95,7 +97,7 @@
#else
(void) ioctl (0, TIOCSETP, (char *) &osbuf);
#ifdef TIOCSLTC
@@ -562,7 +564,7 @@
@@ -611,7 +615,7 @@
#endif
#ifdef USG

View File

@ -1,6 +1,6 @@
bin/buildhash
bin/deformat-c
bin/deformat-sh
bin/defmt-c
bin/defmt-sh
bin/findaffix
bin/icombine
bin/ijoin

View File

@ -12,7 +12,7 @@ if [ ! -f /usr/share/dict/words ]; then
fi
cd $WRKSRC || exit 1;
sed -e s:/usr/local:$PREFIX: <local.h.samp >local.h || exit 1;
sed -e s:/usr/local:$PREFIX: <local.h.bsd >local.h || exit 1;
echo "#undef NO8BIT" >> local.h
if [ ! -z "ISPELL_INCLAMERICAN" ] && \