Update to 3.1.7-pre-4.

No response from:	shige

Now the FreeBSD specific compdefs I submitted have been included
within their distribution!

Introduce a workaround for the libzsh shared library generation.
This should be solved by the forthcoming 3.1.7 release.

5 files changed, 59 insertions, 28 deletions

diff --git a/shells/zsh-devel/Makefile b/shells/zsh-devel/Makefile
index 1752b219ed9e..51b6f2b8a2b4 100644
--- a/shells/zsh-devel/Makefile
+++ b/shells/zsh-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	zsh
-PORTVERSION=	3.1.7.p2
+PORTVERSION=	3.1.7.p4
 CATEGORIES=	shells
 MASTER_SITES=	http://people.FreeBSD.org/~knu/ports/distfiles/ \
 		ftp://ftp.zsh.org/%SUBDIR%/ \
@@ -24,7 +24,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	shige@FreeBSD.org
 
 ZSH_VER=	${PORTVERSION:S/.p/-pre-/}
-ZSHFUNC_FILES=	zsh-functions-freebsd-2000.04.29.tar.gz
+ZSHFUNC_FILES=	zsh-functions-freebsd-2000.05.15.tar.gz
 ZSHFUNC_SUBDIR=	share/zsh/${ZSH_VER}/functions
 NO_LATEST_LINK=	yes
 GNU_CONFIGURE=	yes
@@ -33,7 +33,16 @@ INSTALL_TARGET=	install install.info
 MAN1=		zsh.1 zshbuiltins.1 zshcompctl.1 zshexpn.1 zshmisc.1 \
 		zshoptions.1 zshall.1 zshparam.1 zshzle.1 zshmodules.1 \
 		zshzftpsys.1 zshcompsys.1 zshcompwid.1
-PLIST_SUB=	ZSH_VER=${ZSH_VER} ZSHFUNC_SUBDIR=${ZSHFUNC_SUBDIR}
+PLIST_SUB=	ZSH_VER="${ZSH_VER}" ZSHFUNC_SUBDIR="${ZSHFUNC_SUBDIR}" \
+		LIBZSH="${LIBZSH}"
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 400013
+LIBZSH=		@comment lib/zsh/libzsh-${ZSH_VER}.so
+.else
+LIBZSH=		lib/zsh/libzsh-${ZSH_VER}.so
+.endif
 
 # If you want to build a static binary, uncomment the following line
 #LDFLAGS+=-static
@@ -66,4 +75,4 @@ post-install:
 	  ${ECHO} ${PREFIX}/bin/zsh) > /etc/shells
 	@${RM} /etc/shells.bak
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/shells/zsh-devel/distinfo b/shells/zsh-devel/distinfo
index de76983b4ed4..f239028a643d 100644
--- a/shells/zsh-devel/distinfo
+++ b/shells/zsh-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (zsh-3.1.7-pre-2.tar.gz) = 1f97951dd8f03725297ec769547efcf1
-MD5 (zsh-functions-freebsd-2000.04.29.tar.gz) = 22be3dec958a0990285ee61f66f01345
+MD5 (zsh-3.1.7-pre-4.tar.gz) = af54de34de7f1183d614aa0a47424890
+MD5 (zsh-functions-freebsd-2000.05.15.tar.gz) = ac283eef1c6048e424701e63200707a1
diff --git a/shells/zsh-devel/files/patch-ab b/shells/zsh-devel/files/patch-ab
index 2b744620a6f0..0b351fbe0acf 100644
--- a/shells/zsh-devel/files/patch-ab
+++ b/shells/zsh-devel/files/patch-ab
@@ -1,5 +1,5 @@
---- Doc/zsh.texi.orig	Thu Apr 20 04:04:38 2000
-+++ Doc/zsh.texi	Sat Apr 29 00:05:57 2000
+--- Doc/zsh.texi.orig	Mon May  8 18:18:06 2000
++++ Doc/zsh.texi	Mon May 15 18:50:31 2000
 @@ -7,6 +7,10 @@
  @end iftex
  @setfilename zsh.info
