Update zsh to 4.2.6.

Better DragonFly support, new complete functions (arch_archives,
arch_namespace, bzr, cplay, date, dchroot, dlocate, dpkg-cross,
git, madison, module-assistant, piuparts, quilt, toolchain-source,
urxvt, and xpdf), bug fixes, etc.

14 files changed, 26 insertions, 192 deletions

diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index 424f1624f67..1984a2784b2 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.50 2005/11/26 15:41:16 uebayasi Exp $
+# $NetBSD: Makefile,v 1.51 2005/12/07 03:00:50 uebayasi Exp $
 
 .include "../../shells/zsh/Makefile.common"
 
-PKGREVISION=	2
-
-ZSH_VERSION=	4.2.5
+ZSH_VERSION=	4.2.6
 ZSH_MAINTAINER=	uebayasi@NetBSD.org
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/shells/zsh/PLIST b/shells/zsh/PLIST
index 13a8a233adb..e55143d99d4 100644
--- a/shells/zsh/PLIST
+++ b/shells/zsh/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2005/04/07 14:16:41 adam Exp $
+@comment $NetBSD: PLIST,v 1.17 2005/12/07 03:00:50 uebayasi Exp $
 bin/${PKGNAME}
 bin/zsh
 man/man1/zsh.1
@@ -37,6 +37,8 @@ share/zsh/${PKGVERSION}/functions/_apt
 share/zsh/${PKGVERSION}/functions/_apt-move
 share/zsh/${PKGVERSION}/functions/_apt-show-versions
 share/zsh/${PKGVERSION}/functions/_aptitude
+share/zsh/${PKGVERSION}/functions/_arch_archives
+share/zsh/${PKGVERSION}/functions/_arch_namespace
 share/zsh/${PKGVERSION}/functions/_arg_compile
 share/zsh/${PKGVERSION}/functions/_arguments
 share/zsh/${PKGVERSION}/functions/_arp
@@ -58,6 +60,7 @@ share/zsh/${PKGVERSION}/functions/_bts
 share/zsh/${PKGVERSION}/functions/_bug
 share/zsh/${PKGVERSION}/functions/_builtin
 share/zsh/${PKGVERSION}/functions/_bzip2
+share/zsh/${PKGVERSION}/functions/_bzr
 share/zsh/${PKGVERSION}/functions/_cache_invalid
 share/zsh/${PKGVERSION}/functions/_cal
 share/zsh/${PKGVERSION}/functions/_call_function
@@ -84,6 +87,7 @@ share/zsh/${PKGVERSION}/functions/_correct
 share/zsh/${PKGVERSION}/functions/_correct_filename
 share/zsh/${PKGVERSION}/functions/_correct_word
 share/zsh/${PKGVERSION}/functions/_cpio
+share/zsh/${PKGVERSION}/functions/_cplay
 share/zsh/${PKGVERSION}/functions/_cvs
 share/zsh/${PKGVERSION}/functions/_cvsup
 share/zsh/${PKGVERSION}/functions/_cygcheck
@@ -92,6 +96,8 @@ share/zsh/${PKGVERSION}/functions/_cygrunsrv
 share/zsh/${PKGVERSION}/functions/_cygserver
 share/zsh/${PKGVERSION}/functions/_cygstart
 share/zsh/${PKGVERSION}/functions/_darcs
+share/zsh/${PKGVERSION}/functions/_date
+share/zsh/${PKGVERSION}/functions/_dchroot
 share/zsh/${PKGVERSION}/functions/_dcop
 share/zsh/${PKGVERSION}/functions/_dd
 share/zsh/${PKGVERSION}/functions/_deb_packages
@@ -112,8 +118,10 @@ share/zsh/${PKGVERSION}/functions/_directory_stack
 share/zsh/${PKGVERSION}/functions/_dirs
 share/zsh/${PKGVERSION}/functions/_disable
 share/zsh/${PKGVERSION}/functions/_dispatch
