Subject: pkg/14376: Update for shells/zsh
To: None <gnats-bugs@gnats.netbsd.org>
From: Eric Gillespie, Jr. <epg@pretzelnet.org>
List: netbsd-bugs
Date: 10/27/2001 13:54:03
>Number:         14376
>Category:       pkg
>Synopsis:       Update for shells/zsh
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sat Oct 27 11:50:00 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     Eric Gillespie Jr.
>Release:        NetBSD 1.5.1
>Organization:
>Environment:
System: NetBSD trantor.pretzelnet.org 1.5.2 NetBSD 1.5.2 (TRANTOR) #1: Thu Oct 18 02:15:08 EST 2001 epg@trantor.pretzelnet.org:/u/src/sys/arch/i386/compile/TRANTOR i386


>Description:
zsh 4.0.4 is now out (there was a last-minute problem wit 4.0.3, and it
was effectively never released).  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

patch-aa had to be changed because Doc/Makefile.in changed slightly.

Also, some trick was being used with previous versions to link the zsh
binary to /usr/pkg/lib/zsh/libzsh-4.0.2.so.  This trick doesn't seem
to work with this release, so i added to LDFLAGS in the pkgsrc
Makefile.

>How-To-Repeat:
>Fix:
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/shells/zsh/Makefile,v
retrieving revision 1.29
diff -a -u -r1.29 Makefile
--- Makefile	2001/10/05 16:36:00	1.29
+++ Makefile	2001/10/27 18:39:30
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.29 2001/10/05 16:36:00 tron 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 @@
 .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
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/shells/zsh/distinfo,v
retrieving revision 1.5
diff -a -u -r1.5 distinfo
--- distinfo	2001/07/23 18:23:44	1.5
+++ distinfo	2001/10/27 18:39:30
@@ -1,5 +1,5 @@
 $NetBSD: distinfo,v 1.5 2001/07/23 18:23:44 nra 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
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/shells/zsh/patches/patch-aa,v
retrieving revision 1.4
diff -a -u -r1.4 patch-aa
--- patch-aa	2001/06/05 16:28:08	1.4
+++ patch-aa	2001/10/27 18:39:30
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.4 2001/06/05 16:28:08 jtb Exp $
+$NetBSD$
 
---- 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 @@
 +MAKEINFO = makeinfo --no-split
  TEXI2DVI = texi2dvi
  DVIPS = dvips
- TEXI2HTML = texi2html -expandinfo -split_chapter
+ TEXI2HTML = texi2html -expand info -split chapter
Index: pkg/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/shells/zsh/pkg/PLIST,v
retrieving revision 1.12
diff -a -u -r1.12 PLIST
--- PLIST	2001/09/23 21:20:35	1.12
+++ PLIST	2001/10/27 18:39:30
@@ -46,6 +46,7 @@
 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/_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/_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/_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/_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/_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/_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
>Release-Note:
>Audit-Trail:
>Unformatted: