Handle info file correctly:

- use makeinfo to genarate it
- use the .info name scheme
- add dir info to the texinfo source file
- add hooks to PLIST to make sure it gets installed to info/dir

Fixes pr 6600 and 6601 by Greg A. Woods.

4 files changed, 47 insertions, 6 deletions

diff --git a/textproc/ispell/Makefile b/textproc/ispell/Makefile
index 09481859795..72c83e90a77 100644
--- a/textproc/ispell/Makefile
+++ b/textproc/ispell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 1998/11/22 21:21:38 tron Exp $
+# $NetBSD: Makefile,v 1.15 1998/12/21 00:35:59 frueauf Exp $
 # FreeBSD Id: Makefile,v 1.21 1997/08/13 23:29:52 jmz Exp
 #
 
@@ -12,8 +12,9 @@ HOMEPAGE=	http://www.gnu.org/software/ispell/ispell.html
 
 MAKE_FLAGS=	TMPDIR=${WRKDIR}
 SCRIPTS_ENV=	"LANG=${LANG}"
+
 USE_GTEXINFO=	yes
-INFO_FILES=	ispell
+INFO_FILES=	ispell.info
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/textproc/ispell/patches/patch-ab b/textproc/ispell/patches/patch-ab
index 2e7a4e57ae9..edac0348e9d 100644
--- a/textproc/ispell/patches/patch-ab
+++ b/textproc/ispell/patches/patch-ab
@@ -1,7 +1,20 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 11:14:13 agc Exp $
+$NetBSD: patch-ab,v 1.3 1998/12/21 00:36:00 frueauf Exp $
 
 --- Makefile.orig	Thu Oct 12 20:04:06 1995
-+++ Makefile	Wed Jun  4 05:05:47 1997
++++ Makefile	Mon Dec 21 01:09:49 1998
+@@ -240,9 +240,9 @@
+ 	  set $(SHELLDEBUG); \
+ 	  if [ -d $$TEXINFODIR -a -r ispell.info ]; then \
+ 	    set -ex; \
+-	    rm -f $$TEXINFODIR/ispell; \
+-	    $$INSTALL ispell.info $$TEXINFODIR/ispell; \
+-	    chmod 644 $$TEXINFODIR/ispell; \
++	    rm -f $$TEXINFODIR/ispell.info; \
++	    $$INSTALL ispell.info $$TEXINFODIR/ispell.info; \
++	    chmod 644 $$TEXINFODIR/ispell.info; \
+ 	  else \
+ 	    : ; \
+ 	  fi
 @@ -253,7 +253,7 @@
  	    set -ex; \
  	    rm -f $$ELISPDIR/ispell.el; \
@@ -11,6 +24,15 @@ $NetBSD: patch-ab,v 1.2 1998/08/07 11:14:13 agc Exp $
  		echo '(byte-compile-file "'"$$ELISPDIR/ispell.el"'")' \
  		  > /tmp/emi$$$$; \
  		$$EMACS -batch -l /tmp/emi$$$$; \
+@@ -324,7 +324,7 @@
+ 	  set $(SHELLDEBUG); \
+ 	  if [ -d $$TEXINFODIR ]; then \
+ 	    if sh iwhich makeinfo >/dev/null \
+-	      &&  makeinfo ispell.texinfo 2>/dev/null; then \
++	      &&  $$BINDIR/makeinfo --no-split --force ispell.texinfo 2>/dev/null; then \
+ 		:; \
+ 	    elif sh iwhich $$EMACS >/dev/null; then \
+ 		set -e; \
 @@ -508,7 +508,7 @@
  local.h:
  	set +e; [ -r local.h ]  ||  cp local.h.samp local.h
diff --git a/textproc/ispell/patches/patch-aj b/textproc/ispell/patches/patch-aj
new file mode 100644
index 00000000000..40e63669d53
--- /dev/null
+++ b/textproc/ispell/patches/patch-aj
@@ -0,0 +1,16 @@
+$NetBSD: patch-aj,v 1.1 1998/12/21 00:36:00 frueauf Exp $
+
+--- ispell.texinfo-orig	Wed Nov  2 19:44:23 1994
++++ ispell.texinfo	Sun Dec 20 23:22:20 1998
+@@ -4,6 +4,11 @@
+ @settitle ISPELL V3.1
+ @comment %**end of header (This is for running Texinfo on a region.)
+ 
++@dircategory Miscellaneous
++@direntry
++* ISPELL: (ispell).             An interactive spelling corrector.
++@end direntry
++
+ @iftex
+ @finalout
+ @end iftex
diff --git a/textproc/ispell/pkg/PLIST b/textproc/ispell/pkg/PLIST
index c517f555f21..fbd638c02c9 100644
--- a/textproc/ispell/pkg/PLIST
+++ b/textproc/ispell/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 1998/11/13 15:26:06 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.4 1998/12/21 00:36:00 frueauf Exp $
 bin/buildhash
 bin/findaffix
 bin/icombine
@@ -8,7 +8,9 @@ bin/munchlist
 bin/sq
 bin/tryaffix
 bin/unsq
-info/ispell
+@unexec %D/bin/install-info --delete %D/info/ispell.info %D/info/dir
+info/ispell.info
+@exec %D/bin/install-info %D/info/ispell.info %D/info/dir
 share/emacs/site-lisp/ispell.el
 lib/american.hash
 lib/americanmed+.hash