Regenerate some patches that were being incorrectly applied.

Noticed by:	garga

4 files changed, 46 insertions, 61 deletions

diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index 3f0301027a66..bf2b7cab119b 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -22,7 +22,7 @@
 
 PORTNAME=	zsh
 PORTVERSION=	4.3.6
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	shells
 MASTER_SITES=	SF
 .if !defined(NOPORTDOCS)
diff --git a/shells/zsh/files/patch-Completion-BSD-Command-_csup b/shells/zsh/files/patch-Completion-BSD-Command-_csup
index 366ed338271a..3e7c567653c2 100644
--- a/shells/zsh/files/patch-Completion-BSD-Command-_csup
+++ b/shells/zsh/files/patch-Completion-BSD-Command-_csup
@@ -1,26 +1,30 @@
---- Completion/BSD/Command/_csup.orig	2008-08-12 13:52:12.409319715 +0200
-+++ Completion/BSD/Command/_csup	2008-08-07 23:26:34.000000000 +0200
-@@ -0,0 +1,23 @@
-+#compdef csup
-+
-+_arguments -s \
-+    '-1[disable automatic retries]' \
-+    '-4[Force usage of IPv4 addresses]' \
-+    '-6[Force usage of IPv6 addresses]' \
+--- Completion/BSD/Command/_csup.orig	2007-07-20 18:39:15.000000000 +0200
++++ Completion/BSD/Command/_csup	2008-08-13 19:00:33.890223677 +0200
+@@ -4,17 +4,17 @@
+     '-1[disable automatic retries]' \
+     '-4[Force usage of IPv4 addresses]' \
+     '-6[Force usage of IPv6 addresses]' \
+-    '-A:local address:_hosts' \
+-    '-b:base directory:_files -/' \
+-    '-c:collections directory:_files -/' \
+-    '-d:maximum number of deleted files:' \
+-    '-h:server host:_hosts' \
+-    '-i:file pattern:' \
 +    '-A[Local address to bind to when connecting to the server]:local address:_hosts' \
 +    '-b[Base directory]:base directory:_files -/' \
 +    '-c[Subdirectory of base for information about collections]:collections directory:_files -/' \
 +    '-d[maximum number of deleted files]:maximum number of deleted files:' \
 +    '-h[Server host]:server host:_hosts' \
 +    '-i[Include only files and directories matching]:file pattern:' \
-+    '-k[keep temporary copies of failed updates]' \
+     '-k[keep temporary copies of failed updates]' \
+-    '-l:lock file:_files' \
+-    '-L:verbosity level:(0 1 2)' \
+-    '-p:port:_ports' \
+-    '-r:maximum number of retries:' \
 +    '-l[Lock file]:lock file:_files' \
 +    '-L[Verbosity level]:verbosity level:(0 1 2)' \
 +    '-p[Server port]:port:_ports' \
 +    '-r[maximum number of retries]:maximum number of retries:' \