@@ -28,16 +28,16 @@
  @end example
  
  @noindent
-@@ -2555,7 +2559,7 @@
- @t{histchars} parameter which is `@t{!}'
- by default and may occur anywhere on the command line; history
- expansions do not nest.  The `@t{!}' can be escaped with `@t{\}'
--or can be enclosed between a pair of single quotes (@t{@value{dsq}}) to suppress
-+or can be enclosed between a pair of single quotes (@t{'}@t{'}) to suppress
- its special meaning. Double quotes will @emph{not} work for this.
- 
- @noindent
-@@ -6092,7 +6096,7 @@
+@@ -2571,7 +2575,7 @@
+ A history expansion begins with the first character of the @t{histchars}
+ parameter, which is `@t{!}' by default, and may occur anywhere on the
+ command line; history expansions do not nest.  The `@t{!}' can be escaped
+-with `@t{\}' or can be enclosed between a pair of single quotes (@t{@value{dsq}})
++with `@t{\}' or can be enclosed between a pair of single quotes (@t{'}@t{'})
+ to suppress its special meaning.  Double quotes will @emph{not} work for
+ this.  Following this history character is an optional event designator
+ (@ref{Event Designators}) and then an optional word
+@@ -6137,7 +6141,7 @@
  @example
  unsetopt localtraps
  trap - INT
@@ -46,7 +46,7 @@
  @end example
  
  @noindent
-@@ -6313,7 +6317,7 @@
+@@ -6358,7 +6362,7 @@
  @cindex rc, quoting style
  @cindex quoting style, rc
  @item @t{RC_QUOTES}
@@ -55,7 +55,7 @@
  within singly quoted strings.
  
  @pindex RCS
-@@ -9328,7 +9332,7 @@
+@@ -9373,7 +9377,7 @@
  @item @t{quote-line} (ESC-') (unbound) (unbound)
  Quote the current line; that is, put a `@t{'}' character at the
  beginning and the end, and convert all `@t{'}' characters
@@ -64,7 +64,7 @@
  
  @tindex quote-region
  @item @t{quote-region} (ESC-") (unbound) (unbound)
-@@ -10112,7 +10116,7 @@
+@@ -15230,7 +15234,7 @@
  
  @noindent
  @example
@@ -73,7 +73,7 @@
  @end example
  
  @noindent
-@@ -10200,7 +10204,7 @@
+@@ -15318,7 +15322,7 @@
  
  @noindent
  @example
@@ -82,7 +82,7 @@
  @end example
  
  @noindent
-@@ -16239,7 +16243,7 @@
+@@ -16469,7 +16473,7 @@
  paranoid behaviour, intended to avoid common security problems involving
  a root-run @t{rm} being tricked into removing files other than the ones
  intended.  It will refuse to follow symbolic links, so that (for example)
@@ -91,7 +91,7 @@
  if @t{/tmp/foo} happens to be a link to @t{/etc}.  It will also check
  where it is after leaving directories, so that a recursive removal of
  a deep directory tree can't end up recursively removing @t{/usr} as
-@@ -16638,7 +16642,7 @@
+@@ -16868,7 +16872,7 @@
  @item @t{link}
  If the file is a link and the @t{-L} option is in
  effect, this contains the name of the file linked to, otherwise
diff --git a/shells/zsh-devel/files/patch-ad b/shells/zsh-devel/files/patch-ad
new file mode 100644
index 000000000000..f4ed01b0ada3
--- /dev/null
+++ b/shells/zsh-devel/files/patch-ad
@@ -0,0 +1,11 @@
+--- configure.in.orig	Wed May  3 03:01:17 2000
++++ configure.in	Wed May 17 21:34:02 2000
+@@ -1489,7 +1489,7 @@
+   esac
+   case "$host" in
+     *-hpux*)  EXTRA_LDFLAGS="${EXTRA_LDFLAGS=-Wl,-E}" ;;
+-    *-freebsd3*|*-freebsd4*|*-linux*) EXTRA_LDFLAGS="${EXTRA_LDFLAGS=-rdynamic}" ;;
++    *-freebsd[3-9]*|*-linux*) EXTRA_LDFLAGS="${EXTRA_LDFLAGS=-rdynamic}" ;;
+     mips-sni-sysv4)
+       #
+       # unfortunately, we have different compilers
diff --git a/shells/zsh-devel/pkg-plist b/shells/zsh-devel/pkg-plist
index 4c0715789851..7ecf9943f5d2 100644
--- a/shells/zsh-devel/pkg-plist
+++ b/shells/zsh-devel/pkg-plist
@@ -5,6 +5,7 @@ bin/zsh-%%ZSH_VER%%
 @unexec install-info --delete %D/info/zsh.info %D/info/dir
 info/zsh.info
 @exec install-info %D/info/zsh.info %D/info/dir
