3 files changed, 86 insertions, 69 deletions

diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index 5bf04e81d2dc..18d570cf1360 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -25,7 +25,7 @@
 #			NOTE: does NOT have to be inside ${PREFIX} tree
 
 PORTNAME=	zsh
-PORTVERSION=	4.2.0
+PORTVERSION=	4.2.1
 CATEGORIES=	shells
 MASTER_SITES=	http://www.zsh.org/zsh/ \
 		ftp://ftp.zsh.org/zsh/ \
@@ -52,10 +52,11 @@ COMMENT?=	The Z shell
 
 ZSH_VER=	${PORTVERSION}
 # Conflicts with shells/zsh-devel as it installs files into the same locations
-CONFLICTS=	zsh-devel-* zsh-4.1.*
+CONFLICTS=	zsh-devel-[0-9]* zsh-4.1.*
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+USE_REINPLACE=	yes
 
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-etcdir=${ZSH_ETCDIR} --with-curses-terminfo \
@@ -92,21 +93,32 @@ MAN1=		zsh.1 zshbuiltins.1 zshcompctl.1 zshcompwid.1 zshcompsys.1 \
 		zshcontrib.1 zshexpn.1 zshmisc.1 zshmodules.1 zshoptions.1 \
 		zshparam.1 zshtcpsys.1 zshzftpsys.1 zshzle.1 zshall.1
 DOCS=		LICENCE META-FAQ README Etc/BUGS Etc/CONTRIBUTORS Etc/FAQ \
-		Etc/FEATURES Etc/NEWS Etc/completion-style-guide \
+		Etc/completion-style-guide \
 		Doc/zsh*.html Doc/zsh.dvi Doc/zsh_a4.ps Doc/zsh_us.ps
 EXAMPLES=	zlogin zshenv zshrc
 
