4 files changed, 187 insertions, 158 deletions

diff --git a/shells/zsh-devel/Makefile b/shells/zsh-devel/Makefile
index 05b678b28e18..3e746bd5e24f 100644
--- a/shells/zsh-devel/Makefile
+++ b/shells/zsh-devel/Makefile
@@ -6,17 +6,23 @@
 #
 
 PORTNAME=	zsh
-PORTVERSION=	3.1.6
+PORTVERSION= 	${ZSH_VER}
 CATEGORIES=	shells
 MASTER_SITES=	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/
+		ftp://ftp.uit.no/pub/unix/shells/zsh/ \
+		http://people.FreeBSD.org/~knu/ports/distfiles/
+
+DISTFILES=	zsh-${ZSH_VER}.tar.gz ${ZSHFUNC_FILES}
 
 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
 NO_LATEST_LINK=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-zsh-mem --enable-zsh-secure-free --enable-dynamic
@@ -24,6 +30,9 @@ 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
 
@@ -39,6 +48,9 @@ post-build:
 	)
 
 post-install:
+	@for i in ${ZSHFUNC_FILES} ; do \
+		${TAR} zxf ${DISTDIR}/$${i} -C ${PREFIX}/${ZSHFUNC_SUBDIR} ;\
+	done
 	@${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 a6172d755069..758a94f9d442 100644
--- a/shells/zsh-devel/distinfo
+++ b/shells/zsh-devel/distinfo
@@ -1 +1,2 @@
 MD5 (zsh-3.1.6.tar.gz) = e5b9af6eb65c44950a1aebb2c4b72623
+MD5 (zsh-functions-freebsd-2000.03.31.tar.gz) = 0b958d1b3523d9dc32a64edd98e7edb7
diff --git a/shells/zsh-devel/pkg-descr b/shells/zsh-devel/pkg-descr
index 8f4144f053ea..5df075c1db61 100644
--- a/shells/zsh-devel/pkg-descr
+++ b/shells/zsh-devel/pkg-descr
@@ -4,3 +4,11 @@ compatible.  It includes enhancements of many types, notably in the
 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. :)
diff --git a/shells/zsh-devel/pkg-plist b/shells/zsh-devel/pkg-plist
index c899b2df060e..0cd3befb391b 100644
--- a/shells/zsh-devel/pkg-plist
+++ b/shells/zsh-devel/pkg-plist
@@ -1,164 +1,172 @@
 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-3.1.6
