Update to 3.1.6.

PR:		ports/12944
Submitted by:	Chris Piazza <cpiazza@FreeBSD.org>

5 files changed, 174 insertions, 18 deletions

diff --git a/shells/zsh-devel/Makefile b/shells/zsh-devel/Makefile
index 779bf7ab1581..c9b7ba6b81a7 100644
--- a/shells/zsh-devel/Makefile
+++ b/shells/zsh-devel/Makefile
@@ -1,19 +1,16 @@
 # New ports collection makefile for:	zsh-devel
-# Version required:		3.1.5
+# Version required:		3.1.6
 # Date created:			31 October 1998
 # Whom:				shige
 #
-# $Id: Makefile,v 1.30 1999/03/01 09:38:19 shige Exp $
+# $Id: Makefile,v 1.31 1999/06/05 22:31:54 mharo Exp $
 #
 
-DISTNAME=	zsh-3.1.5
+DISTNAME=	zsh-3.1.6
 CATEGORIES=	shells
 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/ \
-		ftp://mrrl.lut.ac.uk/zsh/ \
 		ftp://ftp.fu-berlin.de/pub/unix/shells/zsh/ \
 		ftp://ftp.ips.oz.au/pub/packages/zsh/ \
 		ftp://ftp.uit.no/pub/unix/shells/zsh/
@@ -23,12 +20,14 @@ MAINTAINER=	shige@FreeBSD.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 zshmodules.1 \
+		zshzftpsys.1 zshcompsys.1 zshcompwid.1
 
 # If you want to build a static binary, uncomment the following line
 #LDFLAGS+=-static
 
 post-install:
+	@${INSTALL_DATA} ${WRKSRC}/Doc/zsh.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/zsh.info ${PREFIX}/info/dir
 	@${ECHO} "Updating /etc/shells"
 	@${CP} /etc/shells /etc/shells.bak
diff --git a/shells/zsh-devel/distinfo b/shells/zsh-devel/distinfo
index 357f5ea46c3e..a6172d755069 100644
--- a/shells/zsh-devel/distinfo
+++ b/shells/zsh-devel/distinfo
@@ -1 +1 @@
-MD5 (zsh-3.1.5.tar.gz) = d954f91b6f0bd71e45e39f1228e7f4d7
+MD5 (zsh-3.1.6.tar.gz) = e5b9af6eb65c44950a1aebb2c4b72623
diff --git a/shells/zsh-devel/files/patch-aa b/shells/zsh-devel/files/patch-aa
index 8a2fc99891c1..72c9807481cb 100644
--- a/shells/zsh-devel/files/patch-aa
+++ b/shells/zsh-devel/files/patch-aa
@@ -1,6 +1,6 @@
---- 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 @@
+--- Doc/Makefile.in.orig	Tue Aug  3 12:00:20 1999
++++ Doc/Makefile.in	Tue Aug  3 12:00:50 1999
+@@ -74,7 +74,7 @@
  	$(TEXI2DVI) $(sdir)/zsh.texi
  
  zsh.info: zsh.texi
@@ -9,11 +9,11 @@
  
  zsh.texi: zsh.yo
  	$(YODL) -o $(sdir)/zsh.texi -I$(sdir) -w ztexi.yo version.yo zsh.yo
-@@ -133,7 +133,7 @@
+@@ -177,7 +177,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 zsh.info-[1-9]*; do \
 +	for file in zsh.info ; do \
  	  if test -f $$file; then \
  	    $(INSTALL_DATA) $$file $(infodir); \
diff --git a/shells/zsh-devel/files/patch-ab b/shells/zsh-devel/files/patch-ab
index 5ecddf7123bd..997a1739d669 100644
--- a/shells/zsh-devel/files/patch-ab
+++ b/shells/zsh-devel/files/patch-ab
@@ -1,7 +1,7 @@
---- 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
+--- Doc/zsh.texi.orig	Sun Aug  1 05:13:14 1999
++++ Doc/zsh.texi	Tue Aug  3 12:01:18 1999
+@@ -7,6 +7,10 @@
+ @end iftex
  @setfilename zsh.info
  @settitle zsh
 +@dircategory Shells
diff --git a/shells/zsh-devel/pkg-plist b/shells/zsh-devel/pkg-plist
index 43d5a6f22e95..c899b2df060e 100644
--- a/shells/zsh-devel/pkg-plist
+++ b/shells/zsh-devel/pkg-plist
@@ -1,7 +1,164 @@
 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.1.5
+bin/zsh-3.1.6
 @unexec install-info --delete %D/info/zsh.info %D/info/dir
 info/zsh.info
 @exec install-info %D/info/zsh.info %D/info/dir
