Don't hardcode package version number into package lists.

3 files changed, 402 insertions, 403 deletions

diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index 7f90c60ebdd..17c1954ee95 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2001/09/23 21:15:39 tron Exp $
+# $NetBSD: Makefile,v 1.26 2001/09/23 21:20:35 tron Exp $
 
 DISTNAME=       zsh-4.0.2
 CATEGORIES=	shells
@@ -15,8 +15,7 @@ COMMENT=	The Z shell
 
 GNU_CONFIGURE=	yes
 INFO_FILES=	zsh.info
-
-PLIST_SRC=	${PKGDIR}/PLIST
+PLIST_SUBST+=	PKGVERSION="${PKGVERSION}"
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/shells/zsh/pkg/PLIST b/shells/zsh/pkg/PLIST
index e570304b8c4..85c137700cf 100644
--- a/shells/zsh/pkg/PLIST
+++ b/shells/zsh/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2001/09/23 21:08:56 tron Exp $
+@comment $NetBSD: PLIST,v 1.12 2001/09/23 21:20:35 tron Exp $
 bin/zsh
 @exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak || true; echo %D/%F) >/etc/shells
 @unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak || true) >/etc/shells
@@ -24,347 +24,347 @@ share/doc/zsh/BUGS
 share/doc/zsh/FAQ
 share/doc/zsh/FEATURES
 share/doc/zsh/NEWS
