5 files changed, 249 insertions, 66 deletions

diff --git a/shells/zsh-devel/Makefile b/shells/zsh-devel/Makefile
index 3e746bd5e24f..dd67a8bb7d0c 100644
--- a/shells/zsh-devel/Makefile
+++ b/shells/zsh-devel/Makefile
@@ -6,36 +6,43 @@
 #
 
 PORTNAME=	zsh
-PORTVERSION= 	${ZSH_VER}
+PORTVERSION=	3.1.7.p1
 CATEGORIES=	shells
-MASTER_SITES=	ftp://ftp.zsh.org/zsh/ \
+MASTER_SITES=	http://people.FreeBSD.org/~knu/ports/distfiles/ \
+		ftp://ftp.zsh.org/zsh/ \
 		ftp://ftp.sterling.com/zsh/ \
 		ftp://ftp.rge.com/pub/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/ \
-		http://people.FreeBSD.org/~knu/ports/distfiles/
-
-DISTFILES=	zsh-${ZSH_VER}.tar.gz ${ZSHFUNC_FILES}
+		ftp://ftp.uit.no/pub/unix/shells/zsh/
+DISTNAME=	${PORTNAME}-${ZSH_VER}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		${ZSHFUNC_FILES}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	shige@FreeBSD.org
 
-EXTRACT_ONLY=	zsh-${ZSH_VER}.tar.gz
-ZSHFUNC_FILES=	zsh-functions-freebsd-2000.03.31.tar.gz
-ZSHFUNC_SUBDIR=	share/zsh/functions
+ZSH_VER=	${PORTVERSION:S/.p/-pre-/}
+ZSHFUNC_FILES=	zsh-functions-freebsd-2000.04.29.tar.gz
+ZSHFUNC_SUBDIR=	share/zsh/${ZSH_VER}/functions
 NO_LATEST_LINK=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-zsh-mem --enable-zsh-secure-free --enable-dynamic
+INSTALL_TARGET=	install install.info
 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
-
-ZSH_VER=	3.1.6
 PLIST_SUB=	ZSH_VER=${ZSH_VER} ZSHFUNC_SUBDIR=${ZSHFUNC_SUBDIR}
 
 # If you want to build a static binary, uncomment the following line
 #LDFLAGS+=-static
 
+post-extract:
+	@${MKDIR} ${WRKDIR}/functions
+	@for i in ${ZSHFUNC_FILES} ; do \
+		${TAR} zxf ${DISTDIR}/$${i} -C ${WRKDIR}/functions ;\
+	done
+
 post-build:
 # Fix ".so" macro problem by using "soelim" command.
 	@(cd ${WRKSRC} ; \
@@ -46,11 +53,10 @@ post-build:
 		${RM} -f ./man1/zshall.1 ; \
 		/usr/bin/soelim ./man1/zshall.1.source > ./man1/zshall.1 ; \
 	)
+	@cd ${WRKSRC}/Doc && ${MAKE} info
 
 post-install:
