Don't install ispell.el to share/emacs/site-lisp, since the one

coming with emacs is much newer

4 files changed, 32 insertions, 23 deletions

diff --git a/textproc/ispell/Makefile b/textproc/ispell/Makefile
index 8359fd8195a..3e48654e064 100644
--- a/textproc/ispell/Makefile
+++ b/textproc/ispell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 1999/10/19 08:59:37 agc Exp $
+# $NetBSD: Makefile,v 1.22 2000/01/02 03:50:04 wiz Exp $
 # FreeBSD Id: Makefile,v 1.21 1997/08/13 23:29:52 jmz Exp
 #
 
@@ -58,7 +58,4 @@ french:
 	@${ECHO} "Okay, making a french/english version of ispell...."
 	@${MAKE} ${.MAKEFLAGS} ISPELL_FR=yes
 
-pre-install:
-	@${MKDIR} ${PREFIX}/share/emacs/site-lisp
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ispell/files/patch-sum b/textproc/ispell/files/patch-sum
index 511f1ebc251..0d35d0d9a1d 100644
--- a/textproc/ispell/files/patch-sum
+++ b/textproc/ispell/files/patch-sum
@@ -1,7 +1,7 @@
-$NetBSD: patch-sum,v 1.2 1999/08/16 15:52:57 fredb Exp $
+$NetBSD: patch-sum,v 1.3 2000/01/02 03:50:05 wiz Exp $
 
 MD5 (patch-aa) = ea9ddb2204ffd0aa61dd3d6258b19fc6
-MD5 (patch-ab) = 2c7b34d537a0f2f78aa7ec2395ade3ce
+MD5 (patch-ab) = c2035cb65b544921cf27ee45ee92edfd
 MD5 (patch-ac) = 0d005cfc05419c839f27e8ec0b99739d
 MD5 (patch-ad) = abee03515e80abc7222429779694a849
 MD5 (patch-ae) = de2ab8a2ec5ad381504d7c945946b6d9
diff --git a/textproc/ispell/patches/patch-ab b/textproc/ispell/patches/patch-ab
index 9d61ade96f5..3d0a40c13e3 100644
--- a/textproc/ispell/patches/patch-ab
+++ b/textproc/ispell/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.5 1999/08/16 15:52:58 fredb Exp $
+$NetBSD: patch-ab,v 1.6 2000/01/02 03:50:05 wiz Exp $
 
---- Makefile.orig	Thu Oct 12 15:04:06 1995
-+++ Makefile	Fri Mar  5 21:28:05 1999
-@@ -240,9 +240,9 @@
+--- Makefile.orig	Sat Jan  1 20:32:31 2000
++++ Makefile	Sat Jan  1 20:38:02 2000
+@@ -240,31 +240,15 @@
  	  set $(SHELLDEBUG); \
  	  if [ -d $$TEXINFODIR -a -r ispell.info ]; then \
  	    set -ex; \
@@ -15,16 +15,29 @@ $NetBSD: patch-ab,v 1.5 1999/08/16 15:52:58 fredb Exp $
  	  else \
  	    : ; \
  	  fi
-@@ -253,7 +253,7 @@
- 	    set -ex; \
- 	    rm -f $$ELISPDIR/ispell.el; \
- 	    $$INSTALL ispell.el $$ELISPDIR; \
+ 	@set +e; \
+ 	  . ./config.sh; \
+ 	  set $(SHELLDEBUG); \
+-	  if [ -d $$ELISPDIR ]; then \
+-	    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$$$$; \
-@@ -324,7 +324,7 @@
+-		echo '(byte-compile-file "'"$$ELISPDIR/ispell.el"'")' \
+-		  > /tmp/emi$$$$; \
+-		$$EMACS -batch -l /tmp/emi$$$$; \
+-		rm -f /tmp/emi$$$$; \
+-		chmod 644 $$ELISPDIR/ispell.el $$ELISPDIR/ispell.elc; \
+-	    else \
+-		chmod 644 $$ELISPDIR/ispell.el; \
+-	    fi; \
+-	  else \
+-	    : ; \
+-	  fi
+ 
+ install-dictbuild:
+ 	@. ./config.sh; \
+@@ -324,7 +308,7 @@
  	  set $(SHELLDEBUG); \
  	  if [ -d $$TEXINFODIR ]; then \
  	    if sh iwhich makeinfo >/dev/null \
@@ -33,7 +46,7 @@ $NetBSD: patch-ab,v 1.5 1999/08/16 15:52:58 fredb Exp $
  		:; \
  	    elif sh iwhich $$EMACS >/dev/null; then \
  		set -e; \
-@@ -508,7 +508,7 @@
+@@ -508,7 +492,7 @@
  local.h:
  	set +e; [ -r local.h ]  ||  cp local.h.samp local.h
  
@@ -42,7 +55,7 @@ $NetBSD: patch-ab,v 1.5 1999/08/16 15:52:58 fredb Exp $
  	@. ./config.sh; \
  	  set $(SHELLDEBUG); \
  	  set +e; \
-@@ -522,7 +522,8 @@
+@@ -522,7 +506,8 @@
  	  else \
  	    set -x; \
  	    rm -f msgs.h; ln $$msgs msgs.h  ||  cp $$msgs msgs.h; \
diff --git a/textproc/ispell/pkg/PLIST b/textproc/ispell/pkg/PLIST
index 88f9f73e58e..fd1a19fd24e 100644
--- a/textproc/ispell/pkg/PLIST
+++ b/textproc/ispell/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 1999/02/11 19:17:35 tv Exp $
+@comment $NetBSD: PLIST,v 1.6 2000/01/02 03:50:05 wiz Exp $
 bin/buildhash
 bin/findaffix
 bin/icombine
@@ -11,7 +11,6 @@ bin/unsq
 @unexec install-info --delete %D/info/ispell.info %D/info/dir
 info/ispell.info
 @exec install-info %D/info/ispell.info %D/info/dir
-share/emacs/site-lisp/ispell.el
 lib/american.hash
 lib/americanmed+.hash
 lib/english.aff