zsh-4.0.1 is a stable release so should be in shells/zsh instead of zsh4.

Pass --disable-dynamic to configure.  Correct homepage.  Remove a mirror.

Addresses some issues by Geoff Wing <gcw@zsh.org> raised on netbsd-bugs.

4 files changed, 24 insertions, 62 deletions

diff --git a/shells/zsh/patches/patch-aa b/shells/zsh/patches/patch-aa
index 56e784c4187..bcdb53fe066 100644
--- a/shells/zsh/patches/patch-aa
+++ b/shells/zsh/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2000/01/06 22:42:15 windsor Exp $
+$NetBSD: patch-aa,v 1.4 2001/06/05 16:28:08 jtb Exp $
 
---- Src/Makefile.in.orig	Thu Jan  6 15:39:29 2000
-+++ Src/Makefile.in	Thu Jan  6 15:40:03 2000
-@@ -148,7 +148,7 @@
- # 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
-+	-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	Fri Jun  1 23:43:42 2001
++++ Doc/Makefile.in
+@@ -37,7 +37,7 @@
+ 
+ @DEFS_MK@
+ 
+-MAKEINFO = makeinfo
++MAKEINFO = makeinfo --no-split
+ TEXI2DVI = texi2dvi
+ DVIPS = dvips
+ TEXI2HTML = texi2html -expandinfo -split_chapter
diff --git a/shells/zsh/patches/patch-ab b/shells/zsh/patches/patch-ab
index fb5c4335175..17ce431b003 100644
--- a/shells/zsh/patches/patch-ab
+++ b/shells/zsh/patches/patch-ab
@@ -1,23 +1,13 @@
-$NetBSD: patch-ab,v 1.3 2000/01/06 22:42:15 windsor Exp $
+$NetBSD: patch-ab,v 1.4 2001/06/05 16:28:08 jtb Exp $
 
---- Doc/Makefile.in.orig	Thu Jan  6 15:40:23 2000
-+++ Doc/Makefile.in	Thu Jan  6 15:42:03 2000
-@@ -91,7 +91,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. ; }
- 
-@@ -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 \
- 	  [ -f "$$file" ] && $(INSTALL_DATA) $$file $(infodir) ; \
- 	done
- 
+--- configure.orig	Fri Jun  1 14:52:49 2001
++++ configure
+@@ -6771,7 +6771,7 @@
+     DLLDARG=""
+   fi
+   if test -n "$GCC"; then
+-    DLCFLAGS="${DLCFLAGS=-fpic}"
++    DLCFLAGS="${DLCFLAGS=-fPIC}"
+   else
+     case "$host_os" in
+       hpux*)                 DLCFLAGS="${DLCFLAGS=+z}" ;;
diff --git a/shells/zsh/patches/patch-ac b/shells/zsh/patches/patch-ac
deleted file mode 100644
index 77e6bc01ba3..00000000000
--- a/shells/zsh/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2000/01/06 22:42:15 windsor Exp $
-
---- Doc/zsh.texi.orig	Thu Jan  6 15:44:41 2000
-+++ Doc/zsh.texi	Thu Jan  6 15:45:48 2000
-@@ -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
diff --git a/shells/zsh/patches/patch-ad b/shells/zsh/patches/patch-ad
deleted file mode 100644
index 74ad941a3ab..00000000000
--- a/shells/zsh/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2000/01/06 22:42:15 windsor Exp $
-
---- Makefile.in.orig	Thu Jan  6 15:45:59 2000
-+++ Makefile.in	Thu Jan  6 15:46:16 2000
-@@ -50,7 +50,7 @@
- CPPFLAGS = @CPPFLAGS@
- DEFS     = @DEFS@
- CFLAGS   = @CFLAGS@
--LDFLAGS  = @LDFLAGS@
-+LDFLAGS  = @LDFLAGS@ -s
- LIBS     = @LIBS@
- 
- # ========== YOU SHOULDN'T HAVE TO CHANGE ANYTHING BELOW HERE ==========