Update to version 3.1.5 after repository copy.

PR:		8552
Submitted by:	Shigeyuki FUKUSHIMA <shige@kuis.kyoto-u.ac.jp>

2 files changed, 32 insertions, 39 deletions

diff --git a/shells/zsh-devel/files/patch-aa b/shells/zsh-devel/files/patch-aa
index 28109c3ca0d8..8a2fc99891c1 100644
--- a/shells/zsh-devel/files/patch-aa
+++ b/shells/zsh-devel/files/patch-aa
@@ -1,19 +1,20 @@
-*** Src/Makefile.in.orig	Tue Jul  9 11:00:39 1996
---- Src/Makefile.in	Tue Jul  9 11:00:46 1996
-***************
-*** 138,144 ****
-  # install binary, creating install directory if necessary
-  install.bin: zsh
-  	$(top_srcdir)/mkinstalldirs $(bindir)
-! 	-if [ -f $(bindir)/zsh ]; then mv $(bindir)/zsh $(bindir)/zsh.old; fi
-  	$(INSTALL_PROGRAM) zsh $(bindir)/zsh
-  	-if [ -f $(bindir)/zsh-$(VERSION) ]; then rm -f $(bindir)/zsh-$(VERSION); fi
-  	ln $(bindir)/zsh $(bindir)/zsh-$(VERSION)
---- 138,144 ----
-  # install binary, creating install directory if necessary
-  install.bin: zsh
-  	$(top_srcdir)/mkinstalldirs $(bindir)
-! 	-if [ -f $(bindir)/zsh ]; then mv -f $(bindir)/zsh $(bindir)/zsh.old; fi
-  	$(INSTALL_PROGRAM) zsh $(bindir)/zsh
-  	-if [ -f $(bindir)/zsh-$(VERSION) ]; then rm -f $(bindir)/zsh-$(VERSION); fi
-  	ln $(bindir)/zsh $(bindir)/zsh-$(VERSION)
+--- Doc/Makefile.in.orig	Sun Nov  1 01:00:48 1998
++++ Doc/Makefile.in	Sun Nov  1 01:03:09 1998
+@@ -65,7 +65,7 @@
+ 	$(TEXI2DVI) $(sdir)/zsh.texi
+ 
+ zsh.info: zsh.texi
+-	$(MAKEINFO) $(sdir)/zsh.texi; exit 0
++	$(MAKEINFO) --no-split $(sdir)/zsh.texi; exit 0
+ 
+ zsh.texi: zsh.yo
+ 	$(YODL) -o $(sdir)/zsh.texi -I$(sdir) -w ztexi.yo version.yo zsh.yo
+@@ -133,7 +133,7 @@
+ # install info pages, creating install directory if necessary
+ install.info: zsh.info
+ 	$(sdir_top)/mkinstalldirs $(infodir)
+-	for file in zsh.info zsh.info-[1-9]; do \
++	for file in zsh.info ; do \
+ 	  if test -f $$file; then \
+ 	    $(INSTALL_DATA) $$file $(infodir); \
+ 	  elif test -f $(sdir)/$$file; then \
diff --git a/shells/zsh-devel/files/patch-ab b/shells/zsh-devel/files/patch-ab
index c80f4c7f852c..5ecddf7123bd 100644
--- a/shells/zsh-devel/files/patch-ab
+++ b/shells/zsh-devel/files/patch-ab
@@ -1,21 +1,13 @@
---- Doc/Makefile.in.orig	Wed Dec 18 05:14:11 1996
-+++ Doc/Makefile.in	Mon Jun 16 20:40:29 1997
-@@ -93,7 +93,8 @@
- everything: all zsh_us.ps zsh_a4.ps zsh_toc.html
- 
- zsh.info: zsh.texi
--	@$(MAKEINFO) -I$(srcdir) $(srcdir)/zsh.texi || { \
-+	@rm -f zsh.info*
-+	@$(MAKEINFO) --no-split -I$(srcdir) $(srcdir)/zsh.texi || { \
- 	echo Info documentation cannot be compiled without $(MAKEINFO). ; \
- 	echo You can find precompiled info files in zsh-doc.tar.gz. ; }
- 
-@@ -127,7 +128,7 @@
- # install info pages, creating install directory if necessary
- install.info: zsh.info
- 	$(top_srcdir)/mkinstalldirs $(infodir)
--	for file in zsh.info zsh.info-[1-9]; do \
-+	for file in zsh.info*; do \
- 	  [ -f "$$file" ] && $(INSTALL_DATA) $$file $(infodir) ; \
- 	done
+--- Doc/zsh.texi.orig	Sun Nov  1 01:01:48 1998
++++ Doc/zsh.texi	Sun Nov  1 01:02:17 1998
+@@ -2,6 +2,10 @@
+ @c %**start of header
+ @setfilename zsh.info
+ @settitle zsh
++@dircategory Shells
++@direntry
++* Zsh: (zsh).			The Z shell.
++@end direntry
+ @c %**end of header
  
+ @ifinfo