9 files changed, 614 insertions, 151 deletions

diff --git a/shells/zsh-devel/Makefile b/shells/zsh-devel/Makefile
index 44d3c0b52753..b6e23218c918 100644
--- a/shells/zsh-devel/Makefile
+++ b/shells/zsh-devel/Makefile
@@ -39,6 +39,12 @@ MAN1=		zsh.1 zshbuiltins.1 zshcompctl.1 zshexpn.1 zshmisc.1 \
 		zshzftpsys.1 zshcompsys.1 zshcompwid.1
 PLIST_SUB=	ZSH_VER="${ZSH_VER}" ZSHFUNC_SUBDIR="${ZSHFUNC_SUBDIR}"
 
+pre-everything::
+	@${ECHO} "The main zsh port (ports/shells/zsh) has been upgraded"
+	@${ECHO} "to 4.0.1.  It is highly advised that you use that port"
+	@${ECHO} "instead of this one."
+	@${FALSE}
+
 # If you want to build a static binary, uncomment the following line
 #LDFLAGS+=-static
 
diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index 30c6967baafb..aab2c17f14c8 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -6,26 +6,36 @@
 #
 
 PORTNAME=	zsh
-PORTVERSION=	3.0.8
+PORTVERSION=	4.0.1
 CATEGORIES=	shells
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
-		ftp://ftp.sterling.com/zsh/ \
-		ftp://ftp.rge.com/pub/shells/zsh/ \
-		ftp://ftp.cenatls.cena.dgac.fr/pub/shells/zsh/ \
-		ftp://ftp.fu-berlin.de/pub/unix/shells/zsh/ \
-		ftp://ftp.ips.oz.au/pub/packages/zsh/ \
-		ftp://ftp.uit.no/pub/unix/shells/zsh/
+		ftp://ftp.zsh.org/%SUBDIR%/ \
+		ftp://ftp.sterling.com/%SUBDIR%/ \
+		ftp://ftp.rge.com/pub/shells/%SUBDIR%/ \
+		ftp://ftp.fu-berlin.de/pub/unix/shells/%SUBDIR%/ \
+		ftp://ftp.ips.oz.au/pub/packages/%SUBDIR%/ \
+		ftp://ftp.uit.no/pub/unix/shells/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	will@FreeBSD.org
 
+USE_AUTOCONF=	yes
+
+ZSH_VER=	${PORTVERSION}
+ZSHFUNC_SUBDIR=	share/zsh/${ZSH_VER}/functions
 GNU_CONFIGURE=	yes
-MAN1=		zsh.1 zshbuiltins.1 zshcompctl.1 zshexpn.1 zshmisc.1 \
-		zshoptions.1 zshall.1 zshparam.1 zshzle.1
-PLIST_SUB=	ZSH_VERSION=${DISTNAME:S/zsh-//}
+CONFIGURE_ARGS=	--enable-zsh-mem --enable-zsh-secure-free --enable-dynamic
+INSTALL_TARGET=	install install.info
+MAN1=		zsh.1 zshbuiltins.1 zshcompctl.1 zshcompwid.1 zshcompsys.1 \
+		zshcontrib.1 zshexpn.1 zshmisc.1 zshmodules.1 zshoptions.1 \
+		zshparam.1 zshzftpsys.1 zshzle.1 zshall.1
+PLIST_SUB=	ZSH_VER="${ZSH_VER}" ZSHFUNC_SUBDIR="${ZSHFUNC_SUBDIR}"
 
 .if defined(WANT_STATIC)
-CONFIGURE_ENV+=	"LDFLAGS=-static"
+CONFIGURE_ENV+= "LDFLAGS=-static"
+PLIST_SUB+=	NO_STATIC="@comment "
+.else
+PLIST_SUB+=	NO_STATIC=""
 .endif
 
 post-build:
@@ -38,8 +48,13 @@ post-build:
 		${RM} -f ./man1/zshall.1 ; \
 		/usr/bin/soelim ./man1/zshall.1.source > ./man1/zshall.1 ; \
 	)
+	@cd ${WRKSRC}/Doc && ${MAKE} info
+
+pre-install:
+	@${RM} -f ${WRKSRC}/Completion/Unix/Command/_mount.orig
 
 post-install:
+	@${INSTALL_DATA} ${WRKSRC}/Doc/zsh.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/zsh.info ${PREFIX}/info/dir
 	@${ECHO} "Updating /etc/shells"
 	@${CP} /etc/shells /etc/shells.bak
diff --git a/shells/zsh/distinfo b/shells/zsh/distinfo
index 38f8cd8f833c..4cb0d496dae3 100644
--- a/shells/zsh/distinfo
+++ b/shells/zsh/distinfo
@@ -1 +1 @@
-MD5 (zsh-3.0.8.tar.gz) = 6c4c62da23d2b9d8d7599768193cc782
+MD5 (zsh-4.0.1.tar.gz) = 9fc2c72ea3b6cd0449dd513510c9ca0d
diff --git a/shells/zsh/files/patch-aa b/shells/zsh/files/patch-aa
deleted file mode 100644
index 28109c3ca0d8..000000000000
--- a/shells/zsh/files/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-*** 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)
diff --git a/shells/zsh/files/patch-ab b/shells/zsh/files/patch-ab
index 1c11069e06fe..0899f82e9386 100644
--- a/shells/zsh/files/patch-ab
+++ b/shells/zsh/files/patch-ab
@@ -1,21 +1,11 @@
---- Doc/Makefile.in.orig	Wed Jul 14 20:59:48 1999
-+++ Doc/Makefile.in	Fri Sep 10 22:27:01 1999
-@@ -91,7 +91,8 @@
- everything: all zsh_us.ps zsh_a4.ps zsh_toc.html
+--- Doc/Makefile.in.orig	Thu Apr 20 04:03:42 2000
++++ Doc/Makefile.in	Sat Apr 29 00:04:52 2000
+@@ -37,7 +37,7 @@
  
