Changes 4.2.4:

* Bug-fix release

5 files changed, 36 insertions, 20 deletions

diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index fa3fadf17c0..2d008bc3cdb 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.46 2004/08/16 16:17:39 recht Exp $
-#
+# $NetBSD: Makefile,v 1.47 2005/02/21 11:07:37 adam Exp $
+
 .include "../../shells/zsh/Makefile.common"
 
-ZSH_VERSION=	4.2.1
+ZSH_VERSION=	4.2.4
 ZSH_MAINTAINER=	uebayasi@NetBSD.org
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/shells/zsh/PLIST b/shells/zsh/PLIST
index db0a25297c9..4dcb1aea853 100644
--- a/shells/zsh/PLIST
+++ b/shells/zsh/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2004/08/16 16:17:39 recht Exp $
+@comment $NetBSD: PLIST,v 1.15 2005/02/21 11:07:37 adam Exp $
 bin/zsh
 bin/${PKGNAME}
 man/man1/zsh.1
@@ -47,8 +47,10 @@ share/zsh/${PKGVERSION}/functions/_attr
 share/zsh/${PKGVERSION}/functions/_auto-apt
 share/zsh/${PKGVERSION}/functions/_autocd
 share/zsh/${PKGVERSION}/functions/_bash_completions
+share/zsh/${PKGVERSION}/functions/_baz
 share/zsh/${PKGVERSION}/functions/_bindkey
 share/zsh/${PKGVERSION}/functions/_bison
+share/zsh/${PKGVERSION}/functions/_bittorrent
 share/zsh/${PKGVERSION}/functions/_bogofilter
 share/zsh/${PKGVERSION}/functions/_brace_parameter
 share/zsh/${PKGVERSION}/functions/_bsd_pkg
@@ -57,6 +59,7 @@ share/zsh/${PKGVERSION}/functions/_bug
 share/zsh/${PKGVERSION}/functions/_builtin
 share/zsh/${PKGVERSION}/functions/_bzip2
 share/zsh/${PKGVERSION}/functions/_cache_invalid
+share/zsh/${PKGVERSION}/functions/_cal
 share/zsh/${PKGVERSION}/functions/_call_function
 share/zsh/${PKGVERSION}/functions/_call_program
 share/zsh/${PKGVERSION}/functions/_cd
@@ -88,6 +91,7 @@ share/zsh/${PKGVERSION}/functions/_cygpath
 share/zsh/${PKGVERSION}/functions/_cygrunsrv
 share/zsh/${PKGVERSION}/functions/_cygserver
 share/zsh/${PKGVERSION}/functions/_cygstart
+share/zsh/${PKGVERSION}/functions/_darcs
 share/zsh/${PKGVERSION}/functions/_dcop
 share/zsh/${PKGVERSION}/functions/_dd
 share/zsh/${PKGVERSION}/functions/_deb_packages
@@ -95,6 +99,7 @@ share/zsh/${PKGVERSION}/functions/_debchange
 share/zsh/${PKGVERSION}/functions/_debfoster
 share/zsh/${PKGVERSION}/functions/_debsign
 share/zsh/${PKGVERSION}/functions/_default
+share/zsh/${PKGVERSION}/functions/_defaults
 share/zsh/${PKGVERSION}/functions/_describe
 share/zsh/${PKGVERSION}/functions/_description
 share/zsh/${PKGVERSION}/functions/_dict
@@ -137,6 +142,7 @@ share/zsh/${PKGVERSION}/functions/_file_systems
 share/zsh/${PKGVERSION}/functions/_files
 share/zsh/${PKGVERSION}/functions/_find
 share/zsh/${PKGVERSION}/functions/_finger
+share/zsh/${PKGVERSION}/functions/_fink
 share/zsh/${PKGVERSION}/functions/_first
 share/zsh/${PKGVERSION}/functions/_flex
 share/zsh/${PKGVERSION}/functions/_floppy
@@ -151,6 +157,7 @@ share/zsh/${PKGVERSION}/functions/_getent
 share/zsh/${PKGVERSION}/functions/_getfacl
 share/zsh/${PKGVERSION}/functions/_global
 share/zsh/${PKGVERSION}/functions/_global_tags
+share/zsh/${PKGVERSION}/functions/_gnome-gv
 share/zsh/${PKGVERSION}/functions/_gnu_generic
 share/zsh/${PKGVERSION}/functions/_gpg
 share/zsh/${PKGVERSION}/functions/_gphoto2
