- update to 4.3.12

Changes since 4.3.11
--------------------

The zsh/parameter module has a new readonly associative array
$usergroups whose keys are the names of system groups of which the
current user is a member and whose values are the corresponding
group identifiers.

The region_highlight array, which controls highlighting of the
command line from zle widgets, is now updated dynamically as
the command line is edited.

In POSIX emulation ("emulate sh") the shell is more accurate about
when it should or should not exit on errors.

The ${NAME:OFFSET:LENGTH} syntax now supports negative LENGTH, which
counts back from the end of the string.

The (g:opts:) flag in parameter expansion processes escape sequences like
the echo and print builtins.  opts can be any combination of o, e and c.
With e, acts like print rather than echo except for octal escapes which
are controlled separately by the o option.  With c, interpret control
sequences like "^X" as bindkey does.  Regardless of the opts, \c is not
interpreted.

6 files changed, 27 insertions, 54 deletions

diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index 35993c8c0463..f9eec58deb70 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	zsh
-PORTVERSION=	4.3.11
+PORTVERSION=	4.3.12
 CATEGORIES=	shells
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-dev/${PORTVERSION}:src \
 		SF/${PORTNAME}/${PORTNAME}-doc-dev/${PORTVERSION}:doc
@@ -30,14 +30,13 @@ USE_NCURSES=	yes
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
 .endif
 
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-term-lib="ncursesw ncurses" --with-tcsetpgrp \
 		--enable-function-subdirs
 
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-bsdtar
-EXTRA_COMPLETION_FILES=	_sockstat
-EXTRA_COMPLETION_DIR=	Completion/BSD/Command
+#EXTRA_COMPLETION_FILES=	_sockstat
+#EXTRA_COMPLETION_DIR=	Completion/BSD/Command
 
 LICENSE=	ZSH
 LICENSE_NAME=   ZSH license