-share/zsh/4.0.2/functions/_a2ps
-share/zsh/4.0.2/functions/_alias
-share/zsh/4.0.2/functions/_aliases
-share/zsh/4.0.2/functions/_all_labels
-share/zsh/4.0.2/functions/_all_matches
-share/zsh/4.0.2/functions/_alternative
-share/zsh/4.0.2/functions/_apachectl
-share/zsh/4.0.2/functions/_apm
-share/zsh/4.0.2/functions/_approximate
-share/zsh/4.0.2/functions/_apt
-share/zsh/4.0.2/functions/_archie
-share/zsh/4.0.2/functions/_arg_compile
-share/zsh/4.0.2/functions/_arguments
-share/zsh/4.0.2/functions/_arp
-share/zsh/4.0.2/functions/_arrays
-share/zsh/4.0.2/functions/_autocd
-share/zsh/4.0.2/functions/_autoload
-share/zsh/4.0.2/functions/_bash_completions
-share/zsh/4.0.2/functions/_bindkey
-share/zsh/4.0.2/functions/_bison
-share/zsh/4.0.2/functions/_brace_parameter
-share/zsh/4.0.2/functions/_bsd_pkg
-share/zsh/4.0.2/functions/_bug
-share/zsh/4.0.2/functions/_builtin
-share/zsh/4.0.2/functions/_bzip2
-share/zsh/4.0.2/functions/_cache_invalid
-share/zsh/4.0.2/functions/_call_function
-share/zsh/4.0.2/functions/_call_program
-share/zsh/4.0.2/functions/_cd
-share/zsh/4.0.2/functions/_chown
-share/zsh/4.0.2/functions/_combination
-share/zsh/4.0.2/functions/_command
-share/zsh/4.0.2/functions/_command_names
-share/zsh/4.0.2/functions/_compdef
-share/zsh/4.0.2/functions/_complete
-share/zsh/4.0.2/functions/_complete_debug
-share/zsh/4.0.2/functions/_complete_help
-share/zsh/4.0.2/functions/_complete_tag
-share/zsh/4.0.2/functions/_compress
-share/zsh/4.0.2/functions/_condition
-share/zsh/4.0.2/functions/_configure
-share/zsh/4.0.2/functions/_contexts
-share/zsh/4.0.2/functions/_correct
-share/zsh/4.0.2/functions/_correct_filename
-share/zsh/4.0.2/functions/_correct_word
-share/zsh/4.0.2/functions/_cpio
-share/zsh/4.0.2/functions/_cvs
-share/zsh/4.0.2/functions/_cvsup
-share/zsh/4.0.2/functions/_dd
-share/zsh/4.0.2/functions/_deb_packages
-share/zsh/4.0.2/functions/_default
-share/zsh/4.0.2/functions/_describe
-share/zsh/4.0.2/functions/_description
-share/zsh/4.0.2/functions/_dict
-share/zsh/4.0.2/functions/_dict_words
-share/zsh/4.0.2/functions/_diff
-share/zsh/4.0.2/functions/_diff_options
-share/zsh/4.0.2/functions/_dir_list
-share/zsh/4.0.2/functions/_directories
-share/zsh/4.0.2/functions/_directory_stack
-share/zsh/4.0.2/functions/_disable
-share/zsh/4.0.2/functions/_domains
-share/zsh/4.0.2/functions/_dpkg
-share/zsh/4.0.2/functions/_dpkg_source
-share/zsh/4.0.2/functions/_dupload
-share/zsh/4.0.2/functions/_dvi
-share/zsh/4.0.2/functions/_echotc
-share/zsh/4.0.2/functions/_echoti
-share/zsh/4.0.2/functions/_elm
-share/zsh/4.0.2/functions/_emulate
-share/zsh/4.0.2/functions/_enable
-share/zsh/4.0.2/functions/_enscript
-share/zsh/4.0.2/functions/_equal
-share/zsh/4.0.2/functions/_expand
-share/zsh/4.0.2/functions/_expand_alias
-share/zsh/4.0.2/functions/_expand_word
-share/zsh/4.0.2/functions/_fakeroot
-share/zsh/4.0.2/functions/_fc
-share/zsh/4.0.2/functions/_fetchmail
-share/zsh/4.0.2/functions/_file_descriptors
-share/zsh/4.0.2/functions/_files
-share/zsh/4.0.2/functions/_find
-share/zsh/4.0.2/functions/_finger
-share/zsh/4.0.2/functions/_first
-share/zsh/4.0.2/functions/_flex
-share/zsh/4.0.2/functions/_floppy
-share/zsh/4.0.2/functions/_functions
-share/zsh/4.0.2/functions/_gcc
-share/zsh/4.0.2/functions/_gdb
-share/zsh/4.0.2/functions/_generic
-share/zsh/4.0.2/functions/_getconf
-share/zsh/4.0.2/functions/_gnu_generic
-share/zsh/4.0.2/functions/_gprof
-share/zsh/4.0.2/functions/_grep
-share/zsh/4.0.2/functions/_groups
-share/zsh/4.0.2/functions/_gs
-share/zsh/4.0.2/functions/_guard
-share/zsh/4.0.2/functions/_gv
-share/zsh/4.0.2/functions/_gzip
-share/zsh/4.0.2/functions/_hash
-share/zsh/4.0.2/functions/_history
-share/zsh/4.0.2/functions/_history_complete_word
-share/zsh/4.0.2/functions/_hosts
-share/zsh/4.0.2/functions/_iconv
-share/zsh/4.0.2/functions/_ignored
-share/zsh/4.0.2/functions/_imagemagick
-share/zsh/4.0.2/functions/_in_vared
-share/zsh/4.0.2/functions/_init_d
-share/zsh/4.0.2/functions/_ispell
-share/zsh/4.0.2/functions/_java
-share/zsh/4.0.2/functions/_jobs
-share/zsh/4.0.2/functions/_jobs_bg
-share/zsh/4.0.2/functions/_jobs_builtin
-share/zsh/4.0.2/functions/_jobs_fg
-share/zsh/4.0.2/functions/_joe
-share/zsh/4.0.2/functions/_kill
-share/zsh/4.0.2/functions/_killall
-share/zsh/4.0.2/functions/_kld
-share/zsh/4.0.2/functions/_limits
-share/zsh/4.0.2/functions/_list
-share/zsh/4.0.2/functions/_loadkeys
-share/zsh/4.0.2/functions/_logical_volumes
-share/zsh/4.0.2/functions/_look
-share/zsh/4.0.2/functions/_lp
-share/zsh/4.0.2/functions/_ls
-share/zsh/4.0.2/functions/_lscfg
-share/zsh/4.0.2/functions/_lsdev
-share/zsh/4.0.2/functions/_lslv
-share/zsh/4.0.2/functions/_lspv
-share/zsh/4.0.2/functions/_lsvg
-share/zsh/4.0.2/functions/_lynx
-share/zsh/4.0.2/functions/_lzop
-share/zsh/4.0.2/functions/_mail
-share/zsh/4.0.2/functions/_mailboxes
-share/zsh/4.0.2/functions/_main_complete
-share/zsh/4.0.2/functions/_make
-share/zsh/4.0.2/functions/_man
-share/zsh/4.0.2/functions/_match
-share/zsh/4.0.2/functions/_math
-share/zsh/4.0.2/functions/_menu
-share/zsh/4.0.2/functions/_mere
-share/zsh/4.0.2/functions/_message
-share/zsh/4.0.2/functions/_mh
-share/zsh/4.0.2/functions/_modutils
-share/zsh/4.0.2/functions/_most_recent_file
-share/zsh/4.0.2/functions/_mount
-share/zsh/4.0.2/functions/_multi_parts
-share/zsh/4.0.2/functions/_mutt
-share/zsh/4.0.2/functions/_my_accounts
-share/zsh/4.0.2/functions/_mysql_utils
-share/zsh/4.0.2/functions/_ncftp
-share/zsh/4.0.2/functions/_nedit
-share/zsh/4.0.2/functions/_netscape
-share/zsh/4.0.2/functions/_newsgroups
-share/zsh/4.0.2/functions/_next_label
-share/zsh/4.0.2/functions/_next_tags
-share/zsh/4.0.2/functions/_normal
-share/zsh/4.0.2/functions/_nothing
-share/zsh/4.0.2/functions/_nslookup
-share/zsh/4.0.2/functions/_object_classes
-share/zsh/4.0.2/functions/_oldlist
-share/zsh/4.0.2/functions/_options
-share/zsh/4.0.2/functions/_options_set
-share/zsh/4.0.2/functions/_options_unset
-share/zsh/4.0.2/functions/_other_accounts
-share/zsh/4.0.2/functions/_pack
-share/zsh/4.0.2/functions/_parameter
-share/zsh/4.0.2/functions/_parameters
-share/zsh/4.0.2/functions/_patch
-share/zsh/4.0.2/functions/_path_files
-share/zsh/4.0.2/functions/_pbm
-share/zsh/4.0.2/functions/_pdf
-share/zsh/4.0.2/functions/_perl
-share/zsh/4.0.2/functions/_perl_basepods
-share/zsh/4.0.2/functions/_perl_builtin_funcs
-share/zsh/4.0.2/functions/_perl_modules
-share/zsh/4.0.2/functions/_perldoc
-share/zsh/4.0.2/functions/_physical_volumes
-share/zsh/4.0.2/functions/_pids
-share/zsh/4.0.2/functions/_pine
-share/zsh/4.0.2/functions/_ports
-share/zsh/4.0.2/functions/_prcs
-share/zsh/4.0.2/functions/_precommand
-share/zsh/4.0.2/functions/_prefix
-share/zsh/4.0.2/functions/_print
-share/zsh/4.0.2/functions/_printers
-share/zsh/4.0.2/functions/_prompt
-share/zsh/4.0.2/functions/_ps
-share/zsh/4.0.2/functions/_pspdf
-share/zsh/4.0.2/functions/_psutils
-share/zsh/4.0.2/functions/_rcs
-share/zsh/4.0.2/functions/_read
-share/zsh/4.0.2/functions/_read_comp
-share/zsh/4.0.2/functions/_redirect
-share/zsh/4.0.2/functions/_regex_arguments
-share/zsh/4.0.2/functions/_requested
-share/zsh/4.0.2/functions/_retrieve_cache
-share/zsh/4.0.2/functions/_rlogin
-share/zsh/4.0.2/functions/_rpm
-share/zsh/4.0.2/functions/_ruby
-share/zsh/4.0.2/functions/_sched
-share/zsh/4.0.2/functions/_sep_parts
-share/zsh/4.0.2/functions/_set
-share/zsh/4.0.2/functions/_setopt
-share/zsh/4.0.2/functions/_setup
-share/zsh/4.0.2/functions/_sh
-share/zsh/4.0.2/functions/_signals
-share/zsh/4.0.2/functions/_slrn
-share/zsh/4.0.2/functions/_smit
-share/zsh/4.0.2/functions/_socket
-share/zsh/4.0.2/functions/_source
-share/zsh/4.0.2/functions/_ssh
-share/zsh/4.0.2/functions/_stat
-share/zsh/4.0.2/functions/_store_cache
-share/zsh/4.0.2/functions/_strip
-share/zsh/4.0.2/functions/_stty
-share/zsh/4.0.2/functions/_su
-share/zsh/4.0.2/functions/_sub_commands
-share/zsh/4.0.2/functions/_subscript
-share/zsh/4.0.2/functions/_sudo
-share/zsh/4.0.2/functions/_tags
-share/zsh/4.0.2/functions/_tar
-share/zsh/4.0.2/functions/_tar_archive
-share/zsh/4.0.2/functions/_telnet
-share/zsh/4.0.2/functions/_tex
-share/zsh/4.0.2/functions/_texi
-share/zsh/4.0.2/functions/_tiff
-share/zsh/4.0.2/functions/_tilde
-share/zsh/4.0.2/functions/_tilde_files
-share/zsh/4.0.2/functions/_tin
-share/zsh/4.0.2/functions/_trap
-share/zsh/4.0.2/functions/_ttyctl
-share/zsh/4.0.2/functions/_typeset
-share/zsh/4.0.2/functions/_ulimit
-share/zsh/4.0.2/functions/_unhash
-share/zsh/4.0.2/functions/_unsetopt
-share/zsh/4.0.2/functions/_update-alternatives
-share/zsh/4.0.2/functions/_urls
-share/zsh/4.0.2/functions/_user_at_host
-share/zsh/4.0.2/functions/_users
-share/zsh/4.0.2/functions/_users_on
-share/zsh/4.0.2/functions/_value
-share/zsh/4.0.2/functions/_values
-share/zsh/4.0.2/functions/_vared
-share/zsh/4.0.2/functions/_vars
-share/zsh/4.0.2/functions/_vnc
-share/zsh/4.0.2/functions/_volume_groups
-share/zsh/4.0.2/functions/_w3m
-share/zsh/4.0.2/functions/_wait
-share/zsh/4.0.2/functions/_wanted
-share/zsh/4.0.2/functions/_webbrowser
-share/zsh/4.0.2/functions/_wget
-share/zsh/4.0.2/functions/_whereis
-share/zsh/4.0.2/functions/_which
-share/zsh/4.0.2/functions/_whois
-share/zsh/4.0.2/functions/_x_arguments
-share/zsh/4.0.2/functions/_x_borderwidth
-share/zsh/4.0.2/functions/_x_color
-share/zsh/4.0.2/functions/_x_colormapid
-share/zsh/4.0.2/functions/_x_cursor
-share/zsh/4.0.2/functions/_x_display
-share/zsh/4.0.2/functions/_x_extension
-share/zsh/4.0.2/functions/_x_font
-share/zsh/4.0.2/functions/_x_geometry
-share/zsh/4.0.2/functions/_x_keysym
-share/zsh/4.0.2/functions/_x_locale
-share/zsh/4.0.2/functions/_x_modifier
-share/zsh/4.0.2/functions/_x_name
-share/zsh/4.0.2/functions/_x_resource
-share/zsh/4.0.2/functions/_x_selection_timeout
-share/zsh/4.0.2/functions/_x_title
-share/zsh/4.0.2/functions/_x_utils
-share/zsh/4.0.2/functions/_x_window
-share/zsh/4.0.2/functions/_xargs
-share/zsh/4.0.2/functions/_xauth
-share/zsh/4.0.2/functions/_xdvi
-share/zsh/4.0.2/functions/_xfig
-share/zsh/4.0.2/functions/_xmodmap
-share/zsh/4.0.2/functions/_xrdb
-share/zsh/4.0.2/functions/_xset
-share/zsh/4.0.2/functions/_xt_arguments
-share/zsh/4.0.2/functions/_xt_session_id
-share/zsh/4.0.2/functions/_xterm
-share/zsh/4.0.2/functions/_xv
-share/zsh/4.0.2/functions/_xwit
-share/zsh/4.0.2/functions/_yodl
-share/zsh/4.0.2/functions/_yp
-share/zsh/4.0.2/functions/_zcat
-share/zsh/4.0.2/functions/_zcompile
-share/zsh/4.0.2/functions/_zdump
-share/zsh/4.0.2/functions/_zed
-share/zsh/4.0.2/functions/_zftp
-share/zsh/4.0.2/functions/_zip
-share/zsh/4.0.2/functions/_zle
-share/zsh/4.0.2/functions/_zmodload
-share/zsh/4.0.2/functions/_zpty
-share/zsh/4.0.2/functions/_zstyle
-share/zsh/4.0.2/functions/allopt
-share/zsh/4.0.2/functions/checkmail
-share/zsh/4.0.2/functions/colors
-share/zsh/4.0.2/functions/compaudit
-share/zsh/4.0.2/functions/compdump
-share/zsh/4.0.2/functions/compinit
-share/zsh/4.0.2/functions/compinstall
-share/zsh/4.0.2/functions/cycle-completion-positions
-share/zsh/4.0.2/functions/edit-command-line
-share/zsh/4.0.2/functions/getjobs
-share/zsh/4.0.2/functions/harden
-share/zsh/4.0.2/functions/history-search-end
-share/zsh/4.0.2/functions/incarg
-share/zsh/4.0.2/functions/incremental-complete-word
-share/zsh/4.0.2/functions/insert-files
-share/zsh/4.0.2/functions/is-at-least
-share/zsh/4.0.2/functions/mere
-share/zsh/4.0.2/functions/nslookup
-share/zsh/4.0.2/functions/predict-on
-share/zsh/4.0.2/functions/prompt_adam1_setup
-share/zsh/4.0.2/functions/prompt_adam2_setup
-share/zsh/4.0.2/functions/prompt_bart_setup
-share/zsh/4.0.2/functions/prompt_bigfade_setup
-share/zsh/4.0.2/functions/prompt_clint_setup
-share/zsh/4.0.2/functions/prompt_elite2_setup
-share/zsh/4.0.2/functions/prompt_elite_setup
-share/zsh/4.0.2/functions/prompt_fade_setup
-share/zsh/4.0.2/functions/prompt_fire_setup
-share/zsh/4.0.2/functions/prompt_off_setup
-share/zsh/4.0.2/functions/prompt_oliver_setup
-share/zsh/4.0.2/functions/prompt_redhat_setup
-share/zsh/4.0.2/functions/prompt_suse_setup
-share/zsh/4.0.2/functions/prompt_zefram_setup
-share/zsh/4.0.2/functions/promptinit
-share/zsh/4.0.2/functions/promptnl
-share/zsh/4.0.2/functions/run-help
-share/zsh/4.0.2/functions/smart-insert-last-word
-share/zsh/4.0.2/functions/zed
-share/zsh/4.0.2/functions/zkbd
-share/zsh/4.0.2/functions/zmv
-share/zsh/4.0.2/functions/zrecompile
-share/zsh/4.0.2/functions/zstyle+
+share/zsh/${PKGVERSION}/functions/_a2ps
+share/zsh/${PKGVERSION}/functions/_alias
+share/zsh/${PKGVERSION}/functions/_aliases
+share/zsh/${PKGVERSION}/functions/_all_labels
+share/zsh/${PKGVERSION}/functions/_all_matches
+share/zsh/${PKGVERSION}/functions/_alternative
+share/zsh/${PKGVERSION}/functions/_apachectl
+share/zsh/${PKGVERSION}/functions/_apm
+share/zsh/${PKGVERSION}/functions/_approximate
+share/zsh/${PKGVERSION}/functions/_apt
+share/zsh/${PKGVERSION}/functions/_archie
+share/zsh/${PKGVERSION}/functions/_arg_compile
+share/zsh/${PKGVERSION}/functions/_arguments
+share/zsh/${PKGVERSION}/functions/_arp
+share/zsh/${PKGVERSION}/functions/_arrays
+share/zsh/${PKGVERSION}/functions/_autocd
+share/zsh/${PKGVERSION}/functions/_autoload
+share/zsh/${PKGVERSION}/functions/_bash_completions
+share/zsh/${PKGVERSION}/functions/_bindkey
+share/zsh/${PKGVERSION}/functions/_bison
+share/zsh/${PKGVERSION}/functions/_brace_parameter
+share/zsh/${PKGVERSION}/functions/_bsd_pkg
+share/zsh/${PKGVERSION}/functions/_bug
+share/zsh/${PKGVERSION}/functions/_builtin
+share/zsh/${PKGVERSION}/functions/_bzip2
+share/zsh/${PKGVERSION}/functions/_cache_invalid
+share/zsh/${PKGVERSION}/functions/_call_function
+share/zsh/${PKGVERSION}/functions/_call_program
+share/zsh/${PKGVERSION}/functions/_cd
+share/zsh/${PKGVERSION}/functions/_chown
+share/zsh/${PKGVERSION}/functions/_combination
+share/zsh/${PKGVERSION}/functions/_command
+share/zsh/${PKGVERSION}/functions/_command_names
+share/zsh/${PKGVERSION}/functions/_compdef
+share/zsh/${PKGVERSION}/functions/_complete
+share/zsh/${PKGVERSION}/functions/_complete_debug
+share/zsh/${PKGVERSION}/functions/_complete_help
+share/zsh/${PKGVERSION}/functions/_complete_tag
+share/zsh/${PKGVERSION}/functions/_compress
+share/zsh/${PKGVERSION}/functions/_condition
+share/zsh/${PKGVERSION}/functions/_configure
+share/zsh/${PKGVERSION}/functions/_contexts
+share/zsh/${PKGVERSION}/functions/_correct
+share/zsh/${PKGVERSION}/functions/_correct_filename
+share/zsh/${PKGVERSION}/functions/_correct_word
+share/zsh/${PKGVERSION}/functions/_cpio
+share/zsh/${PKGVERSION}/functions/_cvs
+share/zsh/${PKGVERSION}/functions/_cvsup
+share/zsh/${PKGVERSION}/functions/_dd
+share/zsh/${PKGVERSION}/functions/_deb_packages
+share/zsh/${PKGVERSION}/functions/_default
+share/zsh/${PKGVERSION}/functions/_describe
+share/zsh/${PKGVERSION}/functions/_description
+share/zsh/${PKGVERSION}/functions/_dict
+share/zsh/${PKGVERSION}/functions/_dict_words
+share/zsh/${PKGVERSION}/functions/_diff
+share/zsh/${PKGVERSION}/functions/_diff_options
+share/zsh/${PKGVERSION}/functions/_dir_list
+share/zsh/${PKGVERSION}/functions/_directories
+share/zsh/${PKGVERSION}/functions/_directory_stack
+share/zsh/${PKGVERSION}/functions/_disable
+share/zsh/${PKGVERSION}/functions/_domains
+share/zsh/${PKGVERSION}/functions/_dpkg
+share/zsh/${PKGVERSION}/functions/_dpkg_source
+share/zsh/${PKGVERSION}/functions/_dupload
+share/zsh/${PKGVERSION}/functions/_dvi
+share/zsh/${PKGVERSION}/functions/_echotc
+share/zsh/${PKGVERSION}/functions/_echoti
+share/zsh/${PKGVERSION}/functions/_elm
+share/zsh/${PKGVERSION}/functions/_emulate
+share/zsh/${PKGVERSION}/functions/_enable
+share/zsh/${PKGVERSION}/functions/_enscript
+share/zsh/${PKGVERSION}/functions/_equal
+share/zsh/${PKGVERSION}/functions/_expand
+share/zsh/${PKGVERSION}/functions/_expand_alias
+share/zsh/${PKGVERSION}/functions/_expand_word
+share/zsh/${PKGVERSION}/functions/_fakeroot
+share/zsh/${PKGVERSION}/functions/_fc
+share/zsh/${PKGVERSION}/functions/_fetchmail
+share/zsh/${PKGVERSION}/functions/_file_descriptors
+share/zsh/${PKGVERSION}/functions/_files
+share/zsh/${PKGVERSION}/functions/_find
+share/zsh/${PKGVERSION}/functions/_finger
+share/zsh/${PKGVERSION}/functions/_first
+share/zsh/${PKGVERSION}/functions/_flex
+share/zsh/${PKGVERSION}/functions/_floppy
+share/zsh/${PKGVERSION}/functions/_functions
+share/zsh/${PKGVERSION}/functions/_gcc
+share/zsh/${PKGVERSION}/functions/_gdb
+share/zsh/${PKGVERSION}/functions/_generic
+share/zsh/${PKGVERSION}/functions/_getconf
+share/zsh/${PKGVERSION}/functions/_gnu_generic
+share/zsh/${PKGVERSION}/functions/_gprof
+share/zsh/${PKGVERSION}/functions/_grep
+share/zsh/${PKGVERSION}/functions/_groups
+share/zsh/${PKGVERSION}/functions/_gs
+share/zsh/${PKGVERSION}/functions/_guard
+share/zsh/${PKGVERSION}/functions/_gv
+share/zsh/${PKGVERSION}/functions/_gzip
+share/zsh/${PKGVERSION}/functions/_hash
+share/zsh/${PKGVERSION}/functions/_history
+share/zsh/${PKGVERSION}/functions/_history_complete_word
+share/zsh/${PKGVERSION}/functions/_hosts
+share/zsh/${PKGVERSION}/functions/_iconv
+share/zsh/${PKGVERSION}/functions/_ignored
+share/zsh/${PKGVERSION}/functions/_imagemagick
+share/zsh/${PKGVERSION}/functions/_in_vared
+share/zsh/${PKGVERSION}/functions/_init_d
+share/zsh/${PKGVERSION}/functions/_ispell
+share/zsh/${PKGVERSION}/functions/_java
+share/zsh/${PKGVERSION}/functions/_jobs
+share/zsh/${PKGVERSION}/functions/_jobs_bg
+share/zsh/${PKGVERSION}/functions/_jobs_builtin
+share/zsh/${PKGVERSION}/functions/_jobs_fg
+share/zsh/${PKGVERSION}/functions/_joe
+share/zsh/${PKGVERSION}/functions/_kill
+share/zsh/${PKGVERSION}/functions/_killall
+share/zsh/${PKGVERSION}/functions/_kld
+share/zsh/${PKGVERSION}/functions/_limits
+share/zsh/${PKGVERSION}/functions/_list
+share/zsh/${PKGVERSION}/functions/_loadkeys
+share/zsh/${PKGVERSION}/functions/_logical_volumes
+share/zsh/${PKGVERSION}/functions/_look
+share/zsh/${PKGVERSION}/functions/_lp
+share/zsh/${PKGVERSION}/functions/_ls
+share/zsh/${PKGVERSION}/functions/_lscfg
+share/zsh/${PKGVERSION}/functions/_lsdev
+share/zsh/${PKGVERSION}/functions/_lslv
+share/zsh/${PKGVERSION}/functions/_lspv
+share/zsh/${PKGVERSION}/functions/_lsvg
+share/zsh/${PKGVERSION}/functions/_lynx
+share/zsh/${PKGVERSION}/functions/_lzop
+share/zsh/${PKGVERSION}/functions/_mail
+share/zsh/${PKGVERSION}/functions/_mailboxes
+share/zsh/${PKGVERSION}/functions/_main_complete
+share/zsh/${PKGVERSION}/functions/_make
+share/zsh/${PKGVERSION}/functions/_man
+share/zsh/${PKGVERSION}/functions/_match
+share/zsh/${PKGVERSION}/functions/_math
+share/zsh/${PKGVERSION}/functions/_menu
+share/zsh/${PKGVERSION}/functions/_mere
+share/zsh/${PKGVERSION}/functions/_message
+share/zsh/${PKGVERSION}/functions/_mh
+share/zsh/${PKGVERSION}/functions/_modutils
+share/zsh/${PKGVERSION}/functions/_most_recent_file
+share/zsh/${PKGVERSION}/functions/_mount
+share/zsh/${PKGVERSION}/functions/_multi_parts
+share/zsh/${PKGVERSION}/functions/_mutt
+share/zsh/${PKGVERSION}/functions/_my_accounts
+share/zsh/${PKGVERSION}/functions/_mysql_utils
+share/zsh/${PKGVERSION}/functions/_ncftp
+share/zsh/${PKGVERSION}/functions/_nedit
+share/zsh/${PKGVERSION}/functions/_netscape
+share/zsh/${PKGVERSION}/functions/_newsgroups
+share/zsh/${PKGVERSION}/functions/_next_label
+share/zsh/${PKGVERSION}/functions/_next_tags
+share/zsh/${PKGVERSION}/functions/_normal
+share/zsh/${PKGVERSION}/functions/_nothing
+share/zsh/${PKGVERSION}/functions/_nslookup
+share/zsh/${PKGVERSION}/functions/_object_classes
+share/zsh/${PKGVERSION}/functions/_oldlist
+share/zsh/${PKGVERSION}/functions/_options
+share/zsh/${PKGVERSION}/functions/_options_set
+share/zsh/${PKGVERSION}/functions/_options_unset
+share/zsh/${PKGVERSION}/functions/_other_accounts
+share/zsh/${PKGVERSION}/functions/_pack
+share/zsh/${PKGVERSION}/functions/_parameter
+share/zsh/${PKGVERSION}/functions/_parameters
+share/zsh/${PKGVERSION}/functions/_patch
+share/zsh/${PKGVERSION}/functions/_path_files
+share/zsh/${PKGVERSION}/functions/_pbm
+share/zsh/${PKGVERSION}/functions/_pdf
+share/zsh/${PKGVERSION}/functions/_perl
+share/zsh/${PKGVERSION}/functions/_perl_basepods
+share/zsh/${PKGVERSION}/functions/_perl_builtin_funcs
+share/zsh/${PKGVERSION}/functions/_perl_modules
+share/zsh/${PKGVERSION}/functions/_perldoc
+share/zsh/${PKGVERSION}/functions/_physical_volumes
+share/zsh/${PKGVERSION}/functions/_pids
+share/zsh/${PKGVERSION}/functions/_pine
+share/zsh/${PKGVERSION}/functions/_ports
+share/zsh/${PKGVERSION}/functions/_prcs
+share/zsh/${PKGVERSION}/functions/_precommand
+share/zsh/${PKGVERSION}/functions/_prefix
+share/zsh/${PKGVERSION}/functions/_print
+share/zsh/${PKGVERSION}/functions/_printers
+share/zsh/${PKGVERSION}/functions/_prompt
+share/zsh/${PKGVERSION}/functions/_ps
+share/zsh/${PKGVERSION}/functions/_pspdf
+share/zsh/${PKGVERSION}/functions/_psutils
+share/zsh/${PKGVERSION}/functions/_rcs
+share/zsh/${PKGVERSION}/functions/_read
+share/zsh/${PKGVERSION}/functions/_read_comp
+share/zsh/${PKGVERSION}/functions/_redirect
+share/zsh/${PKGVERSION}/functions/_regex_arguments
+share/zsh/${PKGVERSION}/functions/_requested
+share/zsh/${PKGVERSION}/functions/_retrieve_cache
+share/zsh/${PKGVERSION}/functions/_rlogin
+share/zsh/${PKGVERSION}/functions/_rpm
+share/zsh/${PKGVERSION}/functions/_ruby
+share/zsh/${PKGVERSION}/functions/_sched
+share/zsh/${PKGVERSION}/functions/_sep_parts
+share/zsh/${PKGVERSION}/functions/_set
+share/zsh/${PKGVERSION}/functions/_setopt
+share/zsh/${PKGVERSION}/functions/_setup
+share/zsh/${PKGVERSION}/functions/_sh
+share/zsh/${PKGVERSION}/functions/_signals
+share/zsh/${PKGVERSION}/functions/_slrn
+share/zsh/${PKGVERSION}/functions/_smit
+share/zsh/${PKGVERSION}/functions/_socket
+share/zsh/${PKGVERSION}/functions/_source
+share/zsh/${PKGVERSION}/functions/_ssh
+share/zsh/${PKGVERSION}/functions/_stat
+share/zsh/${PKGVERSION}/functions/_store_cache
+share/zsh/${PKGVERSION}/functions/_strip
+share/zsh/${PKGVERSION}/functions/_stty
+share/zsh/${PKGVERSION}/functions/_su
+share/zsh/${PKGVERSION}/functions/_sub_commands
+share/zsh/${PKGVERSION}/functions/_subscript
+share/zsh/${PKGVERSION}/functions/_sudo
+share/zsh/${PKGVERSION}/functions/_tags
+share/zsh/${PKGVERSION}/functions/_tar
+share/zsh/${PKGVERSION}/functions/_tar_archive
+share/zsh/${PKGVERSION}/functions/_telnet
+share/zsh/${PKGVERSION}/functions/_tex
+share/zsh/${PKGVERSION}/functions/_texi
+share/zsh/${PKGVERSION}/functions/_tiff
+share/zsh/${PKGVERSION}/functions/_tilde
+share/zsh/${PKGVERSION}/functions/_tilde_files
+share/zsh/${PKGVERSION}/functions/_tin
+share/zsh/${PKGVERSION}/functions/_trap
+share/zsh/${PKGVERSION}/functions/_ttyctl
+share/zsh/${PKGVERSION}/functions/_typeset
+share/zsh/${PKGVERSION}/functions/_ulimit
+share/zsh/${PKGVERSION}/functions/_unhash
+share/zsh/${PKGVERSION}/functions/_unsetopt
+share/zsh/${PKGVERSION}/functions/_update-alternatives
+share/zsh/${PKGVERSION}/functions/_urls
+share/zsh/${PKGVERSION}/functions/_user_at_host
+share/zsh/${PKGVERSION}/functions/_users
+share/zsh/${PKGVERSION}/functions/_users_on
+share/zsh/${PKGVERSION}/functions/_value
+share/zsh/${PKGVERSION}/functions/_values
+share/zsh/${PKGVERSION}/functions/_vared
+share/zsh/${PKGVERSION}/functions/_vars
+share/zsh/${PKGVERSION}/functions/_vnc
+share/zsh/${PKGVERSION}/functions/_volume_groups
+share/zsh/${PKGVERSION}/functions/_w3m
+share/zsh/${PKGVERSION}/functions/_wait
+share/zsh/${PKGVERSION}/functions/_wanted
+share/zsh/${PKGVERSION}/functions/_webbrowser
+share/zsh/${PKGVERSION}/functions/_wget
+share/zsh/${PKGVERSION}/functions/_whereis
+share/zsh/${PKGVERSION}/functions/_which
+share/zsh/${PKGVERSION}/functions/_whois
+share/zsh/${PKGVERSION}/functions/_x_arguments
+share/zsh/${PKGVERSION}/functions/_x_borderwidth
+share/zsh/${PKGVERSION}/functions/_x_color
+share/zsh/${PKGVERSION}/functions/_x_colormapid
+share/zsh/${PKGVERSION}/functions/_x_cursor
+share/zsh/${PKGVERSION}/functions/_x_display
+share/zsh/${PKGVERSION}/functions/_x_extension
+share/zsh/${PKGVERSION}/functions/_x_font
+share/zsh/${PKGVERSION}/functions/_x_geometry
+share/zsh/${PKGVERSION}/functions/_x_keysym
+share/zsh/${PKGVERSION}/functions/_x_locale
+share/zsh/${PKGVERSION}/functions/_x_modifier
+share/zsh/${PKGVERSION}/functions/_x_name
+share/zsh/${PKGVERSION}/functions/_x_resource
+share/zsh/${PKGVERSION}/functions/_x_selection_timeout
+share/zsh/${PKGVERSION}/functions/_x_title
+share/zsh/${PKGVERSION}/functions/_x_utils
+share/zsh/${PKGVERSION}/functions/_x_window
+share/zsh/${PKGVERSION}/functions/_xargs
+share/zsh/${PKGVERSION}/functions/_xauth
+share/zsh/${PKGVERSION}/functions/_xdvi
+share/zsh/${PKGVERSION}/functions/_xfig
+share/zsh/${PKGVERSION}/functions/_xmodmap
+share/zsh/${PKGVERSION}/functions/_xrdb
+share/zsh/${PKGVERSION}/functions/_xset
+share/zsh/${PKGVERSION}/functions/_xt_arguments
+share/zsh/${PKGVERSION}/functions/_xt_session_id
+share/zsh/${PKGVERSION}/functions/_xterm
+share/zsh/${PKGVERSION}/functions/_xv
+share/zsh/${PKGVERSION}/functions/_xwit
+share/zsh/${PKGVERSION}/functions/_yodl
+share/zsh/${PKGVERSION}/functions/_yp
+share/zsh/${PKGVERSION}/functions/_zcat
+share/zsh/${PKGVERSION}/functions/_zcompile
+share/zsh/${PKGVERSION}/functions/_zdump
+share/zsh/${PKGVERSION}/functions/_zed
+share/zsh/${PKGVERSION}/functions/_zftp
+share/zsh/${PKGVERSION}/functions/_zip
+share/zsh/${PKGVERSION}/functions/_zle
+share/zsh/${PKGVERSION}/functions/_zmodload
+share/zsh/${PKGVERSION}/functions/_zpty
+share/zsh/${PKGVERSION}/functions/_zstyle
+share/zsh/${PKGVERSION}/functions/allopt
+share/zsh/${PKGVERSION}/functions/checkmail
+share/zsh/${PKGVERSION}/functions/colors
+share/zsh/${PKGVERSION}/functions/compaudit
+share/zsh/${PKGVERSION}/functions/compdump
+share/zsh/${PKGVERSION}/functions/compinit
+share/zsh/${PKGVERSION}/functions/compinstall
+share/zsh/${PKGVERSION}/functions/cycle-completion-positions
+share/zsh/${PKGVERSION}/functions/edit-command-line
+share/zsh/${PKGVERSION}/functions/getjobs
+share/zsh/${PKGVERSION}/functions/harden
+share/zsh/${PKGVERSION}/functions/history-search-end
+share/zsh/${PKGVERSION}/functions/incarg
+share/zsh/${PKGVERSION}/functions/incremental-complete-word
+share/zsh/${PKGVERSION}/functions/insert-files
+share/zsh/${PKGVERSION}/functions/is-at-least
+share/zsh/${PKGVERSION}/functions/mere
+share/zsh/${PKGVERSION}/functions/nslookup
+share/zsh/${PKGVERSION}/functions/predict-on
+share/zsh/${PKGVERSION}/functions/prompt_adam1_setup
+share/zsh/${PKGVERSION}/functions/prompt_adam2_setup
+share/zsh/${PKGVERSION}/functions/prompt_bart_setup
+share/zsh/${PKGVERSION}/functions/prompt_bigfade_setup
+share/zsh/${PKGVERSION}/functions/prompt_clint_setup
+share/zsh/${PKGVERSION}/functions/prompt_elite2_setup
+share/zsh/${PKGVERSION}/functions/prompt_elite_setup
+share/zsh/${PKGVERSION}/functions/prompt_fade_setup
+share/zsh/${PKGVERSION}/functions/prompt_fire_setup
+share/zsh/${PKGVERSION}/functions/prompt_off_setup
+share/zsh/${PKGVERSION}/functions/prompt_oliver_setup
+share/zsh/${PKGVERSION}/functions/prompt_redhat_setup
+share/zsh/${PKGVERSION}/functions/prompt_suse_setup
+share/zsh/${PKGVERSION}/functions/prompt_zefram_setup
+share/zsh/${PKGVERSION}/functions/promptinit
+share/zsh/${PKGVERSION}/functions/promptnl
+share/zsh/${PKGVERSION}/functions/run-help
+share/zsh/${PKGVERSION}/functions/smart-insert-last-word
+share/zsh/${PKGVERSION}/functions/zed
+share/zsh/${PKGVERSION}/functions/zkbd
+share/zsh/${PKGVERSION}/functions/zmv
+share/zsh/${PKGVERSION}/functions/zrecompile
+share/zsh/${PKGVERSION}/functions/zstyle+
 @dirrm share/zsh/site-functions