- 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
+ @DEFS_MK@
  
+-MAKEINFO = makeinfo
++MAKEINFO = makeinfo --no-split
+ TEXI2DVI = texi2dvi
+ DVIPS = dvips
+ TEXI2HTML = texi2html -expandinfo -split_chapter
diff --git a/shells/zsh/files/patch-ac b/shells/zsh/files/patch-ac
deleted file mode 100644
index 90e273ac638e..000000000000
--- a/shells/zsh/files/patch-ac
+++ /dev/null
@@ -1,100 +0,0 @@
-*** Doc/zsh.texi.orig	Fri Sep  3 16:44:37 1999
---- Doc/zsh.texi	Sun Feb 13 12:02:35 2000
-***************
-*** 2,7 ****
---- 2,11 ----
-  @c %**start of header
-  @setfilename zsh.info
-  @settitle    zsh
-+ @dircategory Shells
-+ @direntry
-+ * Zsh: (zsh).                   The Z shell.
-+ @end direntry
-  @c %**end of header
-  
-  @ifinfo
-***************
-*** 834,840 ****
-  A character may be @dfn{quoted} (that is, made to stand for itself) by
-  preceding it with a @code{\}.  @code{\} followed by a newline is
-  ignored.  All characters enclosed between a pair of single quotes
-! (@t{@value{dsq}}) are quoted, except the first character of @code{histchars}
-  (@code{!} by default).  A single quote cannot appear within single
-  quotes.  Inside double quotes (@code{""}), parameter and command
-  substitution occurs, and @code{\} quotes the characters @code{\},
---- 838,844 ----
-  A character may be @dfn{quoted} (that is, made to stand for itself) by
-  preceding it with a @code{\}.  @code{\} followed by a newline is
-  ignored.  All characters enclosed between a pair of single quotes
-! (@t{'}@t{'}) are quoted, except the first character of @code{histchars}
-  (@code{!} by default).  A single quote cannot appear within single
-  quotes.  Inside double quotes (@code{""}), parameter and command
-  substitution occurs, and @code{\} quotes the characters @code{\},
-***************
-*** 1622,1628 ****
-  @code{histchars} parameter which is @code{!} by default and may occur 
-  anywhere on the command line; history substitutions do not nest.  The 
-  @code{!} can be escaped with @code{\} or can be enclosed between a pair of 
-! single quotes (@t{@value{dsq}}) 
-  to suppress its special meaning. Double quotes will not work for this.
-  
-  @noindent
---- 1626,1632 ----
-  @code{histchars} parameter which is @code{!} by default and may occur 
-  anywhere on the command line; history substitutions do not nest.  The 
-  @code{!} can be escaped with @code{\} or can be enclosed between a pair of 
-! single quotes (@t{'}@t{'})
-  to suppress its special meaning. Double quotes will not work for this.
-  
-  @noindent
-***************
-*** 5183,5189 ****
-  @cindex rc, quoting style
-  @cindex quoting style, rc
-  @pindex RC_QUOTES
-! Allow the character sequence @t{@value{dsq}} to signify a single quote within
-  singly quoted strings.
-  
-  @item RCS (+f)
---- 5187,5193 ----
-  @cindex rc, quoting style
-  @cindex quoting style, rc
-  @pindex RC_QUOTES
-! Allow the character sequence @t{'}@t{'} to signify a single quote within
-  singly quoted strings.
-  
-  @item RCS (+f)
-***************
-*** 7008,7014 ****
-  use is
-  
-  @example
-! compctl -D -f + -H 0 @value{dsq} -X '(No file found; using history)'
-  @end example
-  
-  which forces completion to look back in the history list for a word if no
---- 7012,7018 ----
-  use is
-  
-  @example
-! compctl -D -f + -H 0 @t{'}@t{'} -X '(No file found; using history)'
-  @end example
-  
-  which forces completion to look back in the history list for a word if no
-***************
-*** 7071,7077 ****
-  name completion performed on the first word in the range.  For example,
-  
-  @example
-! compctl -x 'r[-exec,;]' -l @value{dsq} -- find
-  @end example
-  
-  completes arguments between @code{-exec} and the following @code{;} (or the
---- 7075,7081 ----
-  name completion performed on the first word in the range.  For example,
-  
-  @example
-! compctl -x 'r[-exec,;]' -l @t{'}@t{'} -- find
-  @end example
-  
-  completes arguments between @code{-exec} and the following @code{;} (or the
diff --git a/shells/zsh/files/patch-ad b/shells/zsh/files/patch-ad
new file mode 100644
index 000000000000..c40ea35d768b
--- /dev/null
+++ b/shells/zsh/files/patch-ad
@@ -0,0 +1,162 @@
+--- Completion/Unix/Command/_mount.orig	Sun Jun  3 22:30:24 2001
++++ Completion/Unix/Command/_mount	Sun Jun  3 22:30:32 2001
+@@ -365,6 +365,52 @@
+       'onerror[set behaviour on error]:behaviour on error:(panic lock umount repair)'
+     )
+     ;;
++  freebsd*)
++    _fs_any=(
++      '(sync)async[do all I/O asynchronously]'
++      'current[use current options on already mounted file system]'
++      'force[force R/W mount of unclean filesystem]'
++      'fstab[use options listed in /etc/fstab]'
++      'noasync[do I/O synchronously]'
++      'noatime[don'"'"'t update access time]'
++      'noauto[can only be mounted explicitly]'
++      'noclusterr[disable read clustering]'
++      'noclusterw[disable write clustering]'
++      'nodev[don'"'"'t interpret devices]'
++      'noexec[don'"'"'t allow execution of binaries]'
++      'nosuid[ignore suid and sgid bits]'
++      'nosymfollow[don'"'"'t follow symlinks]'
++      'rdonly[mount file system read-only]'
++      '(async)sync[do all I/O synchronously]'
++      'suiddir[allow suid bits on directories]'
++      'update[change status of already mounted filesystem]'
++      'union[cause the namespace at the mount point to appear as the union of the mounted filesystem and the existing directory]'
++    )
++    _fs_iso9660=(
++      'extatt[enable use of extended attributes]'
++      'gens[don'"'"'t strip version number on files]'
++      'joliet[don'"'"'t use any Joliet extensions]'
++      'rrip[don'"'"'t use any Rockridge extensions]'
++      'strictjoliet[relax checking for Supplementary Volume Descriptor Flags field which is set to a wrong value on some Joliet formatted disks]'
++    )
++    _fs_std=(
++      'nodev[don'"'"'t interpret devices]'
++      'noexec[don'"'"'t allow execution of binaries]'
++      'nosuid[ignore suid and sgid bits]'
++      'rdonly[mount file system read-only]'
++      'union[cause the namespace at the mount point to appear as the union of the mounted filesystem and the existing directory]'
++    )
++    _fs_devfs=( "$_fs_std[@]" )
++    _fs_fdesc=( "$_fs_std[@]" )
++    _fs_kernfs=( "$_fs_std[@]" )
++    _fs_linprocfs=( "$_fs_std[@]" )
++    _fs_procfs=( "$_fs_std[@]" )
++    _fs_msdos=(
++      'shortnames[]'
++      'longnames[]'
++      'nowin95[]'
++    )
++    ;;
+   esac
+ fi
+ 
+@@ -475,6 +521,25 @@
+     deffs=hsfs
+     typeops=-F
+     ;;
++  freebsd*)
++    args=( -s
++      '-a[mount all filesystems in fstab]'
++      '-d[cause everything to be done except for the actual system call]'      
++      '-f[forced mount]'
++      '-o[specify file system options]:file system option:->fsopt'
++      '-p[print mounted file systems]'
++      '-r[mount readonly]'
++      '-t[specify file system type]:file system type:->fstype'
++      '-u[change status of already mounted filesystem]'
++      '-v[verbose mode]'
++      '-w[mount read/write]'
++      ':dev or dir:->devordir'
++      ':mount point:_files -/'
++    )
++    fss=( cd9660 devfs ext2fs fdesc kernfs linprocfs mfs msdos nfs 
++          ntfs null nwfs portal procfs std ufs umap union )
++    deffs=ufs
++    ;;
+   *)
+     # Default for all other systems. Dunno.
+ 
+@@ -517,6 +582,17 @@
+ 	'-v[verbose]'
+       )
+     ;;  
++    freebsd*)
++      args=(
++        '-a[unmount all mounted file systems]'
++        '-A[unmount all mounted file systems except the root]'
++        '-f[force unmount]'
++        '-h[unmount all filesystems associated with host]:hostnames:_hosts'
++	'-t[unmount all filesystems of specified type]:file system type:->fstype'
++	'-v[verbose mode]'
++	'*:dev or dir:->udevordir'
++      )
++    ;;
+     *)
+       args=( \
+ 	'-h[show help]'
+@@ -553,20 +629,55 @@
+   if (( $+opt_args[-a] )); then
+     _message "no device or directory with option \`-a'"
+   else
+-    _alternative \
+-        'devices:device:{compadd "$expl[@]" /dev/*}' \
+-	'directories:mount point:_files -/' && ret=0
++    local dev_tmp mp_tmp mline
++
++    case "$OSTYPE" in
++    freebsd*)
++      while read mline; do 
++        case $mline[(w)1] in
++          \#* )
++            ;;
++          proc)
++            ;;
++          *)
++            [[ $mline[(w)3] == swap ]] || \
++              dev_tmp=( $dev_tmp $mline[(w)1] ) \
++              mp_tmp=( $mp_tmp $mline[(w)2] )
++            ;;
++        esac
++      done < /etc/fstab
++      
++      _alternative \
++          'devices:device:compadd -a dev_tmp' \
++          'directories:mount point:compadd -a mp_tmp' && ret=0
++      ;;
++    *)
++      _alternative \
++          'devices:device:{compadd "$expl[@]" /dev/*}' \
++	  'directories:mount point:_files -/' && ret=0
++    ;;
++    esac
+   fi
+   ;;
+ udevordir)
+   if (( $+opt_args[-a] )); then
+     _message "no device or directory with option \`-a'"
+   else
+-    local dev_tmp mp_tmp
++    local dev_tmp mp_tmp mline
+ 
+-    tmp=( "${(@f)$(< /etc/mtab)}" )
+-    dev_tmp=( "${(@)${(@)tmp%% *}:#none}" )
+-    mp_tmp=( "${(@)${(@)tmp#* }%% *}" )
++    case "$OSTYPE" in
++    freebsd*)
++      /sbin/mount | while read mline; do
++        dev_tmp=( $dev_tmp $mline[(w)1] )
++        mp_tmp=( $mp_tmp $mline[(w)3] )
++      done
++      ;;
++    *)
++      tmp=( "${(@f)$(< /etc/mtab)}" )
++      dev_tmp=( "${(@)${(@)tmp%% *}:#none}" )
++      mp_tmp=( "${(@)${(@)tmp#* }%% *}" )
++      ;;
++    esac
+ 
+     _alternative \
+         'devices:device:compadd -a dev_tmp' \
diff --git a/shells/zsh/pkg-descr b/shells/zsh/pkg-descr
index 2740c468f6aa..4bf0d83794ce 100644
--- a/shells/zsh/pkg-descr
+++ b/shells/zsh/pkg-descr
@@ -5,4 +5,12 @@ command-line editor, options for customising its behaviour, filename
 globbing, features to make C-shell (csh) users feel more at home and
 extra features drawn from tcsh (another `custom' shell).
 
+If you want to use zsh completion system, you should type the following
+commands:
+
+	$ autoload -U compinstall
+	$ compinstall
+
+See also zshcompsys(1) manpages. :)
+
 WWW: http://www.zsh.org/
diff --git a/shells/zsh/pkg-plist b/shells/zsh/pkg-plist
index 5d5b0adfe894..64dbc2e492f9 100644
--- a/shells/zsh/pkg-plist
+++ b/shells/zsh/pkg-plist
@@ -1,7 +1,408 @@
 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
-bin/zsh-%%ZSH_VERSION%%
+bin/zsh-%%ZSH_VER%%
 @unexec install-info --delete %D/info/zsh.info %D/info/dir
 info/zsh.info
 @exec install-info %D/info/zsh.info %D/info/dir
+%%NO_STATIC%%lib/zsh/libzsh-%%ZSH_VER%%.so
+%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/cap.so
+%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/clone.so
+%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/compctl.so
+%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/complete.so
+%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/complist.so
+%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/computil.so
+%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/deltochar.so
+%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/example.so
+%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/files.so
+%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/mapfile.so
+%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/mathfunc.so
+%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/parameter.so
+%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/rlimits.so
+%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/sched.so
+%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/stat.so
+%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/termcap.so
+%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/terminfo.so
+%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/zftp.so
+%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/zle.so
+%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/zleparameter.so
+%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/zprof.so
+%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/zpty.so
+%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/zutil.so
+%%ZSHFUNC_SUBDIR%%/_a2ps
+%%ZSHFUNC_SUBDIR%%/_alias
+%%ZSHFUNC_SUBDIR%%/_aliases
+%%ZSHFUNC_SUBDIR%%/_all_labels
+%%ZSHFUNC_SUBDIR%%/_all_matches
+%%ZSHFUNC_SUBDIR%%/_alternative
+%%ZSHFUNC_SUBDIR%%/_apachectl
+%%ZSHFUNC_SUBDIR%%/_apm
+%%ZSHFUNC_SUBDIR%%/_approximate
+%%ZSHFUNC_SUBDIR%%/_apt
+%%ZSHFUNC_SUBDIR%%/_archie
+%%ZSHFUNC_SUBDIR%%/_arg_compile
+%%ZSHFUNC_SUBDIR%%/_arguments
+%%ZSHFUNC_SUBDIR%%/_arp
+%%ZSHFUNC_SUBDIR%%/_arrays
+%%ZSHFUNC_SUBDIR%%/_autoload
+%%ZSHFUNC_SUBDIR%%/_bash_completions
+%%ZSHFUNC_SUBDIR%%/_bindkey
+%%ZSHFUNC_SUBDIR%%/_bison
+%%ZSHFUNC_SUBDIR%%/_brace_parameter
+%%ZSHFUNC_SUBDIR%%/_bsd_pkg
+%%ZSHFUNC_SUBDIR%%/_bug
+%%ZSHFUNC_SUBDIR%%/_builtin
+%%ZSHFUNC_SUBDIR%%/_bzip2
+%%ZSHFUNC_SUBDIR%%/_cache_invalid
+%%ZSHFUNC_SUBDIR%%/_call_function
+%%ZSHFUNC_SUBDIR%%/_call_program
+%%ZSHFUNC_SUBDIR%%/_cd
+%%ZSHFUNC_SUBDIR%%/_chown
+%%ZSHFUNC_SUBDIR%%/_combination
+%%ZSHFUNC_SUBDIR%%/_command
+%%ZSHFUNC_SUBDIR%%/_command_names
+%%ZSHFUNC_SUBDIR%%/_compdef
+%%ZSHFUNC_SUBDIR%%/_complete
+%%ZSHFUNC_SUBDIR%%/_complete_debug
+%%ZSHFUNC_SUBDIR%%/_complete_help
+%%ZSHFUNC_SUBDIR%%/_complete_tag
+%%ZSHFUNC_SUBDIR%%/_compress
+%%ZSHFUNC_SUBDIR%%/_condition
+%%ZSHFUNC_SUBDIR%%/_configure
+%%ZSHFUNC_SUBDIR%%/_contexts
+%%ZSHFUNC_SUBDIR%%/_correct
+%%ZSHFUNC_SUBDIR%%/_correct_filename
+%%ZSHFUNC_SUBDIR%%/_correct_word
+%%ZSHFUNC_SUBDIR%%/_cpio
+%%ZSHFUNC_SUBDIR%%/_cvs
+%%ZSHFUNC_SUBDIR%%/_cvsup
+%%ZSHFUNC_SUBDIR%%/_dd
+%%ZSHFUNC_SUBDIR%%/_deb_packages
+%%ZSHFUNC_SUBDIR%%/_default
+%%ZSHFUNC_SUBDIR%%/_describe
+%%ZSHFUNC_SUBDIR%%/_description
+%%ZSHFUNC_SUBDIR%%/_dict
+%%ZSHFUNC_SUBDIR%%/_dict_words
+%%ZSHFUNC_SUBDIR%%/_diff
+%%ZSHFUNC_SUBDIR%%/_diff_options
+%%ZSHFUNC_SUBDIR%%/_dir_list
+%%ZSHFUNC_SUBDIR%%/_directories
+%%ZSHFUNC_SUBDIR%%/_directory_stack
+%%ZSHFUNC_SUBDIR%%/_disable
+%%ZSHFUNC_SUBDIR%%/_domains
+%%ZSHFUNC_SUBDIR%%/_dpkg
+%%ZSHFUNC_SUBDIR%%/_dpkg_source
+%%ZSHFUNC_SUBDIR%%/_dupload
+%%ZSHFUNC_SUBDIR%%/_dvi
+%%ZSHFUNC_SUBDIR%%/_echotc
+%%ZSHFUNC_SUBDIR%%/_echoti
+%%ZSHFUNC_SUBDIR%%/_elm
+%%ZSHFUNC_SUBDIR%%/_emulate
+%%ZSHFUNC_SUBDIR%%/_enable
+%%ZSHFUNC_SUBDIR%%/_enscript
+%%ZSHFUNC_SUBDIR%%/_equal
+%%ZSHFUNC_SUBDIR%%/_expand
+%%ZSHFUNC_SUBDIR%%/_expand_alias
+%%ZSHFUNC_SUBDIR%%/_expand_word
+%%ZSHFUNC_SUBDIR%%/_fakeroot
+%%ZSHFUNC_SUBDIR%%/_fc
+%%ZSHFUNC_SUBDIR%%/_fetchmail
+%%ZSHFUNC_SUBDIR%%/_file_descriptors
+%%ZSHFUNC_SUBDIR%%/_files
+%%ZSHFUNC_SUBDIR%%/_find
+%%ZSHFUNC_SUBDIR%%/_finger
+%%ZSHFUNC_SUBDIR%%/_first
+%%ZSHFUNC_SUBDIR%%/_flex
+%%ZSHFUNC_SUBDIR%%/_floppy
+%%ZSHFUNC_SUBDIR%%/_functions
+%%ZSHFUNC_SUBDIR%%/_gcc
+%%ZSHFUNC_SUBDIR%%/_gdb
+%%ZSHFUNC_SUBDIR%%/_generic
+%%ZSHFUNC_SUBDIR%%/_getconf
+%%ZSHFUNC_SUBDIR%%/_gnu_generic
+%%ZSHFUNC_SUBDIR%%/_gprof
+%%ZSHFUNC_SUBDIR%%/_grep
+%%ZSHFUNC_SUBDIR%%/_groups
+%%ZSHFUNC_SUBDIR%%/_gs
+%%ZSHFUNC_SUBDIR%%/_guard
+%%ZSHFUNC_SUBDIR%%/_gv
+%%ZSHFUNC_SUBDIR%%/_gzip
+%%ZSHFUNC_SUBDIR%%/_hash
+%%ZSHFUNC_SUBDIR%%/_history
+%%ZSHFUNC_SUBDIR%%/_history_complete_word
+%%ZSHFUNC_SUBDIR%%/_hosts
+%%ZSHFUNC_SUBDIR%%/_iconv
+%%ZSHFUNC_SUBDIR%%/_ignored
+%%ZSHFUNC_SUBDIR%%/_imagemagick
+%%ZSHFUNC_SUBDIR%%/_in_vared
+%%ZSHFUNC_SUBDIR%%/_init_d
+%%ZSHFUNC_SUBDIR%%/_ispell
+%%ZSHFUNC_SUBDIR%%/_java
+%%ZSHFUNC_SUBDIR%%/_jobs
+%%ZSHFUNC_SUBDIR%%/_jobs_bg
+%%ZSHFUNC_SUBDIR%%/_jobs_builtin
+%%ZSHFUNC_SUBDIR%%/_jobs_fg
+%%ZSHFUNC_SUBDIR%%/_joe
+%%ZSHFUNC_SUBDIR%%/_kill
+%%ZSHFUNC_SUBDIR%%/_killall
+%%ZSHFUNC_SUBDIR%%/_kld
+%%ZSHFUNC_SUBDIR%%/_limits
+%%ZSHFUNC_SUBDIR%%/_list
+%%ZSHFUNC_SUBDIR%%/_loadkeys
+%%ZSHFUNC_SUBDIR%%/_logical_volumes
+%%ZSHFUNC_SUBDIR%%/_look
+%%ZSHFUNC_SUBDIR%%/_lp
+%%ZSHFUNC_SUBDIR%%/_ls
+%%ZSHFUNC_SUBDIR%%/_lscfg
+%%ZSHFUNC_SUBDIR%%/_lsdev
+%%ZSHFUNC_SUBDIR%%/_lslv
+%%ZSHFUNC_SUBDIR%%/_lspv
+%%ZSHFUNC_SUBDIR%%/_lsvg
+%%ZSHFUNC_SUBDIR%%/_lynx
+%%ZSHFUNC_SUBDIR%%/_lzop
+%%ZSHFUNC_SUBDIR%%/_mail
+%%ZSHFUNC_SUBDIR%%/_mailboxes
+%%ZSHFUNC_SUBDIR%%/_main_complete
+%%ZSHFUNC_SUBDIR%%/_make
+%%ZSHFUNC_SUBDIR%%/_man
+%%ZSHFUNC_SUBDIR%%/_match
+%%ZSHFUNC_SUBDIR%%/_math
+%%ZSHFUNC_SUBDIR%%/_menu
+%%ZSHFUNC_SUBDIR%%/_mere
+%%ZSHFUNC_SUBDIR%%/_message
+%%ZSHFUNC_SUBDIR%%/_mh
+%%ZSHFUNC_SUBDIR%%/_modutils
+%%ZSHFUNC_SUBDIR%%/_most_recent_file
+%%ZSHFUNC_SUBDIR%%/_mount
+%%ZSHFUNC_SUBDIR%%/_multi_parts
+%%ZSHFUNC_SUBDIR%%/_mutt
+%%ZSHFUNC_SUBDIR%%/_my_accounts
+%%ZSHFUNC_SUBDIR%%/_mysql_utils
+%%ZSHFUNC_SUBDIR%%/_ncftp
+%%ZSHFUNC_SUBDIR%%/_nedit
+%%ZSHFUNC_SUBDIR%%/_netscape
+%%ZSHFUNC_SUBDIR%%/_newsgroups
+%%ZSHFUNC_SUBDIR%%/_next_label
+%%ZSHFUNC_SUBDIR%%/_next_tags
+%%ZSHFUNC_SUBDIR%%/_normal
+%%ZSHFUNC_SUBDIR%%/_nothing
+%%ZSHFUNC_SUBDIR%%/_nslookup
+%%ZSHFUNC_SUBDIR%%/_object_classes
+%%ZSHFUNC_SUBDIR%%/_oldlist
+%%ZSHFUNC_SUBDIR%%/_options
+%%ZSHFUNC_SUBDIR%%/_options_set
+%%ZSHFUNC_SUBDIR%%/_options_unset
+%%ZSHFUNC_SUBDIR%%/_other_accounts
+%%ZSHFUNC_SUBDIR%%/_pack
+%%ZSHFUNC_SUBDIR%%/_parameter
+%%ZSHFUNC_SUBDIR%%/_parameters
+%%ZSHFUNC_SUBDIR%%/_patch
+%%ZSHFUNC_SUBDIR%%/_path_files
+%%ZSHFUNC_SUBDIR%%/_pbm
+%%ZSHFUNC_SUBDIR%%/_pdf
+%%ZSHFUNC_SUBDIR%%/_perl
+%%ZSHFUNC_SUBDIR%%/_perl_basepods
+%%ZSHFUNC_SUBDIR%%/_perl_builtin_funcs
+%%ZSHFUNC_SUBDIR%%/_perl_modules
+%%ZSHFUNC_SUBDIR%%/_perldoc
+%%ZSHFUNC_SUBDIR%%/_physical_volumes
+%%ZSHFUNC_SUBDIR%%/_pids
+%%ZSHFUNC_SUBDIR%%/_pine
+%%ZSHFUNC_SUBDIR%%/_ports
+%%ZSHFUNC_SUBDIR%%/_prcs
+%%ZSHFUNC_SUBDIR%%/_precommand
+%%ZSHFUNC_SUBDIR%%/_prefix
+%%ZSHFUNC_SUBDIR%%/_print
+%%ZSHFUNC_SUBDIR%%/_printers
+%%ZSHFUNC_SUBDIR%%/_prompt
+%%ZSHFUNC_SUBDIR%%/_ps
+%%ZSHFUNC_SUBDIR%%/_pspdf
+%%ZSHFUNC_SUBDIR%%/_psutils
+%%ZSHFUNC_SUBDIR%%/_rcs
+%%ZSHFUNC_SUBDIR%%/_read
+%%ZSHFUNC_SUBDIR%%/_read_comp
+%%ZSHFUNC_SUBDIR%%/_redirect
+%%ZSHFUNC_SUBDIR%%/_regex_arguments
+%%ZSHFUNC_SUBDIR%%/_requested
+%%ZSHFUNC_SUBDIR%%/_retrieve_cache
+%%ZSHFUNC_SUBDIR%%/_rlogin
+%%ZSHFUNC_SUBDIR%%/_rpm
+%%ZSHFUNC_SUBDIR%%/_ruby
+%%ZSHFUNC_SUBDIR%%/_sched
+%%ZSHFUNC_SUBDIR%%/_sep_parts
+%%ZSHFUNC_SUBDIR%%/_set
+%%ZSHFUNC_SUBDIR%%/_setopt
+%%ZSHFUNC_SUBDIR%%/_setup
+%%ZSHFUNC_SUBDIR%%/_sh
+%%ZSHFUNC_SUBDIR%%/_signals
+%%ZSHFUNC_SUBDIR%%/_slrn
+%%ZSHFUNC_SUBDIR%%/_smit
+%%ZSHFUNC_SUBDIR%%/_socket
+%%ZSHFUNC_SUBDIR%%/_source
+%%ZSHFUNC_SUBDIR%%/_ssh
+%%ZSHFUNC_SUBDIR%%/_stat
+%%ZSHFUNC_SUBDIR%%/_store_cache
+%%ZSHFUNC_SUBDIR%%/_strip
+%%ZSHFUNC_SUBDIR%%/_stty
+%%ZSHFUNC_SUBDIR%%/_su
+%%ZSHFUNC_SUBDIR%%/_sub_commands
+%%ZSHFUNC_SUBDIR%%/_subscript
+%%ZSHFUNC_SUBDIR%%/_sudo
+%%ZSHFUNC_SUBDIR%%/_tags
+%%ZSHFUNC_SUBDIR%%/_tar
+%%ZSHFUNC_SUBDIR%%/_tar_archive
+%%ZSHFUNC_SUBDIR%%/_telnet
+%%ZSHFUNC_SUBDIR%%/_tex
+%%ZSHFUNC_SUBDIR%%/_texi
+%%ZSHFUNC_SUBDIR%%/_tiff
+%%ZSHFUNC_SUBDIR%%/_tilde
+%%ZSHFUNC_SUBDIR%%/_tilde_files
+%%ZSHFUNC_SUBDIR%%/_tin
+%%ZSHFUNC_SUBDIR%%/_trap
+%%ZSHFUNC_SUBDIR%%/_ttyctl
+%%ZSHFUNC_SUBDIR%%/_typeset
+%%ZSHFUNC_SUBDIR%%/_ulimit
+%%ZSHFUNC_SUBDIR%%/_unhash
+%%ZSHFUNC_SUBDIR%%/_unsetopt
+%%ZSHFUNC_SUBDIR%%/_update-alternatives
+%%ZSHFUNC_SUBDIR%%/_urls
+%%ZSHFUNC_SUBDIR%%/_user_at_host
+%%ZSHFUNC_SUBDIR%%/_users
+%%ZSHFUNC_SUBDIR%%/_users_on
+%%ZSHFUNC_SUBDIR%%/_value
+%%ZSHFUNC_SUBDIR%%/_values
+%%ZSHFUNC_SUBDIR%%/_vared
+%%ZSHFUNC_SUBDIR%%/_vars
+%%ZSHFUNC_SUBDIR%%/_vnc
+%%ZSHFUNC_SUBDIR%%/_volume_groups
+%%ZSHFUNC_SUBDIR%%/_w3m
+%%ZSHFUNC_SUBDIR%%/_wait
+%%ZSHFUNC_SUBDIR%%/_wanted
+%%ZSHFUNC_SUBDIR%%/_webbrowser
+%%ZSHFUNC_SUBDIR%%/_wget
+%%ZSHFUNC_SUBDIR%%/_whereis
+%%ZSHFUNC_SUBDIR%%/_which
+%%ZSHFUNC_SUBDIR%%/_whois
+%%ZSHFUNC_SUBDIR%%/_x_arguments
+%%ZSHFUNC_SUBDIR%%/_x_borderwidth
+%%ZSHFUNC_SUBDIR%%/_x_color
+%%ZSHFUNC_SUBDIR%%/_x_colormapid
+%%ZSHFUNC_SUBDIR%%/_x_cursor
+%%ZSHFUNC_SUBDIR%%/_x_display
+%%ZSHFUNC_SUBDIR%%/_x_extension
+%%ZSHFUNC_SUBDIR%%/_x_font
+%%ZSHFUNC_SUBDIR%%/_x_geometry
+%%ZSHFUNC_SUBDIR%%/_x_keysym
+%%ZSHFUNC_SUBDIR%%/_x_locale
+%%ZSHFUNC_SUBDIR%%/_x_modifier
+%%ZSHFUNC_SUBDIR%%/_x_name
+%%ZSHFUNC_SUBDIR%%/_x_resource
+%%ZSHFUNC_SUBDIR%%/_x_selection_timeout
+%%ZSHFUNC_SUBDIR%%/_x_title
+%%ZSHFUNC_SUBDIR%%/_x_utils
+%%ZSHFUNC_SUBDIR%%/_x_window
+%%ZSHFUNC_SUBDIR%%/_xargs
+%%ZSHFUNC_SUBDIR%%/_xauth
+%%ZSHFUNC_SUBDIR%%/_xdvi
+%%ZSHFUNC_SUBDIR%%/_xfig
+%%ZSHFUNC_SUBDIR%%/_xmodmap
+%%ZSHFUNC_SUBDIR%%/_xrdb
+%%ZSHFUNC_SUBDIR%%/_xset
+%%ZSHFUNC_SUBDIR%%/_xt_arguments
+%%ZSHFUNC_SUBDIR%%/_xt_session_id
+%%ZSHFUNC_SUBDIR%%/_xterm
+%%ZSHFUNC_SUBDIR%%/_xv
+%%ZSHFUNC_SUBDIR%%/_xwit
+%%ZSHFUNC_SUBDIR%%/_yodl
+%%ZSHFUNC_SUBDIR%%/_yp
+%%ZSHFUNC_SUBDIR%%/_zcat
+%%ZSHFUNC_SUBDIR%%/_zcompile
+%%ZSHFUNC_SUBDIR%%/_zdump
+%%ZSHFUNC_SUBDIR%%/_zed
+%%ZSHFUNC_SUBDIR%%/_zftp
+%%ZSHFUNC_SUBDIR%%/_zip
+%%ZSHFUNC_SUBDIR%%/_zle
+%%ZSHFUNC_SUBDIR%%/_zmodload
+%%ZSHFUNC_SUBDIR%%/_zpty
+%%ZSHFUNC_SUBDIR%%/_zstyle
+%%ZSHFUNC_SUBDIR%%/allopt
+%%ZSHFUNC_SUBDIR%%/checkmail
+%%ZSHFUNC_SUBDIR%%/colors
+%%ZSHFUNC_SUBDIR%%/compaudit
+%%ZSHFUNC_SUBDIR%%/compdump
+%%ZSHFUNC_SUBDIR%%/compinit
+%%ZSHFUNC_SUBDIR%%/compinstall
+%%ZSHFUNC_SUBDIR%%/cycle-completion-positions
+%%ZSHFUNC_SUBDIR%%/edit-command-line
+%%ZSHFUNC_SUBDIR%%/getjobs
+%%ZSHFUNC_SUBDIR%%/harden
+%%ZSHFUNC_SUBDIR%%/history-search-end
+%%ZSHFUNC_SUBDIR%%/incarg
+%%ZSHFUNC_SUBDIR%%/incremental-complete-word
+%%ZSHFUNC_SUBDIR%%/insert-files
+%%ZSHFUNC_SUBDIR%%/is-at-least
+%%ZSHFUNC_SUBDIR%%/mere
+%%ZSHFUNC_SUBDIR%%/nslookup
+%%ZSHFUNC_SUBDIR%%/predict-on
+%%ZSHFUNC_SUBDIR%%/prompt_adam1_setup
+%%ZSHFUNC_SUBDIR%%/prompt_adam2_setup
+%%ZSHFUNC_SUBDIR%%/prompt_bart_setup
+%%ZSHFUNC_SUBDIR%%/prompt_bigfade_setup
+%%ZSHFUNC_SUBDIR%%/prompt_clint_setup
+%%ZSHFUNC_SUBDIR%%/prompt_elite2_setup
+%%ZSHFUNC_SUBDIR%%/prompt_elite_setup
+%%ZSHFUNC_SUBDIR%%/prompt_fade_setup
+%%ZSHFUNC_SUBDIR%%/prompt_fire_setup
+%%ZSHFUNC_SUBDIR%%/prompt_off_setup
+%%ZSHFUNC_SUBDIR%%/prompt_oliver_setup
+%%ZSHFUNC_SUBDIR%%/prompt_redhat_setup
+%%ZSHFUNC_SUBDIR%%/prompt_suse_setup
+%%ZSHFUNC_SUBDIR%%/prompt_zefram_setup
+%%ZSHFUNC_SUBDIR%%/promptinit
+%%ZSHFUNC_SUBDIR%%/promptnl
+%%ZSHFUNC_SUBDIR%%/run-help
+%%ZSHFUNC_SUBDIR%%/smart-insert-last-word
+%%ZSHFUNC_SUBDIR%%/zed
+%%NO_STATIC%%%%ZSHFUNC_SUBDIR%%/zfanon
+%%NO_STATIC%%%%ZSHFUNC_SUBDIR%%/zfautocheck
+%%NO_STATIC%%%%ZSHFUNC_SUBDIR%%/zfcd
+%%NO_STATIC%%%%ZSHFUNC_SUBDIR%%/zfcd_match
+%%NO_STATIC%%%%ZSHFUNC_SUBDIR%%/zfcget
+%%NO_STATIC%%%%ZSHFUNC_SUBDIR%%/zfclose
+%%NO_STATIC%%%%ZSHFUNC_SUBDIR%%/zfcput
+%%NO_STATIC%%%%ZSHFUNC_SUBDIR%%/zfdir
+%%NO_STATIC%%%%ZSHFUNC_SUBDIR%%/zffcache
+%%NO_STATIC%%%%ZSHFUNC_SUBDIR%%/zfgcp
+%%NO_STATIC%%%%ZSHFUNC_SUBDIR%%/zfget
+%%NO_STATIC%%%%ZSHFUNC_SUBDIR%%/zfget_match
+%%NO_STATIC%%%%ZSHFUNC_SUBDIR%%/zfgoto
+%%NO_STATIC%%%%ZSHFUNC_SUBDIR%%/zfhere
+%%NO_STATIC%%%%ZSHFUNC_SUBDIR%%/zfinit
+%%NO_STATIC%%%%ZSHFUNC_SUBDIR%%/zfls
+%%NO_STATIC%%%%ZSHFUNC_SUBDIR%%/zfmark
+%%NO_STATIC%%%%ZSHFUNC_SUBDIR%%/zfopen
+%%NO_STATIC%%%%ZSHFUNC_SUBDIR%%/zfparams
+%%NO_STATIC%%%%ZSHFUNC_SUBDIR%%/zfpcp
+%%NO_STATIC%%%%ZSHFUNC_SUBDIR%%/zfput
+%%NO_STATIC%%%%ZSHFUNC_SUBDIR%%/zfrglob
+%%NO_STATIC%%%%ZSHFUNC_SUBDIR%%/zfrtime
+%%NO_STATIC%%%%ZSHFUNC_SUBDIR%%/zfsession
+%%NO_STATIC%%%%ZSHFUNC_SUBDIR%%/zfstat
+%%NO_STATIC%%%%ZSHFUNC_SUBDIR%%/zftp_chpwd
+%%NO_STATIC%%%%ZSHFUNC_SUBDIR%%/zftp_progress
+%%NO_STATIC%%%%ZSHFUNC_SUBDIR%%/zftransfer
+%%NO_STATIC%%%%ZSHFUNC_SUBDIR%%/zftype
+%%NO_STATIC%%%%ZSHFUNC_SUBDIR%%/zfuget
+%%NO_STATIC%%%%ZSHFUNC_SUBDIR%%/zfuput
+%%ZSHFUNC_SUBDIR%%/zkbd
+%%ZSHFUNC_SUBDIR%%/zmv
+%%ZSHFUNC_SUBDIR%%/zrecompile
+%%ZSHFUNC_SUBDIR%%/zstyle+
+@exec mkdir %D/share/zsh/site-functions
+%%NO_STATIC%%@dirrm lib/zsh/%%ZSH_VER%%/zsh
+%%NO_STATIC%%@dirrm lib/zsh/%%ZSH_VER%%
+%%NO_STATIC%%@dirrm lib/zsh
+@dirrm %%ZSHFUNC_SUBDIR%%
+@dirrm share/zsh/%%ZSH_VER%%
+@dirrm share/zsh/site-functions
+@dirrm share/zsh