-+    '-s[suppress status checks]' \
-+    '-v[print version information]' \
-+    '(-Z)-z[enable compression]' \
-+    '(-z)-Z[disable compression]' \
-+    ':csup file:_files' \
-+    ':destination directory:_files -/'
+     '-s[suppress status checks]' \
+     '-v[print version information]' \
+     '(-Z)-z[enable compression]' \
diff --git a/shells/zsh/files/patch-Completion-BSD-Command-_portlint b/shells/zsh/files/patch-Completion-BSD-Command-_portlint
index e3d1fa6ffc71..332194784b8b 100644
--- a/shells/zsh/files/patch-Completion-BSD-Command-_portlint
+++ b/shells/zsh/files/patch-Completion-BSD-Command-_portlint
@@ -1,20 +1,11 @@
---- Completion/BSD/Command/_portlint.orig	2008-08-12 13:52:12.431339117 +0200
-+++ Completion/BSD/Command/_portlint	2008-08-07 23:39:52.000000000 +0200
-@@ -0,0 +1,17 @@
-+#compdef portlint
-+
-+_arguments -s \
-+    '-a[additional check for scripts/* and pkg-*]' \
-+    '-A[turn on all additional checks (equivalent to -abcNt)]' \
-+    '-b[warn $(VARIABLE)]' \
-+    '-c[committer mode]' \
-+    '-C[pedantic committer mode (equivalent to -abct)]' \
-+    '-g[group errors together to avoid duplication (disabled if -v is specified)]' \
-+    '-h[show summary of command line options]' \
-+    '-v[verbose mode]' \
-+    '-t[nit pick about use of spaces]' \
-+    '-N[writing a new port]' \
-+    '-V[print the version and exit]' \
+--- Completion/BSD/Command/_portlint.orig	2007-07-20 18:39:15.000000000 +0200
++++ Completion/BSD/Command/_portlint	2008-08-13 19:00:33.915251533 +0200
+@@ -12,6 +12,6 @@
+     '-t[nit pick about use of spaces]' \
+     '-N[writing a new port]' \
+     '-V[print the version and exit]' \
+-    '-M:set make variables to ENV (ex. PORTSDIR=/usr/ports.work):_guard ".#" "environment vars"' \
+-    '-B:allow # contiguous blank lines:_guard "[0-9]#" "numeric value"' \
 +    '-M[set make variables to ENV (ex. PORTSDIR=/usr/ports.work)]: :_guard ".#" "environment vars"' \
 +    '-B[allow # contiguous blank lines]: :_guard "[0-9]#" "numeric value"' \
-+    ':port directory:_files -/'
+     ':port directory:_files -/'
diff --git a/shells/zsh/files/patch-Completion-BSD-Command-_portsnap b/shells/zsh/files/patch-Completion-BSD-Command-_portsnap
index cdee103deaac..37eb3f62e0b1 100644
--- a/shells/zsh/files/patch-Completion-BSD-Command-_portsnap
+++ b/shells/zsh/files/patch-Completion-BSD-Command-_portsnap
@@ -1,32 +1,22 @@
---- Completion/BSD/Command/_portsnap.orig	2008-08-12 13:52:12.440350813 +0200
-+++ Completion/BSD/Command/_portsnap	2008-08-07 23:20:31.000000000 +0200
-@@ -0,0 +1,29 @@
-+#compdef portsnap
-+
-+local context state line
-+typeset -A opt_args
-+
-+flags=(
-+  '(cron)fetch[Fetch a compressed snapshot or update existing one]'
-+  '(fetch)cron[Sleep rand(3600) seconds, and then fetch updates]'
-+  '(update)extract[Extract snapshot, replacing existing files and dirs]'
-+  '(extract)update[Update ports tree to match current snapshot]'
-+)
-+
-+_arguments -C -s \
+--- Completion/BSD/Command/_portsnap.orig	2007-07-22 13:40:02.000000000 +0200
++++ Completion/BSD/Command/_portsnap	2008-08-13 19:00:33.920251572 +0200
+@@ -11,13 +11,13 @@
+ )
+ 
+ _arguments -C -s \
+-    '-d:Store working files in workdir:_files -/' \
+-    '-f:Read configuration options from conffile:_files' \
 +    '-d[Store working files in workdir]:workdir:_files -/' \
 +    '-f[Read configuration options from conffile]:conf file:_files' \
-+    '-I[Update INDEX only. (update command only)]' \
+     '-I[Update INDEX only. (update command only)]' \
+-    '-k:Trust an RSA key with SHA256 hash of KEY:_files' \
+-    '-l:Merge the specified local describes file into the INDEX:_files' \
+-    '-p:Location of uncompressed ports tree:_files -/' \
+-    '-s:Server from which to fetch updates:_hosts' \
 +    '-k[Trust an RSA key with SHA256 hash of KEY]:RSA key:_files' \
 +    '-l[Merge the specified local describes file into the INDEX]:file:_files' \
 +    '-p[Location of uncompressed ports tree]:uncompressed ports tree:_files -/' \
 +    '-s[Server from which to fetch updates]:server:_hosts' \
-+    '*:principal:->principal' && ret=0
-+
-+if [[ $state == principal ]]; then
-+  _alternative \
-+    ':file flag:_values -S " " -w "commands" $flags[@]' \
-+    '*:path:_files -/'
-+fi
-+
-+return ret
+     '*:principal:->principal' && ret=0
+ 
+ if [[ $state == principal ]]; then