+%%LIBZSH%%
 lib/zsh/%%ZSH_VER%%/cap.so
 lib/zsh/%%ZSH_VER%%/clone.so
 lib/zsh/%%ZSH_VER%%/compctl.so
@@ -53,8 +54,8 @@ lib/zsh/%%ZSH_VER%%/zsh/zutil.so
 %%ZSHFUNC_SUBDIR%%/_apt
 %%ZSHFUNC_SUBDIR%%/_archie
 %%ZSHFUNC_SUBDIR%%/_arg_compile
-%%ZSHFUNC_SUBDIR%%/_arguments
 %%ZSHFUNC_SUBDIR%%/_argument_sets
+%%ZSHFUNC_SUBDIR%%/_arguments
 %%ZSHFUNC_SUBDIR%%/_arrays
 %%ZSHFUNC_SUBDIR%%/_autoload
 %%ZSHFUNC_SUBDIR%%/_bash_completions
@@ -65,7 +66,6 @@ lib/zsh/%%ZSH_VER%%/zsh/zutil.so
 %%ZSHFUNC_SUBDIR%%/_bsd_pkg
 %%ZSHFUNC_SUBDIR%%/_bug
 %%ZSHFUNC_SUBDIR%%/_builtin
-%%ZSHFUNC_SUBDIR%%/_bunzip2
 %%ZSHFUNC_SUBDIR%%/_bzip2
 %%ZSHFUNC_SUBDIR%%/_call
 %%ZSHFUNC_SUBDIR%%/_cd
@@ -117,6 +117,7 @@ lib/zsh/%%ZSH_VER%%/zsh/zutil.so
 %%ZSHFUNC_SUBDIR%%/_finger
 %%ZSHFUNC_SUBDIR%%/_first
 %%ZSHFUNC_SUBDIR%%/_flex
+%%ZSHFUNC_SUBDIR%%/_floppy
 %%ZSHFUNC_SUBDIR%%/_funcall
 %%ZSHFUNC_SUBDIR%%/_functions
 %%ZSHFUNC_SUBDIR%%/_gcc
@@ -133,6 +134,7 @@ lib/zsh/%%ZSH_VER%%/zsh/zutil.so
 %%ZSHFUNC_SUBDIR%%/_hosts
 %%ZSHFUNC_SUBDIR%%/_ignored
 %%ZSHFUNC_SUBDIR%%/_imagemagick
+%%ZSHFUNC_SUBDIR%%/_in_vared
 %%ZSHFUNC_SUBDIR%%/_ispell
 %%ZSHFUNC_SUBDIR%%/_jobs
 %%ZSHFUNC_SUBDIR%%/_joe
@@ -141,8 +143,14 @@ lib/zsh/%%ZSH_VER%%/zsh/zutil.so
 %%ZSHFUNC_SUBDIR%%/_kld
 %%ZSHFUNC_SUBDIR%%/_limits
 %%ZSHFUNC_SUBDIR%%/_list
+%%ZSHFUNC_SUBDIR%%/_look
 %%ZSHFUNC_SUBDIR%%/_lp
