3 files changed, 19 insertions, 17 deletions

diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index 569f6f1a4ddd..d981a14d1fd7 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for:	zsh
-# Date created:			11 Feb. 1995
-# Whom:				torstenb
-#
+# Created by: torstenb
 # $FreeBSD$
-#
 
 PORTNAME=	zsh
-PORTVERSION=	5.0.0
-PORTREVISION=	1
+PORTVERSION=	5.0.1
 CATEGORIES=	shells
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} \
 		SF/${PORTNAME}/${PORTNAME}-doc/${PORTVERSION}:doc
@@ -39,7 +34,8 @@ EXTRA_PATCHES=	${FILESDIR}/extra-patch-bsdtar
 #EXTRA_COMPLETION_FILES=	_sockstat
 #EXTRA_COMPLETION_DIR=	Completion/BSD/Command
 
-OPTIONS_DEFINE=	GDBM MEM SECURE_FREE MAILDIR MULTIBYTE PCRE STATIC DOCS DEBUG
+OPTIONS_DEFINE=	GDBM MEM SECURE_FREE MAILDIR MULTIBYTE PCRE STATIC DOCS DEBUG \
+		EXAMPLES
 OPTIONS_DEFAULT=	SECURE_FREE MAILDIR MULTIBYTE
 
 GDBM_DESC=	Enable GDBM support (GPL)
@@ -59,7 +55,7 @@ PORTDOCS=	*
 PORTEXAMPLES=	zlogin zshenv zshrc
 SHELLS=		/etc/shells
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
 DISTFILES+=	${DISTNAME}-doc${EXTRACT_SUFX}:doc
@@ -150,10 +146,10 @@ INFO=	zsh
 .endif
 
 post-install:
-	${LN} ${PREFIX}/bin/zsh ${PREFIX}/bin/rzsh
+	${LN} -f ${PREFIX}/bin/zsh ${PREFIX}/bin/rzsh
 	${TEST} -d ${ZSH_ETCDIR} || ${MKDIR} ${ZSH_ETCDIR}
 	${TEST} -d ${ZSH_SITEFNDIR} || ${MKDIR} ${ZSH_SITEFNDIR}
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
 	cd ${WRKSRC}/StartupFiles && ${INSTALL_DATA} ${PORTEXAMPLES} ${EXAMPLESDIR}
 .endif
@@ -174,4 +170,4 @@ post-install:
 			${CHMOD} 644 $$i.zwc ; \
 		done'
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/shells/zsh/distinfo b/shells/zsh/distinfo
index e6efbd0e2fd4..7031a5342fab 100644
--- a/shells/zsh/distinfo
+++ b/shells/zsh/distinfo
@@ -1,4 +1,4 @@
-SHA256 (zsh-5.0.0.tar.bz2) = cd014a8e09a3607c68369d1615db96d0fbb7279a125950b32032fd448c44a888
-SIZE (zsh-5.0.0.tar.bz2) = 3014362
-SHA256 (zsh-5.0.0-doc.tar.bz2) = d2219eb3003c108af9d297ff055aa6df3cdb756ccf6b1b2ee3db8a72dbb2ef30
-SIZE (zsh-5.0.0-doc.tar.bz2) = 2875712
+SHA256 (zsh-5.0.1.tar.bz2) = c63d26fd1426a6188c28bbfb479e6a094a859054b84dc7711c9d4d1e05a505ed
+SIZE (zsh-5.0.1.tar.bz2) = 3027098
+SHA256 (zsh-5.0.1-doc.tar.bz2) = d702c3f8cacd91c638660841125f64ae4e5b6fda6bc328bbe242fd10e4c88cbb
+SIZE (zsh-5.0.1-doc.tar.bz2) = 2902626
diff --git a/shells/zsh/pkg-plist b/shells/zsh/pkg-plist
index 4d8647fad5ce..2f14362ec44f 100644
--- a/shells/zsh/pkg-plist
+++ b/shells/zsh/pkg-plist
@@ -144,7 +144,6 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Base/_read_comp
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Base/_regex_arguments
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Base/_regex_words
-%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Base/_remote_files
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Base/_requested
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Base/_retrieve_cache
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Base/_sep_parts
@@ -236,6 +235,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_acpitool
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_analyseplugin
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_brctl
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_btrfs
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_chrt
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_cryptsetup
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_ethtool
@@ -334,6 +334,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_chkconfig
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_chmod
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_chown
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_clay
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_comm
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_compress
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_configure
@@ -347,6 +348,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_cvs
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_darcs
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_date
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_dbus
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_dd
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_devtodo
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_dhclient
@@ -435,6 +437,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_less
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_links
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_list_files
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_lha
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_ln
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_loadkeys
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_locales
@@ -472,6 +475,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_netcat
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_newsgroups
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_nice
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_nkf
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_nm
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_nmap
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_npm
@@ -521,6 +525,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_ranlib
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_rar
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_rcs
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_remote_files
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_renice
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_ri
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_rlogin
@@ -619,6 +624,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_zfs_pool
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_zip
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_zpool
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_xz
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/X.zwc
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/X/_acroread
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/X/_dcop