Updated to 4.0.4, provided by Eric Gillespie Jr. in pkg/14376

This is a minor bug-fix release, though some new functions have been added:

_bts                            Completion for Debian BTS
_chflags                        Completion for chflags(1)
_links                          Completion for links web browser
_samba
_sysctl
_user_admin
bash-backward-kill-word

4 files changed, 18 insertions, 10 deletions

diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index 124a9e0034d..f3890c79db2 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.29 2001/10/05 16:36:00 tron Exp $
+# $NetBSD: Makefile,v 1.30 2001/11/29 09:16:28 martti Exp $
 
-DISTNAME=       zsh-4.0.2
+DISTNAME=       zsh-4.0.4
 CATEGORIES=	shells
 MASTER_SITES=   ftp://ftp.rge.com/pub/shells/zsh/ \
 		ftp://sunsite.auc.dk/pub/unix/shells/zsh/ \
@@ -25,6 +25,7 @@ LDFLAGS+=	-static
 .if ${OPSYS} == "SunOS"
 PLIST_SRC=	${PKGDIR}/PLIST.dynamic ${PKGDIR}/PLIST
 .else
+LDFLAGS+=	-Wl,-R/usr/pkg/lib/zsh
 PLIST_SRC=	${PKGDIR}/PLIST.shlibs ${PKGDIR}/PLIST.dynamic ${PKGDIR}/PLIST
 .endif
 .endif
diff --git a/shells/zsh/PLIST b/shells/zsh/PLIST
index ffe854c5999..df63a0d3b83 100644
--- a/shells/zsh/PLIST
+++ b/shells/zsh/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:27:02 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/11/29 09:16:28 martti Exp $
 bin/zsh
 @exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak || true; echo %D/%F) >/etc/shells
 @unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak || true) >/etc/shells
@@ -46,6 +46,7 @@ share/zsh/${PKGVERSION}/functions/_bindkey
 share/zsh/${PKGVERSION}/functions/_bison
 share/zsh/${PKGVERSION}/functions/_brace_parameter
 share/zsh/${PKGVERSION}/functions/_bsd_pkg
+share/zsh/${PKGVERSION}/functions/_bts
 share/zsh/${PKGVERSION}/functions/_bug
 share/zsh/${PKGVERSION}/functions/_builtin
 share/zsh/${PKGVERSION}/functions/_bzip2
@@ -53,6 +54,7 @@ share/zsh/${PKGVERSION}/functions/_cache_invalid
 share/zsh/${PKGVERSION}/functions/_call_function
 share/zsh/${PKGVERSION}/functions/_call_program
 share/zsh/${PKGVERSION}/functions/_cd
+share/zsh/${PKGVERSION}/functions/_chflags
 share/zsh/${PKGVERSION}/functions/_chown
 share/zsh/${PKGVERSION}/functions/_combination
 share/zsh/${PKGVERSION}/functions/_command
@@ -143,6 +145,7 @@ share/zsh/${PKGVERSION}/functions/_kill
 share/zsh/${PKGVERSION}/functions/_killall
 share/zsh/${PKGVERSION}/functions/_kld
 share/zsh/${PKGVERSION}/functions/_limits
+share/zsh/${PKGVERSION}/functions/_links
 share/zsh/${PKGVERSION}/functions/_list
 share/zsh/${PKGVERSION}/functions/_loadkeys
 share/zsh/${PKGVERSION}/functions/_logical_volumes
@@ -224,6 +227,7 @@ share/zsh/${PKGVERSION}/functions/_retrieve_cache
 share/zsh/${PKGVERSION}/functions/_rlogin
 share/zsh/${PKGVERSION}/functions/_rpm
 share/zsh/${PKGVERSION}/functions/_ruby
+share/zsh/${PKGVERSION}/functions/_samba
 share/zsh/${PKGVERSION}/functions/_sched
 share/zsh/${PKGVERSION}/functions/_sep_parts
 share/zsh/${PKGVERSION}/functions/_set
@@ -244,6 +248,7 @@ share/zsh/${PKGVERSION}/functions/_su
 share/zsh/${PKGVERSION}/functions/_sub_commands
 share/zsh/${PKGVERSION}/functions/_subscript
 share/zsh/${PKGVERSION}/functions/_sudo
+share/zsh/${PKGVERSION}/functions/_sysctl
 share/zsh/${PKGVERSION}/functions/_tags
 share/zsh/${PKGVERSION}/functions/_tar
 share/zsh/${PKGVERSION}/functions/_tar_archive
@@ -262,6 +267,7 @@ share/zsh/${PKGVERSION}/functions/_unhash
 share/zsh/${PKGVERSION}/functions/_unsetopt
 share/zsh/${PKGVERSION}/functions/_update-alternatives
 share/zsh/${PKGVERSION}/functions/_urls
+share/zsh/${PKGVERSION}/functions/_user_admin
 share/zsh/${PKGVERSION}/functions/_user_at_host
 share/zsh/${PKGVERSION}/functions/_users
 share/zsh/${PKGVERSION}/functions/_users_on
@@ -322,6 +328,7 @@ share/zsh/${PKGVERSION}/functions/_zmodload
 share/zsh/${PKGVERSION}/functions/_zpty
 share/zsh/${PKGVERSION}/functions/_zstyle
 share/zsh/${PKGVERSION}/functions/allopt
+share/zsh/${PKGVERSION}/functions/bash-backward-kill-word
 share/zsh/${PKGVERSION}/functions/checkmail
 share/zsh/${PKGVERSION}/functions/colors
 share/zsh/${PKGVERSION}/functions/compaudit
diff --git a/shells/zsh/distinfo b/shells/zsh/distinfo
index 8330558ce1d..0bdc86d66ad 100644
--- a/shells/zsh/distinfo
+++ b/shells/zsh/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2001/07/23 18:23:44 nra Exp $
+$NetBSD: distinfo,v 1.6 2001/11/29 09:16:28 martti Exp $
 
-SHA1 (zsh-4.0.2.tar.bz2) = 067db91345d7a0a82dff10b7afdcdd43d3a99636
-Size (zsh-4.0.2.tar.bz2) = 1666946 bytes
-SHA1 (patch-aa) = 0cfe03d2bbae988a6c59ec4ee67244ed836d7f1d
+SHA1 (zsh-4.0.4.tar.bz2) = 7e0f5f6fc5468afa9c42861119ed834617c4327a
+Size (zsh-4.0.4.tar.bz2) = 1680823 bytes
+SHA1 (patch-aa) = 5e5fde0f21a64c2e0579958868b05737ef0c6afb
diff --git a/shells/zsh/patches/patch-aa b/shells/zsh/patches/patch-aa
index bcdb53fe066..a38c417ef5f 100644
--- a/shells/zsh/patches/patch-aa
+++ b/shells/zsh/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.4 2001/06/05 16:28:08 jtb Exp $
+$NetBSD: patch-aa,v 1.5 2001/11/29 09:16:28 martti Exp $
 
---- Doc/Makefile.in.orig	Fri Jun  1 23:43:42 2001
+--- Doc/Makefile.in.orig	Fri Oct 26 22:18:31 2001
 +++ Doc/Makefile.in
 @@ -37,7 +37,7 @@
  
@@ -10,4 +10,4 @@ $NetBSD: patch-aa,v 1.4 2001/06/05 16:28:08 jtb Exp $
 +MAKEINFO = makeinfo --no-split
  TEXI2DVI = texi2dvi
  DVIPS = dvips
- TEXI2HTML = texi2html -expandinfo -split_chapter
+ TEXI2HTML = texi2html -expand info -split chapter