+lib/zsh/3.1.6/cap.so
+lib/zsh/3.1.6/clone.so
+lib/zsh/3.1.6/comp1.so
+lib/zsh/3.1.6/compctl.so
+lib/zsh/3.1.6/complist.so
+lib/zsh/3.1.6/deltochar.so
+lib/zsh/3.1.6/example.so
+lib/zsh/3.1.6/files.so
+lib/zsh/3.1.6/mapfile.so
+lib/zsh/3.1.6/parameter.so
+lib/zsh/3.1.6/rlimits.so
+lib/zsh/3.1.6/sched.so
+lib/zsh/3.1.6/stat.so
+lib/zsh/3.1.6/zftp.so
+lib/zsh/3.1.6/zle.so
+share/zsh/functions/_a2ps
+share/zsh/functions/_aliases
+share/zsh/functions/_approximate
+share/zsh/functions/_arrays
+share/zsh/functions/_autoload
+share/zsh/functions/_bg_jobs
+share/zsh/functions/_bindkey
+share/zsh/functions/_brace_parameter
+share/zsh/functions/_builtin
+share/zsh/functions/_bunzip2
+share/zsh/functions/_bzip2
+share/zsh/functions/_cd
+share/zsh/functions/_chown
+share/zsh/functions/_command
+share/zsh/functions/_command_names
+share/zsh/functions/_compalso
+share/zsh/functions/_complete
+share/zsh/functions/_complete_opts
+share/zsh/functions/_compress
+share/zsh/functions/_condition
+share/zsh/functions/_configure
+share/zsh/functions/_correct
+share/zsh/functions/_correct_filename
+share/zsh/functions/_correct_word
+share/zsh/functions/_cvs
+share/zsh/functions/_dd
+share/zsh/functions/_default
+share/zsh/functions/_dirs
+share/zsh/functions/_disable
+share/zsh/functions/_dvi
+share/zsh/functions/_echotc
+share/zsh/functions/_enable
+share/zsh/functions/_equal
+share/zsh/functions/_expand
+share/zsh/functions/_expand_word
+share/zsh/functions/_fc
+share/zsh/functions/_files
+share/zsh/functions/_find
+share/zsh/functions/_first
+share/zsh/functions/_functions
+share/zsh/functions/_gdb
+share/zsh/functions/_groups
+share/zsh/functions/_gunzip
+share/zsh/functions/_gzip
+share/zsh/functions/_hash
+share/zsh/functions/_history_complete_word
+share/zsh/functions/_hosts
+share/zsh/functions/_jobs
+share/zsh/functions/_kill
+share/zsh/functions/_limits
+share/zsh/functions/_list
+share/zsh/functions/_long_options
+share/zsh/functions/_main_complete
+share/zsh/functions/_make
+share/zsh/functions/_man
+share/zsh/functions/_match
+share/zsh/functions/_math
+share/zsh/functions/_menu
+share/zsh/functions/_mh
+share/zsh/functions/_most_recent_file
+share/zsh/functions/_multi_parts
+share/zsh/functions/_normal
+share/zsh/functions/_oldlist
+share/zsh/functions/_options
+share/zsh/functions/_parameter
+share/zsh/functions/_parameters
+share/zsh/functions/_path_files
+share/zsh/functions/_pdf
+share/zsh/functions/_precommand
+share/zsh/functions/_ps
+share/zsh/functions/_rcs
+share/zsh/functions/_read_comp
+share/zsh/functions/_redirect
+share/zsh/functions/_rlogin
+share/zsh/functions/_sched
+share/zsh/functions/_sep_parts
+share/zsh/functions/_set
+share/zsh/functions/_set_options
+share/zsh/functions/_setopt
+share/zsh/functions/_sh
+share/zsh/functions/_source
+share/zsh/functions/_stat
+share/zsh/functions/_strip
+share/zsh/functions/_stty
+share/zsh/functions/_su
+share/zsh/functions/_subscript
+share/zsh/functions/_tar
+share/zsh/functions/_tar_archive
+share/zsh/functions/_tex
+share/zsh/functions/_tilde
+share/zsh/functions/_trap
+share/zsh/functions/_uncompress
+share/zsh/functions/_unhash
+share/zsh/functions/_unset_options
+share/zsh/functions/_unsetopt
+share/zsh/functions/_use_lo
+share/zsh/functions/_vars
+share/zsh/functions/_vars_eq
+share/zsh/functions/_wait
+share/zsh/functions/_which
+share/zsh/functions/_x_options
+share/zsh/functions/_xfig
+share/zsh/functions/_zftp
+share/zsh/functions/_zle
+share/zsh/functions/_zmodload
+share/zsh/functions/compdump
+share/zsh/functions/compinit
+share/zsh/functions/compinstall
+share/zsh/functions/incremental-complete-word
+share/zsh/functions/insert-files
+share/zsh/functions/zfanon
+share/zsh/functions/zfautocheck
+share/zsh/functions/zfcd
+share/zsh/functions/zfcd_match
+share/zsh/functions/zfcget
+share/zsh/functions/zfclose
+share/zsh/functions/zfcput
+share/zsh/functions/zfdir
+share/zsh/functions/zfgcp
+share/zsh/functions/zfget
+share/zsh/functions/zfget_match
+share/zsh/functions/zfgoto
+share/zsh/functions/zfhere
+share/zsh/functions/zfinit
+share/zsh/functions/zfls
+share/zsh/functions/zfmark
+share/zsh/functions/zfopen
+share/zsh/functions/zfparams
+share/zsh/functions/zfpcp
+share/zsh/functions/zfput
+share/zsh/functions/zfrglob
+share/zsh/functions/zfrtime
+share/zsh/functions/zfstat
+share/zsh/functions/zftp_chpwd
+share/zsh/functions/zftp_progress
+share/zsh/functions/zftype
+share/zsh/functions/zfuget
+share/zsh/functions/zfuput
+@dirrm lib/zsh/3.1.6
+@dirrm lib/zsh
+@dirrm share/zsh/functions
+@dirrm share/zsh