From d3e18b115262fd62ad77103bbb01112fb1bf9fe5 Mon Sep 17 00:00:00 2001 From: windsor Date: Thu, 6 Jan 2000 22:42:14 +0000 Subject: upgrade to 3.0.7, the latest release --- shells/zsh/Makefile | 5 ++--- shells/zsh/files/md5 | 4 ++-- shells/zsh/files/patch-sum | 10 +++++----- shells/zsh/patches/patch-aa | 32 ++++++++++++-------------------- shells/zsh/patches/patch-ab | 12 ++++++------ shells/zsh/patches/patch-ac | 8 ++++---- shells/zsh/patches/patch-ad | 8 ++++---- 7 files changed, 35 insertions(+), 44 deletions(-) (limited to 'shells') diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile index c1a4f6f8927..be243b99d91 100644 --- a/shells/zsh/Makefile +++ b/shells/zsh/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.13 1999/02/26 11:00:13 frueauf Exp $ -# FreeBSD Id: Makefile,v 1.26 1997/09/26 08:23:14 torstenb Exp +# $NetBSD: Makefile,v 1.14 2000/01/06 22:42:14 windsor Exp $ # -DISTNAME= zsh-3.0.5 +DISTNAME= zsh-3.0.7 CATEGORIES= shells MASTER_SITES= ftp://ftp.math.gatech.edu/pub/zsh/ \ ftp://uiarchive.uiuc.edu/pub/packages/shells/zsh/ \ diff --git a/shells/zsh/files/md5 b/shells/zsh/files/md5 index ac7c5ae1b6d..7e8457207ae 100644 --- a/shells/zsh/files/md5 +++ b/shells/zsh/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.2 1998/08/07 13:27:39 agc Exp $ +$NetBSD: md5,v 1.3 2000/01/06 22:42:15 windsor Exp $ -MD5 (zsh-3.0.5.tar.gz) = 7c3ce278a75ee8d05c5d0fc1821b2a7a +MD5 (zsh-3.0.7.tar.gz) = da3d2f21522c4d51c97f3686d4becd5a diff --git a/shells/zsh/files/patch-sum b/shells/zsh/files/patch-sum index 05ca5b33061..0a41d428cfb 100644 --- a/shells/zsh/files/patch-sum +++ b/shells/zsh/files/patch-sum @@ -1,6 +1,6 @@ -$NetBSD: patch-sum,v 1.1 1999/07/09 14:23:06 agc Exp $ +$NetBSD: patch-sum,v 1.2 2000/01/06 22:42:15 windsor Exp $ -MD5 (patch-aa) = 124858f0551a47046b9aa61b1ae6c670 -MD5 (patch-ab) = a7658e72612a6f3772ca215fb5431681 -MD5 (patch-ac) = 081b636dfa910015b42244bfa2f1f0c0 -MD5 (patch-ad) = e7d540e4291addc2bcbf6e81884d7dc0 +MD5 (patch-aa) = a2ac60c0e27d150f798cb49be5f87b68 +MD5 (patch-ab) = c8e4d65de514d29e9516dc4d45286489 +MD5 (patch-ac) = 3e5a20b03b80390a699ffc562b18daa7 +MD5 (patch-ad) = acde180ea6862d95990f83d496f4b5c1 diff --git a/shells/zsh/patches/patch-aa b/shells/zsh/patches/patch-aa index 57dc9dbc14b..56e784c4187 100644 --- a/shells/zsh/patches/patch-aa +++ b/shells/zsh/patches/patch-aa @@ -1,21 +1,13 @@ -$NetBSD: patch-aa,v 1.2 1998/08/07 11:13:58 agc Exp $ +$NetBSD: patch-aa,v 1.3 2000/01/06 22:42:15 windsor Exp $ -*** Src/Makefile.in.orig Tue Jul 9 11:00:39 1996 ---- Src/Makefile.in Tue Jul 9 11:00:46 1996 -*************** -*** 138,144 **** - # install binary, creating install directory if necessary - install.bin: zsh - $(top_srcdir)/mkinstalldirs $(bindir) -! -if [ -f $(bindir)/zsh ]; then mv $(bindir)/zsh $(bindir)/zsh.old; fi - $(INSTALL_PROGRAM) zsh $(bindir)/zsh - -if [ -f $(bindir)/zsh-$(VERSION) ]; then rm -f $(bindir)/zsh-$(VERSION); fi - ln $(bindir)/zsh $(bindir)/zsh-$(VERSION) ---- 138,144 ---- - # install binary, creating install directory if necessary - install.bin: zsh - $(top_srcdir)/mkinstalldirs $(bindir) -! -if [ -f $(bindir)/zsh ]; then mv -f $(bindir)/zsh $(bindir)/zsh.old; fi - $(INSTALL_PROGRAM) zsh $(bindir)/zsh - -if [ -f $(bindir)/zsh-$(VERSION) ]; then rm -f $(bindir)/zsh-$(VERSION); fi - ln $(bindir)/zsh $(bindir)/zsh-$(VERSION) +--- Src/Makefile.in.orig Thu Jan 6 15:39:29 2000 ++++ Src/Makefile.in Thu Jan 6 15:40:03 2000 +@@ -148,7 +148,7 @@ + # install binary, creating install directory if necessary + install.bin: zsh + $(top_srcdir)/mkinstalldirs $(bindir) +- -if [ -f $(bindir)/zsh ]; then mv $(bindir)/zsh $(bindir)/zsh.old; fi ++ -if [ -f $(bindir)/zsh ]; then mv -f $(bindir)/zsh $(bindir)/zsh.old; fi + $(INSTALL_PROGRAM) zsh $(bindir)/zsh + -if [ -f $(bindir)/zsh-$(VERSION) ]; then rm -f $(bindir)/zsh-$(VERSION); fi + ln $(bindir)/zsh $(bindir)/zsh-$(VERSION) diff --git a/shells/zsh/patches/patch-ab b/shells/zsh/patches/patch-ab index d8fbbc80f9a..fb5c4335175 100644 --- a/shells/zsh/patches/patch-ab +++ b/shells/zsh/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.2 1998/08/07 11:13:59 agc Exp $ +$NetBSD: patch-ab,v 1.3 2000/01/06 22:42:15 windsor Exp $ ---- Doc/Makefile.in.orig Wed Dec 18 05:14:11 1996 -+++ Doc/Makefile.in Mon Jun 16 20:40:29 1997 -@@ -93,7 +93,8 @@ +--- Doc/Makefile.in.orig Thu Jan 6 15:40:23 2000 ++++ Doc/Makefile.in Thu Jan 6 15:42:03 2000 +@@ -91,7 +91,8 @@ everything: all zsh_us.ps zsh_a4.ps zsh_toc.html zsh.info: zsh.texi @@ -12,11 +12,11 @@ $NetBSD: patch-ab,v 1.2 1998/08/07 11:13:59 agc Exp $ echo Info documentation cannot be compiled without $(MAKEINFO). ; \ echo You can find precompiled info files in zsh-doc.tar.gz. ; } -@@ -127,7 +128,7 @@ +@@ -125,7 +126,7 @@ # install info pages, creating install directory if necessary install.info: zsh.info $(top_srcdir)/mkinstalldirs $(infodir) -- for file in zsh.info zsh.info-[1-9]; do \ +- for file in zsh.info zsh.info-[1-9]*; do \ + for file in zsh.info*; do \ [ -f "$$file" ] && $(INSTALL_DATA) $$file $(infodir) ; \ done diff --git a/shells/zsh/patches/patch-ac b/shells/zsh/patches/patch-ac index fb802f14bf4..77e6bc01ba3 100644 --- a/shells/zsh/patches/patch-ac +++ b/shells/zsh/patches/patch-ac @@ -1,7 +1,7 @@ -$NetBSD: patch-ac,v 1.2 1998/08/07 11:14:02 agc Exp $ +$NetBSD: patch-ac,v 1.3 2000/01/06 22:42:15 windsor Exp $ ---- Doc/zsh.texi.orig Thu Dec 19 09:00:10 1996 -+++ Doc/zsh.texi Mon Jun 16 20:35:02 1997 +--- Doc/zsh.texi.orig Thu Jan 6 15:44:41 2000 ++++ Doc/zsh.texi Thu Jan 6 15:45:48 2000 @@ -2,6 +2,10 @@ @c %**start of header @setfilename zsh.info @@ -12,4 +12,4 @@ $NetBSD: patch-ac,v 1.2 1998/08/07 11:14:02 agc Exp $ +@end direntry @c %**end of header - @setchapternewpage odd + @ifinfo diff --git a/shells/zsh/patches/patch-ad b/shells/zsh/patches/patch-ad index 1f646c06e44..74ad941a3ab 100644 --- a/shells/zsh/patches/patch-ad +++ b/shells/zsh/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.2 1998/08/07 11:14:02 agc Exp $ +$NetBSD: patch-ad,v 1.3 2000/01/06 22:42:15 windsor Exp $ ---- Makefile.in.orig Thu Jan 1 06:21:45 1998 -+++ Makefile.in Thu Jan 1 06:21:54 1998 -@@ -52,7 +52,7 @@ +--- Makefile.in.orig Thu Jan 6 15:45:59 2000 ++++ Makefile.in Thu Jan 6 15:46:16 2000 +@@ -50,7 +50,7 @@ CPPFLAGS = @CPPFLAGS@ DEFS = @DEFS@ CFLAGS = @CFLAGS@ -- cgit v1.2.3