Update to 5.1

Switch the default mirror to zsh.org until the distfiles appears on sourceforge

5 files changed, 24 insertions, 31 deletions

diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index a93fb60c3689..002e2783aa64 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -2,14 +2,13 @@
 # $FreeBSD$
 
 PORTNAME=	zsh
-PORTVERSION=	5.0.8
-PORTREVISION=	3
+DISTVERSION=	5.1
 CATEGORIES=	shells
 MASTER_SITES=	\
-		SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} \
-		SF/${PORTNAME}/${PORTNAME}-doc/${PORTVERSION}:doc \
 		http://www.zsh.org/pub/:doc \
-		http://www.zsh.org/pub/
+		http://www.zsh.org/pub/ \
+		SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} \
+		SF/${PORTNAME}/${PORTNAME}-doc/${PORTVERSION}:doc
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	bapt@FreeBSD.org
@@ -24,7 +23,7 @@ MAKE_JOBS_UNSAFE=	yes
 
 ZSH_VER=	${PORTVERSION}
 
-USES=		iconv ncurses shebangfix tar:bzip2
+USES=		iconv ncurses shebangfix tar:xz
 SHEBANG_FILES=	Functions/Calendar/calendar_add \
 		Functions/Misc/checkmail \
 		Functions/Misc/run-help \
diff --git a/shells/zsh/distinfo b/shells/zsh/distinfo
index 046abd2a84ba..663a75bd75ca 100644
--- a/shells/zsh/distinfo
+++ b/shells/zsh/distinfo
@@ -1,4 +1,4 @@
-SHA256 (zsh-5.0.8.tar.bz2) = 8079cf08cb8beff22f84b56bd72bb6e6962ff4718d816f3d83a633b4c9e17d23
-SIZE (zsh-5.0.8.tar.bz2) = 3250542
-SHA256 (zsh-5.0.8-doc.tar.bz2) = 0ee5088c47fa5ceac6e087c7e00f2ede3f5920a03d32220772342ce980339e40
-SIZE (zsh-5.0.8-doc.tar.bz2) = 3204865
+SHA256 (zsh-5.1.tar.xz) = c3a654fa0ef26cb1a3228c9257101870e72899fde1cd815388b1b2cbbdfa59b4
+SIZE (zsh-5.1.tar.xz) = 2785404
+SHA256 (zsh-5.1-doc.tar.xz) = b0f921f5323f06b2b96374b7dd2dabc84966260f0c663a9ef88071b0b0d89d66
+SIZE (zsh-5.1-doc.tar.xz) = 3065956
diff --git a/shells/zsh/files/patch-Completion_Unix_Command___du b/shells/zsh/files/patch-Completion_Unix_Command___du
deleted file mode 100644
index f990131d725c..000000000000
--- a/shells/zsh/files/patch-Completion_Unix_Command___du
+++ /dev/null
@@ -1,9 +0,0 @@
---- Completion/Unix/Command/_du.orig	2015-05-03 17:57:18 UTC
-+++ Completion/Unix/Command/_du
-@@ -74,5 +74,5 @@ else
-   do
-     [[ $OSTYPE = $~pattern ]] && args+=( $arg )
-   done
--  _arguments -s -A "-*" $args
-+  _arguments -s -A "-*" $args '*:file:_files'
- fi
diff --git a/shells/zsh/files/patch-Src_Modules_zpty.c b/shells/zsh/files/patch-Src_Modules_zpty.c
deleted file mode 100644
index f0e3b199d8d2..000000000000
--- a/shells/zsh/files/patch-Src_Modules_zpty.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- Src/Modules/zpty.c.orig	2015-06-02 06:51:05.604875000 +0200
-+++ Src/Modules/zpty.c	2015-06-02 00:07:36.672596000 +0200
-@@ -154,7 +154,7 @@ getptycmd(char *name)
-     return NULL;
- }
- 
--#ifdef USE_DEV_PTMX
-+#if defined(HAVE_POSIX_OPENPT) || defined(USE_DEV_PTMX)
- 
- #ifdef HAVE_SYS_STROPTS_H
- #include <sys/stropts.h>
diff --git a/shells/zsh/pkg-plist b/shells/zsh/pkg-plist
index 02eec9f90492..866baa45ceab 100644
--- a/shells/zsh/pkg-plist
+++ b/shells/zsh/pkg-plist
@@ -93,6 +93,8 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/BSD/_powerd
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/BSD/_procstat
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/BSD/_sockstat
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/BSD/_systat
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/BSD/_watch-snoop
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Base.zwc
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Base/_all_labels
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Base/_all_matches
@@ -199,6 +201,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_deb_architectures
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_deb_packages
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_debchange
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_debcheckout
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_debdiff
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_debfoster
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_debsign
@@ -276,6 +279,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Mandriva/_rebootin
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Mandriva/_urpmi
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Redhat.zwc
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Redhat/_dnf
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Redhat/_rpm
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Redhat/_yum
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris.zwc
@@ -322,6 +326,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_augeas
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_awk
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_baz
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_beep
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_bind_addresses
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_bison
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_bittorrent
@@ -358,6 +363,8 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_cvs
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_darcs
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_date
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_date_formats
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_dates
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_dbus
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_dd
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_devtodo
@@ -503,6 +510,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_other_accounts
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_pack
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_patch
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_patchutils
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_path_commands
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_path_files
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_pax
@@ -532,7 +540,6 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_printers
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_prove
 %%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
@@ -608,6 +615,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_totd
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_tracepath
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_tree
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_ttys
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_twidge
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_twisted
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_unace
@@ -624,10 +632,12 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_uzbl
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_vcsh
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_vim
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_vmstat
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_vorbis
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_vorbiscomment
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_vux
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_w3m
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_watch
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_wc
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_webbrowser
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_wget
@@ -720,6 +730,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_cd
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_command
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_command_names
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_compadd
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_compdef
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_condition
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_default
@@ -762,6 +773,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_precommand
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_print
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_prompt
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_ps1234
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_read
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_redirect
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_run-help
@@ -770,6 +782,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_setopt
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_source
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_stat
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_strftime
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_subscript
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_suffix_alias_files
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_tcpsys
@@ -971,6 +984,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Zle.zwc
 %%DATADIR%%/%%ZSH_VER%%/functions/Zle/backward-kill-word-match
 %%DATADIR%%/%%ZSH_VER%%/functions/Zle/backward-word-match
+%%DATADIR%%/%%ZSH_VER%%/functions/Zle/bracketed-paste-magic
 %%DATADIR%%/%%ZSH_VER%%/functions/Zle/capitalize-word-match
 %%DATADIR%%/%%ZSH_VER%%/functions/Zle/copy-earlier-word
 %%DATADIR%%/%%ZSH_VER%%/functions/Zle/cycle-completion-positions