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.

8 files changed, 465 insertions, 90 deletions

diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index beee08fbff2..70509a59a7b 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -1,28 +1,34 @@
-# $NetBSD: Makefile,v 1.20 2001/06/05 09:28:10 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.21 2001/06/05 16:28:07 jtb Exp $
 
-DISTNAME=       zsh-3.0.8
+DISTNAME=       zsh-4.0.1
 CATEGORIES=	shells
-MASTER_SITES=   ftp://ftp.rge.com/pub/shells/zsh/old/ \
-		ftp://sunsite.auc.dk/pub/unix/shells/zsh/old/ \
-		ftp://ftp.uit.no/pub/unix/shells/zsh/old/ \
-		ftp://ftp.net.lut.ac.uk/zsh/old/ \
-		ftp://ftp.zsh.org/zsh/old/
-
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://sunsite.auc.dk/zsh/
+MASTER_SITES=   ftp://ftp.rge.com/pub/shells/zsh/ \
+		ftp://sunsite.auc.dk/pub/unix/shells/zsh/ \
+		ftp://ftp.uit.no/pub/unix/shells/zsh/ \
+		ftp://ftp.net.lut.ac.uk/zsh/ \
+		ftp://ftp.zsh.org/zsh/
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	uebayasi@soum.co.jp
+HOMEPAGE=	http://sunsite.dk/zsh/
 COMMENT=	The Z shell
 
 GNU_CONFIGURE=	yes
 INFO_FILES=	zsh.info
 
+PLIST_SRC=	${PKGDIR}/PLIST
+
 .include "../../mk/bsd.prefs.mk"
 
 .if defined(ZSH_STATIC)
+CONFIGURE_ARGS+=--disable-dynamic
 LDFLAGS+=	-static
+.else
+PLIST_SRC+=	${PKGDIR}/PLIST.dynamic
 .endif
 
 post-install:
+	@cd ${WRKSRC}/Doc; ${MAKE} install.info
 	${CP} /etc/shells /etc/shells.bak
 	(${GREP} -v ${PREFIX}/bin/zsh /etc/shells.bak; ${ECHO} ${PREFIX}/bin/zsh) >/etc/shells
 	${RM} /etc/shells.bak
diff --git a/shells/zsh/distinfo b/shells/zsh/distinfo
index e6da6db62ea..80e3651f06f 100644
--- a/shells/zsh/distinfo
+++ b/shells/zsh/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 14:53:33 agc Exp $
+SHA1 (patch-aa) = 0cfe03d2bbae988a6c59ec4ee67244ed836d7f1d
 
-SHA1 (zsh-3.0.8.tar.gz) = d5d07abdd9c0f063c79d19de9482f7517016b54d
-Size (zsh-3.0.8.tar.gz) = 657979 bytes
-SHA1 (patch-aa) = 7209d74d6a7535e41d8db1d1109a6039b9bb3e0e
-SHA1 (patch-ab) = be8e64c07903177c1912ef52798d2c3dafcc2520
-SHA1 (patch-ac) = 2d80828a22ee0414c93442cfdbf2e08817afb8bb
-SHA1 (patch-ad) = 613fcaaa117aa38ff2e41eddaad5947bd5e0190d
+SHA1 (zsh-4.0.1.tar.bz2) = f47c555f4d85745017869b15e22d64a67304a716
+Size (zsh-4.0.1.tar.bz2) = 1650945 bytes
+SHA1 (patch-aa) = 0cfe03d2bbae988a6c59ec4ee67244ed836d7f1d
+SHA1 (patch-ab) = 9f9ca7de2eb97308102316ef2acc8b0fa5175f93
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 ==========
diff --git a/shells/zsh/pkg/PLIST b/shells/zsh/pkg/PLIST
index 27710cbeb18..2b52838bd27 100644
--- a/shells/zsh/pkg/PLIST
+++ b/shells/zsh/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 1999/08/13 14:06:59 agc Exp $
+@comment $NetBSD: PLIST,v 1.7 2001/06/05 16:28:09 jtb Exp $
 bin/zsh
 @exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells
 @unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells
@@ -6,12 +6,359 @@ bin/${PKGNAME}
 @unexec install-info --delete %D/info/zsh.info %D/info/dir
 info/zsh.info
 @exec install-info %D/info/zsh.info %D/info/dir
-man/man1/zshcompctl.1.gz
-man/man1/zshexpn.1.gz
-man/man1/zshmisc.1.gz
-man/man1/zshoptions.1.gz
-man/man1/zshall.1.gz
-man/man1/zshzle.1.gz
-man/man1/zsh.1.gz
-man/man1/zshbuiltins.1.gz
-man/man1/zshparam.1.gz
+man/man1/zsh.1
+man/man1/zshall.1
+man/man1/zshbuiltins.1
+man/man1/zshcompctl.1
+man/man1/zshcompsys.1
+man/man1/zshcompwid.1
+man/man1/zshcontrib.1
+man/man1/zshexpn.1
+man/man1/zshmisc.1
+man/man1/zshmodules.1
+man/man1/zshoptions.1
+man/man1/zshparam.1
+man/man1/zshzftpsys.1
+man/man1/zshzle.1
+share/zsh/4.0.1/functions/_a2ps
+share/zsh/4.0.1/functions/_alias
+share/zsh/4.0.1/functions/_aliases
+share/zsh/4.0.1/functions/_all_labels
+share/zsh/4.0.1/functions/_all_matches
+share/zsh/4.0.1/functions/_alternative
+share/zsh/4.0.1/functions/_apachectl
+share/zsh/4.0.1/functions/_apm
+share/zsh/4.0.1/functions/_approximate
+share/zsh/4.0.1/functions/_apt
+share/zsh/4.0.1/functions/_archie
+share/zsh/4.0.1/functions/_arg_compile
+share/zsh/4.0.1/functions/_arguments
+share/zsh/4.0.1/functions/_arp
+share/zsh/4.0.1/functions/_arrays
+share/zsh/4.0.1/functions/_autoload
+share/zsh/4.0.1/functions/_bash_completions
+share/zsh/4.0.1/functions/_bindkey
+share/zsh/4.0.1/functions/_bison
+share/zsh/4.0.1/functions/_brace_parameter
+share/zsh/4.0.1/functions/_bsd_pkg
+share/zsh/4.0.1/functions/_bug
+share/zsh/4.0.1/functions/_builtin
+share/zsh/4.0.1/functions/_bzip2
+share/zsh/4.0.1/functions/_cache_invalid
+share/zsh/4.0.1/functions/_call_function
+share/zsh/4.0.1/functions/_call_program
+share/zsh/4.0.1/functions/_cd
+share/zsh/4.0.1/functions/_chown
+share/zsh/4.0.1/functions/_combination
+share/zsh/4.0.1/functions/_command
+share/zsh/4.0.1/functions/_command_names
+share/zsh/4.0.1/functions/_compdef
+share/zsh/4.0.1/functions/_complete
+share/zsh/4.0.1/functions/_complete_debug
+share/zsh/4.0.1/functions/_complete_help
+share/zsh/4.0.1/functions/_complete_tag
+share/zsh/4.0.1/functions/_compress
+share/zsh/4.0.1/functions/_condition
+share/zsh/4.0.1/functions/_configure
+share/zsh/4.0.1/functions/_contexts
+share/zsh/4.0.1/functions/_correct
+share/zsh/4.0.1/functions/_correct_filename
+share/zsh/4.0.1/functions/_correct_word
+share/zsh/4.0.1/functions/_cpio
+share/zsh/4.0.1/functions/_cvs
+share/zsh/4.0.1/functions/_cvsup
+share/zsh/4.0.1/functions/_dd
+share/zsh/4.0.1/functions/_deb_packages
+share/zsh/4.0.1/functions/_default
+share/zsh/4.0.1/functions/_describe
+share/zsh/4.0.1/functions/_description
+share/zsh/4.0.1/functions/_dict
+share/zsh/4.0.1/functions/_dict_words
+share/zsh/4.0.1/functions/_diff
+share/zsh/4.0.1/functions/_diff_options
+share/zsh/4.0.1/functions/_dir_list
+share/zsh/4.0.1/functions/_directories
+share/zsh/4.0.1/functions/_directory_stack
+share/zsh/4.0.1/functions/_disable
+share/zsh/4.0.1/functions/_domains
+share/zsh/4.0.1/functions/_dpkg
+share/zsh/4.0.1/functions/_dpkg_source
+share/zsh/4.0.1/functions/_dupload
+share/zsh/4.0.1/functions/_dvi
+share/zsh/4.0.1/functions/_echotc
+share/zsh/4.0.1/functions/_echoti
+share/zsh/4.0.1/functions/_elm
+share/zsh/4.0.1/functions/_emulate
+share/zsh/4.0.1/functions/_enable
+share/zsh/4.0.1/functions/_enscript
+share/zsh/4.0.1/functions/_equal
+share/zsh/4.0.1/functions/_expand
+share/zsh/4.0.1/functions/_expand_alias
+share/zsh/4.0.1/functions/_expand_word
+share/zsh/4.0.1/functions/_fakeroot
+share/zsh/4.0.1/functions/_fc
+share/zsh/4.0.1/functions/_fetchmail
+share/zsh/4.0.1/functions/_file_descriptors
+share/zsh/4.0.1/functions/_files
+share/zsh/4.0.1/functions/_find
+share/zsh/4.0.1/functions/_finger
+share/zsh/4.0.1/functions/_first
+share/zsh/4.0.1/functions/_flex
+share/zsh/4.0.1/functions/_floppy
+share/zsh/4.0.1/functions/_functions
+share/zsh/4.0.1/functions/_gcc
+share/zsh/4.0.1/functions/_gdb
+share/zsh/4.0.1/functions/_generic
+share/zsh/4.0.1/functions/_getconf
+share/zsh/4.0.1/functions/_gnu_generic
+share/zsh/4.0.1/functions/_gprof
+share/zsh/4.0.1/functions/_grep
+share/zsh/4.0.1/functions/_groups
+share/zsh/4.0.1/functions/_gs
+share/zsh/4.0.1/functions/_guard
+share/zsh/4.0.1/functions/_gv
+share/zsh/4.0.1/functions/_gzip
+share/zsh/4.0.1/functions/_hash
+share/zsh/4.0.1/functions/_history
+share/zsh/4.0.1/functions/_history_complete_word
+share/zsh/4.0.1/functions/_hosts
+share/zsh/4.0.1/functions/_iconv
+share/zsh/4.0.1/functions/_ignored
+share/zsh/4.0.1/functions/_imagemagick
+share/zsh/4.0.1/functions/_in_vared
+share/zsh/4.0.1/functions/_init_d
+share/zsh/4.0.1/functions/_ispell
+share/zsh/4.0.1/functions/_java
+share/zsh/4.0.1/functions/_jobs
+share/zsh/4.0.1/functions/_jobs_bg
+share/zsh/4.0.1/functions/_jobs_builtin
+share/zsh/4.0.1/functions/_jobs_fg
+share/zsh/4.0.1/functions/_joe
+share/zsh/4.0.1/functions/_kill
+share/zsh/4.0.1/functions/_killall
+share/zsh/4.0.1/functions/_kld
+share/zsh/4.0.1/functions/_limits
+share/zsh/4.0.1/functions/_list
+share/zsh/4.0.1/functions/_loadkeys
+share/zsh/4.0.1/functions/_logical_volumes
+share/zsh/4.0.1/functions/_look
+share/zsh/4.0.1/functions/_lp
+share/zsh/4.0.1/functions/_ls
+share/zsh/4.0.1/functions/_lscfg
+share/zsh/4.0.1/functions/_lsdev
+share/zsh/4.0.1/functions/_lslv
+share/zsh/4.0.1/functions/_lspv
+share/zsh/4.0.1/functions/_lsvg
+share/zsh/4.0.1/functions/_lynx
+share/zsh/4.0.1/functions/_lzop
+share/zsh/4.0.1/functions/_mail
+share/zsh/4.0.1/functions/_mailboxes
+share/zsh/4.0.1/functions/_main_complete
+share/zsh/4.0.1/functions/_make
+share/zsh/4.0.1/functions/_man
+share/zsh/4.0.1/functions/_match
+share/zsh/4.0.1/functions/_math
+share/zsh/4.0.1/functions/_menu
+share/zsh/4.0.1/functions/_mere
+share/zsh/4.0.1/functions/_message
+share/zsh/4.0.1/functions/_mh
+share/zsh/4.0.1/functions/_modutils
+share/zsh/4.0.1/functions/_most_recent_file
+share/zsh/4.0.1/functions/_mount
+share/zsh/4.0.1/functions/_multi_parts
+share/zsh/4.0.1/functions/_mutt
+share/zsh/4.0.1/functions/_my_accounts
+share/zsh/4.0.1/functions/_mysql_utils
+share/zsh/4.0.1/functions/_ncftp
+share/zsh/4.0.1/functions/_nedit
+share/zsh/4.0.1/functions/_netscape
+share/zsh/4.0.1/functions/_newsgroups
+share/zsh/4.0.1/functions/_next_label
+share/zsh/4.0.1/functions/_next_tags
+share/zsh/4.0.1/functions/_normal
+share/zsh/4.0.1/functions/_nothing
+share/zsh/4.0.1/functions/_nslookup
+share/zsh/4.0.1/functions/_object_classes
+share/zsh/4.0.1/functions/_oldlist
+share/zsh/4.0.1/functions/_options
+share/zsh/4.0.1/functions/_options_set
+share/zsh/4.0.1/functions/_options_unset
+share/zsh/4.0.1/functions/_other_accounts
+share/zsh/4.0.1/functions/_pack
+share/zsh/4.0.1/functions/_parameter
+share/zsh/4.0.1/functions/_parameters
+share/zsh/4.0.1/functions/_patch
+share/zsh/4.0.1/functions/_path_files
+share/zsh/4.0.1/functions/_pbm
+share/zsh/4.0.1/functions/_pdf
+share/zsh/4.0.1/functions/_perl
+share/zsh/4.0.1/functions/_perl_basepods
+share/zsh/4.0.1/functions/_perl_builtin_funcs
+share/zsh/4.0.1/functions/_perl_modules
+share/zsh/4.0.1/functions/_perldoc
+share/zsh/4.0.1/functions/_physical_volumes
+share/zsh/4.0.1/functions/_pids
+share/zsh/4.0.1/functions/_pine
+share/zsh/4.0.1/functions/_ports
+share/zsh/4.0.1/functions/_prcs
+share/zsh/4.0.1/functions/_precommand
+share/zsh/4.0.1/functions/_prefix
+share/zsh/4.0.1/functions/_print
+share/zsh/4.0.1/functions/_printers
+share/zsh/4.0.1/functions/_prompt
+share/zsh/4.0.1/functions/_ps
+share/zsh/4.0.1/functions/_pspdf
+share/zsh/4.0.1/functions/_psutils
+share/zsh/4.0.1/functions/_rcs
+share/zsh/4.0.1/functions/_read
+share/zsh/4.0.1/functions/_read_comp
+share/zsh/4.0.1/functions/_redirect
+share/zsh/4.0.1/functions/_regex_arguments
+share/zsh/4.0.1/functions/_requested
+share/zsh/4.0.1/functions/_retrieve_cache
+share/zsh/4.0.1/functions/_rlogin
+share/zsh/4.0.1/functions/_rpm
+share/zsh/4.0.1/functions/_ruby
+share/zsh/4.0.1/functions/_sched
+share/zsh/4.0.1/functions/_sep_parts
+share/zsh/4.0.1/functions/_set
+share/zsh/4.0.1/functions/_setopt
+share/zsh/4.0.1/functions/_setup
+share/zsh/4.0.1/functions/_sh
+share/zsh/4.0.1/functions/_signals
+share/zsh/4.0.1/functions/_slrn
+share/zsh/4.0.1/functions/_smit
+share/zsh/4.0.1/functions/_socket
+share/zsh/4.0.1/functions/_source
+share/zsh/4.0.1/functions/_ssh
+share/zsh/4.0.1/functions/_stat
+share/zsh/4.0.1/functions/_store_cache
+share/zsh/4.0.1/functions/_strip
+share/zsh/4.0.1/functions/_stty
+share/zsh/4.0.1/functions/_su
+share/zsh/4.0.1/functions/_sub_commands
+share/zsh/4.0.1/functions/_subscript
+share/zsh/4.0.1/functions/_sudo
+share/zsh/4.0.1/functions/_tags
+share/zsh/4.0.1/functions/_tar
+share/zsh/4.0.1/functions/_tar_archive
+share/zsh/4.0.1/functions/_telnet
+share/zsh/4.0.1/functions/_tex
+share/zsh/4.0.1/functions/_texi
+share/zsh/4.0.1/functions/_tiff
+share/zsh/4.0.1/functions/_tilde
+share/zsh/4.0.1/functions/_tilde_files
+share/zsh/4.0.1/functions/_tin
+share/zsh/4.0.1/functions/_trap
+share/zsh/4.0.1/functions/_ttyctl
+share/zsh/4.0.1/functions/_typeset
+share/zsh/4.0.1/functions/_ulimit
+share/zsh/4.0.1/functions/_unhash
+share/zsh/4.0.1/functions/_unsetopt
+share/zsh/4.0.1/functions/_update-alternatives
+share/zsh/4.0.1/functions/_urls
+share/zsh/4.0.1/functions/_user_at_host
+share/zsh/4.0.1/functions/_users
+share/zsh/4.0.1/functions/_users_on
+share/zsh/4.0.1/functions/_value
+share/zsh/4.0.1/functions/_values
+share/zsh/4.0.1/functions/_vared
+share/zsh/4.0.1/functions/_vars
+share/zsh/4.0.1/functions/_vnc
+share/zsh/4.0.1/functions/_volume_groups
+share/zsh/4.0.1/functions/_w3m
+share/zsh/4.0.1/functions/_wait
+share/zsh/4.0.1/functions/_wanted
+share/zsh/4.0.1/functions/_webbrowser
+share/zsh/4.0.1/functions/_wget
+share/zsh/4.0.1/functions/_whereis
+share/zsh/4.0.1/functions/_which
+share/zsh/4.0.1/functions/_whois
+share/zsh/4.0.1/functions/_x_arguments
+share/zsh/4.0.1/functions/_x_borderwidth
+share/zsh/4.0.1/functions/_x_color
+share/zsh/4.0.1/functions/_x_colormapid
+share/zsh/4.0.1/functions/_x_cursor
+share/zsh/4.0.1/functions/_x_display
+share/zsh/4.0.1/functions/_x_extension
+share/zsh/4.0.1/functions/_x_font
+share/zsh/4.0.1/functions/_x_geometry
+share/zsh/4.0.1/functions/_x_keysym
+share/zsh/4.0.1/functions/_x_locale
+share/zsh/4.0.1/functions/_x_modifier
+share/zsh/4.0.1/functions/_x_name
+share/zsh/4.0.1/functions/_x_resource
+share/zsh/4.0.1/functions/_x_selection_timeout
+share/zsh/4.0.1/functions/_x_title
+share/zsh/4.0.1/functions/_x_utils
+share/zsh/4.0.1/functions/_x_window
+share/zsh/4.0.1/functions/_xargs
+share/zsh/4.0.1/functions/_xauth
+share/zsh/4.0.1/functions/_xdvi
+share/zsh/4.0.1/functions/_xfig
+share/zsh/4.0.1/functions/_xmodmap
+share/zsh/4.0.1/functions/_xrdb
+share/zsh/4.0.1/functions/_xset
+share/zsh/4.0.1/functions/_xt_arguments
+share/zsh/4.0.1/functions/_xt_session_id
+share/zsh/4.0.1/functions/_xterm
+share/zsh/4.0.1/functions/_xv
+share/zsh/4.0.1/functions/_xwit
+share/zsh/4.0.1/functions/_yodl
+share/zsh/4.0.1/functions/_yp
+share/zsh/4.0.1/functions/_zcat
+share/zsh/4.0.1/functions/_zcompile
+share/zsh/4.0.1/functions/_zdump
+share/zsh/4.0.1/functions/_zed
+share/zsh/4.0.1/functions/_zftp
+share/zsh/4.0.1/functions/_zip
+share/zsh/4.0.1/functions/_zle
+share/zsh/4.0.1/functions/_zmodload
+share/zsh/4.0.1/functions/_zpty
+share/zsh/4.0.1/functions/_zstyle
+share/zsh/4.0.1/functions/allopt
+share/zsh/4.0.1/functions/checkmail
+share/zsh/4.0.1/functions/colors
+share/zsh/4.0.1/functions/compaudit
+share/zsh/4.0.1/functions/compdump
+share/zsh/4.0.1/functions/compinit
+share/zsh/4.0.1/functions/compinstall
+share/zsh/4.0.1/functions/cycle-completion-positions
+share/zsh/4.0.1/functions/edit-command-line
+share/zsh/4.0.1/functions/getjobs
+share/zsh/4.0.1/functions/harden
+share/zsh/4.0.1/functions/history-search-end
+share/zsh/4.0.1/functions/incarg
+share/zsh/4.0.1/functions/incremental-complete-word
+share/zsh/4.0.1/functions/insert-files
+share/zsh/4.0.1/functions/is-at-least
+share/zsh/4.0.1/functions/mere
+share/zsh/4.0.1/functions/nslookup
+share/zsh/4.0.1/functions/predict-on
+share/zsh/4.0.1/functions/prompt_adam1_setup
+share/zsh/4.0.1/functions/prompt_adam2_setup
+share/zsh/4.0.1/functions/prompt_bart_setup
+share/zsh/4.0.1/functions/prompt_bigfade_setup
+share/zsh/4.0.1/functions/prompt_clint_setup
+share/zsh/4.0.1/functions/prompt_elite2_setup
+share/zsh/4.0.1/functions/prompt_elite_setup
+share/zsh/4.0.1/functions/prompt_fade_setup
+share/zsh/4.0.1/functions/prompt_fire_setup
+share/zsh/4.0.1/functions/prompt_off_setup
+share/zsh/4.0.1/functions/prompt_oliver_setup
+share/zsh/4.0.1/functions/prompt_redhat_setup
+share/zsh/4.0.1/functions/prompt_suse_setup
+share/zsh/4.0.1/functions/prompt_zefram_setup
+share/zsh/4.0.1/functions/promptinit
+share/zsh/4.0.1/functions/promptnl
+share/zsh/4.0.1/functions/run-help
+share/zsh/4.0.1/functions/smart-insert-last-word
+share/zsh/4.0.1/functions/zed
+share/zsh/4.0.1/functions/zkbd
+share/zsh/4.0.1/functions/zmv
+share/zsh/4.0.1/functions/zrecompile
+share/zsh/4.0.1/functions/zstyle+
+@unexec rmdir %D/share/zsh/site-functions 2>/dev/null || true
+@unexec rmdir %D/share/zsh/4.0.1/functions 2>/dev/null || true
+@unexec rmdir %D/share/zsh/4.0.1 2>/dev/null || true
+@unexec rmdir %D/share/zsh 2>/dev/null || true
diff --git a/shells/zsh/pkg/PLIST.dynamic b/shells/zsh/pkg/PLIST.dynamic
new file mode 100644
index 00000000000..3689539ee14
--- /dev/null
+++ b/shells/zsh/pkg/PLIST.dynamic
@@ -0,0 +1,62 @@
+@comment $NetBSD: PLIST.dynamic,v 1.1 2001/06/05 16:28:09 jtb Exp $
+lib/zsh/libzsh-4.0.1.so
+lib/zsh/4.0.1/zsh/rlimits.so
+lib/zsh/4.0.1/zsh/sched.so
+lib/zsh/4.0.1/zsh/cap.so
+lib/zsh/4.0.1/zsh/clone.so
+lib/zsh/4.0.1/zsh/example.so
+lib/zsh/4.0.1/zsh/files.so
+lib/zsh/4.0.1/zsh/mapfile.so
+lib/zsh/4.0.1/zsh/mathfunc.so
+lib/zsh/4.0.1/zsh/parameter.so
+lib/zsh/4.0.1/zsh/stat.so
+lib/zsh/4.0.1/zsh/termcap.so
+lib/zsh/4.0.1/zsh/terminfo.so
+lib/zsh/4.0.1/zsh/zftp.so
+lib/zsh/4.0.1/zsh/zprof.so
+lib/zsh/4.0.1/zsh/zpty.so
+lib/zsh/4.0.1/zsh/zutil.so
+lib/zsh/4.0.1/zsh/compctl.so
+lib/zsh/4.0.1/zsh/complete.so
+lib/zsh/4.0.1/zsh/complist.so
+lib/zsh/4.0.1/zsh/computil.so
+lib/zsh/4.0.1/zsh/deltochar.so
+lib/zsh/4.0.1/zsh/zle.so
+lib/zsh/4.0.1/zsh/zleparameter.so
+share/zsh/4.0.1/functions/zfanon
+share/zsh/4.0.1/functions/zfautocheck
+share/zsh/4.0.1/functions/zfcd
+share/zsh/4.0.1/functions/zfcd_match
+share/zsh/4.0.1/functions/zfcget
+share/zsh/4.0.1/functions/zfclose
+share/zsh/4.0.1/functions/zfcput
+share/zsh/4.0.1/functions/zfdir
+share/zsh/4.0.1/functions/zffcache
+share/zsh/4.0.1/functions/zfgcp
+share/zsh/4.0.1/functions/zfget
+share/zsh/4.0.1/functions/zfget_match
+share/zsh/4.0.1/functions/zfgoto
+share/zsh/4.0.1/functions/zfhere
+share/zsh/4.0.1/functions/zfinit
+share/zsh/4.0.1/functions/zfls
+share/zsh/4.0.1/functions/zfmark
+share/zsh/4.0.1/functions/zfopen
+share/zsh/4.0.1/functions/zfparams
+share/zsh/4.0.1/functions/zfpcp
+share/zsh/4.0.1/functions/zfput
+share/zsh/4.0.1/functions/zfrglob
+share/zsh/4.0.1/functions/zfrtime
+share/zsh/4.0.1/functions/zfsession
+share/zsh/4.0.1/functions/zfstat
+share/zsh/4.0.1/functions/zftp_chpwd
+share/zsh/4.0.1/functions/zftp_progress
+share/zsh/4.0.1/functions/zftransfer
+share/zsh/4.0.1/functions/zftype
+share/zsh/4.0.1/functions/zfuget
+share/zsh/4.0.1/functions/zfuput
+@dirrm share/zsh/4.0.1/functions
+@dirrm share/zsh/4.0.1
+@dirrm share/zsh
+@dirrm lib/zsh/4.0.1/zsh
+@dirrm lib/zsh/4.0.1
+@dirrm lib/zsh