pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/textproc/ispell Update to 3.4.00
details: https://anonhg.NetBSD.org/pkgsrc/rev/c9b3432749cb
branches: trunk
changeset: 648379:c9b3432749cb
user: ryoon <ryoon%pkgsrc.org@localhost>
date: Sat Mar 14 07:55:32 2015 +0000
description:
Update to 3.4.00
Changelog:
Version 3.4.00
==============
- The english.5 manual page has been dropped from the distribution;
the english.aff file provides superior documentation (and in any
case, most people will use munchlist to apply affixes).
- Ispell now supports systems (BSD) that foolish discarded backwards
compatibility and insist on using termios.
- A function (getline) has been renamed in correct.c to solve
compilation problems on some systems.
- The manual page now correctly identifies the ispell version that it
describes.
- It is now possible to insert the ispell version information into
shell scripts via the Makefile.
- An error has been corrected in the English affix files that caused
certain words ending in "th" to be pluralized incorrectly. The
dictionaries have been updated to ensure that no incorrect plurals
have crept in.
- The personal dictionary is now written in a stable order when there
are multiple variant capitalizations of a word.
- The security of temporary files has been improved on systems that
don't have the "mktemp" command.
- The deformatters makefile has been changed to be compatible with
older versions of make.
- A bug in TeX deformatting has been corrected. Previously, two
adjacent math-mode environments introduced with dollar signs, such
as $a=b$$c=d$, would cause ispell to lose track of whether it was
in math mode.
- The Makefile now supports a DESTDIR installation prefix (patch from
Petter Reinholdtsen)
- The American and British Makefiles have been simplified to ensure
that dictionaries are always built with the lastest information.
diffstat:
textproc/ispell/Makefile | 6 +-
textproc/ispell/PLIST | 3 +-
textproc/ispell/distinfo | 12 +-
textproc/ispell/patches/patch-ab | 56 +++++---------
textproc/ispell/patches/patch-ak | 147 ---------------------------------------
textproc/ispell/patches/patch-as | 52 -------------
6 files changed, 28 insertions(+), 248 deletions(-)
diffs (truncated from 355 to 300 lines):
diff -r 93c98f6bb184 -r c9b3432749cb textproc/ispell/Makefile
--- a/textproc/ispell/Makefile Sat Mar 14 07:55:21 2015 +0000
+++ b/textproc/ispell/Makefile Sat Mar 14 07:55:32 2015 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2013/04/24 11:15:45 rodent Exp $
+# $NetBSD: Makefile,v 1.27 2015/03/14 07:55:32 ryoon Exp $
#
-DISTNAME= ispell-3.3.02
+DISTNAME= ispell-3.4.00
CATEGORIES= textproc
MASTER_SITES= http://fmg-www.cs.ucla.edu/geoff/tars/
@@ -10,7 +10,7 @@
COMMENT= Interactive spelling checker
CONFLICTS+= ispell-base-[0-9]*
-USE_TOOLS+= mktemp:run yacc
+USE_TOOLS+= gmake mktemp:run yacc
INSTALLATION_DIRS= bin lib ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
MAKE_FLAGS+= TMPDIR=${WRKDIR:Q}
diff -r 93c98f6bb184 -r c9b3432749cb textproc/ispell/PLIST
--- a/textproc/ispell/PLIST Sat Mar 14 07:55:21 2015 +0000
+++ b/textproc/ispell/PLIST Sat Mar 14 07:55:32 2015 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2013/04/24 02:20:36 rodent Exp $
+@comment $NetBSD: PLIST,v 1.2 2015/03/14 07:55:32 ryoon Exp $
bin/buildhash
bin/defmt-c
bin/defmt-sh
@@ -17,5 +17,4 @@
man/man1/ispell.1
man/man1/munchlist.1
man/man1/tryaffix.1
-man/man5/english.5
man/man5/ispell.5
diff -r 93c98f6bb184 -r c9b3432749cb textproc/ispell/distinfo
--- a/textproc/ispell/distinfo Sat Mar 14 07:55:21 2015 +0000
+++ b/textproc/ispell/distinfo Sat Mar 14 07:55:32 2015 +0000
@@ -1,15 +1,13 @@
-$NetBSD: distinfo,v 1.3 2014/05/14 02:28:13 rodent Exp $
+$NetBSD: distinfo,v 1.4 2015/03/14 07:55:32 ryoon 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 (ispell-3.4.00.tar.gz) = 6138ab935f0261be8162e3cdc07c127d53555837
+RMD160 (ispell-3.4.00.tar.gz) = c6a2a6d6dd65782d7c3fdf90968e61a5091b616c
+Size (ispell-3.4.00.tar.gz) = 638770 bytes
SHA1 (patch-aa) = 7617574ae1c53aa7b9389f0e75ddcab99dbeb07c
-SHA1 (patch-ab) = 94a33a906de66a55d4aa46beec4df9c8dde9546d
+SHA1 (patch-ab) = 842cd5946716f57fc263b7c941d32b50f79515e5
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 -r 93c98f6bb184 -r c9b3432749cb textproc/ispell/patches/patch-ab
--- a/textproc/ispell/patches/patch-ab Sat Mar 14 07:55:21 2015 +0000
+++ b/textproc/ispell/patches/patch-ab Sat Mar 14 07:55:32 2015 +0000
@@ -1,50 +1,32 @@
-$NetBSD: patch-ab,v 1.9 2014/05/14 02:28:13 rodent Exp $
+$NetBSD: patch-ab,v 1.10 2015/03/14 07:55:32 ryoon Exp $
---- Makefile.orig Wed May 25 13:57:02 2005
+--- Makefile.orig 2015-02-08 09:10:54.000000000 +0000
+++ Makefile
-@@ -373,13 +373,10 @@ install-dictbuild:
+@@ -397,13 +397,10 @@ install-dictbuild:
rm -f fixispell-a$$MAN1EXT
@. ./config.sh; \
set -x; \
-- $$INSTALL sq.1 $$MAN1DIR/sq$$MAN1EXT; \
+- $$INSTALL sq.1 $(DESTDIR)$$MAN1DIR/sq$$MAN1EXT; \
for m in buildhash munchlist findaffix tryaffix; do \
echo ".so `basename $$MAN1DIR`/ispell$$MAN1EXT" \
- > $$MAN1DIR/$$m$$MAN1EXT; \
+ > $(DESTDIR)$$MAN1DIR/$$m$$MAN1EXT; \
- done; \
- echo ".so `basename $$MAN1DIR`/sq$$MAN1EXT" \
-- > $$MAN1DIR/unsq$$MAN1EXT
+- > $(DESTDIR)$$MAN1DIR/unsq$$MAN1EXT
+ done
@. ./config.sh; \
set -x; \
- cd $$MAN1DIR; \
-@@ -506,10 +503,10 @@ defhash.h: config.X local.h Makefile
+ cd $(DESTDIR)$$MAN1DIR; \
+@@ -421,7 +418,7 @@ install-languages:
+ cd $(DESTDIR)$$LIBDIR; \
+ if [ $$MASTERHASH != $$DEFHASH ]; then \
+ rm -f $$DEFHASH; \
+- $$LINK -s $(DESTDIR)$$MASTERHASH $$DEFHASH; \
++ $$LINK -s $$MASTERHASH $$DEFHASH; \
+ fi
- config.sh: config.X defhash.h local.h Makefile
- set $(SHELLDEBUG); \
-- for var in BAKEXT BINDIR CC CFLAGS COUNTSUFFIX DEFDICT DEFHASH \
-+ for var in BAKEXT CC CFLAGS COUNTSUFFIX DEFDICT DEFHASH \
- DEFLANG EXEEXT HASHSUFFIX INSTALL \
-- LANGUAGES LIBDIR LIBES LINK LINT LINTFLAGS LOOK_XREF \
-- MAKE_SORTTMP MAN1DIR MAN1EXT MAN45DIR MAN45EXT MAN45SECT MASTERHASH \
-+ LANGUAGES LIBES LINK LINT LINTFLAGS LOOK_XREF \
-+ MAKE_SORTTMP MAN1EXT MAN45EXT MAN45SECT MASTERHASH \
- MSGLANG POUNDBANG REGLIB STATSUFFIX \
- SPELL_XREF TERMLIB TIB_XREF WORDS YACC \
- ; do \
-@@ -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; \
-+ for var in BINDIR LIBDIR MAN1DIR MAN45DIR; do \
-+ cat config.X defhash.h local.h \
-+ | sed -n -e "s/^#define[ ]*$$var[ ]*"'"'"/$$var=/p" \
-+ | sed -e 's/"[^"]*$$/'"'/" -e "s/=/=\$${DESTDIR}'/" -e 's/\\"/"/g' \
-+ | sed -n -e '$$p'; \
-+ done >> config.sh; \
- echo 'case "$$MAKE_SORTTMP" in "") \
- SORTTMP="-e /!!SORTTMP!!/s/=.*$$/=/";; *) SORTTMP=;; esac' \
- >> config.sh
-@@ -636,7 +639,7 @@ local.h:
+ munchable: findaffix tryaffix munchlist buildhash ispell icombine
+@@ -666,7 +663,7 @@ local.h:
set +e; \
[ -r local.h ] || (cp local.h.generic local.h; chmod u+w local.h)
@@ -53,13 +35,13 @@
@. ./config.sh; \
set $(SHELLDEBUG); \
set +e; \
-@@ -650,7 +653,8 @@ msgs.h: config.sh FRC
+@@ -680,7 +677,8 @@ msgs.h: config.sh FRC
else \
set -x; \
- rm -f msgs.h; $$LINK $$msgs msgs.h || cp $$msgs msgs.h; \
+ rm -f msgs.h; $$LINK -s $$msgs msgs.h || cp $$msgs msgs.h; \
- fi
+ fi; \
-+ touch msgs.h
++ touch msgs.h
FRC:
diff -r 93c98f6bb184 -r c9b3432749cb textproc/ispell/patches/patch-ak
--- a/textproc/ispell/patches/patch-ak Sat Mar 14 07:55:21 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,147 +0,0 @@
-$NetBSD: patch-ak,v 1.3 2014/05/14 02:28:13 rodent Exp $
-
---- 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) || defined(__OpenBSD__)
-+#define USE_TERMIOS
-+#include <termios.h>
-+#elif defined(USG)
- #include <termio.h>
- #else
- #ifndef __DJGPP__
-@@ -165,7 +168,10 @@ static int iputch (c)
- return putchar (c);
- }
-
--#ifdef USG
-+#ifdef USE_TERMIOS
-+static struct termios sbuf;
-+static struct termios osbuf;
-+#elif defined(USG)
- static struct termio sbuf;
- static struct termio osbuf;
- #else
-@@ -292,8 +298,31 @@ retry:
-
- #endif
-
-+#ifdef USE_TERMIOS
-+ if (!isatty (0))
-+ {
-+ (void) fprintf (stderr, TERM_C_NO_BATCH);
-+ exit (1);
-+ }
-+ tcgetattr(0, &osbuf);
-+ termchanged = 1;
-+
-+ sbuf = osbuf;
-+ sbuf.c_lflag &= ~(ECHO | ECHOK | ECHONL | ICANON);
-+ sbuf.c_oflag &= ~(OPOST);
-+ sbuf.c_iflag &= ~(INLCR | IGNCR | ICRNL);
-+ sbuf.c_lflag |= ISIG;
-+ sbuf.c_cc[VMIN] = 1;
-+ sbuf.c_cc[VTIME] = 0;
-+ tcsetattr(0, TCSANOW, &sbuf);
-+
-+ uerasechar = osbuf.c_cc[VERASE];
-+ ukillchar = osbuf.c_cc[VKILL];
-+
-+#endif
-+
- #ifdef SIGTSTP
--#ifndef USG
-+#if !(defined(USG) || defined(USE_TERMIOS))
- (void) sigsetmask (1<<(SIGTSTP-1) | 1<<(SIGTTIN-1) | 1<<(SIGTTOU-1));
- #endif
- #endif
-@@ -319,7 +348,7 @@ retry:
- #endif
- #endif
-
--#ifndef USG
-+#if !(defined(USG) || defined(USE_TERMIOS))
- (void) ioctl (0, TIOCGETP, (char *) &osbuf);
- #ifdef TIOCGLTC
- (void) ioctl (0, TIOCGLTC, (char *) &oltc);
-@@ -372,7 +401,9 @@ SIGNAL_TYPE done (signo)
- {
- if (te)
- tputs (te, 1, iputch);
--#ifdef USG
-+#ifdef USE_TERMIOS
-+ tcsetattr(0, TCSANOW, &osbuf);
-+#elif defined(USG)
- (void) ioctl (0, TCSETAW, (char *) &osbuf);
- #else
- (void) ioctl (0, TIOCSETP, (char *) &osbuf);
-@@ -393,7 +424,9 @@ static SIGNAL_TYPE onstop (signo)
- imove (li - 1, 0);
- if (te)
- tputs (te, 1, iputch);
--#ifdef USG
-+#ifdef USE_TERMIOS
-+ tcsetattr(0, TCSANOW, &osbuf);
-+#elif defined(USG)
- (void) ioctl (0, TCSETAW, (char *) &osbuf);
- #else
- (void) ioctl (0, TIOCSETP, (char *) &osbuf);
-@@ -412,7 +445,9 @@ static SIGNAL_TYPE onstop (signo)
- (void) signal (signo, onstop);
- if (termchanged)
- {
--#ifdef USG
-+#ifdef USE_TERMIOS
-+ tcsetattr(0, TCSANOW, &sbuf);
-+#elif defined(USG)
- (void) ioctl (0, TCSETAW, (char *) &sbuf);
- #else
- (void) ioctl (0, TIOCSETP, (char *) &sbuf);
-@@ -480,7 +515,9 @@ int shellescape (buf)
- }
- argv[i] = NULL;
-
--#ifdef USG
-+#ifdef USE_TERMIOS
-+ tcsetattr(0, TCSANOW, &osbuf);
-+#elif defined(USG)
- (void) ioctl (0, TCSETAW, (char *) &osbuf);
- #else
- (void) ioctl (0, TIOCSETP, (char *) &osbuf);
-@@ -526,7 +563,9 @@ int shellescape (buf)
- (void) signal (SIGTSTP, onstop);
- #endif
-
--#ifdef USG
-+#ifdef USE_TERMIOS
-+ tcsetattr(0, TCSANOW, &sbuf);
-+#elif defined(USG)
- (void) ioctl (0, TCSETAW, (char *) &sbuf);
- #else
- (void) ioctl (0, TIOCSETP, (char *) &sbuf);
-@@ -562,7 +601,9 @@ void shescape (buf)
- char curdir[MAXPATHLEN];
- #endif
-
--#ifdef USG
-+#ifdef USE_TERMIOS
-+ tcsetattr(0, TCSANOW, &osbuf);
-+#elif defined(USG)
- (void) ioctl (0, TCSETAW, (char *) &osbuf);
- #else
- (void) ioctl (0, TIOCSETP, (char *) &osbuf);
-@@ -610,7 +651,9 @@ void shescape (buf)
- chdir (curdir);
- #endif
-
--#ifdef USG
-+#ifdef USE_TERMIOS
-+ tcsetattr(0, TCSANOW, &sbuf);
-+#elif defined(USG)
- (void) ioctl (0, TCSETAW, (char *) &sbuf);
- #else
- (void) ioctl (0, TIOCSETP, (char *) &sbuf);
diff -r 93c98f6bb184 -r c9b3432749cb textproc/ispell/patches/patch-as
Home |
Main Index |
Thread Index |
Old Index