+share/zsh/${PKGVERSION}/functions/_dlocate
 share/zsh/${PKGVERSION}/functions/_domains
 share/zsh/${PKGVERSION}/functions/_dpkg
+share/zsh/${PKGVERSION}/functions/_dpkg-cross
 share/zsh/${PKGVERSION}/functions/_dpkg_source
 share/zsh/${PKGVERSION}/functions/_dput
 share/zsh/${PKGVERSION}/functions/_du
@@ -155,6 +163,7 @@ share/zsh/${PKGVERSION}/functions/_getclip
 share/zsh/${PKGVERSION}/functions/_getconf
 share/zsh/${PKGVERSION}/functions/_getent
 share/zsh/${PKGVERSION}/functions/_getfacl
+share/zsh/${PKGVERSION}/functions/_git
 share/zsh/${PKGVERSION}/functions/_global
 share/zsh/${PKGVERSION}/functions/_global_tags
 share/zsh/${PKGVERSION}/functions/_gnome-gv
@@ -218,6 +227,7 @@ share/zsh/${PKGVERSION}/functions/_lynx
 share/zsh/${PKGVERSION}/functions/_lzop
 share/zsh/${PKGVERSION}/functions/_mac_applications
 share/zsh/${PKGVERSION}/functions/_mac_files_for_application
+share/zsh/${PKGVERSION}/functions/_madison
 share/zsh/${PKGVERSION}/functions/_mail
 share/zsh/${PKGVERSION}/functions/_mailboxes
 share/zsh/${PKGVERSION}/functions/_main_complete
@@ -234,6 +244,7 @@ share/zsh/${PKGVERSION}/functions/_mh
 share/zsh/${PKGVERSION}/functions/_mime_types
 share/zsh/${PKGVERSION}/functions/_mkshortcut
 share/zsh/${PKGVERSION}/functions/_mkzsh
+share/zsh/${PKGVERSION}/functions/_module-assistant
 share/zsh/${PKGVERSION}/functions/_modutils
 share/zsh/${PKGVERSION}/functions/_mondo
 share/zsh/${PKGVERSION}/functions/_most_recent_file
@@ -286,6 +297,7 @@ share/zsh/${PKGVERSION}/functions/_physical_volumes
 share/zsh/${PKGVERSION}/functions/_pick_variant
 share/zsh/${PKGVERSION}/functions/_pids
 share/zsh/${PKGVERSION}/functions/_pine
+share/zsh/${PKGVERSION}/functions/_piuparts
 share/zsh/${PKGVERSION}/functions/_pkgtool
 share/zsh/${PKGVERSION}/functions/_ports
 share/zsh/${PKGVERSION}/functions/_postfix
@@ -302,6 +314,7 @@ share/zsh/${PKGVERSION}/functions/_pspdf
 share/zsh/${PKGVERSION}/functions/_psutils
 share/zsh/${PKGVERSION}/functions/_putclip
 share/zsh/${PKGVERSION}/functions/_python
+share/zsh/${PKGVERSION}/functions/_quilt
 share/zsh/${PKGVERSION}/functions/_raggle
 share/zsh/${PKGVERSION}/functions/_rar
 share/zsh/${PKGVERSION}/functions/_rcs
@@ -364,6 +377,7 @@ share/zsh/${PKGVERSION}/functions/_tilde_files
 share/zsh/${PKGVERSION}/functions/_time_zone
 share/zsh/${PKGVERSION}/functions/_tin
 share/zsh/${PKGVERSION}/functions/_tla
+share/zsh/${PKGVERSION}/functions/_toolchain-source
 share/zsh/${PKGVERSION}/functions/_trap
 share/zsh/${PKGVERSION}/functions/_ttyctl
 share/zsh/${PKGVERSION}/functions/_typeset
