4 files changed, 18 insertions, 38 deletions

diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index a9ced112a2cf..12832f679ff4 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	zsh
-PORTVERSION=	4.3.15
-PORTREVISION=	2
+PORTVERSION=	4.3.17
 CATEGORIES=	shells
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-dev/${PORTVERSION} \
 		SF/${PORTNAME}/${PORTNAME}-doc-dev/${PORTVERSION}:doc
@@ -20,9 +19,9 @@ MAINTAINER=	bapt@FreeBSD.org
 COMMENT=	The Z shell
 
 LICENSE=	ZSH
-LICENSE_NAME=   ZSH license
+LICENSE_NAME=	ZSH license
 LICENSE_FILE=	${WRKSRC}/LICENCE
-LICENSE_PERMS=  ${_LICENSE_PERMS_DEFAULT}
+LICENSE_PERMS=	${_LICENSE_PERMS_DEFAULT}
 
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/shells/zsh/distinfo b/shells/zsh/distinfo
index ba73d79f7186..4de86a9d3237 100644
--- a/shells/zsh/distinfo
+++ b/shells/zsh/distinfo
@@ -1,4 +1,4 @@
-SHA256 (zsh-4.3.15.tar.bz2) = 8708f485823fb7e51aa696776d0dfac7d3558485182672cf9311c12a50a95486
-SIZE (zsh-4.3.15.tar.bz2) = 2969951
-SHA256 (zsh-4.3.15-doc.tar.bz2) = 73b7ee1a737fbaf9be77cf6b55b27cca96bac39bc5ef25efa9ceb427cd1b5ad4
-SIZE (zsh-4.3.15-doc.tar.bz2) = 2712215
+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
diff --git a/shells/zsh/files/patch-Src__Zle__zle_main.c b/shells/zsh/files/patch-Src__Zle__zle_main.c
deleted file mode 100644
index f8ecf8a1ca8b..000000000000
--- a/shells/zsh/files/patch-Src__Zle__zle_main.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- ./Src/Zle/zle_main.c.orig	2012-01-13 21:55:51.773384066 +0100
-+++ ./Src/Zle/zle_main.c	2012-01-13 21:56:14.530384358 +0100
-@@ -1200,6 +1200,18 @@
- 	putc('\r', shout);
-     if (tmout)
- 	alarm(tmout);
-+
-+    /*
-+     * On some windowing systems we may enter this function before the
-+     * terminal is fully opened and sized, resulting in an infinite
-+     * series of SIGWINCH when the handler prints the prompt before we
-+     * have done so here.  Therefore, hold any such signal until the
-+     * first full refresh has completed.  The important bit is that the
-+     * handler must not see zleactive = 1 until ZLE really is active.
-+     * See the end of adjustwinsize() in Src/utils.c
-+     */
-+    queue_signals();
-+
-     zleactive = 1;
-     resetneeded = 1;
-     errflag = retflag = 0;
-@@ -1209,6 +1221,8 @@
- 
-     zrefresh();
- 
-+    unqueue_signals();	/* Should now be safe to acknowledge SIGWINCH */
-+
-     zlecallhook("zle-line-init", NULL);
- 
-     zlecore();
diff --git a/shells/zsh/pkg-plist b/shells/zsh/pkg-plist
index 56debddf7022..738eea3c3a9f 100644
--- a/shells/zsh/pkg-plist
+++ b/shells/zsh/pkg-plist
@@ -529,6 +529,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_socket
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_sort
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_spamassassin
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_sqlite
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_sqsh
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_ssh
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_stgit
@@ -577,6 +578,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_users
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_users_on
 %%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/_vorbis
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_vorbiscomment
@@ -639,8 +641,10 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/X/_x_visual
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/X/_x_window
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/X/_xauth
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/X/_xclip
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/X/_xdvi
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/X/_xfig
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/X/_xft_fonts
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/X/_xloadimage
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/X/_xmodmap
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/X/_xournal
@@ -740,6 +744,12 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_zsh-mime-handler
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_zstyle
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_ztodo
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/openSUSE.zwc
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/openSUSE/_SuSEconfig
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/openSUSE/_hwinfo
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/openSUSE/_osc
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/openSUSE/_yast2
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/openSUSE/_zypper
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/bashcompinit
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/compaudit
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/compdump
@@ -970,6 +980,7 @@ bin/zsh-%%ZSH_VER%%
 @dirrm %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Base
 @dirrm %%DATADIR%%/%%ZSH_VER%%/functions/Completion/BSD
 @dirrm %%DATADIR%%/%%ZSH_VER%%/functions/Completion/AIX
+@dirrm %%DATADIR%%/%%ZSH_VER%%/functions/Completion/openSUSE
 @dirrm %%DATADIR%%/%%ZSH_VER%%/functions/Completion
 @dirrm %%DATADIR%%/%%ZSH_VER%%/functions/Calendar
 @dirrm %%DATADIR%%/%%ZSH_VER%%/functions/Chpwd