6 files changed, 233 insertions, 323 deletions

diff --git a/shells/zsh-devel/Makefile b/shells/zsh-devel/Makefile
index 895f550497f2..2a95d6b4a5ca 100644
--- a/shells/zsh-devel/Makefile
+++ b/shells/zsh-devel/Makefile
@@ -6,22 +6,17 @@
 #
 
 PORTNAME=	zsh
-PORTVERSION=	3.1.9
+PORTVERSION=	${ZSH_VER}.dev${ZSH_DEV_REV}
 CATEGORIES=	shells
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
-		${MASTER_SITE_LOCAL} \
-		ftp://ftp.zsh.org/%SUBDIR%/ \
+MASTER_SITES=	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%/
-# last one for ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	${PORTNAME} knu
-DISTNAME=	${PORTNAME}-${ZSH_VER}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		${ZSHFUNC_FILES}
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+MASTER_SITE_SUBDIR=	${PORTNAME}/development
+
+DISTNAME=	${PORTNAME}-${ZSH_VER}-dev-${ZSH_DEV_REV}
 
 MAINTAINER=	shige@FreeBSD.org
 
@@ -29,26 +24,36 @@ FORBIDDEN=	"The main zsh port (ports/shells/zsh) has been upgraded to 4.x.  It i
 
 USE_AUTOCONF=	yes
 
-ZSH_VER=	${PORTVERSION}
-ZSHFUNC_FILES=	zsh-functions-freebsd-2000.09.06.tar.gz
-ZSHFUNC_SUBDIR=	share/zsh/${ZSH_VER}/functions
+ZSH_VER=	4.1.0
+ZSH_DEV_REV=	4
+ZSHFUNC_SUBDIR=	share/zsh/${ZSH_VER}-dev-${ZSH_DEV_REV}/functions
 NO_LATEST_LINK=	yes
+
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-zsh-mem --enable-zsh-secure-free --enable-dynamic
-INSTALL_TARGET=	install install.info
+CONFIGURE_ARGS= --enable-zsh-mem --enable-zsh-secure-free --enable-dynamic \
+		--enable-maildir-support
+
+.if !defined(NOPORTDOCS)
+INSTALL_TARGET= install install.info
+.endif
+
 MAN1=		zsh.1 zshbuiltins.1 zshcompctl.1 zshexpn.1 zshmisc.1 \
 		zshoptions.1 zshall.1 zshparam.1 zshzle.1 zshmodules.1 \
 		zshzftpsys.1 zshcompsys.1 zshcompwid.1
-PLIST_SUB=	ZSH_VER="${ZSH_VER}" ZSHFUNC_SUBDIR="${ZSHFUNC_SUBDIR}"
 
-# If you want to build a static binary, uncomment the following line
-#LDFLAGS+=-static
+PLIST_SUB=	ZSH_VER="${ZSH_VER}-dev-${ZSH_DEV_REV}" \
+		ZSHFUNC_SUBDIR="${ZSHFUNC_SUBDIR}"
+
+.if defined(WANT_STATIC)
+CONFIGURE_ENV+=	"LDFLAGS=-static"
+PLIST_SUB+=	NO_STATIC="@comment "
+.else
+PLIST_SUB+=	NO_STATIC=""
+.endif
 
-post-extract:
-	@${MKDIR} ${WRKDIR}/functions
-	@for i in ${ZSHFUNC_FILES} ; do \
-		${TAR} zxf ${DISTDIR}/$${i} -C ${WRKDIR}/functions ;\
-	done
+post-patch:
+	@${PERL} -pi -e 's!\$\(htmldir\)!\$\(prefix\)/share/doc/zsh!' \
+		${WRKSRC}/Doc/Makefile.in
 
 post-build:
 # Fix ".so" macro problem by using "soelim" command.
@@ -60,16 +65,18 @@ post-build:
 		${RM} -f ./man1/zshall.1 ; \
 		/usr/bin/soelim ./man1/zshall.1.source > ./man1/zshall.1 ; \
 	)
-	@cd ${WRKSRC}/Doc && ${MAKE} info
 
 post-install:
-	@${INSTALL_DATA} ${WRKDIR}/functions/* ${PREFIX}/${ZSHFUNC_SUBDIR}
-	@${INSTALL_DATA} ${WRKSRC}/Doc/zsh.info ${PREFIX}/info
+	@${MKDIR} ${PREFIX}/share/examples/zsh
+.for file in zlogin zshenv zshrc
+	${INSTALL_DATA} ${WRKSRC}/StartupFiles/${file} \
+		${PREFIX}/share/examples/zsh
+.endfor
 	@install-info ${PREFIX}/info/zsh.info ${PREFIX}/info/dir
 	@${ECHO} "Updating /etc/shells"
 	@${CP} /etc/shells /etc/shells.bak
 	@(${GREP} -v ${PREFIX}/bin/zsh /etc/shells.bak; \
-	  ${ECHO_CMD} ${PREFIX}/bin/zsh) > /etc/shells
+		${ECHO_CMD} ${PREFIX}/bin/zsh) > /etc/shells
 	@${RM} /etc/shells.bak
 
 .include <bsd.port.mk>
diff --git a/shells/zsh-devel/distinfo b/shells/zsh-devel/distinfo
index 618726bdfe87..07232f1ef08d 100644
--- a/shells/zsh-devel/distinfo
+++ b/shells/zsh-devel/distinfo
@@ -1,2 +1 @@
-MD5 (zsh-3.1.9.tar.gz) = b69ed3f04d2a3eb676f8d2ace562270a
-MD5 (zsh-functions-freebsd-2000.09.06.tar.gz) = 88b64a5216dbff1c122fb21de83efed1
+MD5 (zsh-4.1.0-dev-4.tar.gz) = 1f3972797bdc33e9bf564126204be96c
diff --git a/shells/zsh-devel/files/patch-aa b/shells/zsh-devel/files/patch-aa
deleted file mode 100644
index 0899f82e9386..000000000000
--- a/shells/zsh-devel/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 @@
- 
- @DEFS_MK@
- 
--MAKEINFO = makeinfo
-+MAKEINFO = makeinfo --no-split
- TEXI2DVI = texi2dvi
- DVIPS = dvips
- TEXI2HTML = texi2html -expandinfo -split_chapter
diff --git a/shells/zsh-devel/files/patch-ab b/shells/zsh-devel/files/patch-ab
deleted file mode 100644
index 6c3ef316a228..000000000000
--- a/shells/zsh-devel/files/patch-ab
+++ /dev/null
@@ -1,165 +0,0 @@
---- Doc/zsh.texi.orig	Tue May 30 18:17:46 2000
-+++ Doc/zsh.texi	Thu Jun  1 00:17:04 2000
-@@ -7,6 +7,10 @@
- @end iftex
- @setfilename zsh.info
- @settitle zsh
-+@dircategory Shells
-+@direntry
-+* Zsh: (zsh).			The Z shell.
-+@end direntry
- @c %**end of header
- 
- @ifinfo
-@@ -1185,14 +1189,14 @@
- string by using the `@t{\'}' escape.
- 
- @noindent
--All characters enclosed between a pair of single quotes (@t{@value{dsq}}) that
-+All characters enclosed between a pair of single quotes (@t{'}@t{'}) that
- is not preceded by a `@t{$}' are quoted.  A single quote cannot appear
- within single quotes unless the option @t{RC_QUOTES} is set, in which case
- a pair of single quotes are turned into a single quote.  For example,
- 
- @noindent
- @example
--print @value{dsq}@value{dsq}
-+print @t{'}@t{'}@t{'}@t{'}
- @end example
- 
- @noindent
-@@ -2674,7 +2678,7 @@
- A history expansion begins with the first character of the @t{histchars}
- parameter, which is `@t{!}' by default, and may occur anywhere on the
- command line; history expansions do not nest.  The `@t{!}' can be escaped
--with `@t{\}' or can be enclosed between a pair of single quotes (@t{@value{dsq}})
-+with `@t{\}' or can be enclosed between a pair of single quotes (@t{'}@t{'})
- to suppress its special meaning.  Double quotes will @emph{not} work for
- this.  Following this history character is an optional event designator
- (@ref{Event Designators}) and then an optional word
-@@ -6271,7 +6275,7 @@
- @example
- unsetopt localtraps
- trap - INT
--fn() @{ setopt localtraps; trap @value{dsq} INT; sleep 3; @}
-+fn() @{ setopt localtraps; trap @t{'}@t{'} INT; sleep 3; @}
- @end example
- 
- @noindent
-@@ -6500,7 +6504,7 @@
- @cindex rc, quoting style
- @cindex quoting style, rc
- @item @t{RC_QUOTES}
--Allow the character sequence `@t{@value{dsq}}' to signify a single quote
-+Allow the character sequence `@t{'}@t{'}' to signify a single quote
- within singly quoted strings.  Note this does not apply in quoted strings
- using the format @t{$'}@var{...}@t{'}, where a backslashed single quote can
- be used.
-@@ -9528,7 +9532,7 @@
- @item @t{quote-line} (ESC-') (unbound) (unbound)
- Quote the current line; that is, put a `@t{'}' character at the
- beginning and the end, and convert all `@t{'}' characters
--to `@t{'\@value{dsq}}'.
-+to `@t{'\}@t{'}@t{'}'.
- 
- @tindex quote-region
- @item @t{quote-region} (ESC-") (unbound) (unbound)
-@@ -12350,7 +12354,7 @@
- 
- @noindent
- @example
--zstyle ':completion:*' group-name @value{dsq}
-+zstyle ':completion:*' group-name @t{'}@t{'}
- @end example
- 
- @noindent
-@@ -12583,7 +12587,7 @@
- 
- @noindent
- The default colors are the same as for the GNU @t{ls} command and can be
--obtained by setting the style to an empty string (i.e. @t{@value{dsq}}).
-+obtained by setting the style to an empty string (i.e. @t{'}@t{'}).
- 
- @kindex list-packed, completion style
- @item @t{list-packed}
-@@ -12663,7 +12667,7 @@
- 
- @noindent
- @example
--zstyle ':completion:*' matcher-list @value{dsq} 'm:@{a-zA-Z@}=@{A-Za-z@}'
-+zstyle ':completion:*' matcher-list @t{'}@t{'} 'm:@{a-zA-Z@}=@{A-Za-z@}'
- @end example
- 
- @noindent
-@@ -12677,7 +12681,7 @@
- @example
- zstyle ':completion:*' completer _complete _prefix
- zstyle ':completion:*:complete:*' matcher-list \ 
--       @value{dsq} 'm:@{a-zA-Z@}=@{A-Za-z@}'
-+       @t{'}@t{'} 'm:@{a-zA-Z@}=@{A-Za-z@}'
- @end example
- 
- @noindent
-@@ -12695,7 +12699,7 @@
- @example
- zstyle ':completion:*' completer _complete _correct _complete:foo
- zstyle ':completion:*:complete:*' matcher-list \ 
--    @value{dsq} 'm:@{a-zA-Z@}=@{A-Za-z@}'
-+    @t{'}@t{'} 'm:@{a-zA-Z@}=@{A-Za-z@}'
- zstyle ':completion:*:foo:*' matcher-list \ 
-     'm:@{a-zA-Z@}=@{A-Za-z@} r:|[-_./]=* r:|=*'
- @end example
-@@ -15380,7 +15384,7 @@
- 
- @noindent
- @example
--compctl -M @value{dsq} 'm:@{a-zA-Z@}=@{A-Za-z@}'
-+compctl -M @t{'}@t{'} 'm:@{a-zA-Z@}=@{A-Za-z@}'
- @end example
- 
- @noindent
-@@ -15591,7 +15595,7 @@
- 
- @noindent
- @example
--compctl -D -f + -H 0 @value{dsq}
-+compctl -D -f + -H 0 @t{'}@t{'}
- @end example
- 
- @noindent
-@@ -15679,7 +15683,7 @@
- 
- @noindent
- @example
--compctl -x 'r[-exec,;]' -l @value{dsq} -- find
-+compctl -x 'r[-exec,;]' -l @t{'}@t{'} -- find
- @end example
- 
- @noindent
-@@ -16740,7 +16744,7 @@
- paranoid behaviour, intended to avoid security problems involving
- a @t{chown} being tricked into affecting files other than the ones
- intended.  It will refuse to follow symbolic links, so that (for example)
--``@t{chown luser /tmp/foo/passwd}@value{dsq} can't accidentally chown @t{/etc/passwd}
-+``@t{chown luser /tmp/foo/passwd}@t{'}@t{'} can't accidentally chown @t{/etc/passwd}
- if @t{/tmp/foo} happens to be a link to @t{/etc}.  It will also check
- where it is after leaving directories, so that a recursive chown of
- a deep directory tree can't end up recursively chowning @t{/usr} as
-@@ -16831,7 +16835,7 @@
- paranoid behaviour, intended to avoid common security problems involving
- a root-run @t{rm} being tricked into removing files other than the ones
- intended.  It will refuse to follow symbolic links, so that (for example)
--``@t{rm /tmp/foo/passwd}@value{dsq} can't accidentally remove @t{/etc/passwd}
-+``@t{rm /tmp/foo/passwd}@t{'}@t{'} can't accidentally remove @t{/etc/passwd}
- if @t{/tmp/foo} happens to be a link to @t{/etc}.  It will also check
- where it is after leaving directories, so that a recursive removal of
- a deep directory tree can't end up recursively removing @t{/usr} as
-@@ -17231,7 +17235,7 @@
- @item @t{link}
- If the file is a link and the @t{-L} option is in
- effect, this contains the name of the file linked to, otherwise
--it is empty.  Note that if this element is selected (``@t{stat +link}@value{dsq})
-+it is empty.  Note that if this element is selected (``@t{stat +link}@t{'}@t{'})
- then the @t{-L} option is automatically used.
- 
- @end table
diff --git a/shells/zsh-devel/files/patch-ad b/shells/zsh-devel/files/patch-ad
deleted file mode 100644
index f4ed01b0ada3..000000000000
--- a/shells/zsh-devel/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	Wed May  3 03:01:17 2000
-+++ configure.in	Wed May 17 21:34:02 2000
-@@ -1489,7 +1489,7 @@
-   esac
-   case "$host" in
-     *-hpux*)  EXTRA_LDFLAGS="${EXTRA_LDFLAGS=-Wl,-E}" ;;
--    *-freebsd3*|*-freebsd4*|*-linux*) EXTRA_LDFLAGS="${EXTRA_LDFLAGS=-rdynamic}" ;;
-+    *-freebsd[3-9]*|*-linux*) EXTRA_LDFLAGS="${EXTRA_LDFLAGS=-rdynamic}" ;;
-     mips-sni-sysv4)
-       #
-       # unfortunately, we have different compilers
diff --git a/shells/zsh-devel/pkg-plist b/shells/zsh-devel/pkg-plist
index 895ffe42ec00..6545da63e05d 100644
--- a/shells/zsh-devel/pkg-plist
+++ b/shells/zsh-devel/pkg-plist
@@ -1,78 +1,99 @@
 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
+@exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells; rm -f /etc/shells.bak
+@unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak
 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
-lib/zsh/libzsh-%%ZSH_VER%%.so
-lib/zsh/%%ZSH_VER%%/cap.so
-lib/zsh/%%ZSH_VER%%/clone.so
-lib/zsh/%%ZSH_VER%%/compctl.so
-lib/zsh/%%ZSH_VER%%/complete.so
-lib/zsh/%%ZSH_VER%%/complist.so
-lib/zsh/%%ZSH_VER%%/computil.so
-lib/zsh/%%ZSH_VER%%/deltochar.so
-lib/zsh/%%ZSH_VER%%/example.so
-lib/zsh/%%ZSH_VER%%/files.so
-lib/zsh/%%ZSH_VER%%/mapfile.so
-lib/zsh/%%ZSH_VER%%/mathfunc.so
-lib/zsh/%%ZSH_VER%%/parameter.so
-lib/zsh/%%ZSH_VER%%/rlimits.so
-lib/zsh/%%ZSH_VER%%/sched.so
-lib/zsh/%%ZSH_VER%%/stat.so
-lib/zsh/%%ZSH_VER%%/zftp.so
-lib/zsh/%%ZSH_VER%%/zle.so
-lib/zsh/%%ZSH_VER%%/zleparameter.so
-lib/zsh/%%ZSH_VER%%/zutil.so
-lib/zsh/%%ZSH_VER%%/zsh/cap.so
-lib/zsh/%%ZSH_VER%%/zsh/clone.so
-lib/zsh/%%ZSH_VER%%/zsh/compctl.so
-lib/zsh/%%ZSH_VER%%/zsh/complete.so
-lib/zsh/%%ZSH_VER%%/zsh/complist.so
-lib/zsh/%%ZSH_VER%%/zsh/computil.so
-lib/zsh/%%ZSH_VER%%/zsh/deltochar.so
-lib/zsh/%%ZSH_VER%%/zsh/example.so
-lib/zsh/%%ZSH_VER%%/zsh/files.so
-lib/zsh/%%ZSH_VER%%/zsh/mapfile.so
-lib/zsh/%%ZSH_VER%%/zsh/mathfunc.so
-lib/zsh/%%ZSH_VER%%/zsh/parameter.so
-lib/zsh/%%ZSH_VER%%/zsh/rlimits.so
-lib/zsh/%%ZSH_VER%%/zsh/sched.so
-lib/zsh/%%ZSH_VER%%/zsh/stat.so
-lib/zsh/%%ZSH_VER%%/zsh/zftp.so
-lib/zsh/%%ZSH_VER%%/zsh/zle.so
-lib/zsh/%%ZSH_VER%%/zsh/zleparameter.so
-lib/zsh/%%ZSH_VER%%/zsh/zprof.so
-lib/zsh/%%ZSH_VER%%/zsh/zpty.so
-lib/zsh/%%ZSH_VER%%/zsh/zutil.so
+%%PORTDOCS%%@unexec install-info --delete %D/%%PORTDOCS%%info/zsh.info %D/info/dir
+%%PORTDOCS%%info/zsh.info
+%%PORTDOCS%%info/zsh.info-1
+%%PORTDOCS%%info/zsh.info-10
+%%PORTDOCS%%info/zsh.info-11
+%%PORTDOCS%%info/zsh.info-12
+%%PORTDOCS%%info/zsh.info-13
+%%PORTDOCS%%info/zsh.info-14
+%%PORTDOCS%%info/zsh.info-15
+%%PORTDOCS%%info/zsh.info-16
+%%PORTDOCS%%info/zsh.info-17
+%%PORTDOCS%%info/zsh.info-18
+%%PORTDOCS%%info/zsh.info-19
+%%PORTDOCS%%info/zsh.info-2
+%%PORTDOCS%%info/zsh.info-20
+%%PORTDOCS%%info/zsh.info-3
+%%PORTDOCS%%info/zsh.info-4
+%%PORTDOCS%%info/zsh.info-5
+%%PORTDOCS%%info/zsh.info-6
+%%PORTDOCS%%info/zsh.info-7
+%%PORTDOCS%%info/zsh.info-8
+%%PORTDOCS%%info/zsh.info-9
+%%PORTDOCS%%@exec install-info %D/%%PORTDOCS%%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/langinfo.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/net/tcp.so
+%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/parameter.so
+%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/pcre.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
+share/examples/zsh/zlogin
+share/examples/zsh/zshenv
+share/examples/zsh/zshrc
 %%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%%/_apt-show-versions
 %%ZSHFUNC_SUBDIR%%/_archie
 %%ZSHFUNC_SUBDIR%%/_arg_compile
 %%ZSHFUNC_SUBDIR%%/_arguments
+%%ZSHFUNC_SUBDIR%%/_arp
+%%ZSHFUNC_SUBDIR%%/_arping
 %%ZSHFUNC_SUBDIR%%/_arrays
+%%ZSHFUNC_SUBDIR%%/_autocd
 %%ZSHFUNC_SUBDIR%%/_autoload
 %%ZSHFUNC_SUBDIR%%/_bash_completions
-%%ZSHFUNC_SUBDIR%%/_bg_jobs
 %%ZSHFUNC_SUBDIR%%/_bindkey
 %%ZSHFUNC_SUBDIR%%/_bison
 %%ZSHFUNC_SUBDIR%%/_brace_parameter
 %%ZSHFUNC_SUBDIR%%/_bsd_pkg
+%%ZSHFUNC_SUBDIR%%/_bts
 %%ZSHFUNC_SUBDIR%%/_bug
 %%ZSHFUNC_SUBDIR%%/_builtin
 %%ZSHFUNC_SUBDIR%%/_bzip2
-%%ZSHFUNC_SUBDIR%%/_call
+%%ZSHFUNC_SUBDIR%%/_cache_invalid
+%%ZSHFUNC_SUBDIR%%/_call_function
+%%ZSHFUNC_SUBDIR%%/_call_program
 %%ZSHFUNC_SUBDIR%%/_cd
+%%ZSHFUNC_SUBDIR%%/_cdcd
+%%ZSHFUNC_SUBDIR%%/_chflags
+%%ZSHFUNC_SUBDIR%%/_chkconfig
 %%ZSHFUNC_SUBDIR%%/_chown
 %%ZSHFUNC_SUBDIR%%/_combination
 %%ZSHFUNC_SUBDIR%%/_command
 %%ZSHFUNC_SUBDIR%%/_command_names
-%%ZSHFUNC_SUBDIR%%/_compalso
 %%ZSHFUNC_SUBDIR%%/_compdef
 %%ZSHFUNC_SUBDIR%%/_complete
 %%ZSHFUNC_SUBDIR%%/_complete_debug
@@ -84,97 +105,139 @@ lib/zsh/%%ZSH_VER%%/zsh/zutil.so
 %%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%%/_debchange
 %%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%%/_dirs
 %%ZSHFUNC_SUBDIR%%/_disable
+%%ZSHFUNC_SUBDIR%%/_dispatch
 %%ZSHFUNC_SUBDIR%%/_domains
 %%ZSHFUNC_SUBDIR%%/_dpkg
-%%ZSHFUNC_SUBDIR%%/_dpkg-source
+%%ZSHFUNC_SUBDIR%%/_dpkg_source
+%%ZSHFUNC_SUBDIR%%/_dput
 %%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%%/_fg_jobs
+%%ZSHFUNC_SUBDIR%%/_fetchmail
 %%ZSHFUNC_SUBDIR%%/_file_descriptors
+%%ZSHFUNC_SUBDIR%%/_file_systems
 %%ZSHFUNC_SUBDIR%%/_files
 %%ZSHFUNC_SUBDIR%%/_find
 %%ZSHFUNC_SUBDIR%%/_finger
 %%ZSHFUNC_SUBDIR%%/_first
 %%ZSHFUNC_SUBDIR%%/_flex
 %%ZSHFUNC_SUBDIR%%/_floppy
-%%ZSHFUNC_SUBDIR%%/_funcall
+%%ZSHFUNC_SUBDIR%%/_fsh
 %%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%%/_ifconfig
 %%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%%/_last
+%%ZSHFUNC_SUBDIR%%/_limit
 %%ZSHFUNC_SUBDIR%%/_limits
+%%ZSHFUNC_SUBDIR%%/_links
 %%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%%/_make-kpkg
 %%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%%/_mozilla
+%%ZSHFUNC_SUBDIR%%/_mtools
 %%ZSHFUNC_SUBDIR%%/_multi_parts
 %%ZSHFUNC_SUBDIR%%/_mutt
 %%ZSHFUNC_SUBDIR%%/_my_accounts
 %%ZSHFUNC_SUBDIR%%/_mysql_utils
+%%ZSHFUNC_SUBDIR%%/_ncftp
 %%ZSHFUNC_SUBDIR%%/_nedit
+%%ZSHFUNC_SUBDIR%%/_net_interfaces
 %%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
@@ -190,7 +253,7 @@ lib/zsh/%%ZSH_VER%%/zsh/zutil.so
 %%ZSHFUNC_SUBDIR%%/_perldoc
 %%ZSHFUNC_SUBDIR%%/_physical_volumes
 %%ZSHFUNC_SUBDIR%%/_pids
-%%ZSHFUNC_SUBDIR%%/_popd
+%%ZSHFUNC_SUBDIR%%/_pine
 %%ZSHFUNC_SUBDIR%%/_ports
 %%ZSHFUNC_SUBDIR%%/_prcs
 %%ZSHFUNC_SUBDIR%%/_precommand
@@ -202,55 +265,72 @@ lib/zsh/%%ZSH_VER%%/zsh/zutil.so
 %%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%%/_rsync
+%%ZSHFUNC_SUBDIR%%/_ruby
+%%ZSHFUNC_SUBDIR%%/_samba
 %%ZSHFUNC_SUBDIR%%/_sched
 %%ZSHFUNC_SUBDIR%%/_sep_parts
 %%ZSHFUNC_SUBDIR%%/_set
-%%ZSHFUNC_SUBDIR%%/_set_options
+%%ZSHFUNC_SUBDIR%%/_set_command
 %%ZSHFUNC_SUBDIR%%/_setopt
 %%ZSHFUNC_SUBDIR%%/_setup
 %%ZSHFUNC_SUBDIR%%/_sh
 %%ZSHFUNC_SUBDIR%%/_signals
+%%ZSHFUNC_SUBDIR%%/_slrn
 %%ZSHFUNC_SUBDIR%%/_smit
 %%ZSHFUNC_SUBDIR%%/_socket
-%%ZSHFUNC_SUBDIR%%/_sort_tags
 %%ZSHFUNC_SUBDIR%%/_source
+%%ZSHFUNC_SUBDIR%%/_spamassassin
 %%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%%/_sysctl
 %%ZSHFUNC_SUBDIR%%/_tags
 %%ZSHFUNC_SUBDIR%%/_tar
 %%ZSHFUNC_SUBDIR%%/_tar_archive
 %%ZSHFUNC_SUBDIR%%/_telnet
+%%ZSHFUNC_SUBDIR%%/_terminals
 %%ZSHFUNC_SUBDIR%%/_tex
 %%ZSHFUNC_SUBDIR%%/_texi
 %%ZSHFUNC_SUBDIR%%/_tiff
 %%ZSHFUNC_SUBDIR%%/_tilde
 %%ZSHFUNC_SUBDIR%%/_tilde_files
+%%ZSHFUNC_SUBDIR%%/_time_zone
+%%ZSHFUNC_SUBDIR%%/_tin
 %%ZSHFUNC_SUBDIR%%/_trap
-%%ZSHFUNC_SUBDIR%%/_umount
+%%ZSHFUNC_SUBDIR%%/_ttyctl
+%%ZSHFUNC_SUBDIR%%/_typeset
+%%ZSHFUNC_SUBDIR%%/_ulimit
 %%ZSHFUNC_SUBDIR%%/_unhash
-%%ZSHFUNC_SUBDIR%%/_unset_options
 %%ZSHFUNC_SUBDIR%%/_unsetopt
+%%ZSHFUNC_SUBDIR%%/_update-alternatives
 %%ZSHFUNC_SUBDIR%%/_urls
-%%ZSHFUNC_SUBDIR%%/_use_lo
+%%ZSHFUNC_SUBDIR%%/_urpmi
+%%ZSHFUNC_SUBDIR%%/_user_admin
 %%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%%/_vars_eq
+%%ZSHFUNC_SUBDIR%%/_vnc
 %%ZSHFUNC_SUBDIR%%/_volume_groups
+%%ZSHFUNC_SUBDIR%%/_w3m
 %%ZSHFUNC_SUBDIR%%/_wait
 %%ZSHFUNC_SUBDIR%%/_wanted
 %%ZSHFUNC_SUBDIR%%/_webbrowser
@@ -274,18 +354,20 @@ lib/zsh/%%ZSH_VER%%/zsh/zutil.so
 %%ZSHFUNC_SUBDIR%%/_x_resource
 %%ZSHFUNC_SUBDIR%%/_x_selection_timeout
 %%ZSHFUNC_SUBDIR%%/_x_title
+%%ZSHFUNC_SUBDIR%%/_x_utils
+%%ZSHFUNC_SUBDIR%%/_x_visual
 %%ZSHFUNC_SUBDIR%%/_x_window
 %%ZSHFUNC_SUBDIR%%/_xargs
 %%ZSHFUNC_SUBDIR%%/_xauth
 %%ZSHFUNC_SUBDIR%%/_xdvi
 %%ZSHFUNC_SUBDIR%%/_xfig
+%%ZSHFUNC_SUBDIR%%/_xloadimage
 %%ZSHFUNC_SUBDIR%%/_xmodmap
 %%ZSHFUNC_SUBDIR%%/_xrdb
 %%ZSHFUNC_SUBDIR%%/_xset
 %%ZSHFUNC_SUBDIR%%/_xt_arguments
 %%ZSHFUNC_SUBDIR%%/_xt_session_id
 %%ZSHFUNC_SUBDIR%%/_xterm
-%%ZSHFUNC_SUBDIR%%/_xutils
 %%ZSHFUNC_SUBDIR%%/_xv
 %%ZSHFUNC_SUBDIR%%/_xwit
 %%ZSHFUNC_SUBDIR%%/_yodl
@@ -293,23 +375,31 @@ lib/zsh/%%ZSH_VER%%/zsh/zutil.so
 %%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%%/acx
 %%ZSHFUNC_SUBDIR%%/allopt
-%%ZSHFUNC_SUBDIR%%/cat
-%%ZSHFUNC_SUBDIR%%/cdmatch
-%%ZSHFUNC_SUBDIR%%/cdmatch2
+%%ZSHFUNC_SUBDIR%%/bash-backward-kill-word
+%%ZSHFUNC_SUBDIR%%/bash-backward-word
+%%ZSHFUNC_SUBDIR%%/bash-down-case-word
+%%ZSHFUNC_SUBDIR%%/bash-forward-word
+%%ZSHFUNC_SUBDIR%%/bash-kill-word
+%%ZSHFUNC_SUBDIR%%/bash-transpose-words
+%%ZSHFUNC_SUBDIR%%/bash-up-case-word
 %%ZSHFUNC_SUBDIR%%/checkmail
 %%ZSHFUNC_SUBDIR%%/colors
+%%ZSHFUNC_SUBDIR%%/compaudit
 %%ZSHFUNC_SUBDIR%%/compdump
 %%ZSHFUNC_SUBDIR%%/compinit
 %%ZSHFUNC_SUBDIR%%/compinstall
-%%ZSHFUNC_SUBDIR%%/cx
+%%ZSHFUNC_SUBDIR%%/copy-earlier-word
+%%ZSHFUNC_SUBDIR%%/cycle-completion-positions
 %%ZSHFUNC_SUBDIR%%/edit-command-line
+%%ZSHFUNC_SUBDIR%%/getjobs
 %%ZSHFUNC_SUBDIR%%/harden
 %%ZSHFUNC_SUBDIR%%/history-search-end
 %%ZSHFUNC_SUBDIR%%/incarg
@@ -317,13 +407,13 @@ lib/zsh/%%ZSH_VER%%/zsh/zutil.so
 %%ZSHFUNC_SUBDIR%%/insert-files
 %%ZSHFUNC_SUBDIR%%/is-at-least
 %%ZSHFUNC_SUBDIR%%/mere
-%%ZSHFUNC_SUBDIR%%/multicomp
 %%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
@@ -332,56 +422,57 @@ lib/zsh/%%ZSH_VER%%/zsh/zutil.so
 %%ZSHFUNC_SUBDIR%%/prompt_oliver_setup
 %%ZSHFUNC_SUBDIR%%/prompt_redhat_setup
 %%ZSHFUNC_SUBDIR%%/prompt_suse_setup
+%%ZSHFUNC_SUBDIR%%/prompt_walters_setup
 %%ZSHFUNC_SUBDIR%%/prompt_zefram_setup
 %%ZSHFUNC_SUBDIR%%/promptinit
-%%ZSHFUNC_SUBDIR%%/proto
-%%ZSHFUNC_SUBDIR%%/pushd
-%%ZSHFUNC_SUBDIR%%/randline
+%%ZSHFUNC_SUBDIR%%/promptnl
 %%ZSHFUNC_SUBDIR%%/run-help
-%%ZSHFUNC_SUBDIR%%/yp
-%%ZSHFUNC_SUBDIR%%/yu
+%%ZSHFUNC_SUBDIR%%/smart-insert-last-word
+%%ZSHFUNC_SUBDIR%%/tetris
+%%ZSHFUNC_SUBDIR%%/zcalc
 %%ZSHFUNC_SUBDIR%%/zed
-%%ZSHFUNC_SUBDIR%%/zfanon
-%%ZSHFUNC_SUBDIR%%/zfautocheck
-%%ZSHFUNC_SUBDIR%%/zfcd
-%%ZSHFUNC_SUBDIR%%/zfcd_match
-%%ZSHFUNC_SUBDIR%%/zfcget
-%%ZSHFUNC_SUBDIR%%/zfclose
-%%ZSHFUNC_SUBDIR%%/zfcput
-%%ZSHFUNC_SUBDIR%%/zfdir
-%%ZSHFUNC_SUBDIR%%/zffcache
-%%ZSHFUNC_SUBDIR%%/zfgcp
-%%ZSHFUNC_SUBDIR%%/zfget
-%%ZSHFUNC_SUBDIR%%/zfget_match
-%%ZSHFUNC_SUBDIR%%/zfgoto
-%%ZSHFUNC_SUBDIR%%/zfhere
-%%ZSHFUNC_SUBDIR%%/zfinit
-%%ZSHFUNC_SUBDIR%%/zfls
-%%ZSHFUNC_SUBDIR%%/zfmark
-%%ZSHFUNC_SUBDIR%%/zfopen
-%%ZSHFUNC_SUBDIR%%/zfparams
-%%ZSHFUNC_SUBDIR%%/zfpcp
-%%ZSHFUNC_SUBDIR%%/zfput
-%%ZSHFUNC_SUBDIR%%/zfrglob
-%%ZSHFUNC_SUBDIR%%/zfrtime
-%%ZSHFUNC_SUBDIR%%/zfsession
-%%ZSHFUNC_SUBDIR%%/zfstat
-%%ZSHFUNC_SUBDIR%%/zftp_chpwd
-%%ZSHFUNC_SUBDIR%%/zftp_progress
-%%ZSHFUNC_SUBDIR%%/zftransfer
-%%ZSHFUNC_SUBDIR%%/zftype
-%%ZSHFUNC_SUBDIR%%/zfuget
-%%ZSHFUNC_SUBDIR%%/zfuput
-%%ZSHFUNC_SUBDIR%%/zless
-%%ZSHFUNC_SUBDIR%%/zls
+%%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
-@dirrm lib/zsh/%%ZSH_VER%%/zsh
-@dirrm lib/zsh/%%ZSH_VER%%
-@dirrm lib/zsh
+%%NO_STATIC%%@dirrm lib/zsh/%%ZSH_VER%%/zsh/net
+%%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
+@dirrm share/examples/zsh