+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/3.1.6/cap.so
-lib/zsh/3.1.6/clone.so
-lib/zsh/3.1.6/comp1.so
-lib/zsh/3.1.6/compctl.so
-lib/zsh/3.1.6/complist.so
-lib/zsh/3.1.6/deltochar.so
-lib/zsh/3.1.6/example.so
-lib/zsh/3.1.6/files.so
-lib/zsh/3.1.6/mapfile.so
-lib/zsh/3.1.6/parameter.so
-lib/zsh/3.1.6/rlimits.so
-lib/zsh/3.1.6/sched.so
-lib/zsh/3.1.6/stat.so
-lib/zsh/3.1.6/zftp.so
-lib/zsh/3.1.6/zle.so
-share/zsh/functions/_a2ps
-share/zsh/functions/_aliases
-share/zsh/functions/_approximate
-share/zsh/functions/_arrays
-share/zsh/functions/_autoload
-share/zsh/functions/_bg_jobs
-share/zsh/functions/_bindkey
-share/zsh/functions/_brace_parameter
-share/zsh/functions/_builtin
-share/zsh/functions/_bunzip2
-share/zsh/functions/_bzip2
-share/zsh/functions/_cd
-share/zsh/functions/_chown
-share/zsh/functions/_command
-share/zsh/functions/_command_names
-share/zsh/functions/_compalso
-share/zsh/functions/_complete
-share/zsh/functions/_complete_opts
-share/zsh/functions/_compress
-share/zsh/functions/_condition
-share/zsh/functions/_configure
-share/zsh/functions/_correct
-share/zsh/functions/_correct_filename
-share/zsh/functions/_correct_word
-share/zsh/functions/_cvs
-share/zsh/functions/_dd
-share/zsh/functions/_default
-share/zsh/functions/_dirs
-share/zsh/functions/_disable
-share/zsh/functions/_dvi
-share/zsh/functions/_echotc
-share/zsh/functions/_enable
-share/zsh/functions/_equal
-share/zsh/functions/_expand
-share/zsh/functions/_expand_word
-share/zsh/functions/_fc
-share/zsh/functions/_files
-share/zsh/functions/_find
-share/zsh/functions/_first
-share/zsh/functions/_functions
-share/zsh/functions/_gdb
-share/zsh/functions/_groups
-share/zsh/functions/_gunzip
-share/zsh/functions/_gzip
-share/zsh/functions/_hash
-share/zsh/functions/_history_complete_word
-share/zsh/functions/_hosts
-share/zsh/functions/_jobs
-share/zsh/functions/_kill
-share/zsh/functions/_limits
-share/zsh/functions/_list
-share/zsh/functions/_long_options
-share/zsh/functions/_main_complete
-share/zsh/functions/_make
-share/zsh/functions/_man
-share/zsh/functions/_match
-share/zsh/functions/_math
-share/zsh/functions/_menu
-share/zsh/functions/_mh
-share/zsh/functions/_most_recent_file
-share/zsh/functions/_multi_parts
-share/zsh/functions/_normal
-share/zsh/functions/_oldlist
-share/zsh/functions/_options
-share/zsh/functions/_parameter
-share/zsh/functions/_parameters
-share/zsh/functions/_path_files
-share/zsh/functions/_pdf
-share/zsh/functions/_precommand
-share/zsh/functions/_ps
-share/zsh/functions/_rcs
-share/zsh/functions/_read_comp
-share/zsh/functions/_redirect
-share/zsh/functions/_rlogin
-share/zsh/functions/_sched
-share/zsh/functions/_sep_parts
-share/zsh/functions/_set
-share/zsh/functions/_set_options
-share/zsh/functions/_setopt
-share/zsh/functions/_sh
-share/zsh/functions/_source
-share/zsh/functions/_stat
-share/zsh/functions/_strip
-share/zsh/functions/_stty
-share/zsh/functions/_su
-share/zsh/functions/_subscript
-share/zsh/functions/_tar
-share/zsh/functions/_tar_archive
-share/zsh/functions/_tex
-share/zsh/functions/_tilde
-share/zsh/functions/_trap
-share/zsh/functions/_uncompress
-share/zsh/functions/_unhash
-share/zsh/functions/_unset_options
-share/zsh/functions/_unsetopt
-share/zsh/functions/_use_lo
-share/zsh/functions/_vars
-share/zsh/functions/_vars_eq
-share/zsh/functions/_wait
-share/zsh/functions/_which
-share/zsh/functions/_x_options
-share/zsh/functions/_xfig
-share/zsh/functions/_zftp
-share/zsh/functions/_zle
-share/zsh/functions/_zmodload
-share/zsh/functions/compdump
-share/zsh/functions/compinit
-share/zsh/functions/compinstall
-share/zsh/functions/incremental-complete-word
-share/zsh/functions/insert-files
-share/zsh/functions/zfanon
-share/zsh/functions/zfautocheck
-share/zsh/functions/zfcd
-share/zsh/functions/zfcd_match
-share/zsh/functions/zfcget
-share/zsh/functions/zfclose
-share/zsh/functions/zfcput
-share/zsh/functions/zfdir
-share/zsh/functions/zfgcp
-share/zsh/functions/zfget
-share/zsh/functions/zfget_match
-share/zsh/functions/zfgoto
-share/zsh/functions/zfhere
-share/zsh/functions/zfinit
-share/zsh/functions/zfls
-share/zsh/functions/zfmark
-share/zsh/functions/zfopen
-share/zsh/functions/zfparams
-share/zsh/functions/zfpcp
-share/zsh/functions/zfput
-share/zsh/functions/zfrglob
-share/zsh/functions/zfrtime
-share/zsh/functions/zfstat
-share/zsh/functions/zftp_chpwd
-share/zsh/functions/zftp_progress
-share/zsh/functions/zftype
-share/zsh/functions/zfuget
-share/zsh/functions/zfuput
-@dirrm lib/zsh/3.1.6
+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%%/complist.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%%/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
+%%ZSHFUNC_SUBDIR%%/_a2ps
+%%ZSHFUNC_SUBDIR%%/_aliases
+%%ZSHFUNC_SUBDIR%%/_approximate
+%%ZSHFUNC_SUBDIR%%/_arrays
+%%ZSHFUNC_SUBDIR%%/_autoload
+%%ZSHFUNC_SUBDIR%%/_bg_jobs
+%%ZSHFUNC_SUBDIR%%/_bindkey
+%%ZSHFUNC_SUBDIR%%/_brace_parameter
+%%ZSHFUNC_SUBDIR%%/_builtin
+%%ZSHFUNC_SUBDIR%%/_bunzip2
+%%ZSHFUNC_SUBDIR%%/_bzip2
+%%ZSHFUNC_SUBDIR%%/_cd
+%%ZSHFUNC_SUBDIR%%/_chown
+%%ZSHFUNC_SUBDIR%%/_command
+%%ZSHFUNC_SUBDIR%%/_command_names
+%%ZSHFUNC_SUBDIR%%/_compalso
+%%ZSHFUNC_SUBDIR%%/_complete
+%%ZSHFUNC_SUBDIR%%/_complete_opts
+%%ZSHFUNC_SUBDIR%%/_compress
+%%ZSHFUNC_SUBDIR%%/_condition
+%%ZSHFUNC_SUBDIR%%/_configure
+%%ZSHFUNC_SUBDIR%%/_correct
+%%ZSHFUNC_SUBDIR%%/_correct_filename
+%%ZSHFUNC_SUBDIR%%/_correct_word
+%%ZSHFUNC_SUBDIR%%/_cvs
+%%ZSHFUNC_SUBDIR%%/_dd
+%%ZSHFUNC_SUBDIR%%/_default
+%%ZSHFUNC_SUBDIR%%/_dirs
+%%ZSHFUNC_SUBDIR%%/_disable
+%%ZSHFUNC_SUBDIR%%/_dvi
+%%ZSHFUNC_SUBDIR%%/_echotc
+%%ZSHFUNC_SUBDIR%%/_enable
+%%ZSHFUNC_SUBDIR%%/_equal
+%%ZSHFUNC_SUBDIR%%/_expand
+%%ZSHFUNC_SUBDIR%%/_expand_word
+%%ZSHFUNC_SUBDIR%%/_fc
+%%ZSHFUNC_SUBDIR%%/_files
+%%ZSHFUNC_SUBDIR%%/_find
+%%ZSHFUNC_SUBDIR%%/_first
+%%ZSHFUNC_SUBDIR%%/_functions
+%%ZSHFUNC_SUBDIR%%/_gdb
+%%ZSHFUNC_SUBDIR%%/_groups
+%%ZSHFUNC_SUBDIR%%/_gunzip
+%%ZSHFUNC_SUBDIR%%/_gzip
+%%ZSHFUNC_SUBDIR%%/_hash
+%%ZSHFUNC_SUBDIR%%/_history_complete_word
+%%ZSHFUNC_SUBDIR%%/_hosts
+%%ZSHFUNC_SUBDIR%%/_jobs
+%%ZSHFUNC_SUBDIR%%/_kill
+%%ZSHFUNC_SUBDIR%%/_limits
+%%ZSHFUNC_SUBDIR%%/_list
+%%ZSHFUNC_SUBDIR%%/_long_options
+%%ZSHFUNC_SUBDIR%%/_main_complete
+%%ZSHFUNC_SUBDIR%%/_make
+%%ZSHFUNC_SUBDIR%%/_man
+%%ZSHFUNC_SUBDIR%%/_match
+%%ZSHFUNC_SUBDIR%%/_math
+%%ZSHFUNC_SUBDIR%%/_menu
+%%ZSHFUNC_SUBDIR%%/_mh
+%%ZSHFUNC_SUBDIR%%/_most_recent_file
+%%ZSHFUNC_SUBDIR%%/_multi_parts
+%%ZSHFUNC_SUBDIR%%/_normal
+%%ZSHFUNC_SUBDIR%%/_oldlist
+%%ZSHFUNC_SUBDIR%%/_options
+%%ZSHFUNC_SUBDIR%%/_parameter
+%%ZSHFUNC_SUBDIR%%/_parameters
+%%ZSHFUNC_SUBDIR%%/_path_files
+%%ZSHFUNC_SUBDIR%%/_pdf
+%%ZSHFUNC_SUBDIR%%/_precommand
+%%ZSHFUNC_SUBDIR%%/_ps
+%%ZSHFUNC_SUBDIR%%/_rcs
+%%ZSHFUNC_SUBDIR%%/_read_comp
+%%ZSHFUNC_SUBDIR%%/_redirect
+%%ZSHFUNC_SUBDIR%%/_rlogin
+%%ZSHFUNC_SUBDIR%%/_sched
+%%ZSHFUNC_SUBDIR%%/_sep_parts
+%%ZSHFUNC_SUBDIR%%/_set
+%%ZSHFUNC_SUBDIR%%/_set_options
+%%ZSHFUNC_SUBDIR%%/_setopt
+%%ZSHFUNC_SUBDIR%%/_sh
+%%ZSHFUNC_SUBDIR%%/_source
+%%ZSHFUNC_SUBDIR%%/_stat
+%%ZSHFUNC_SUBDIR%%/_strip
+%%ZSHFUNC_SUBDIR%%/_stty
+%%ZSHFUNC_SUBDIR%%/_su
+%%ZSHFUNC_SUBDIR%%/_subscript
+%%ZSHFUNC_SUBDIR%%/_tar
+%%ZSHFUNC_SUBDIR%%/_tar_archive
+%%ZSHFUNC_SUBDIR%%/_tex
+%%ZSHFUNC_SUBDIR%%/_tilde
+%%ZSHFUNC_SUBDIR%%/_trap
+%%ZSHFUNC_SUBDIR%%/_uncompress
+%%ZSHFUNC_SUBDIR%%/_unhash
+%%ZSHFUNC_SUBDIR%%/_unset_options
+%%ZSHFUNC_SUBDIR%%/_unsetopt
+%%ZSHFUNC_SUBDIR%%/_use_lo
+%%ZSHFUNC_SUBDIR%%/_vars
+%%ZSHFUNC_SUBDIR%%/_vars_eq
+%%ZSHFUNC_SUBDIR%%/_wait
+%%ZSHFUNC_SUBDIR%%/_which
+%%ZSHFUNC_SUBDIR%%/_x_options
+%%ZSHFUNC_SUBDIR%%/_xfig
+%%ZSHFUNC_SUBDIR%%/_zftp
+%%ZSHFUNC_SUBDIR%%/_zle
+%%ZSHFUNC_SUBDIR%%/_zmodload
+%%ZSHFUNC_SUBDIR%%/compdump
+%%ZSHFUNC_SUBDIR%%/compinit
+%%ZSHFUNC_SUBDIR%%/compinstall
+%%ZSHFUNC_SUBDIR%%/incremental-complete-word
+%%ZSHFUNC_SUBDIR%%/insert-files
+%%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%%/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%%/zfstat
+%%ZSHFUNC_SUBDIR%%/zftp_chpwd
+%%ZSHFUNC_SUBDIR%%/zftp_progress
+%%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
+@dirrm lib/zsh/%%ZSH_VER%%
 @dirrm lib/zsh
-@dirrm share/zsh/functions
+@dirrm %%ZSHFUNC_SUBDIR%%
 @dirrm share/zsh