From 6fc56e32b944d85a4d42738ee27bd70427306b75 Mon Sep 17 00:00:00 2001 From: brad Date: Sun, 14 Mar 1999 07:54:05 +0000 Subject: [PATCH] downgrade to zsh 3.0.5, suggested by --- shells/zsh/Makefile | 9 +++++---- shells/zsh/files/md5 | 6 +++--- shells/zsh/patches/patch-aa | 39 ++++++++++++++++++------------------- shells/zsh/patches/patch-ab | 32 ++++++++++++++++++------------ shells/zsh/patches/patch-ac | 13 +++++++++++++ shells/zsh/pkg/PLIST | 4 ++-- 6 files changed, 62 insertions(+), 41 deletions(-) create mode 100644 shells/zsh/patches/patch-ac diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile index a20dcdf1c68..cd90365fa5f 100644 --- a/shells/zsh/Makefile +++ b/shells/zsh/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.5 1999/03/05 14:38:32 brad Exp $ +# $OpenBSD: Makefile,v 1.6 1999/03/14 07:54:05 brad Exp $ -DISTNAME= zsh-3.1.5 +DISTNAME= zsh-3.0.5 CATEGORIES= shells MASTER_SITES= ftp://ftp.zsh.org/zsh/ \ ftp://ftp.math.gatech.edu/pub/zsh/ \ @@ -15,9 +15,10 @@ MASTER_SITES= ftp://ftp.zsh.org/zsh/ \ MAINTAINER= gene@OpenBSD.ORG GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-zsh-mem --enable-zsh-secure-free --enable-dynamic + MAN1= zsh.1 zshbuiltins.1 zshcompctl.1 zshexpn.1 zshmisc.1 \ - zshoptions.1 zshall.1 zshparam.1 zshzle.1 zshmodules.1 + zshoptions.1 zshall.1 zshparam.1 zshzle.1 + # If you want to build a static binary, uncomment the following line #LDFLAGS+=-static diff --git a/shells/zsh/files/md5 b/shells/zsh/files/md5 index 64b506c82f4..cf66541ae1c 100644 --- a/shells/zsh/files/md5 +++ b/shells/zsh/files/md5 @@ -1,3 +1,3 @@ -MD5 (zsh-3.1.5.tar.gz) = d954f91b6f0bd71e45e39f1228e7f4d7 -RMD160 (zsh-3.1.5.tar.gz) = 751bf2bffda19d307e980d71870f0639d86990f8 -SHA1 (zsh-3.1.5.tar.gz) = c20bef2cb427cf31db82a06ccb71f65ef91b9279 +MD5 (zsh-3.0.5.tar.gz) = 7c3ce278a75ee8d05c5d0fc1821b2a7a +RMD160 (zsh-3.0.5.tar.gz) = 7141e8d634917f9c5a23302a52190080836abe75 +SHA1 (zsh-3.0.5.tar.gz) = 01449b03ec02745604e2e2432dfd10cb2f2a56d6 diff --git a/shells/zsh/patches/patch-aa b/shells/zsh/patches/patch-aa index d9988ed5e44..28109c3ca0d 100644 --- a/shells/zsh/patches/patch-aa +++ b/shells/zsh/patches/patch-aa @@ -1,20 +1,19 @@ ---- Doc/Makefile.in.orig Fri Mar 5 09:03:09 1999 -+++ Doc/Makefile.in Fri Mar 5 09:04:24 1999 -@@ -65,7 +65,7 @@ - $(TEXI2DVI) $(sdir)/zsh.texi - - zsh.info: zsh.texi -- $(MAKEINFO) $(sdir)/zsh.texi; exit 0 -+ $(MAKEINFO) --no-split $(sdir)/zsh.texi; exit 0 - - zsh.texi: zsh.yo - $(YODL) -o $(sdir)/zsh.texi -I$(sdir) -w ztexi.yo version.yo zsh.yo -@@ -133,7 +133,7 @@ - # install info pages, creating install directory if necessary - install.info: zsh.info - $(sdir_top)/mkinstalldirs $(infodir) -- for file in zsh.info zsh.info-[1-9]; do \ -+ for file in zsh.info ; do \ - if test -f $$file; then \ - $(INSTALL_DATA) $$file $(infodir); \ - elif test -f $(sdir)/$$file; then \ +*** 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) diff --git a/shells/zsh/patches/patch-ab b/shells/zsh/patches/patch-ab index 8569e5e5f28..c80f4c7f852 100644 --- a/shells/zsh/patches/patch-ab +++ b/shells/zsh/patches/patch-ab @@ -1,13 +1,21 @@ ---- Doc/zsh.texi.orig Fri Mar 5 09:00:10 1999 -+++ Doc/zsh.texi Fri Mar 5 09:01:05 1999 -@@ -2,6 +2,10 @@ - @c %**start of header - @setfilename zsh.info - @settitle zsh -+@dircategory Shells -+@direntry -+* Zsh: (zsh). The Z shell. -+@end direntry - @c %**end of header +--- 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 @@ + everything: all zsh_us.ps zsh_a4.ps zsh_toc.html + + zsh.info: zsh.texi +- @$(MAKEINFO) -I$(srcdir) $(srcdir)/zsh.texi || { \ ++ @rm -f zsh.info* ++ @$(MAKEINFO) --no-split -I$(srcdir) $(srcdir)/zsh.texi || { \ + echo Info documentation cannot be compiled without $(MAKEINFO). ; \ + echo You can find precompiled info files in zsh-doc.tar.gz. ; } + +@@ -127,7 +128,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*; do \ + [ -f "$$file" ] && $(INSTALL_DATA) $$file $(infodir) ; \ + done - @ifinfo diff --git a/shells/zsh/patches/patch-ac b/shells/zsh/patches/patch-ac new file mode 100644 index 00000000000..20799ee0948 --- /dev/null +++ b/shells/zsh/patches/patch-ac @@ -0,0 +1,13 @@ +--- Doc/zsh.texi.orig Thu Dec 19 09:00:10 1996 ++++ Doc/zsh.texi Mon Jun 16 20:35:02 1997 +@@ -2,6 +2,10 @@ + @c %**start of header + @setfilename zsh.info + @settitle zsh ++@dircategory Shells ++@direntry ++* Zsh: (zsh). The Z shell. ++@end direntry + @c %**end of header + + @setchapternewpage odd diff --git a/shells/zsh/pkg/PLIST b/shells/zsh/pkg/PLIST index 86b602343c4..adc805f7f9d 100644 --- a/shells/zsh/pkg/PLIST +++ b/shells/zsh/pkg/PLIST @@ -1,10 +1,11 @@ bin/zsh @unexec echo "Don't forget to update /etc/shells" -bin/zsh-3.1.5 +bin/zsh-3.0.5 @unexec install-info --delete %D/info/zsh.info %D/info/dir info/zsh.info @exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir @exec install-info %D/info/zsh.info %D/info/dir +info/dir man/man1/zshcompctl.1 man/man1/zshexpn.1 man/man1/zshmisc.1 @@ -14,4 +15,3 @@ man/man1/zshzle.1 man/man1/zsh.1 man/man1/zshbuiltins.1 man/man1/zshparam.1 -man/man1/zshmodules.1