@@ -163,6 +170,7 @@ share/zsh/${PKGVERSION}/functions/_guard
 share/zsh/${PKGVERSION}/functions/_gv
 share/zsh/${PKGVERSION}/functions/_gzip
 share/zsh/${PKGVERSION}/functions/_hash
+share/zsh/${PKGVERSION}/functions/_hdiutil
 share/zsh/${PKGVERSION}/functions/_history
 share/zsh/${PKGVERSION}/functions/_history_complete_word
 share/zsh/${PKGVERSION}/functions/_hosts
@@ -192,6 +200,7 @@ share/zsh/${PKGVERSION}/functions/_less
 share/zsh/${PKGVERSION}/functions/_limit
 share/zsh/${PKGVERSION}/functions/_limits
 share/zsh/${PKGVERSION}/functions/_links
+share/zsh/${PKGVERSION}/functions/_lintian
 share/zsh/${PKGVERSION}/functions/_list
 share/zsh/${PKGVERSION}/functions/_loadkeys
 share/zsh/${PKGVERSION}/functions/_locales
@@ -208,6 +217,8 @@ share/zsh/${PKGVERSION}/functions/_lspv
 share/zsh/${PKGVERSION}/functions/_lsvg
 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/_mail
 share/zsh/${PKGVERSION}/functions/_mailboxes
 share/zsh/${PKGVERSION}/functions/_main_complete
@@ -216,6 +227,7 @@ share/zsh/${PKGVERSION}/functions/_make-kpkg
 share/zsh/${PKGVERSION}/functions/_man
 share/zsh/${PKGVERSION}/functions/_match
 share/zsh/${PKGVERSION}/functions/_math
+share/zsh/${PKGVERSION}/functions/_mencal
 share/zsh/${PKGVERSION}/functions/_menu
 share/zsh/${PKGVERSION}/functions/_mere
 share/zsh/${PKGVERSION}/functions/_message
@@ -252,6 +264,7 @@ share/zsh/${PKGVERSION}/functions/_nothing
 share/zsh/${PKGVERSION}/functions/_nslookup
 share/zsh/${PKGVERSION}/functions/_object_classes
 share/zsh/${PKGVERSION}/functions/_oldlist
+share/zsh/${PKGVERSION}/functions/_open
 share/zsh/${PKGVERSION}/functions/_options
 share/zsh/${PKGVERSION}/functions/_options_set
 share/zsh/${PKGVERSION}/functions/_options_unset
@@ -275,6 +288,7 @@ share/zsh/${PKGVERSION}/functions/_pids
 share/zsh/${PKGVERSION}/functions/_pine
 share/zsh/${PKGVERSION}/functions/_pkgtool
 share/zsh/${PKGVERSION}/functions/_ports
+share/zsh/${PKGVERSION}/functions/_postfix
 share/zsh/${PKGVERSION}/functions/_prcs
 share/zsh/${PKGVERSION}/functions/_precommand
 share/zsh/${PKGVERSION}/functions/_prefix
@@ -298,6 +312,7 @@ share/zsh/${PKGVERSION}/functions/_regex_arguments
 share/zsh/${PKGVERSION}/functions/_renice
 share/zsh/${PKGVERSION}/functions/_requested
 share/zsh/${PKGVERSION}/functions/_retrieve_cache
+share/zsh/${PKGVERSION}/functions/_retrieve_mac_apps
 share/zsh/${PKGVERSION}/functions/_rlogin
 share/zsh/${PKGVERSION}/functions/_rpm
 share/zsh/${PKGVERSION}/functions/_rsync
@@ -376,6 +391,7 @@ share/zsh/${PKGVERSION}/functions/_vorbis
 share/zsh/${PKGVERSION}/functions/_vux
 share/zsh/${PKGVERSION}/functions/_w3m
 share/zsh/${PKGVERSION}/functions/_wait
+share/zsh/${PKGVERSION}/functions/_wajig
 share/zsh/${PKGVERSION}/functions/_wanted
 share/zsh/${PKGVERSION}/functions/_webbrowser
 share/zsh/${PKGVERSION}/functions/_wget
diff --git a/shells/zsh/distinfo b/shells/zsh/distinfo
index 75340d149e7..c1e09c7f317 100644
--- a/shells/zsh/distinfo
+++ b/shells/zsh/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.19 2005/01/21 02:40:41 uebayasi Exp $
+$NetBSD: distinfo,v 1.20 2005/02/21 11:07:37 adam Exp $
 