diff --git a/shells/zsh/distinfo b/shells/zsh/distinfo
index bb7ca00cb9c4..d4e256484063 100644
--- a/shells/zsh/distinfo
+++ b/shells/zsh/distinfo
@@ -1,4 +1,4 @@
-SHA256 (zsh-4.3.11.tar.bz2) = 30eb774120d89d98336c929c210a9df4f61fc1f0137732812a6c0d8b8d074f05
-SIZE (zsh-4.3.11.tar.bz2) = 2868429
-SHA256 (zsh-4.3.11-doc.tar.bz2) = 956100a251cf523978a2f81802636b6cdd28f2861d508eedb10477317cecec4c
-SIZE (zsh-4.3.11-doc.tar.bz2) = 2687527
+SHA256 (zsh-4.3.12.tar.bz2) = 4a9fd2dac76fc08fd1dc400deba854fcefa12ad76226d93fb6c01a801324f106
+SIZE (zsh-4.3.12.tar.bz2) = 2917959
+SHA256 (zsh-4.3.12-doc.tar.bz2) = 8d13cc1540d79afd9fc451b43a10046fed1f11d12bdc2bbd8158bc7084a5dfed
+SIZE (zsh-4.3.12-doc.tar.bz2) = 2698428
diff --git a/shells/zsh/files/_sockstat b/shells/zsh/files/_sockstat
deleted file mode 100644
index 2acbe6bec351..000000000000
--- a/shells/zsh/files/_sockstat
+++ /dev/null
@@ -1,23 +0,0 @@
-#compdef sockstat
-
-local tmp_proto protocols proto
-
-tmp_proto=(${${(M)${(f)"$(</etc/protocols)"}##[a-z0-9]*}})
-for proto ($tmp_proto) { 
-	case $proto in
-	*\#*)
-		protocols=($protocols ${${(j: :)${=proto}}// *\# /:}) 
-		;;
-	*)
-		protocols=($protocols ${${(j: :)${=proto}}// */})
-	esac
-}
-
-_arguments -s \
-	'-4[Show AF_INET (IPv4) sockets]' \
-	'-6[Show AF_INET6 (IPv6) sockets]' \
-	'-c[Show connected sockets]' \
-	'-l[Show listening sockets]' \
-	'-u[Show AF_LOCAL (UNIX) sockets]' \
-	'-p[Only show Internet sockets if the port number is on the specified list]' \
-	'-P[Only show sockets of the specified protocols]:protocols:(($protocols))'
diff --git a/shells/zsh/files/patch-Completion-Unix-Command-_mount b/shells/zsh/files/patch-Completion-Unix-Command-_mount
deleted file mode 100644
index eaa4e4eee6a9..000000000000
--- a/shells/zsh/files/patch-Completion-Unix-Command-_mount
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./Completion/Unix/Command/_mount.orig	2009-08-28 17:10:39.000000000 +0200
-+++ ./Completion/Unix/Command/_mount	2011-02-28 00:34:40.000000000 +0100
-@@ -868,7 +868,7 @@
-     # add glabel devices
-     _glabel=(${(M)${(f)"$(/sbin/glabel list)"}:#*Name:[[:space:]]*/*})
-     for mline ($_glabel);do
--	    dev_tmp+=( mline[(w)3] )
-+	    dev_tmp+=( /dev/$mline[(w)3] )
-     done
- 
-     _alternative \
diff --git a/shells/zsh/files/patch-Completion-Unix-Type-_file_systems b/shells/zsh/files/patch-Completion-Unix-Type-_file_systems
deleted file mode 100644
index ac856a90f3f1..000000000000
--- a/shells/zsh/files/patch-Completion-Unix-Type-_file_systems
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./Completion/Unix/Type/_file_systems.orig	2009-06-04 14:53:41.000000000 +0200
-+++ ./Completion/Unix/Type/_file_systems	2011-02-28 00:47:20.000000000 +0100
-@@ -21,7 +21,7 @@
-           ntfs null nwfs portal procfs std udf ufs umap union )
-   ;;
-   freebsd*)
--    fss=( cd9660 devfs ext2fs fdesc kernfs linprocfs mfs msdosfs nfs
-+    fss=( cd9660 devfs ext2fs fdesc kernfs linprocfs linsysfs mfs msdosfs nfs
-     ntfs nullfs nwfs portal procfs smbfs std udf ufs umap unionfs 
-     reiserfs xfs)
-   ;;
diff --git a/shells/zsh/pkg-plist b/shells/zsh/pkg-plist
index bb240353df77..0a21f56869cc 100644
--- a/shells/zsh/pkg-plist
+++ b/shells/zsh/pkg-plist
@@ -60,6 +60,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Calendar/calendar_showdate
 %%DATADIR%%/%%ZSH_VER%%/functions/Calendar/calendar_sort
 %%DATADIR%%/%%ZSH_VER%%/functions/Chpwd.zwc
+%%DATADIR%%/%%ZSH_VER%%/functions/Chpwd/zsh_directory_name_cdr
 %%DATADIR%%/%%ZSH_VER%%/functions/Chpwd/chpwd_recent_add
 %%DATADIR%%/%%ZSH_VER%%/functions/Chpwd/chpwd_recent_filehandler
 %%DATADIR%%/%%ZSH_VER%%/functions/Chpwd/chpwd_recent_dirs
@@ -260,6 +261,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_valgrind
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_vserver
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_wakeup_capable_devices
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_wpa_cli
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_yast
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Mandriva.zwc
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Mandriva/_rebootin
@@ -294,6 +296,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_arch_namespace
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_arp
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_arping
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_at
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_attr
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_awk
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_baz
@@ -376,6 +379,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_gnupod
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_gnutls
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_gpg
+%%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/_graphicsmagick
@@ -395,6 +399,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_iftop
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_imagemagick
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_init_d
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_initctl
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_ip
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_irssi
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_ispell
@@ -447,6 +452,8 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_newsgroups
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_nice
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_nmap
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_npm
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_notmuch
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_nslookup
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_other_accounts
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_osc
@@ -462,6 +469,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_perl_basepods
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_perl_modules
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_perldoc
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_pgrep
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_php
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_pids
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_pine
@@ -551,6 +559,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_uname
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_unexpand
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_uniq
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_unison
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_units
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_urls
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_user_admin
@@ -588,11 +597,14 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/X/_gqview
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/X/_gv
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/X/_kfmclient
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/X/_matlab
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/X/_mozilla
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/X/_mplayer
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/X/_nautilus
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/X/_nedit
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/X/_netscape
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/X/_okular
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/X/_pdftk
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/X/_qiv
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/X/_setxkbmap
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/X/_urxvt
@@ -621,6 +633,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/X/_xfig
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/X/_xloadimage
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/X/_xmodmap
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/X/_xournal
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/X/_xpdf
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/X/_xrandr
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/X/_xscreensaver
@@ -705,6 +718,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_wait
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_which
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_zattr
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_zargs
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_zcalc_line
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_zcompile
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_zed
@@ -806,6 +820,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/VCS_Info/Backends/VCS_INFO_detect_cdv
 %%DATADIR%%/%%ZSH_VER%%/functions/VCS_Info/Backends/VCS_INFO_detect_cvs
 %%DATADIR%%/%%ZSH_VER%%/functions/VCS_Info/Backends/VCS_INFO_detect_darcs
+%%DATADIR%%/%%ZSH_VER%%/functions/VCS_Info/Backends/VCS_INFO_detect_fossil
 %%DATADIR%%/%%ZSH_VER%%/functions/VCS_Info/Backends/VCS_INFO_detect_git
 %%DATADIR%%/%%ZSH_VER%%/functions/VCS_Info/Backends/VCS_INFO_detect_hg
 %%DATADIR%%/%%ZSH_VER%%/functions/VCS_Info/Backends/VCS_INFO_detect_mtn
@@ -817,6 +832,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/VCS_Info/Backends/VCS_INFO_get_data_cdv
 %%DATADIR%%/%%ZSH_VER%%/functions/VCS_Info/Backends/VCS_INFO_get_data_cvs
 %%DATADIR%%/%%ZSH_VER%%/functions/VCS_Info/Backends/VCS_INFO_get_data_darcs
+%%DATADIR%%/%%ZSH_VER%%/functions/VCS_Info/Backends/VCS_INFO_get_data_fossil
 %%DATADIR%%/%%ZSH_VER%%/functions/VCS_Info/Backends/VCS_INFO_get_data_git
 %%DATADIR%%/%%ZSH_VER%%/functions/VCS_Info/Backends/VCS_INFO_get_data_hg
 %%DATADIR%%/%%ZSH_VER%%/functions/VCS_Info/Backends/VCS_INFO_get_data_mtn
@@ -837,6 +853,8 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/VCS_Info/VCS_INFO_reposub
 %%DATADIR%%/%%ZSH_VER%%/functions/VCS_Info/VCS_INFO_set
 %%DATADIR%%/%%ZSH_VER%%/functions/VCS_Info/vcs_info
+%%DATADIR%%/%%ZSH_VER%%/functions/VCS_Info/vcs_info_hookadd
+%%DATADIR%%/%%ZSH_VER%%/functions/VCS_Info/vcs_info_hookdel
 %%DATADIR%%/%%ZSH_VER%%/functions/VCS_Info/vcs_info_lastmsg
 %%DATADIR%%/%%ZSH_VER%%/functions/VCS_Info/vcs_info_printsys
 %%DATADIR%%/%%ZSH_VER%%/functions/VCS_Info/vcs_info_setsys
@@ -906,6 +924,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Zle/replace-string
 %%DATADIR%%/%%ZSH_VER%%/functions/Zle/replace-string-again
 %%DATADIR%%/%%ZSH_VER%%/functions/Zle/select-word-style
+%%DATADIR%%/%%ZSH_VER%%/functions/Zle/send-invisible
 %%DATADIR%%/%%ZSH_VER%%/functions/Zle/smart-insert-last-word
 %%DATADIR%%/%%ZSH_VER%%/functions/Zle/split-shell-arguments
 %%DATADIR%%/%%ZSH_VER%%/functions/Zle/transpose-lines