4 files changed, 23 insertions, 35 deletions

diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index 91e37212ae5f..e00911aa1ca8 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	zsh
-PORTVERSION=	4.3.17
-PORTREVISION=	3
+PORTVERSION=	5.0.0
 CATEGORIES=	shells
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-dev/${PORTVERSION} \
-		SF/${PORTNAME}/${PORTNAME}-doc-dev/${PORTVERSION}:doc
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} \
+		SF/${PORTNAME}/${PORTNAME}-doc/${PORTVERSION}:doc
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	bapt@FreeBSD.org
diff --git a/shells/zsh/distinfo b/shells/zsh/distinfo
index 4de86a9d3237..3c10cd99d2b6 100644
--- a/shells/zsh/distinfo
+++ b/shells/zsh/distinfo
@@ -1,4 +1,2 @@
-SHA256 (zsh-4.3.17.tar.bz2) = 054e0452afd9c742c9f1489465175e1d4d7db50d88b602d132551d850cf7a704
-SIZE (zsh-4.3.17.tar.bz2) = 2978903
-SHA256 (zsh-4.3.17-doc.tar.bz2) = 68f71ba6ba0dc56bfdd93573c7f02dcc3a4f06fd8e24a5f9e17202cf5e68cb91
-SIZE (zsh-4.3.17-doc.tar.bz2) = 2719164
+SHA256 (zsh-5.0.0.tar.bz2) = cd014a8e09a3607c68369d1615db96d0fbb7279a125950b32032fd448c44a888
+SIZE (zsh-5.0.0.tar.bz2) = 3014362
diff --git a/shells/zsh/files/patch-Completion-Unix-Type-_zfs_dataset b/shells/zsh/files/patch-Completion-Unix-Type-_zfs_dataset
deleted file mode 100644
index 4b59be90f50c..000000000000
--- a/shells/zsh/files/patch-Completion-Unix-Type-_zfs_dataset
+++ /dev/null
@@ -1,27 +0,0 @@
---- ./Completion/Unix/Type/_zfs_dataset.orig	2009-06-09 10:49:20.305960368 +0000
-+++ ./Completion/Unix/Type/_zfs_dataset	2009-06-09 10:50:24.299466247 +0000
-@@ -9,7 +9,23 @@
- [[ -n $type[(r)snap] ]] && typearg=( $typearg snapshot )
- [[ -n $typearg ]] && typearg=( -t ${(j:,:)typearg} )
- 
--datasetlist=( ${="$(zfs list -H -o name $typearg)":#no datasets available} )
-+case "$OSTYPE" in
-+	freebsd*)
-+	local -i osreldate
-+	osreldate=${${(f)"$(/sbin/sysctl kern.osreldate)"}[(w)2]}
-+	if (( $osreldate >= 702102 ));then
-+		datasetlist=( ${="$(zfs list -H -o name ${typearg:--t all})":#no datasets available} )
-+	else
-+		datasetlist=( ${="$(zfs list -H -o name $typearg)":#no datasets available} )
-+	fi
-+	;;
-+	netbsd*)
-+		datasetlist=( ${="$(zfs list -H -o name ${typearg:--t all})":#no datasets available} )
-+	;;
-+	*)
-+	datasetlist=( ${="$(zfs list -H -o name $typearg)":#no datasets available} )
-+	;;
-+esac
- 
- expl_type=${typearg[2,-1]//,/\/}
- if [[ -n $type[(r)mtpt] ]]; then
diff --git a/shells/zsh/pkg-plist b/shells/zsh/pkg-plist
index 738eea3c3a9f..c143bbf5ff5e 100644
--- a/shells/zsh/pkg-plist
+++ b/shells/zsh/pkg-plist
@@ -274,21 +274,34 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Redhat/_rpm
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Redhat/_yum
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris.zwc
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_be_name
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_beadm
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_coreadm
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_dhcpinfo
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_dladm
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_dumpadm
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_dtrace
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_gcore
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_flowadm
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_fmadm
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_inetadm
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_ipadm
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_netstat
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_pfexec
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_ptree
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_pkg5
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_prstat
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_ps
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_savecore
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_snoop
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_svcadm
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_svccfg
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_svcprop
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_svcs
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_svcs_fmri
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_zlogin
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_zoneadm
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_zones
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix.zwc
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_a2ps
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_adb
@@ -387,6 +400,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_go
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_gphoto2
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_gprof
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_gradle
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_graphicsmagick
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_grep
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_groff
@@ -443,6 +457,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_mkdir
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_module
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_monotone
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_mosh
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_mount
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_mpc
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_mt
@@ -493,6 +508,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_printenv
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_printers
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_ps
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_ps1234
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_pspdf
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_psutils
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_pump
@@ -540,6 +556,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_sudo
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_surfraw
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_sysctl
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_systemd
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_systemctl
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_tar
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_tar_archive
@@ -599,6 +616,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_zdump
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_zfs
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_zfs_dataset
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_zfs_keysource_props
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_zfs_pool
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_zip
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_zpool