+%%ZSHFUNC_SUBDIR%%/_lsdev
+%%ZSHFUNC_SUBDIR%%/_lslv
+%%ZSHFUNC_SUBDIR%%/_lspv
+%%ZSHFUNC_SUBDIR%%/_lsvg
 %%ZSHFUNC_SUBDIR%%/_lynx
+%%ZSHFUNC_SUBDIR%%/_lzop
 %%ZSHFUNC_SUBDIR%%/_mailboxes
 %%ZSHFUNC_SUBDIR%%/_main_complete
 %%ZSHFUNC_SUBDIR%%/_make
@@ -180,6 +188,7 @@ lib/zsh/%%ZSH_VER%%/zsh/zutil.so
 %%ZSHFUNC_SUBDIR%%/_perl_builtin_funcs
 %%ZSHFUNC_SUBDIR%%/_perl_modules
 %%ZSHFUNC_SUBDIR%%/_perldoc
+%%ZSHFUNC_SUBDIR%%/_physical_volumes
 %%ZSHFUNC_SUBDIR%%/_pids
 %%ZSHFUNC_SUBDIR%%/_popd
 %%ZSHFUNC_SUBDIR%%/_ports
@@ -207,6 +216,7 @@ lib/zsh/%%ZSH_VER%%/zsh/zutil.so
 %%ZSHFUNC_SUBDIR%%/_setup
 %%ZSHFUNC_SUBDIR%%/_sh
 %%ZSHFUNC_SUBDIR%%/_signals
+%%ZSHFUNC_SUBDIR%%/_smit
 %%ZSHFUNC_SUBDIR%%/_socket
 %%ZSHFUNC_SUBDIR%%/_sort_tags
 %%ZSHFUNC_SUBDIR%%/_source
@@ -228,9 +238,7 @@ lib/zsh/%%ZSH_VER%%/zsh/zutil.so
 %%ZSHFUNC_SUBDIR%%/_tilde_files
 %%ZSHFUNC_SUBDIR%%/_trap
 %%ZSHFUNC_SUBDIR%%/_umount
-%%ZSHFUNC_SUBDIR%%/_uncompress
 %%ZSHFUNC_SUBDIR%%/_unhash
-%%ZSHFUNC_SUBDIR%%/_unpack
 %%ZSHFUNC_SUBDIR%%/_unset_options
 %%ZSHFUNC_SUBDIR%%/_unsetopt
 %%ZSHFUNC_SUBDIR%%/_urls
@@ -242,6 +250,7 @@ lib/zsh/%%ZSH_VER%%/zsh/zutil.so
 %%ZSHFUNC_SUBDIR%%/_values
 %%ZSHFUNC_SUBDIR%%/_vars
 %%ZSHFUNC_SUBDIR%%/_vars_eq
+%%ZSHFUNC_SUBDIR%%/_volume_groups
 %%ZSHFUNC_SUBDIR%%/_wait
 %%ZSHFUNC_SUBDIR%%/_wanted
 %%ZSHFUNC_SUBDIR%%/_webbrowser
@@ -267,6 +276,7 @@ lib/zsh/%%ZSH_VER%%/zsh/zutil.so
 %%ZSHFUNC_SUBDIR%%/_x_title
 %%ZSHFUNC_SUBDIR%%/_x_window
 %%ZSHFUNC_SUBDIR%%/_xargs
+%%ZSHFUNC_SUBDIR%%/_xauth
 %%ZSHFUNC_SUBDIR%%/_xdvi
 %%ZSHFUNC_SUBDIR%%/_xfig
 %%ZSHFUNC_SUBDIR%%/_xmodmap
@@ -299,6 +309,7 @@ lib/zsh/%%ZSH_VER%%/zsh/zutil.so
 %%ZSHFUNC_SUBDIR%%/compinit
 %%ZSHFUNC_SUBDIR%%/compinstall
 %%ZSHFUNC_SUBDIR%%/cx
+%%ZSHFUNC_SUBDIR%%/edit-command-line
 %%ZSHFUNC_SUBDIR%%/harden
 %%ZSHFUNC_SUBDIR%%/history-search-end
 %%ZSHFUNC_SUBDIR%%/incarg