+post-patch:
+	${REINPLACE_CMD} -e 's/link=dynamic/link=either/' ${WRKSRC}/Src/Modules/*.mdd
+
 post-build:
 	# Fix ".so" macro problem by using "soelim" command.
 	${LN} -sf ${WRKSRC}/Doc ${WRKSRC}/man1
 	${MV} ${WRKSRC}/Doc/zshall.1 ${WRKSRC}/Doc/zshall.1.source
 	cd ${WRKSRC} && /usr/bin/soelim ${WRKSRC}/Doc/zshall.1.source > \
 		${WRKSRC}/Doc/zshall.1
+
 .if !defined(NOPORTDOCS)
-	cd ${WRKSRC}/Doc && makeinfo --no-split zsh.texi
+INFO=	zsh
+
+pre-install:
+	@${MKDIR} ${PREFIX}/info
+	makeinfo --no-split --output=${PREFIX}/info/zsh.info \
+		${WRKSRC}/Doc/zsh.texi
+	install-info ${PREFIX}/info/zsh.info ${PREFIX}/info/dir
 .endif
 
 post-install:
+	${LN} ${PREFIX}/bin/zsh ${PREFIX}/bin/rzsh
 	${TEST} -d ${ZSH_ETCDIR} || ${MKDIR} ${ZSH_ETCDIR}
 	${TEST} -d ${ZSH_SITEFNDIR} || ${MKDIR} ${ZSH_SITEFNDIR}
 	@${MKDIR} ${EXAMPLESDIR}
@@ -114,13 +126,13 @@ post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/Doc/zsh.info ${PREFIX}/info
-	@install-info ${PREFIX}/info/zsh.info ${PREFIX}/info/dir
 .endif
 	@${ECHO_MSG} "Updating /etc/shells"
 	@${CP} /etc/shells /etc/shells.bak
-	@(${GREP} -v ${PREFIX}/bin/zsh /etc/shells.bak; \
-	  ${ECHO_CMD} ${PREFIX}/bin/zsh) > /etc/shells
+	@(${GREP} -v ${PREFIX}/bin/zsh /etc/shells.bak \
+	  | ${GREP} -v ${PREFIX}/bin/rzsh; \
+	  ${ECHO_CMD} ${PREFIX}/bin/zsh; \
+	  ${ECHO_CMD} ${PREFIX}/bin/rzsh) > /etc/shells
 	@${RM} /etc/shells.bak
 
 .include <bsd.port.mk>
diff --git a/shells/zsh/distinfo b/shells/zsh/distinfo
index 0b8c565e03b3..67d4f3b763cb 100644
--- a/shells/zsh/distinfo
+++ b/shells/zsh/distinfo
@@ -1,4 +1,4 @@
-MD5 (zsh-4.2.0.tar.bz2) = 866bcdad8c0c4974650f5eff395a9a35
-SIZE (zsh-4.2.0.tar.bz2) = 1990884
-MD5 (zsh-4.2.0-doc.tar.bz2) = 14aa2d8d9e6f546593fd42f45dfee669
-SIZE (zsh-4.2.0-doc.tar.bz2) = 1695230
+MD5 (zsh-4.2.1.tar.bz2) = b59ef34b8de288d5fd16f842451125c8
+SIZE (zsh-4.2.1.tar.bz2) = 2039188
+MD5 (zsh-4.2.1-doc.tar.bz2) = 943bdc398c6138bdb2294a355f4d0959
+SIZE (zsh-4.2.1-doc.tar.bz2) = 1632937
diff --git a/shells/zsh/pkg-plist b/shells/zsh/pkg-plist
index e45fa2c10f83..c9927fcecb4f 100644
--- a/shells/zsh/pkg-plist
+++ b/shells/zsh/pkg-plist
@@ -2,6 +2,9 @@
 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; rm -f /etc/shells.bak
 @unexec echo "Updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak
+bin/rzsh
+@exec cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells; rm -f /etc/shells.bak
+@unexec cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak
 bin/zsh-%%ZSH_VER%%
 @exec   mkdir %%ZSH_ETCDIR%% 2> /dev/null || true
 @unexec rmdir %%ZSH_ETCDIR%% 2> /dev/null || true
@@ -39,19 +42,15 @@ bin/zsh-%%ZSH_VER%%
 %%NO_STATIC%%@dirrm lib/zsh/%%ZSH_VER%%
 %%NO_STATIC%%lib/zsh/libzsh-%%ZSH_VER%%.so
 %%NO_STATIC%%@dirrm lib/zsh
-%%PORTDOCS%%@unexec install-info --delete %D/info/zsh.info %D/info/dir
-%%PORTDOCS%%info/zsh.info
-%%PORTDOCS%%@exec install-info %D/info/zsh.info %D/info/dir
 %%PORTDOCS%%%%DOCSDIR%%/BUGS
 %%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTORS
 %%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/FEATURES
 %%PORTDOCS%%%%DOCSDIR%%/LICENCE
 %%PORTDOCS%%%%DOCSDIR%%/META-FAQ
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/completion-style-guide
 %%PORTDOCS%%%%DOCSDIR%%/zsh.dvi
+%%PORTDOCS%%%%DOCSDIR%%/zsh.html
 %%PORTDOCS%%%%DOCSDIR%%/zsh_1.html
 %%PORTDOCS%%%%DOCSDIR%%/zsh_10.html
 %%PORTDOCS%%%%DOCSDIR%%/zsh_11.html
@@ -188,6 +187,7 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Completion/Cygwin/_pscp
 %%ZSH_FNDIR%%/Completion/Cygwin/_putclip
 %%ZSH_FNDIR%%/Completion/Debian/_apt
+%%ZSH_FNDIR%%/Completion/Debian/_apt-move
 %%ZSH_FNDIR%%/Completion/Debian/_apt-show-versions
 %%ZSH_FNDIR%%/Completion/Debian/_aptitude
 %%ZSH_FNDIR%%/Completion/Debian/_auto-apt
@@ -224,6 +224,7 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Completion/Unix/_arping
 %%ZSH_FNDIR%%/Completion/Unix/_attr
 %%ZSH_FNDIR%%/Completion/Unix/_bison
+%%ZSH_FNDIR%%/Completion/Unix/_bogofilter
 %%ZSH_FNDIR%%/Completion/Unix/_bzip2
 %%ZSH_FNDIR%%/Completion/Unix/_cdcd
 %%ZSH_FNDIR%%/Completion/Unix/_cdrecord
@@ -300,6 +301,7 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Completion/Unix/_make
 %%ZSH_FNDIR%%/Completion/Unix/_man
 %%ZSH_FNDIR%%/Completion/Unix/_mh
+%%ZSH_FNDIR%%/Completion/Unix/_mime_types
 %%ZSH_FNDIR%%/Completion/Unix/_mount
 %%ZSH_FNDIR%%/Completion/Unix/_mt
 %%ZSH_FNDIR%%/Completion/Unix/_mtools
@@ -326,6 +328,7 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Completion/Unix/_perl_basepods
 %%ZSH_FNDIR%%/Completion/Unix/_perl_modules
 %%ZSH_FNDIR%%/Completion/Unix/_perldoc
+%%ZSH_FNDIR%%/Completion/Unix/_php
 %%ZSH_FNDIR%%/Completion/Unix/_pids
 %%ZSH_FNDIR%%/Completion/Unix/_pine
 %%ZSH_FNDIR%%/Completion/Unix/_ports
@@ -399,6 +402,7 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Completion/X/_dcop
 %%ZSH_FNDIR%%/Completion/X/_gqview
 %%ZSH_FNDIR%%/Completion/X/_gv
+%%ZSH_FNDIR%%/Completion/X/_kfmclient
 %%ZSH_FNDIR%%/Completion/X/_mozilla
 %%ZSH_FNDIR%%/Completion/X/_mplayer
 %%ZSH_FNDIR%%/Completion/X/_nedit
@@ -439,7 +443,6 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Completion/Zsh/_arrays
 %%ZSH_FNDIR%%/Completion/Zsh/_assign
 %%ZSH_FNDIR%%/Completion/Zsh/_autocd
-%%ZSH_FNDIR%%/Completion/Zsh/_autoload
 %%ZSH_FNDIR%%/Completion/Zsh/_bindkey
 %%ZSH_FNDIR%%/Completion/Zsh/_brace_parameter
 %%ZSH_FNDIR%%/Completion/Zsh/_builtin
@@ -552,24 +555,24 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Prompts/prompt_walters_setup
 %%ZSH_FNDIR%%/Prompts/prompt_zefram_setup
 %%ZSH_FNDIR%%/Prompts/promptinit
-%%NO_STATIC%%%%ZSH_FNDIR%%/TCP/tcp_alias
-%%NO_STATIC%%%%ZSH_FNDIR%%/TCP/tcp_close
-%%NO_STATIC%%%%ZSH_FNDIR%%/TCP/tcp_command
-%%NO_STATIC%%%%ZSH_FNDIR%%/TCP/tcp_expect
-%%NO_STATIC%%%%ZSH_FNDIR%%/TCP/tcp_fd_handler
-%%NO_STATIC%%%%ZSH_FNDIR%%/TCP/tcp_log
-%%NO_STATIC%%%%ZSH_FNDIR%%/TCP/tcp_open
-%%NO_STATIC%%%%ZSH_FNDIR%%/TCP/tcp_output
-%%NO_STATIC%%%%ZSH_FNDIR%%/TCP/tcp_point
-%%NO_STATIC%%%%ZSH_FNDIR%%/TCP/tcp_proxy
-%%NO_STATIC%%%%ZSH_FNDIR%%/TCP/tcp_read
-%%NO_STATIC%%%%ZSH_FNDIR%%/TCP/tcp_rename
-%%NO_STATIC%%%%ZSH_FNDIR%%/TCP/tcp_send
-%%NO_STATIC%%%%ZSH_FNDIR%%/TCP/tcp_sess
-%%NO_STATIC%%%%ZSH_FNDIR%%/TCP/tcp_shoot
-%%NO_STATIC%%%%ZSH_FNDIR%%/TCP/tcp_spam
-%%NO_STATIC%%%%ZSH_FNDIR%%/TCP/tcp_talk
-%%NO_STATIC%%%%ZSH_FNDIR%%/TCP/tcp_wait
+%%ZSH_FNDIR%%/TCP/tcp_alias
+%%ZSH_FNDIR%%/TCP/tcp_close
+%%ZSH_FNDIR%%/TCP/tcp_command
+%%ZSH_FNDIR%%/TCP/tcp_expect
+%%ZSH_FNDIR%%/TCP/tcp_fd_handler
+%%ZSH_FNDIR%%/TCP/tcp_log
+%%ZSH_FNDIR%%/TCP/tcp_open
+%%ZSH_FNDIR%%/TCP/tcp_output
+%%ZSH_FNDIR%%/TCP/tcp_point
+%%ZSH_FNDIR%%/TCP/tcp_proxy
+%%ZSH_FNDIR%%/TCP/tcp_read
+%%ZSH_FNDIR%%/TCP/tcp_rename
+%%ZSH_FNDIR%%/TCP/tcp_send
+%%ZSH_FNDIR%%/TCP/tcp_sess
+%%ZSH_FNDIR%%/TCP/tcp_shoot
+%%ZSH_FNDIR%%/TCP/tcp_spam
+%%ZSH_FNDIR%%/TCP/tcp_talk
+%%ZSH_FNDIR%%/TCP/tcp_wait
 %%ZSH_FNDIR%%/Zle/backward-kill-word-match
 %%ZSH_FNDIR%%/Zle/backward-word-match
 %%ZSH_FNDIR%%/Zle/capitalize-word-match
@@ -578,6 +581,7 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Zle/down-case-word-match
 %%ZSH_FNDIR%%/Zle/down-line-or-beginning-search
 %%ZSH_FNDIR%%/Zle/forward-word-match
+%%ZSH_FNDIR%%/Zle/history-pattern-search
 %%ZSH_FNDIR%%/Zle/kill-word-match
 %%ZSH_FNDIR%%/Zle/match-words-by-style
 %%ZSH_FNDIR%%/Zle/narrow-to-region
@@ -590,38 +594,39 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Zle/up-case-word-match
 %%ZSH_FNDIR%%/Zle/up-line-or-beginning-search
 %%ZSH_FNDIR%%/Zle/url-quote-magic
-%%NO_STATIC%%%%ZSH_FNDIR%%/Zftp/zfanon
-%%NO_STATIC%%%%ZSH_FNDIR%%/Zftp/zfautocheck
-%%NO_STATIC%%%%ZSH_FNDIR%%/Zftp/zfcd
-%%NO_STATIC%%%%ZSH_FNDIR%%/Zftp/zfcd_match
-%%NO_STATIC%%%%ZSH_FNDIR%%/Zftp/zfcget
-%%NO_STATIC%%%%ZSH_FNDIR%%/Zftp/zfclose
-%%NO_STATIC%%%%ZSH_FNDIR%%/Zftp/zfcput
-%%NO_STATIC%%%%ZSH_FNDIR%%/Zftp/zfdir
-%%NO_STATIC%%%%ZSH_FNDIR%%/Zftp/zffcache
-%%NO_STATIC%%%%ZSH_FNDIR%%/Zftp/zfgcp
-%%NO_STATIC%%%%ZSH_FNDIR%%/Zftp/zfget
-%%NO_STATIC%%%%ZSH_FNDIR%%/Zftp/zfget_match
-%%NO_STATIC%%%%ZSH_FNDIR%%/Zftp/zfgoto
-%%NO_STATIC%%%%ZSH_FNDIR%%/Zftp/zfhere
-%%NO_STATIC%%%%ZSH_FNDIR%%/Zftp/zfinit
-%%NO_STATIC%%%%ZSH_FNDIR%%/Zftp/zfls
-%%NO_STATIC%%%%ZSH_FNDIR%%/Zftp/zfmark
-%%NO_STATIC%%%%ZSH_FNDIR%%/Zftp/zfopen
-%%NO_STATIC%%%%ZSH_FNDIR%%/Zftp/zfparams
-%%NO_STATIC%%%%ZSH_FNDIR%%/Zftp/zfpcp
-%%NO_STATIC%%%%ZSH_FNDIR%%/Zftp/zfput
-%%NO_STATIC%%%%ZSH_FNDIR%%/Zftp/zfrglob
-%%NO_STATIC%%%%ZSH_FNDIR%%/Zftp/zfrtime
-%%NO_STATIC%%%%ZSH_FNDIR%%/Zftp/zfsession
-%%NO_STATIC%%%%ZSH_FNDIR%%/Zftp/zfstat
-%%NO_STATIC%%%%ZSH_FNDIR%%/Zftp/zftp_chpwd
-%%NO_STATIC%%%%ZSH_FNDIR%%/Zftp/zftp_progress
-%%NO_STATIC%%%%ZSH_FNDIR%%/Zftp/zftransfer
-%%NO_STATIC%%%%ZSH_FNDIR%%/Zftp/zftype
-%%NO_STATIC%%%%ZSH_FNDIR%%/Zftp/zfuget
-%%NO_STATIC%%%%ZSH_FNDIR%%/Zftp/zfuput
-%%NO_STATIC%%@dirrm %%ZSH_FNDIR%%/Zftp
+%%ZSH_FNDIR%%/Zle/zed-set-file-name
+%%ZSH_FNDIR%%/Zftp/zfanon
+%%ZSH_FNDIR%%/Zftp/zfautocheck
+%%ZSH_FNDIR%%/Zftp/zfcd
+%%ZSH_FNDIR%%/Zftp/zfcd_match
+%%ZSH_FNDIR%%/Zftp/zfcget
+%%ZSH_FNDIR%%/Zftp/zfclose
+%%ZSH_FNDIR%%/Zftp/zfcput
+%%ZSH_FNDIR%%/Zftp/zfdir
+%%ZSH_FNDIR%%/Zftp/zffcache
+%%ZSH_FNDIR%%/Zftp/zfgcp
+%%ZSH_FNDIR%%/Zftp/zfget
+%%ZSH_FNDIR%%/Zftp/zfget_match
+%%ZSH_FNDIR%%/Zftp/zfgoto
+%%ZSH_FNDIR%%/Zftp/zfhere
+%%ZSH_FNDIR%%/Zftp/zfinit
+%%ZSH_FNDIR%%/Zftp/zfls
+%%ZSH_FNDIR%%/Zftp/zfmark
+%%ZSH_FNDIR%%/Zftp/zfopen
+%%ZSH_FNDIR%%/Zftp/zfparams
+%%ZSH_FNDIR%%/Zftp/zfpcp
+%%ZSH_FNDIR%%/Zftp/zfput
+%%ZSH_FNDIR%%/Zftp/zfrglob
+%%ZSH_FNDIR%%/Zftp/zfrtime
+%%ZSH_FNDIR%%/Zftp/zfsession
+%%ZSH_FNDIR%%/Zftp/zfstat
+%%ZSH_FNDIR%%/Zftp/zftp_chpwd
+%%ZSH_FNDIR%%/Zftp/zftp_progress
+%%ZSH_FNDIR%%/Zftp/zftransfer
+%%ZSH_FNDIR%%/Zftp/zftype
+%%ZSH_FNDIR%%/Zftp/zfuget
+%%ZSH_FNDIR%%/Zftp/zfuput
+@dirrm %%ZSH_FNDIR%%/Zftp
 %%ZSH_FNDIR%%/Zle/cycle-completion-positions
 %%ZSH_FNDIR%%/Zle/edit-command-line
 %%ZSH_FNDIR%%/Zle/history-search-end
@@ -645,7 +650,7 @@ bin/zsh-%%ZSH_VER%%
 @dirrm %%ZSH_FNDIR%%/MIME
 @dirrm %%ZSH_FNDIR%%/Misc
 @dirrm %%ZSH_FNDIR%%/Prompts
-%%NO_STATIC%%@dirrm %%ZSH_FNDIR%%/TCP
+@dirrm %%ZSH_FNDIR%%/TCP
 @dirrm %%ZSH_FNDIR%%/Zle
 @dirrm %%ZSH_FNDIR%%
 @dirrm %%DATADIR%%/%%ZSH_VER%%