-SHA1 (zsh-4.2.1.tar.bz2) = fadf64908fbb62572b11ec79f7c42960c4e71292
-Size (zsh-4.2.1.tar.bz2) = 2039188 bytes
+SHA1 (zsh-4.2.4.tar.bz2) = 5bd2a12cc9b663ac0c6aed8a619930a233640d7e
+Size (zsh-4.2.4.tar.bz2) = 2089657 bytes
 SHA1 (patch-aa) = 5e5fde0f21a64c2e0579958868b05737ef0c6afb
-SHA1 (patch-ab) = 65e7343fcea23aa516975521d0b92a67c06d1bda
-SHA1 (patch-ac) = b41357f2657addf8fb0fe86639f1e7d6c1d6935a
+SHA1 (patch-ab) = 815de90c379035dbc02b251cee148f6df47f9a65
+SHA1 (patch-ac) = 1335bb9c153fba14d7cf09d47eb87a0ed057e1f5
 SHA1 (patch-ae) = 7d4514d0bad6553d3c0cf115874bf50ed0da3d48
diff --git a/shells/zsh/patches/patch-ab b/shells/zsh/patches/patch-ab
index 0075cf423ad..2f5b8ef2dea 100644
--- a/shells/zsh/patches/patch-ab
+++ b/shells/zsh/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.10 2004/08/16 16:17:39 recht Exp $
+$NetBSD: patch-ab,v 1.11 2005/02/21 11:07:37 adam Exp $
 
---- Src/zsh.h.orig	2004-08-13 12:22:47.000000000 +0200
-+++ Src/zsh.h	2004-08-16 11:54:07.000000000 +0200
-@@ -1576,6 +1576,7 @@
+--- Src/zsh.h.orig	2005-01-12 12:19:06.000000000 +0000
++++ Src/zsh.h
+@@ -1625,6 +1625,7 @@ struct ttyinfo {
  #endif
  };
  
@@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.10 2004/08/16 16:17:39 recht Exp $
  /* defines for whether tabs expand to spaces */
  #if defined(HAVE_TERMIOS_H) || defined(HAVE_TERMIO_H)
  #define SGTTYFLAG       shttyinfo.tio.c_oflag
-@@ -1591,6 +1592,7 @@
+@@ -1640,6 +1641,7 @@ struct ttyinfo {
  #define SGTABTYPE       XTABS
  #  endif
  # endif
diff --git a/shells/zsh/patches/patch-ac b/shells/zsh/patches/patch-ac
index 0283c6b1b15..1b1748f5f27 100644
--- a/shells/zsh/patches/patch-ac
+++ b/shells/zsh/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.16 2005/01/21 02:40:41 uebayasi Exp $
+$NetBSD: patch-ac,v 1.17 2005/02/21 11:07:37 adam Exp $
 
---- configure.orig	Fri Aug 13 19:24:24 2004
-+++ configure	Fri Jan 21 10:03:35 2005
-@@ -13713,6 +13713,10 @@
+--- configure.orig	2005-02-01 17:53:21.000000000 +0000
++++ configure
+@@ -15476,6 +15476,10 @@ echo "${ECHO_T}$zsh_cv_sys_elf" >&6
          DLLD="${DLLD=$CC}"
          DLLDARG=""
        ;;
@@ -13,7 +13,7 @@ $NetBSD: patch-ac,v 1.16 2005/01/21 02:40:41 uebayasi Exp $
        * )
  	DLLD="${DLLD=ld}"
  	DLLDARG=""
-@@ -13723,6 +13727,7 @@
+@@ -15486,6 +15490,7 @@ echo "${ECHO_T}$zsh_cv_sys_elf" >&6
      case "$host_os" in
        hpux*)   DLLDFLAGS="${DLLDFLAGS=-shared}" ;;
        darwin*) DLCFLAGS="${DLCFLAGS=-fno-common}" ;;
@@ -21,7 +21,7 @@ $NetBSD: patch-ac,v 1.16 2005/01/21 02:40:41 uebayasi Exp $
        *)       DLCFLAGS="${DLCFLAGS=-fPIC}" ;;
      esac
    else
-@@ -13736,7 +13741,7 @@
+@@ -15499,7 +15504,7 @@ echo "${ECHO_T}$zsh_cv_sys_elf" >&6
      esac
    fi
    case "$host_os" in