-@dirrm share/zsh/4.0.2/functions
-@dirrm share/zsh/4.0.2
+@dirrm share/zsh/${PKGVERSION}/functions
+@dirrm share/zsh/${PKGVERSION}
 @dirrm share/zsh
 @dirrm share/doc/zsh
diff --git a/shells/zsh/pkg/PLIST.dynamic b/shells/zsh/pkg/PLIST.dynamic
index 14f37884340..28a13f21478 100644
--- a/shells/zsh/pkg/PLIST.dynamic
+++ b/shells/zsh/pkg/PLIST.dynamic
@@ -1,59 +1,59 @@
-@comment $NetBSD: PLIST.dynamic,v 1.3 2001/09/23 21:15:39 tron Exp $
-lib/zsh/libzsh-4.0.2.so
-lib/zsh/4.0.2/zsh/rlimits.so
-lib/zsh/4.0.2/zsh/sched.so
-lib/zsh/4.0.2/zsh/cap.so
-lib/zsh/4.0.2/zsh/clone.so
-lib/zsh/4.0.2/zsh/example.so
-lib/zsh/4.0.2/zsh/files.so
-lib/zsh/4.0.2/zsh/mapfile.so
-lib/zsh/4.0.2/zsh/mathfunc.so
-lib/zsh/4.0.2/zsh/parameter.so
-lib/zsh/4.0.2/zsh/stat.so
-lib/zsh/4.0.2/zsh/termcap.so
-lib/zsh/4.0.2/zsh/terminfo.so
-lib/zsh/4.0.2/zsh/zftp.so
-lib/zsh/4.0.2/zsh/zprof.so
-lib/zsh/4.0.2/zsh/zpty.so
-lib/zsh/4.0.2/zsh/zutil.so
-lib/zsh/4.0.2/zsh/compctl.so
-lib/zsh/4.0.2/zsh/complete.so
-lib/zsh/4.0.2/zsh/complist.so
-lib/zsh/4.0.2/zsh/computil.so
-lib/zsh/4.0.2/zsh/deltochar.so
-lib/zsh/4.0.2/zsh/zle.so
-lib/zsh/4.0.2/zsh/zleparameter.so
-share/zsh/4.0.2/functions/zfanon
-share/zsh/4.0.2/functions/zfautocheck
-share/zsh/4.0.2/functions/zfcd
-share/zsh/4.0.2/functions/zfcd_match
-share/zsh/4.0.2/functions/zfcget
-share/zsh/4.0.2/functions/zfclose
-share/zsh/4.0.2/functions/zfcput
-share/zsh/4.0.2/functions/zfdir
-share/zsh/4.0.2/functions/zffcache
-share/zsh/4.0.2/functions/zfgcp
-share/zsh/4.0.2/functions/zfget
-share/zsh/4.0.2/functions/zfget_match
-share/zsh/4.0.2/functions/zfgoto
-share/zsh/4.0.2/functions/zfhere
-share/zsh/4.0.2/functions/zfinit
-share/zsh/4.0.2/functions/zfls
-share/zsh/4.0.2/functions/zfmark
-share/zsh/4.0.2/functions/zfopen
-share/zsh/4.0.2/functions/zfparams
-share/zsh/4.0.2/functions/zfpcp
-share/zsh/4.0.2/functions/zfput
-share/zsh/4.0.2/functions/zfrglob
-share/zsh/4.0.2/functions/zfrtime
-share/zsh/4.0.2/functions/zfsession
-share/zsh/4.0.2/functions/zfstat
-share/zsh/4.0.2/functions/zftp_chpwd
-share/zsh/4.0.2/functions/zftp_progress
-share/zsh/4.0.2/functions/zftransfer
-share/zsh/4.0.2/functions/zftype
-share/zsh/4.0.2/functions/zfuget
-share/zsh/4.0.2/functions/zfuput
-@dirrm lib/zsh/4.0.2/zsh
-@dirrm lib/zsh/4.0.2
+@comment $NetBSD: PLIST.dynamic,v 1.4 2001/09/23 21:20:35 tron Exp $
+lib/zsh/libzsh-${PKGVERSION}.so
+lib/zsh/${PKGVERSION}/zsh/rlimits.so
+lib/zsh/${PKGVERSION}/zsh/sched.so
+lib/zsh/${PKGVERSION}/zsh/cap.so
+lib/zsh/${PKGVERSION}/zsh/clone.so
+lib/zsh/${PKGVERSION}/zsh/example.so
+lib/zsh/${PKGVERSION}/zsh/files.so
+lib/zsh/${PKGVERSION}/zsh/mapfile.so
+lib/zsh/${PKGVERSION}/zsh/mathfunc.so
+lib/zsh/${PKGVERSION}/zsh/parameter.so
+lib/zsh/${PKGVERSION}/zsh/stat.so
+lib/zsh/${PKGVERSION}/zsh/termcap.so
+lib/zsh/${PKGVERSION}/zsh/terminfo.so
+lib/zsh/${PKGVERSION}/zsh/zftp.so
+lib/zsh/${PKGVERSION}/zsh/zprof.so
+lib/zsh/${PKGVERSION}/zsh/zpty.so
+lib/zsh/${PKGVERSION}/zsh/zutil.so
+lib/zsh/${PKGVERSION}/zsh/compctl.so
+lib/zsh/${PKGVERSION}/zsh/complete.so
+lib/zsh/${PKGVERSION}/zsh/complist.so
+lib/zsh/${PKGVERSION}/zsh/computil.so
+lib/zsh/${PKGVERSION}/zsh/deltochar.so
+lib/zsh/${PKGVERSION}/zsh/zle.so
+lib/zsh/${PKGVERSION}/zsh/zleparameter.so
+share/zsh/${PKGVERSION}/functions/zfanon
+share/zsh/${PKGVERSION}/functions/zfautocheck
+share/zsh/${PKGVERSION}/functions/zfcd
+share/zsh/${PKGVERSION}/functions/zfcd_match
+share/zsh/${PKGVERSION}/functions/zfcget
+share/zsh/${PKGVERSION}/functions/zfclose
+share/zsh/${PKGVERSION}/functions/zfcput
+share/zsh/${PKGVERSION}/functions/zfdir
+share/zsh/${PKGVERSION}/functions/zffcache
+share/zsh/${PKGVERSION}/functions/zfgcp
+share/zsh/${PKGVERSION}/functions/zfget
+share/zsh/${PKGVERSION}/functions/zfget_match
+share/zsh/${PKGVERSION}/functions/zfgoto
+share/zsh/${PKGVERSION}/functions/zfhere
+share/zsh/${PKGVERSION}/functions/zfinit
+share/zsh/${PKGVERSION}/functions/zfls
+share/zsh/${PKGVERSION}/functions/zfmark
+share/zsh/${PKGVERSION}/functions/zfopen
+share/zsh/${PKGVERSION}/functions/zfparams
+share/zsh/${PKGVERSION}/functions/zfpcp
+share/zsh/${PKGVERSION}/functions/zfput
+share/zsh/${PKGVERSION}/functions/zfrglob
+share/zsh/${PKGVERSION}/functions/zfrtime
+share/zsh/${PKGVERSION}/functions/zfsession
+share/zsh/${PKGVERSION}/functions/zfstat
+share/zsh/${PKGVERSION}/functions/zftp_chpwd
+share/zsh/${PKGVERSION}/functions/zftp_progress
+share/zsh/${PKGVERSION}/functions/zftransfer
+share/zsh/${PKGVERSION}/functions/zftype
+share/zsh/${PKGVERSION}/functions/zfuget
+share/zsh/${PKGVERSION}/functions/zfuput
+@dirrm lib/zsh/${PKGVERSION}/zsh
+@dirrm lib/zsh/${PKGVERSION}
 @dirrm lib/zsh