6 files changed, 46 insertions, 55 deletions

diff --git a/shells/zsh-devel/Makefile b/shells/zsh-devel/Makefile
index 124e678a379d..addd7d944c07 100644
--- a/shells/zsh-devel/Makefile
+++ b/shells/zsh-devel/Makefile
@@ -1,15 +1,15 @@
-# New ports collection makefile for:	zsh
-# Version required:     	3.0.5
-# Date created:			11 Feb. 1995
-# Whom:				torstenb
+# New ports collection makefile for:	zsh-devel
+# Version required:		3.1.5
+# Date created:			31 October 1998
+# Whom:				shige
 #
-# $Id: Makefile,v 1.27 1998/08/27 02:33:51 max Exp $
+# $Id: Makefile,v 1.28 1998/12/24 07:42:53 asami Exp $
 #
 
-DISTNAME=       zsh-3.0.5
-PKGNAME=	zsh-3.0.5
+DISTNAME=	zsh-3.1.5
 CATEGORIES=	shells
-MASTER_SITES=   ftp://ftp.math.gatech.edu/pub/zsh/ \
+MASTER_SITES=	ftp://ftp.zsh.org/zsh/ \
+		ftp://ftp.math.gatech.edu/pub/zsh/ \
 		ftp://ftp.sterling.com/zsh/ \
 		ftp://ftp.rge.com/pub/zsh/ \
 		ftp://ftp.cenatls.cena.dgac.fr/pub/shells/zsh/ \
@@ -18,13 +18,12 @@ MASTER_SITES=   ftp://ftp.math.gatech.edu/pub/zsh/ \
 		ftp://ftp.ips.oz.au/pub/packages/zsh/ \
 		ftp://ftp.uit.no/pub/unix/shells/zsh/
 
-MAINTAINER=	torstenb@FreeBSD.ORG
-
-BROKEN=		upgrade
+MAINTAINER=	shige@kuis.kyoto-u.ac.jp
 
 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
+		zshoptions.1 zshall.1 zshparam.1 zshzle.1 zshmodules.1
 
 # If you want to build a static binary, uncomment the following line
 #LDFLAGS+=-static
diff --git a/shells/zsh-devel/distinfo b/shells/zsh-devel/distinfo
index 8cd98e52e4ef..357f5ea46c3e 100644
--- a/shells/zsh-devel/distinfo
+++ b/shells/zsh-devel/distinfo
@@ -1 +1 @@
-MD5 (zsh-3.0.5.tar.gz) = 7c3ce278a75ee8d05c5d0fc1821b2a7a
+MD5 (zsh-3.1.5.tar.gz) = d954f91b6f0bd71e45e39f1228e7f4d7
diff --git a/shells/zsh-devel/files/patch-aa b/shells/zsh-devel/files/patch-aa
index 28109c3ca0d8..8a2fc99891c1 100644
--- a/shells/zsh-devel/files/patch-aa
+++ b/shells/zsh-devel/files/patch-aa
@@ -1,19 +1,20 @@
-*** 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)
+--- Doc/Makefile.in.orig	Sun Nov  1 01:00:48 1998
++++ Doc/Makefile.in	Sun Nov  1 01:03:09 1998
+@@ -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 \
diff --git a/shells/zsh-devel/files/patch-ab b/shells/zsh-devel/files/patch-ab
index c80f4c7f852c..5ecddf7123bd 100644
--- a/shells/zsh-devel/files/patch-ab
+++ b/shells/zsh-devel/files/patch-ab
@@ -1,21 +1,13 @@
---- 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
+--- Doc/zsh.texi.orig	Sun Nov  1 01:01:48 1998
++++ Doc/zsh.texi	Sun Nov  1 01:02:17 1998
+@@ -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
  
+ @ifinfo
diff --git a/shells/zsh-devel/pkg-comment b/shells/zsh-devel/pkg-comment
index c64b941259c2..f219467c6023 100644
--- a/shells/zsh-devel/pkg-comment
+++ b/shells/zsh-devel/pkg-comment
@@ -1 +1 @@
-The Z shell.
+The Z shell (development version).
diff --git a/shells/zsh-devel/pkg-plist b/shells/zsh-devel/pkg-plist
index 5086482c444e..defb84dff95c 100644
--- a/shells/zsh-devel/pkg-plist
+++ b/shells/zsh-devel/pkg-plist
@@ -1,9 +1,8 @@
 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-3.0.5
+bin/zsh-3.1.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