From 1e9c4baaf937eb00ec59f31e439e14e81c2783c7 Mon Sep 17 00:00:00 2001
From: brad <brad@openbsd.org>
Date: Tue, 7 Dec 1999 23:06:52 +0000
Subject: [PATCH] upgrade to zsh 3.0.7, Many bug fixes, including: * Plug
 coproc input file descriptor leak. * Fix core dump when exporting an unset
 special parameter. * Fix potential buffer overflow in quotename()

---
 shells/zsh/Makefile         | 11 ++++-------
 shells/zsh/files/md5        |  6 +++---
 shells/zsh/patches/patch-ab | 21 ++++++++++++++-------
 shells/zsh/pkg/PLIST        |  3 +--
 4 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index 2419e5a0d58..2fd252c6129 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.12 1999/10/07 19:49:50 brad Exp $
+# $OpenBSD: Makefile,v 1.13 1999/12/07 23:06:52 brad Exp $
 
-DISTNAME=	zsh-3.0.6
+DISTNAME=	zsh-3.0.7
 CATEGORIES=	shells
 MASTER_SITES=	ftp://ftp.zsh.org/zsh/ \
 		ftp://ftp.sterling.com/zsh/ \
@@ -19,14 +19,11 @@ CONFIGURE_ARGS=	--enable-zsh-mem --enable-zsh-secure-free
 # invoke with -DSTATIC to build a static binary
 .if defined(STATIC)
 CONFIGURE_ENV+=	LDFLAGS=-static
-PKGNAME= ${DISTNAME}-static
+PKGNAME=	${DISTNAME}-static
 .endif
 
 post-install:
-	@if [ ! -f ${PREFIX}/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 	@install-info ${PREFIX}/info/zsh.info ${PREFIX}/info/dir
-	@PKG_PREFIX="${PREFIX}" ${SH} ${PKGDIR}/INSTALL ${DISTNAME} POST-INSTALL
+	@PKG_PREFIX="${PREFIX}" sh ${PKGDIR}/INSTALL ${DISTNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/shells/zsh/files/md5 b/shells/zsh/files/md5
index 9faa281343a..a97f01fd3f6 100644
--- a/shells/zsh/files/md5
+++ b/shells/zsh/files/md5
@@ -1,3 +1,3 @@
-MD5 (zsh-3.0.6.tar.gz) = 12fd65a2e3629674fd01f84a37e0e23e
-RMD160 (zsh-3.0.6.tar.gz) = a41eb6dbb35f6b1012fdb7c6cbb69e47f6e170a9
-SHA1 (zsh-3.0.6.tar.gz) = 107c4d58a660541b8d9762381b14acb58e973c94
+MD5 (zsh-3.0.7.tar.gz) = da3d2f21522c4d51c97f3686d4becd5a
+RMD160 (zsh-3.0.7.tar.gz) = 7bf1318dec4c2e3108ad65cefbbf947d1bae42d8
+SHA1 (zsh-3.0.7.tar.gz) = 9586aec134ae9fafd34ecac105033fc3aa073df2
diff --git a/shells/zsh/patches/patch-ab b/shells/zsh/patches/patch-ab
index f7d740d1853..3e3b5dad050 100644
--- a/shells/zsh/patches/patch-ab
+++ b/shells/zsh/patches/patch-ab
@@ -1,21 +1,28 @@
---- Doc/Makefile.in.orig	Tue Aug  3 22:56:17 1999
-+++ Doc/Makefile.in	Tue Aug  3 22:57:17 1999
-@@ -91,7 +91,8 @@
+--- Doc/Makefile.in.orig	Mon Aug  2 01:54:47 1999
++++ Doc/Makefile.in	Tue Dec  7 17:16:03 1999
+@@ -27,7 +27,7 @@
+ SHELL = /bin/sh
+ 
+ # Program to format Texinfo source into Info files.
+-MAKEINFO = makeinfo
++MAKEINFO = makeinfo --no-split
+ # Program to format Texinfo source into DVI files.
+ TEXI2DVI = texi2dvi
+ # Program to convert DVI files to PostScript
+@@ -91,6 +91,7 @@
  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 || { \
+ 	@$(MAKEINFO) -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. ; }
- 
 @@ -125,7 +126,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 \
++	for file in zsh.info; do \
  	  [ -f "$$file" ] && $(INSTALL_DATA) $$file $(infodir) ; \
  	done
  
diff --git a/shells/zsh/pkg/PLIST b/shells/zsh/pkg/PLIST
index a9451ff8f1d..b6045e83308 100644
--- a/shells/zsh/pkg/PLIST
+++ b/shells/zsh/pkg/PLIST
@@ -1,8 +1,7 @@
 bin/zsh
-bin/zsh-3.0.6
+bin/zsh-3.0.7
 @unexec install-info --delete %D/info/zsh.info %D/info/dir
 info/zsh.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/zsh.info %D/info/dir
 man/man1/zshcompctl.1
 man/man1/zshexpn.1