Don't install ispell.el - it is already in emacs-20.4 (same author version)

Update MASTER_SITES
One of the patch files (texpatch-3.1.20c.gz) disapeared from the ftp site.
It is now included in the port as patch-ae.

4 files changed, 121 insertions, 17 deletions

diff --git a/textproc/ispell/Makefile b/textproc/ispell/Makefile
index 18ac936..5263073 100644
--- a/textproc/ispell/Makefile
+++ b/textproc/ispell/Makefile
@@ -11,18 +11,14 @@ DISTNAME=	ispell-3.1
 PKGNAME=	ispell-3.1.20c
 CATEGORIES=	textproc elisp
 MASTER_SITES=	ftp://ftp.cs.ucla.edu/pub/ispell-3.1/ \
-		ftp://kdstevens.com/pub/stevens/
-DISTFILES=	ispell-3.1.20.tar.gz ${ISPELL_ELISP}
+		ftp://ftp.kiarchive.ru/pub/unix/text/ispell/
+DISTFILES=	ispell-3.1.20.tar.gz
 
-PATCH_SITES=    ftp://ftp.kiarchive.ru/pub/unix/text/ispell/ \
-		ftp://kdstevens.com/pub/stevens/
-PATCHFILES=     ispell-html-mode.patch texpatch-3.1.20c.gz
+PATCH_SITES=    ftp://ftp.kiarchive.ru/pub/unix/text/ispell/
+PATCHFILES=     ispell-html-mode.patch
 
 MAINTAINER=	jmz@FreeBSD.org
 
-EXTRACT_ONLY=	ispell-3.1.20.tar.gz
-ISPELL_ELISP=	ispell.el-3.2.gz
-
 MAKE_FLAGS=	TMPDIR=${WRKDIR} -f
 MAN1=		ispell.1 sq.1
 MAN4=		ispell.4 english.4
@@ -41,7 +37,6 @@ MLINKS=		ispell.1 buildhash.1 ispell.1 findaffix.1 ispell.1 munchlist.1\
 EXTRA_DICT=	francais-IREQ-1.4.tar.gz
 MASTER_SITES+=	ftp://ftp.robot.ireq.ca/pub/ispell/
 DISTFILES+=	${EXTRA_DICT}
-EXTRACT_ONLY+=	${EXTRA_DICT}
 .endif
 
 pre-extract:
@@ -52,9 +47,6 @@ pre-extract:
 	@${ECHO_MSG} '******************************************************'
 .endif
 
-post-extract:
-	@${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${ISPELL_ELISP} > ${WRKSRC}/ispell.el
-
 pre-configure:
 .if defined(EXTRA_DICT)
 	@${ECHO} ${EXTRA_DICT} > ${WRKDIR}/extra_dict
@@ -73,7 +65,4 @@ french:
 	@${ECHO_MSG} "Okay, making a french/english version of ispell...."
 	@${MAKE} ${.MAKEFLAGS} ISPELL_FR=yes
 
-pre-install:
-	@${MKDIR} ${PREFIX}/share/emacs/site-lisp
-
 .include <bsd.port.mk>
diff --git a/textproc/ispell/files/patch-ae b/textproc/ispell/files/patch-ae
new file mode 100644
index 0000000..80fa93e
--- /dev/null
+++ b/textproc/ispell/files/patch-ae
@@ -0,0 +1,116 @@
+*** 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/pkg-plist b/textproc/ispell/pkg-plist
index ed6ac2d..d888b62 100644
--- a/textproc/ispell/pkg-plist
+++ b/textproc/ispell/pkg-plist
@@ -7,7 +7,6 @@ bin/munchlist
 bin/sq
 bin/tryaffix
 bin/unsq
-share/emacs/site-lisp/ispell.el
 lib/american.hash
 lib/americanmed+.hash
 lib/english.aff
diff --git a/textproc/ispell/scripts/configure b/textproc/ispell/scripts/configure
index 23e8e07..5d05bf2 100644
--- a/textproc/ispell/scripts/configure
+++ b/textproc/ispell/scripts/configure
@@ -48,6 +48,6 @@ echo "#define ELISPDIR \"$PREFIX/share/emacs/site-lisp\"" >> local.h
 
 mv Makefile Makefile.orig
 sed -e 's/^[ 	]*$/\
-/' <Makefile.orig >Makefile
+/' -e 's/[ 	]*ELISPDIR//' <Makefile.orig >Makefile
 
 exit 0;