9 files changed, 18 insertions, 298 deletions

diff --git a/textproc/ispell/Makefile b/textproc/ispell/Makefile
index 83e015f20eaa..293f6243953d 100644
--- a/textproc/ispell/Makefile
+++ b/textproc/ispell/Makefile
@@ -6,24 +6,18 @@
 #
 
 PORTNAME?=	ispell
-PORTVERSION?=	3.1.20c
-PORTREVISION=	3
-CATEGORIES+=	textproc elisp
-MASTER_SITES=	ftp://ftp.cs.ucla.edu/pub/ispell-3.1/ \
-		ftp://ftp.kiarchive.ru/pub/unix/text/ispell/
-DISTNAME=	ispell-3.1
+PORTVERSION?=	3.2.04
+PORTREVISION=	0
+CATEGORIES+=	textproc
+MASTER_SITES=	http://fmg-www.cs.ucla.edu/geoff/tars/
 
 MAINTAINER?=	jmz@FreeBSD.org
-PATCH_SITES=	ftp://ftp.kiarchive.ru/pub/unix/text/ispell/
-ISPELL_FILES=	ispell-3.1.20.tar.gz
-HTML_PATCH=	ispell-html-mode.patch
-DISTFILES=	${ISPELL_FILES}
-PATCHFILES=	${HTML_PATCH}
+ISPELL_FILES= 	ispell-3.2.04.tar.gz
 
-MAN1=		ispell.1 sq.1
+MAN1=		ispell.1
 MAN4=		ispell.4 english.4
 MLINKS=		ispell.1 buildhash.1 ispell.1 findaffix.1 ispell.1 \
-		munchlist.1 ispell.1 tryaffix.1 sq.1 unsq.1
+		munchlist.1 ispell.1 tryaffix.1
 
 EXTRACT_ONLY=	${ISPELL_FILES}
 EXTRA_DICT=
diff --git a/textproc/ispell/distinfo b/textproc/ispell/distinfo
index 72dc349623da..deb847d0f646 100644
--- a/textproc/ispell/distinfo
+++ b/textproc/ispell/distinfo
@@ -1,8 +1,7 @@
-MD5 (ispell-3.1.20.tar.gz) = 92986f940548fe4116428d21b16fd356
+MD5 (ispell-3.2.04.tar.gz) = 7785fa42ed90dd1d078bb3e8fae60899
 MD5 (francais-IREQ-1.4.tar.gz) = 3871371b0f8e57b554f8895ce3a43b5a
 MD5 (iswedish-1.2.1.tar.gz) = b546aeb88d7614c32e541488d55f32fe
 MD5 (hk-deutsch.tar.gz) = 0fb468159f7f0ba5b8a02c1fe111ac2d
-MD5 (ispell-html-mode.patch) = 1b44441a3748e55b3d509fcff21af4b7
 MD5 (br.ispell-2.4.tar.gz) = 241d9e2fefb92ea74f13c1e07d0b4e7b
 MD5 (ispell-norsk-2.0.tar.gz) = 7dd200f749459a42f7ded937ee72bb05
 MD5 (ispell-nl-1.0.0.tar.gz) = d9f8c68f28053e71792053e34201a28b
diff --git a/textproc/ispell/files/patch-ab b/textproc/ispell/files/patch-ab
index 42d7015bc30b..f27b79a2709f 100644
--- a/textproc/ispell/files/patch-ab
+++ b/textproc/ispell/files/patch-ab
@@ -1,30 +1,11 @@
---- Makefile.orig	Thu Oct 12 20:04:06 1995
-+++ Makefile	Sat Jan 22 22:44:42 2000
-@@ -253,7 +253,7 @@
- 	    set -ex; \
- 	    rm -f $$ELISPDIR/ispell.el; \
- 	    $$INSTALL ispell.el $$ELISPDIR; \
--	    if sh iwhich $$EMACS >/dev/null; then \
-+	    if sh iwhich ___XXX___$$EMACS >/dev/null; then \
- 		echo '(byte-compile-file "'"$$ELISPDIR/ispell.el"'")' \
- 		  > /tmp/emi$$$$; \
- 		$$EMACS -batch -l /tmp/emi$$$$; \
-@@ -508,7 +508,7 @@
- local.h:
- 	set +e; [ -r local.h ]  ||  cp local.h.samp local.h
+--- Makefile~	Thu Jun  7 21:06:33 2001
++++ Makefile	Fri Jun 22 23:36:46 2001
+@@ -474,7 +474,7 @@
+ 	set +e; \
+ 	  [ -r local.h ]  ||  (cp local.h.samp local.h; chmod u+w local.h)
  
 -msgs.h:	config.sh FRC
-+msgs.h:	config.sh 
++msgs.h:	config.sh
  	@. ./config.sh; \
  	  set $(SHELLDEBUG); \
  	  set +e; \
-@@ -522,7 +522,8 @@
- 	  else \
- 	    set -x; \
- 	    rm -f msgs.h; ln $$msgs msgs.h  ||  cp $$msgs msgs.h; \
--	  fi
-+	  fi; \
-+	touch msgs.h
- 
- FRC:
- 
diff --git a/textproc/ispell/files/patch-ac b/textproc/ispell/files/patch-ac
deleted file mode 100644
index 57d5f3955220..000000000000
--- a/textproc/ispell/files/patch-ac
+++ /dev/null
@@ -1,37 +0,0 @@
-*** sq.c.orig	Tue Jan 25 21:32:18 1994
---- sq.c	Tue Dec 16 19:02:22 1997
-***************
-*** 49,54 ****
---- 49,55 ----
-   */
-  
-  #include <stdio.h>
-+ #include <string.h>
-  
-  #ifdef __STDC__
-  #define P(x)	x
-***************
-*** 82,90 ****
-      {
-      char	word[257];
-      static char	prev[257] = "";
-  
-!     while (gets (word) != NULL)
-  	trunc (word, prev);
-      return 0;
-      }
-  
---- 83,95 ----
-      {
-      char	word[257];
-      static char	prev[257] = "";
-+     char *s;
-  
-!     while (fgets (word, sizeof(word), stdin) != NULL) {
-! 	if ((s = strchr(word, '\n')) != NULL)
-! 		*s = '\0';
-  	trunc (word, prev);
-+     }
-      return 0;
-      }
-  
diff --git a/textproc/ispell/files/patch-ad b/textproc/ispell/files/patch-ad
deleted file mode 100644
index 759a070f2caf..000000000000
--- a/textproc/ispell/files/patch-ad
+++ /dev/null
@@ -1,57 +0,0 @@
-*** unsq.c.bak	Tue Jan 25 21:32:18 1994
---- unsq.c	Tue Dec 16 19:08:44 1997
-***************
-*** 49,54 ****
---- 49,55 ----
-   */
-  
-  #include <stdio.h>
-+ #include <string.h>
-  #include "msgs.h"
-  
-  #ifdef __STDC__
-***************
-*** 99,104 ****
---- 100,107 ----
-      register char *	prevp;
-      register int	same_count;
-      register int	count_char;
-+     int wsize;
-+     char *s;
-  
-      count_char = getchar ();
-      if (count_char == EOF)
-***************
-*** 114,126 ****
-  	}
-      prevp = prev;
-      wordp = word;
-!     while (same_count--)
-  	*wordp++ = (*prevp++);
-!     if (gets (wordp) == NULL)
-  	{
-  	(void) fprintf (stderr, UNSQ_C_SURPRISE_EOF);
-  	exit (1);
-  	}
-      (void) strcpy (prev, word);
-      return 0 ;
-      }
---- 117,134 ----
-  	}
-      prevp = prev;
-      wordp = word;
-!     wsize = 257;
-!     while (same_count--) {
-  	*wordp++ = (*prevp++);
-! 	wsize--;
-!     }
-!     if (fgets (wordp, wsize, stdin) == NULL)
-  	{
-  	(void) fprintf (stderr, UNSQ_C_SURPRISE_EOF);
-  	exit (1);
-  	}
-+     if ((s = strchr(wordp, '\n')) != NULL)
-+ 	    *s = '\0';
-      (void) strcpy (prev, word);
-      return 0 ;
-      }
diff --git a/textproc/ispell/files/patch-ae b/textproc/ispell/files/patch-ae
deleted file mode 100644
index 80fa93e06848..000000000000
--- a/textproc/ispell/files/patch-ae
+++ /dev/null
@@ -1,116 +0,0 @@
-*** correct.c	Thu Oct 12 12:04:06 1995
---- correct.c.3.1.20b	Tue Oct  5 12:55:03 1999
-***************
-*** 1488,1500 ****
-  	 * all that likely).
-  	 */
-  	bufsize = strlen (contextbufs[0]);
-! 	if (contextbufs[0][bufsize - 1] == '\n')
-! 	    {
-! 	    hadnl = 1;
-! 	    contextbufs[0][--bufsize] = '\0';
-! 	    }
-! 	else
-! 	    hadnl = 0;
-  	if (bufsize == (sizeof contextbufs[0]) / 2 - 1)
-  	    {
-  	    ch = (unsigned char) contextbufs[0][bufsize - 1];
---- 1488,1494 ----
-  	 * all that likely).
-  	 */
-  	bufsize = strlen (contextbufs[0]);
-! 	hadnl = (contextbufs[0][bufsize - 1] == '\n');
-  	if (bufsize == (sizeof contextbufs[0]) / 2 - 1)
-  	    {
-  	    ch = (unsigned char) contextbufs[0][bufsize - 1];
-***************
-*** 1556,1564 ****
---- 1550,1562 ----
-  		}
-  	    else if (contextbufs[0][0] == '~')
-  		{
-+ 		if (hadnl)
-+ 		    contextbufs[0][bufsize - 1] = '\0';
-  		defdupchar = findfiletype (&contextbufs[0][1], 1, (int *) NULL);
-  		if (defdupchar < 0)
-  		    defdupchar = 0;
-+ 		if (hadnl)
-+ 		    contextbufs[0][bufsize - 1] = '\n';
-  		}
-  	    else
-  		{
-*** defmt.c	Thu Oct 12 12:04:06 1995
---- defmt.c.3.1.20b	Tue Oct  5 12:54:41 1999
-***************
-*** 548,554 ****
-  	   (void) fprintf (ofile, "%s", ctoken);
-  	}
-  
-!     if (!lflag  &&  (aflag  ||  hadlf))
-         (void) putc ('\n', ofile);
-     }
-  
---- 548,554 ----
-  	   (void) fprintf (ofile, "%s", ctoken);
-  	}
-  
-!     if (!lflag  && hadlf)
-         (void) putc ('\n', ofile);
-     }
-  
-***************
-*** 588,593 ****
---- 588,595 ----
-  	return 0;
-      }
-  
-+ /* Updates bufp to point to the next character to skip. */
-+ /*  Should only be called on non-word characters. */
-  static int TeX_math_begin (bufp)
-      char **	bufp;
-      {
-***************
-*** 604,613 ****
-  	if (**bufp == TEXLEFTPAREN  ||  **bufp == TEXLEFTSQUARE)
-  	    return 1;
-  	else if (!isalpha(**bufp)  &&  **bufp != '@')
-! 	    {
-! 	    (*bufp)++;
-! 	    continue;
-! 	    }
-  	else if (TeX_strncmp (*bufp, "begin", 5) == 0)
-  	    {
-  	    if (TeX_math_check ('b', bufp))
---- 606,612 ----
-  	if (**bufp == TEXLEFTPAREN  ||  **bufp == TEXLEFTSQUARE)
-  	    return 1;
-  	else if (!isalpha(**bufp)  &&  **bufp != '@')
-! 	    return 0;
-  	else if (TeX_strncmp (*bufp, "begin", 5) == 0)
-  	    {
-  	    if (TeX_math_check ('b', bufp))
-***************
-*** 637,648 ****
-  	    {
-  	    if (*(*bufp)++ == TEXDOT
-  	      &&  (**bufp == TEXRIGHTSQUARE  ||  **bufp == TEXRIGHTANGLE))
-! 		return TeX_math_begin (bufp);
-  	    }
-- 	return 0;
-  	}
-!     else
-! 	return 0;
-      }
-  
-  static int TeX_LR_begin (bufp)
---- 636,645 ----
-  	    {
-  	    if (*(*bufp)++ == TEXDOT
-  	      &&  (**bufp == TEXRIGHTSQUARE  ||  **bufp == TEXRIGHTANGLE))
-! 		break;
-  	    }
-  	}
-!     return 0;
-      }
-  
-  static int TeX_LR_begin (bufp)
diff --git a/textproc/ispell/files/patch-sec1 b/textproc/ispell/files/patch-sec1
deleted file mode 100644
index 24632fe5221c..000000000000
--- a/textproc/ispell/files/patch-sec1
+++ /dev/null
@@ -1,40 +0,0 @@
---- ispell.c-orig	Thu May 24 14:52:00 2001
-+++ ispell.c	Thu May 24 15:00:06 2001
-@@ -802,6 +802,7 @@
-     {
-     struct stat	statbuf;
-     char *	cp;
-+		int fd;
- 
-     currentfile = filename;
- 
-@@ -835,15 +836,20 @@
- 
-     (void) fstat (fileno (infile), &statbuf);
-     (void) strcpy (tempfile, TEMPNAME);
--    if (mktemp (tempfile) == NULL  ||  tempfile[0] == '\0'
--      ||  (outfile = fopen (tempfile, "w")) == NULL)
--	{
--	(void) fprintf (stderr, CANT_CREATE,
--	  (tempfile == NULL  ||  tempfile[0] == '\0')
--	    ? "temporary file" : tempfile);
--	(void) sleep ((unsigned) 2);
--	return;
--	}
-+
-+		if ((fd = mkstemp(tempfile)) == -1) {
-+			fprintf(stderr, "Error: Can't create (mkstemp) temporary file\n");
-+			sleep(2);
-+			return;
-+		}
-+		if ((outfile = fdopen(fd, "w")) == NULL) {
-+			unlink(tempfile);
-+			close(fd);
-+			fprintf(stderr, "Error: Can't open (fdopen) temporary file\n");
-+			sleep(2);
-+			return;
-+		}
-+		/* Is this necessary ? */
-     (void) chmod (tempfile, statbuf.st_mode);
- 
-     quit = 0;
diff --git a/textproc/ispell/pkg-plist b/textproc/ispell/pkg-plist
index 8da4479dd146..d81b0af450db 100644
--- a/textproc/ispell/pkg-plist
+++ b/textproc/ispell/pkg-plist
@@ -1,12 +1,13 @@
 bin/buildhash
+bin/deformat-c
+bin/deformat-sh
 bin/findaffix
 bin/icombine
 bin/ijoin
 bin/ispell
 bin/munchlist
-bin/sq
 bin/tryaffix
-bin/unsq
 share/ispell/english.aff
 share/ispell/english.dict
 share/ispell/english.hash
+
diff --git a/textproc/ispell/scripts/configure b/textproc/ispell/scripts/configure
index 621c1b854410..5c4f10fdc3d5 100644
--- a/textproc/ispell/scripts/configure
+++ b/textproc/ispell/scripts/configure
@@ -20,17 +20,12 @@ if [ ! -z "$ISPELL_BRITISH" ] && \
     	echo '#define MASTERHASH "britishxlg.hash"'  >> local.h 
     else
        echo "#define LANGUAGES \"{american,MASTERDICTS=american.med+,HASHFILES=americanmed+.hash,EXTRADICT=/usr/share/dict/words}$LOCAL\""  >>local.h ||exit 1;
+       echo '#define MASTERHASH "americanmed+.hash"'  >> local.h 
     fi
 
 echo "#undef WORDS"  >> local.h 
 echo '#define WORDS   "/usr/share/dict/words"'  >> local.h 
-echo '#undef ELISPDIR'  >> local.h
-echo "#define ELISPDIR \"$PREFIX/share/emacs/site-lisp\"" >> local.h
 echo "#undef LIBDIR" >> local.h
 echo "#define LIBDIR \"$PREFIX/share/ispell\"" >> local.h
 
-mv Makefile Makefile.orig
-sed -e 's/^[ 	]*$/\
-/' -e 's/[ 	]*ELISPDIR//' <Makefile.orig >Makefile
-
 exit 0;