@@ -377,6 +391,7 @@ share/zsh/${PKGVERSION}/functions/_update-alternatives
 share/zsh/${PKGVERSION}/functions/_update-rc.d
 share/zsh/${PKGVERSION}/functions/_urls
 share/zsh/${PKGVERSION}/functions/_urpmi
+share/zsh/${PKGVERSION}/functions/_urxvt
 share/zsh/${PKGVERSION}/functions/_user_admin
 share/zsh/${PKGVERSION}/functions/_user_at_host
 share/zsh/${PKGVERSION}/functions/_users
@@ -426,6 +441,7 @@ share/zsh/${PKGVERSION}/functions/_xfig
 share/zsh/${PKGVERSION}/functions/_xloadimage
 share/zsh/${PKGVERSION}/functions/_xmlsoft
 share/zsh/${PKGVERSION}/functions/_xmodmap
+share/zsh/${PKGVERSION}/functions/_xpdf
 share/zsh/${PKGVERSION}/functions/_xset
 share/zsh/${PKGVERSION}/functions/_xt_arguments
 share/zsh/${PKGVERSION}/functions/_xt_session_id
diff --git a/shells/zsh/distinfo b/shells/zsh/distinfo
index fec41f439c3..47e1514a8d8 100644
--- a/shells/zsh/distinfo
+++ b/shells/zsh/distinfo
@@ -1,19 +1,9 @@
-$NetBSD: distinfo,v 1.24 2005/10/23 15:36:48 rillig Exp $
+$NetBSD: distinfo,v 1.25 2005/12/07 03:00:50 uebayasi Exp $
 
-SHA1 (zsh-4.2.5.tar.bz2) = 4dc142eb37c4dadae29ed7fb51756ed89ba64263
-RMD160 (zsh-4.2.5.tar.bz2) = 10e2319b30d5791d39c0a4488e297d451adbdbe5
-Size (zsh-4.2.5.tar.bz2) = 2074535 bytes
+SHA1 (zsh-4.2.6.tar.bz2) = e00c3eda3f52c9514bb625bb56e4480358170d39
+RMD160 (zsh-4.2.6.tar.bz2) = e4400fc6311bf6996128ecf7899592d6d8cdb310
+Size (zsh-4.2.6.tar.bz2) = 2098671 bytes
 SHA1 (patch-aa) = 5e5fde0f21a64c2e0579958868b05737ef0c6afb
 SHA1 (patch-ab) = 815de90c379035dbc02b251cee148f6df47f9a65
-SHA1 (patch-ac) = 821c6f60ddfddb72e14d5a33b1b448b2c5c0a036
-SHA1 (patch-ad) = fdd1e0c337e3efec5f94d363d93128e8a7dc5af3
+SHA1 (patch-ac) = 965b56e5ae39d6523416752c1390f01315c5d758
 SHA1 (patch-ae) = 7d4514d0bad6553d3c0cf115874bf50ed0da3d48
-SHA1 (patch-af) = 2389809b3933104be4db45a3d00036d44072056f
-SHA1 (patch-ag) = 2e99c91e7acaa4e1e0eb90f36ca739c0737473e8
-SHA1 (patch-ah) = c25246d0067afaa8fc17c25a803ca68e6de0846e
-SHA1 (patch-ai) = 6065726a9ddbe04a2c43a88b09cbb6fe3937d094
-SHA1 (patch-aj) = dc53a299185bd2549ae390e5fd665dfb609d47b9
-SHA1 (patch-ak) = 8ceabf360b684c01f6eccc8b569c09e7cc41984d
-SHA1 (patch-al) = e762398c8f44c1a2e759db29c124aa1050baf744
-SHA1 (patch-am) = a271782ccb1ccad1db6c03405055bb30ff05c420
-SHA1 (patch-an) = adbf96233d3d1cb6b8a1637cb4ae4e5747838fba
diff --git a/shells/zsh/patches/patch-ac b/shells/zsh/patches/patch-ac
index 6d9c9d9dd6d..cb4e338291c 100644
--- a/shells/zsh/patches/patch-ac
+++ b/shells/zsh/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.19 2005/10/11 12:43:00 joerg Exp $
+$NetBSD: patch-ac,v 1.20 2005/12/07 03:00:50 uebayasi Exp $
 
 --- configure.orig	2005-04-04 11:49:26.000000000 +0200
 +++ configure	2005-05-10 00:02:26.000000000 +0200
