Upgrade to 3.0 pre 2

Approved-By: asami

5 files changed, 29 insertions, 9 deletions

diff --git a/shells/zsh-devel/Makefile b/shells/zsh-devel/Makefile
index 94695a4d1ef4..45593c97bde2 100644
--- a/shells/zsh-devel/Makefile
+++ b/shells/zsh-devel/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	zsh
-# Version required:     	2.6 beta21
+# Version required:     	3.0 pre2
 # Date created:			11 Feb. 1995
 # Whom:				torstenb
 #
-# $Id: Makefile,v 1.17 1996/05/16 08:03:47 torstenb Exp $
+# $Id: Makefile,v 1.18 1996/06/24 11:44:55 torstenb Exp $
 #
 
-DISTNAME=       zsh-2.6-beta21
-PKGNAME=	zsh-2.6b21
+DISTNAME=       zsh-3.0-pre2
+PKGNAME=	zsh-3.0a2
 CATEGORIES+=	shells
 MASTER_SITES=   ftp://ftp.math.gatech.edu/pub/zsh/ \
 		ftp://ftp.sterling.com/zsh/ \
@@ -24,7 +24,7 @@ GNU_CONFIGURE=	yes
 
 post-install:
 .if !defined(NOMANCOMPRESS)
-.for man in zsh zshbuiltins zshcompctl zshexpn zshmisc zshoptions \
+.for man in zsh zshbuiltins zshcompctl zshexpn zshmisc zshoptions zshall \
 	zshparam zshzle 
 	gzip -9nf ${PREFIX}/man/man1/${man}.1
 .endfor
diff --git a/shells/zsh-devel/distinfo b/shells/zsh-devel/distinfo
index cdd0fdbbfb27..afc91c2a1971 100644
--- a/shells/zsh-devel/distinfo
+++ b/shells/zsh-devel/distinfo
@@ -1 +1 @@
-MD5 (zsh-2.6-beta21.tar.gz) = ea194202537cb9463ff9098d5edcaceb
+MD5 (zsh-3.0-pre2.tar.gz) = c6ce3476d07782cf1026603e518987a0
diff --git a/shells/zsh-devel/files/patch-aa b/shells/zsh-devel/files/patch-aa
new file mode 100644
index 000000000000..28109c3ca0d8
--- /dev/null
+++ b/shells/zsh-devel/files/patch-aa
@@ -0,0 +1,19 @@
+*** 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-devel/pkg-comment b/shells/zsh-devel/pkg-comment
index 572907e47c45..e3ec34d63aee 100644
--- a/shells/zsh-devel/pkg-comment
+++ b/shells/zsh-devel/pkg-comment
@@ -1 +1 @@
-Zsh - the Z shell, version 2.6 beta 21
+Zsh - the Z shell
diff --git a/shells/zsh-devel/pkg-plist b/shells/zsh-devel/pkg-plist
index 6d0342907b2f..c8dec0c6a107 100644
--- a/shells/zsh-devel/pkg-plist
+++ b/shells/zsh-devel/pkg-plist
@@ -1,7 +1,7 @@
 bin/zsh
 @exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells
 @unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells
-bin/zsh-2.6-beta21
+bin/zsh-3.0-pre2
 info/zsh.info
 info/zsh.info-1
 info/zsh.info-2
@@ -9,11 +9,12 @@ info/zsh.info-3
 info/zsh.info-4
 info/zsh.info-5
 info/zsh.info-6
+info/zsh.info-7
 man/man1/zsh.1.gz
 man/man1/zshcompctl.1.gz
 man/man1/zshmisc.1.gz
 man/man1/zshoptions.1.gz
-man/man1/zshall.1
+man/man1/zshall.1.gz
 man/man1/zshzle.1.gz
 man/man1/zshparam.1.gz
 man/man1/zshexpn.1.gz