-	@for i in ${ZSHFUNC_FILES} ; do \
-		${TAR} zxf ${DISTDIR}/$${i} -C ${PREFIX}/${ZSHFUNC_SUBDIR} ;\
-	done
+	@${INSTALL_DATA} ${WRKDIR}/functions/* ${PREFIX}/${ZSHFUNC_SUBDIR}
 	@${INSTALL_DATA} ${WRKSRC}/Doc/zsh.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/zsh.info ${PREFIX}/info/dir
 	@${ECHO} "Updating /etc/shells"
diff --git a/shells/zsh-devel/distinfo b/shells/zsh-devel/distinfo
index 758a94f9d442..6b109b830716 100644
--- a/shells/zsh-devel/distinfo
+++ b/shells/zsh-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (zsh-3.1.6.tar.gz) = e5b9af6eb65c44950a1aebb2c4b72623
-MD5 (zsh-functions-freebsd-2000.03.31.tar.gz) = 0b958d1b3523d9dc32a64edd98e7edb7
+MD5 (zsh-3.1.7-pre-1.tar.gz) = daa1d8ce53f0ce1faaec45a8d7a80abc
+MD5 (zsh-functions-freebsd-2000.04.29.tar.gz) = 22be3dec958a0990285ee61f66f01345
diff --git a/shells/zsh-devel/files/patch-aa b/shells/zsh-devel/files/patch-aa
index 72c9807481cb..0899f82e9386 100644
--- a/shells/zsh-devel/files/patch-aa
+++ b/shells/zsh-devel/files/patch-aa
@@ -1,20 +1,11 @@
---- Doc/Makefile.in.orig	Tue Aug  3 12:00:20 1999
-+++ Doc/Makefile.in	Tue Aug  3 12:00:50 1999
-@@ -74,7 +74,7 @@
- 	$(TEXI2DVI) $(sdir)/zsh.texi
+--- 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) $(sdir)/zsh.texi; exit 0
-+	$(MAKEINFO) --no-split $(sdir)/zsh.texi; exit 0
+ @DEFS_MK@
  
- zsh.texi: zsh.yo
- 	$(YODL) -o $(sdir)/zsh.texi -I$(sdir) -w ztexi.yo version.yo zsh.yo
-@@ -177,7 +177,7 @@
- # install info pages, creating install directory if necessary
- install.info: zsh.info
- 	$(sdir_top)/mkinstalldirs $(infodir)
--	for file in zsh.info zsh.info-[1-9]*; do \
-+	for file in zsh.info ; do \
- 	  if test -f $$file; then \
- 	    $(INSTALL_DATA) $$file $(infodir); \
- 	  elif test -f $(sdir)/$$file; then \
+-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
index 39e31585113e..2b744620a6f0 100644
--- a/shells/zsh-devel/files/patch-ab
+++ b/shells/zsh-devel/files/patch-ab
@@ -1,5 +1,5 @@
---- Doc/zsh.texi.orig	Sun Aug  1 21:13:14 1999
-+++ Doc/zsh.texi	Sat Feb  5 01:23:02 2000
+--- Doc/zsh.texi.orig	Thu Apr 20 04:04:38 2000
++++ Doc/zsh.texi	Sat Apr 29 00:05:57 2000
 @@ -7,6 +7,10 @@
  @end iftex
  @setfilename zsh.info
@@ -11,7 +11,7 @@
  @c %**end of header
  
  @ifinfo
-@@ -972,14 +976,14 @@
+@@ -1025,14 +1029,14 @@
  string by using the `@t{\'}' escape.
  
  @noindent
@@ -28,7 +28,7 @@
  @end example
  
  @noindent
-@@ -2340,7 +2344,7 @@
+@@ -2555,7 +2559,7 @@
  @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{\}'
@@ -37,7 +37,7 @@
  its special meaning. Double quotes will @emph{not} work for this.
  
  @noindent
-@@ -5545,7 +5549,7 @@
+@@ -6092,7 +6096,7 @@
  @example
  unsetopt localtraps
  trap - INT
@@ -46,7 +46,7 @@
  @end example
  
  @noindent
-@@ -5767,7 +5771,7 @@
+@@ -6313,7 +6317,7 @@
  @cindex rc, quoting style
  @cindex quoting style, rc
  @item @t{RC_QUOTES}
@@ -55,7 +55,7 @@
  within singly quoted strings.
  
  @pindex RCS
-@@ -8456,7 +8460,7 @@
+@@ -9328,7 +9332,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
@@ -64,7 +64,7 @@
  
  @tindex quote-region
  @item @t{quote-region} (ESC-") (unbound) (unbound)
-@@ -9226,7 +9230,7 @@
+@@ -10112,7 +10116,7 @@
  
  @noindent
  @example
@@ -73,7 +73,7 @@
  @end example
  
  @noindent
-@@ -9314,7 +9318,7 @@
+@@ -10200,7 +10204,7 @@
  
  @noindent
  @example
@@ -82,16 +82,7 @@
  @end example
  
  @noindent
-@@ -10636,7 +10640,7 @@
- 
- @noindent
- @example
--complete-history () @{ compgen -H 0 @value{dsq} @}
-+complete-history () @{ compgen -H 0 '' @}
- @end example
- 
- @noindent
-@@ -11117,7 +11121,7 @@
+@@ -16239,7 +16243,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)
@@ -100,7 +91,7 @@
  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
-@@ -11340,7 +11344,7 @@
+@@ -16638,7 +16642,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
diff --git a/shells/zsh-devel/pkg-plist b/shells/zsh-devel/pkg-plist
index 0cd3befb391b..08af2de3caf9 100644
--- a/shells/zsh-devel/pkg-plist
+++ b/shells/zsh-devel/pkg-plist
@@ -7,37 +7,75 @@ info/zsh.info
 @exec install-info %D/info/zsh.info %D/info/dir
 lib/zsh/%%ZSH_VER%%/cap.so
 lib/zsh/%%ZSH_VER%%/clone.so
-lib/zsh/%%ZSH_VER%%/comp1.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
 %%ZSHFUNC_SUBDIR%%/_a2ps
 %%ZSHFUNC_SUBDIR%%/_aliases
+%%ZSHFUNC_SUBDIR%%/_all_labels
+%%ZSHFUNC_SUBDIR%%/_alternative
 %%ZSHFUNC_SUBDIR%%/_approximate
+%%ZSHFUNC_SUBDIR%%/_apt
+%%ZSHFUNC_SUBDIR%%/_archie
+%%ZSHFUNC_SUBDIR%%/_arg_compile
+%%ZSHFUNC_SUBDIR%%/_arguments
 %%ZSHFUNC_SUBDIR%%/_arrays
 %%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%%/_bug
 %%ZSHFUNC_SUBDIR%%/_builtin
 %%ZSHFUNC_SUBDIR%%/_bunzip2
 %%ZSHFUNC_SUBDIR%%/_bzip2
+%%ZSHFUNC_SUBDIR%%/_call
 %%ZSHFUNC_SUBDIR%%/_cd
 %%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_opts
+%%ZSHFUNC_SUBDIR%%/_complete_help
 %%ZSHFUNC_SUBDIR%%/_compress
 %%ZSHFUNC_SUBDIR%%/_condition
 %%ZSHFUNC_SUBDIR%%/_configure
@@ -45,91 +83,245 @@ lib/zsh/%%ZSH_VER%%/zle.so
 %%ZSHFUNC_SUBDIR%%/_correct_filename
 %%ZSHFUNC_SUBDIR%%/_correct_word
 %%ZSHFUNC_SUBDIR%%/_cvs
+%%ZSHFUNC_SUBDIR%%/_cvsup
 %%ZSHFUNC_SUBDIR%%/_dd
+%%ZSHFUNC_SUBDIR%%/_deb_packages
 %%ZSHFUNC_SUBDIR%%/_default
+%%ZSHFUNC_SUBDIR%%/_describe
+%%ZSHFUNC_SUBDIR%%/_description
+%%ZSHFUNC_SUBDIR%%/_diff
+%%ZSHFUNC_SUBDIR%%/_diff_options
+%%ZSHFUNC_SUBDIR%%/_dir_list
 %%ZSHFUNC_SUBDIR%%/_dirs
 %%ZSHFUNC_SUBDIR%%/_disable
+%%ZSHFUNC_SUBDIR%%/_domains
+%%ZSHFUNC_SUBDIR%%/_dpkg
+%%ZSHFUNC_SUBDIR%%/_dpkg-source
+%%ZSHFUNC_SUBDIR%%/_dupload
 %%ZSHFUNC_SUBDIR%%/_dvi
 %%ZSHFUNC_SUBDIR%%/_echotc
+%%ZSHFUNC_SUBDIR%%/_emulate
 %%ZSHFUNC_SUBDIR%%/_enable
 %%ZSHFUNC_SUBDIR%%/_equal
 %%ZSHFUNC_SUBDIR%%/_expand
 %%ZSHFUNC_SUBDIR%%/_expand_word
+%%ZSHFUNC_SUBDIR%%/_fakeroot
 %%ZSHFUNC_SUBDIR%%/_fc
+%%ZSHFUNC_SUBDIR%%/_fg_jobs
 %%ZSHFUNC_SUBDIR%%/_files
 %%ZSHFUNC_SUBDIR%%/_find
+%%ZSHFUNC_SUBDIR%%/_finger
 %%ZSHFUNC_SUBDIR%%/_first
+%%ZSHFUNC_SUBDIR%%/_flex
+%%ZSHFUNC_SUBDIR%%/_funcall
 %%ZSHFUNC_SUBDIR%%/_functions
+%%ZSHFUNC_SUBDIR%%/_gcc
 %%ZSHFUNC_SUBDIR%%/_gdb
+%%ZSHFUNC_SUBDIR%%/_getconf
+%%ZSHFUNC_SUBDIR%%/_gprof
 %%ZSHFUNC_SUBDIR%%/_groups
+%%ZSHFUNC_SUBDIR%%/_gs
 %%ZSHFUNC_SUBDIR%%/_gunzip
+%%ZSHFUNC_SUBDIR%%/_gv
 %%ZSHFUNC_SUBDIR%%/_gzip
 %%ZSHFUNC_SUBDIR%%/_hash
 %%ZSHFUNC_SUBDIR%%/_history_complete_word
 %%ZSHFUNC_SUBDIR%%/_hosts
+%%ZSHFUNC_SUBDIR%%/_ignored
+%%ZSHFUNC_SUBDIR%%/_imagemagick
+%%ZSHFUNC_SUBDIR%%/_ispell
 %%ZSHFUNC_SUBDIR%%/_jobs
 %%ZSHFUNC_SUBDIR%%/_kill
+%%ZSHFUNC_SUBDIR%%/_killall
+%%ZSHFUNC_SUBDIR%%/_kld
 %%ZSHFUNC_SUBDIR%%/_limits
 %%ZSHFUNC_SUBDIR%%/_list
-%%ZSHFUNC_SUBDIR%%/_long_options
+%%ZSHFUNC_SUBDIR%%/_lp
+%%ZSHFUNC_SUBDIR%%/_lynx
+%%ZSHFUNC_SUBDIR%%/_mailboxes
 %%ZSHFUNC_SUBDIR%%/_main_complete
 %%ZSHFUNC_SUBDIR%%/_make
 %%ZSHFUNC_SUBDIR%%/_man
 %%ZSHFUNC_SUBDIR%%/_match
 %%ZSHFUNC_SUBDIR%%/_math
 %%ZSHFUNC_SUBDIR%%/_menu
+%%ZSHFUNC_SUBDIR%%/_message
 %%ZSHFUNC_SUBDIR%%/_mh
 %%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%%/_nedit
+%%ZSHFUNC_SUBDIR%%/_netscape
+%%ZSHFUNC_SUBDIR%%/_next_label
+%%ZSHFUNC_SUBDIR%%/_next_tags
 %%ZSHFUNC_SUBDIR%%/_normal
+%%ZSHFUNC_SUBDIR%%/_nothing
+%%ZSHFUNC_SUBDIR%%/_nslookup
 %%ZSHFUNC_SUBDIR%%/_oldlist
 %%ZSHFUNC_SUBDIR%%/_options
+%%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%%/_pids
+%%ZSHFUNC_SUBDIR%%/_popd
+%%ZSHFUNC_SUBDIR%%/_ports
+%%ZSHFUNC_SUBDIR%%/_prcs
 %%ZSHFUNC_SUBDIR%%/_precommand
+%%ZSHFUNC_SUBDIR%%/_prefix
+%%ZSHFUNC_SUBDIR%%/_print
+%%ZSHFUNC_SUBDIR%%/_prompt
 %%ZSHFUNC_SUBDIR%%/_ps
+%%ZSHFUNC_SUBDIR%%/_pspdf
+%%ZSHFUNC_SUBDIR%%/_psutils
 %%ZSHFUNC_SUBDIR%%/_rcs
 %%ZSHFUNC_SUBDIR%%/_read_comp
 %%ZSHFUNC_SUBDIR%%/_redirect
+%%ZSHFUNC_SUBDIR%%/_regex_arguments
+%%ZSHFUNC_SUBDIR%%/_requested
 %%ZSHFUNC_SUBDIR%%/_rlogin
+%%ZSHFUNC_SUBDIR%%/_rpm
 %%ZSHFUNC_SUBDIR%%/_sched
 %%ZSHFUNC_SUBDIR%%/_sep_parts
 %%ZSHFUNC_SUBDIR%%/_set
 %%ZSHFUNC_SUBDIR%%/_set_options
 %%ZSHFUNC_SUBDIR%%/_setopt
+%%ZSHFUNC_SUBDIR%%/_setup
 %%ZSHFUNC_SUBDIR%%/_sh
+%%ZSHFUNC_SUBDIR%%/_signals
+%%ZSHFUNC_SUBDIR%%/_socket
+%%ZSHFUNC_SUBDIR%%/_sort_tags
 %%ZSHFUNC_SUBDIR%%/_source
+%%ZSHFUNC_SUBDIR%%/_ssh
 %%ZSHFUNC_SUBDIR%%/_stat
 %%ZSHFUNC_SUBDIR%%/_strip
 %%ZSHFUNC_SUBDIR%%/_stty
 %%ZSHFUNC_SUBDIR%%/_su
 %%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%%/_trap
+%%ZSHFUNC_SUBDIR%%/_umount
 %%ZSHFUNC_SUBDIR%%/_uncompress
 %%ZSHFUNC_SUBDIR%%/_unhash
+%%ZSHFUNC_SUBDIR%%/_unpack
 %%ZSHFUNC_SUBDIR%%/_unset_options
 %%ZSHFUNC_SUBDIR%%/_unsetopt
+%%ZSHFUNC_SUBDIR%%/_urls
 %%ZSHFUNC_SUBDIR%%/_use_lo
+%%ZSHFUNC_SUBDIR%%/_user_at_host
+%%ZSHFUNC_SUBDIR%%/_users
+%%ZSHFUNC_SUBDIR%%/_users_on
+%%ZSHFUNC_SUBDIR%%/_value
+%%ZSHFUNC_SUBDIR%%/_values
 %%ZSHFUNC_SUBDIR%%/_vars
 %%ZSHFUNC_SUBDIR%%/_vars_eq
 %%ZSHFUNC_SUBDIR%%/_wait
+%%ZSHFUNC_SUBDIR%%/_wanted
+%%ZSHFUNC_SUBDIR%%/_webbrowser
+%%ZSHFUNC_SUBDIR%%/_wget
+%%ZSHFUNC_SUBDIR%%/_whereis
 %%ZSHFUNC_SUBDIR%%/_which
-%%ZSHFUNC_SUBDIR%%/_x_options
+%%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_window
+%%ZSHFUNC_SUBDIR%%/_xargs
+%%ZSHFUNC_SUBDIR%%/_xdvi
 %%ZSHFUNC_SUBDIR%%/_xfig
+%%ZSHFUNC_SUBDIR%%/_xmodmap
+%%ZSHFUNC_SUBDIR%%/_xrdb
+%%ZSHFUNC_SUBDIR%%/_xt_arguments
+%%ZSHFUNC_SUBDIR%%/_xt_session_id
+%%ZSHFUNC_SUBDIR%%/_xterm
+%%ZSHFUNC_SUBDIR%%/_xutils
+%%ZSHFUNC_SUBDIR%%/_xv
+%%ZSHFUNC_SUBDIR%%/_xwit
+%%ZSHFUNC_SUBDIR%%/_yodl
+%%ZSHFUNC_SUBDIR%%/_yp
+%%ZSHFUNC_SUBDIR%%/_zcompile
+%%ZSHFUNC_SUBDIR%%/_zdump
 %%ZSHFUNC_SUBDIR%%/_zftp
 %%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%%/checkmail
+%%ZSHFUNC_SUBDIR%%/colors
 %%ZSHFUNC_SUBDIR%%/compdump
 %%ZSHFUNC_SUBDIR%%/compinit
 %%ZSHFUNC_SUBDIR%%/compinstall
+%%ZSHFUNC_SUBDIR%%/cx
+%%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%%/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_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%%/proto
+%%ZSHFUNC_SUBDIR%%/pushd
+%%ZSHFUNC_SUBDIR%%/randline
+%%ZSHFUNC_SUBDIR%%/run-help
+%%ZSHFUNC_SUBDIR%%/yp
+%%ZSHFUNC_SUBDIR%%/yu
+%%ZSHFUNC_SUBDIR%%/zed
 %%ZSHFUNC_SUBDIR%%/zfanon
 %%ZSHFUNC_SUBDIR%%/zfautocheck
 %%ZSHFUNC_SUBDIR%%/zfcd
@@ -138,6 +330,7 @@ lib/zsh/%%ZSH_VER%%/zle.so
 %%ZSHFUNC_SUBDIR%%/zfclose
 %%ZSHFUNC_SUBDIR%%/zfcput
 %%ZSHFUNC_SUBDIR%%/zfdir
+%%ZSHFUNC_SUBDIR%%/zffcache
 %%ZSHFUNC_SUBDIR%%/zfgcp
 %%ZSHFUNC_SUBDIR%%/zfget
 %%ZSHFUNC_SUBDIR%%/zfget_match
@@ -152,21 +345,23 @@ lib/zsh/%%ZSH_VER%%/zle.so
 %%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%%/_cvsup
-%%ZSHFUNC_SUBDIR%%/_kldload
-%%ZSHFUNC_SUBDIR%%/_kldunload
-%%ZSHFUNC_SUBDIR%%/_mount
-%%ZSHFUNC_SUBDIR%%/_pkg_add
-%%ZSHFUNC_SUBDIR%%/_pkg_delete
-%%ZSHFUNC_SUBDIR%%/_pkg_info
-%%ZSHFUNC_SUBDIR%%/_umount
+%%ZSHFUNC_SUBDIR%%/zless
+%%ZSHFUNC_SUBDIR%%/zls
+%%ZSHFUNC_SUBDIR%%/zmv
+%%ZSHFUNC_SUBDIR%%/zrecompile
+%%ZSHFUNC_SUBDIR%%/zstyle+
+@dirrm lib/zsh/%%ZSH_VER%%/zsh
 @dirrm lib/zsh/%%ZSH_VER%%
 @dirrm lib/zsh
 @dirrm %%ZSHFUNC_SUBDIR%%
+@dirrm share/zsh/%%ZSH_VER%%
+@dirrm share/zsh/site-functions
 @dirrm share/zsh