@@ -25,7 +25,7 @@ $NetBSD: patch-ac,v 1.19 2005/10/11 12:43:00 joerg Exp $
      esac
    fi
    case "$host_os" in
--    freebsd*|linux*|irix*|osf*|gnu*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;;
+-    freebsd*|linux*|irix*|osf*|gnu*|dragonfly*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;;
 +    freebsd*|linux*|irix*|osf*|gnu*|interix*|dragonfly*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;;
      sunos*)       DLLDFLAGS="${DLLDFLAGS=-assert nodefinitions}" ;;
      sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G $ldflags}" ;;
diff --git a/shells/zsh/patches/patch-ad b/shells/zsh/patches/patch-ad
deleted file mode 100644
index 992737c855c..00000000000
--- a/shells/zsh/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.10 2005/10/23 15:36:48 rillig Exp $
-
---- Completion/BSD/Command/_chflags.orig	2005-05-09 23:55:24.000000000 +0200
-+++ Completion/BSD/Command/_chflags	2005-05-09 23:55:03.000000000 +0200
-@@ -25,7 +25,7 @@
-   unset own
- fi
- 
--if [[ $OSTYPE = freebsd* ]]; then
-+if [[ $OSTYPE = freebsd* || $OSTYPE = dragonfly* ]]; then
-   flags=( $flags[@]
-     '(nouunlnk)uunlnk[set the user undeletable flag]'
-     '(uunlnk)nouunlnk[unset the user undeletable flag]'
diff --git a/shells/zsh/patches/patch-af b/shells/zsh/patches/patch-af
deleted file mode 100644
index 45580e1ddc2..00000000000
--- a/shells/zsh/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.2 2005/10/23 15:36:48 rillig Exp $
-
---- Completion/Unix/Command/_apm.orig	2005-05-09 23:57:43.000000000 +0200
-+++ Completion/Unix/Command/_apm	2005-05-09 23:58:44.000000000 +0200
-@@ -11,7 +11,7 @@
-     '(-n --noignore)'{-n,--noignore}'[tell the system not to ignore system-generated APM message]' \
-     '(-i --ignore)'{-i,--ignore}'[tell the system to ignore system-generated APM message]' && return
- 
--elif [[ $OSTYPE == freebsd* ]]; then
-+elif [[ $OSTYPE == freebsd* || $OSTYPE = dragonfly* ]]; then
- 
-   _arguments \
-     '-a[display AC line status]' \
diff --git a/shells/zsh/patches/patch-ag b/shells/zsh/patches/patch-ag
deleted file mode 100644
index 357e374bdca..00000000000
--- a/shells/zsh/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2005/10/23 15:36:48 rillig Exp $
-
---- Completion/Unix/Command/_cvs.orig	2005-05-09 23:57:52.000000000 +0200
-+++ Completion/Unix/Command/_cvs	2005-05-09 23:59:19.000000000 +0200
-@@ -7,7 +7,7 @@
- 
-   # "+Qqrwtnlvb:T:e:d:Hfz:s:xa"
-   case $OSTYPE in
--  freebsd*|openbsd*)
-+  freebsd*|openbsd*|dragonfly*)
-     extra='-R[read only access]'
-     ;;
-   esac
diff --git a/shells/zsh/patches/patch-ah b/shells/zsh/patches/patch-ah
deleted file mode 100644
index c2b99645528..00000000000
--- a/shells/zsh/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2005/10/23 15:36:48 rillig Exp $
-
---- Completion/Unix/Command/_ifconfig.orig	2005-05-09 23:57:59.000000000 +0200
-+++ Completion/Unix/Command/_ifconfig	2005-05-09 23:58:49.000000000 +0200
-@@ -19,7 +19,7 @@
-       {,-}trailers {,-}link{0,1,2}
-     )
-   ;;
--  freebsd*)
-+  freebsd* | dragonfly*)
-     args=( -s $updown
-       '(-a -l -u -d -m -L 1 *)-C[list interface cloners]'
-       '(-l -C)-m[list supported media]'
diff --git a/shells/zsh/patches/patch-ai b/shells/zsh/patches/patch-ai
deleted file mode 100644
index 303d3cfbc1e..00000000000
--- a/shells/zsh/patches/patch-ai
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2005/10/23 15:36:48 rillig Exp $
-
---- Completion/Unix/Command/_mount.orig	2005-05-09 23:58:03.000000000 +0200
-+++ Completion/Unix/Command/_mount	2005-05-09 23:59:50.000000000 +0200
-@@ -471,7 +471,7 @@
-       'swidth[specify stripe width]:size'
-     )
-     ;;
--  freebsd*)
-+  freebsd*|dragonfly*)
-     _fs_any=(
-       '(sync)async[do all I/O asynchronously]'
-       'current[use current options on already mounted file system]'
-@@ -626,7 +626,7 @@
-     deffs=hsfs
-     typeops=-F
-     ;;
--  freebsd*)
-+  freebsd*|dragonfly*)
-     args=( -s
-       '(:)-a[mount all filesystems in fstab]'
-       '-d[cause everything to be done except for the actual system call]'      
-@@ -700,7 +700,7 @@
- 	'*:dev or dir:->udevordir'
-       )
-     ;;
--    freebsd*)
-+    freebsd*|dragonfly*)
-       args=(
- 	'(*)-a[unmount all mounted file systems]'
- 	'-A[unmount all mounted file systems except the root]'
-@@ -762,7 +762,7 @@
-   fi
- 
-   case "$OSTYPE" in
--  freebsd*)
-+  freebsd*|dragonfly*)
-     while read mline; do 
-       case $mline[(w)1] in
- 	\#* )
diff --git a/shells/zsh/patches/patch-aj b/shells/zsh/patches/patch-aj
deleted file mode 100644
index e2f14f65a0c..00000000000
--- a/shells/zsh/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.2 2005/10/23 15:36:48 rillig Exp $
-
---- Completion/Unix/Command/_mt.orig	2005-05-09 23:58:35.000000000 +0200
-+++ Completion/Unix/Command/_mt	2005-05-09 23:57:23.000000000 +0200
-@@ -44,7 +44,7 @@
-     'densities:explain some common density codes'
-     'datcompression:enquire or set compression status'
-   )
--elif [[ $OSTYPE = freebsd* ]]; then
-+elif [[ $OSTYPE = freebsd* || $OSTYPE = dragonfly* ]]; then
-   cmds=( ${cmds:#(asf|eof):*}
-     'smk:write specified number of setmarks at current position'
-     'fss:forward space by specified number of setmarks'
diff --git a/shells/zsh/patches/patch-ak b/shells/zsh/patches/patch-ak
deleted file mode 100644
index 6bfb80c8467..00000000000
--- a/shells/zsh/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2005/10/23 15:36:48 rillig Exp $
-
---- Completion/Unix/Command/_sysctl.orig	2005-05-09 23:58:13.000000000 +0200
-+++ Completion/Unix/Command/_sysctl	2005-05-09 23:58:54.000000000 +0200
-@@ -13,7 +13,7 @@
-       '(-o)-x[show opaques as well (entire values)]' \
-       '(-a)*:sysctl variable:_multi_parts -i . sysctlvars'
-   ;;
--  freebsd[0-4].*|darwin*)
-+  freebsd[0-4].*|darwin*|dragonfly*)
-     : ${(A)_cache_sysctlvars:=${${$(sysctl -A 2>/dev/null):#[^a-z]*}%%:*}}
-     _arguments -s -A "-*" \
-       '(-w -X *)-a[list all]' \
diff --git a/shells/zsh/patches/patch-al b/shells/zsh/patches/patch-al
deleted file mode 100644
index 5b0c6ea478e..00000000000
--- a/shells/zsh/patches/patch-al
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-al,v 1.2 2005/10/23 15:36:48 rillig Exp $
-
---- Completion/Unix/Type/_file_systems.orig	2005-05-09 23:58:17.000000000 +0200
-+++ Completion/Unix/Type/_file_systems	2005-05-10 00:00:42.000000000 +0200
-@@ -16,9 +16,9 @@
-   ;;
-   osf*) fss=( advfs ufs nfs mfs cdfs ) ;;
-   solaris*) fss=( ufs nfs hsfs s5fs pcfs cachefs tmpfs ) ;;
--  freebsd*)
-+  freebsd*|dragonfly*)
-     fss=( cd9660 devfs ext2fs fdesc kernfs linprocfs mfs msdos nfs 
--          ntfs null nwfs portal procfs std ufs umap union )
-+          ntfs null nwfs portal procfs std udf ufs umap union )
-   ;;
-   *)
-     # default for all other systems
diff --git a/shells/zsh/patches/patch-am b/shells/zsh/patches/patch-am
deleted file mode 100644
index 8851c3c89af..00000000000
--- a/shells/zsh/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.2 2005/10/23 15:36:48 rillig Exp $
-
---- Completion/Unix/Type/_net_interfaces.orig	2005-05-09 23:58:21.000000000 +0200
-+++ Completion/Unix/Type/_net_interfaces	2005-05-10 00:00:05.000000000 +0200
-@@ -12,7 +12,7 @@
-       disp=(-ld list)
-     fi
-   ;;
--  darwin*|freebsd*) intf=( $(ifconfig -l) ) ;;
-+  darwin*|freebsd*|dragonfly*) intf=( $(ifconfig -l) ) ;;
-   irix*) intf=( ${${${(f)"$(/usr/etc/netstat -i)"}%% *}[2,-1]} ) ;;
-   linux*) intf=( /proc/sys/net/ipv4/conf/*~*(all|default)(N:t) ) ;;
-   *) intf=( $(ifconfig -a|sed -n 's/^\([^ 	:]*\).*/\1/p') ) ;;
diff --git a/shells/zsh/patches/patch-an b/shells/zsh/patches/patch-an
deleted file mode 100644
index 98e09af5c43..00000000000
--- a/shells/zsh/patches/patch-an
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-an,v 1.2 2005/10/23 15:36:48 rillig Exp $
-
---- Src/Modules/zpty.c.orig	2004-06-03 00:15:01.000000000 +0200
-+++ Src/Modules/zpty.c	2005-05-10 00:01:41.000000000 +0200
-@@ -246,15 +246,13 @@
- #ifdef __linux
-     static char char1[] = "abcdefghijklmnopqrstuvwxyz";
-     static char char2[] = "0123456789abcdef";
--#else /* __linux */
--# ifdef __FreeBSD__
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
-     static char char1[] = "pqrsPQRS";
-     static char char2[] = "0123456789abcdefghijklmnopqrstuv";
--# else /* __FreeBSD__ */
-+#else /* __FreeBSD__ || __DragonFly__ */
-     static char char1[] = "pqrstuvwxyzPQRST";
-     static char char2[] = "0123456789abcdef";
--# endif /* __FreeBSD__ */
--#endif /* __linux */
-+#endif
- 
-     static char name[11];
-     static int mfd, sfd;