aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsergei <sergei@FreeBSD.org>2006-09-20 19:43:20 +0800
committersergei <sergei@FreeBSD.org>2006-09-20 19:43:20 +0800
commit680fa11af73c171499b89cddc97315906b1fa6e0 (patch)
treea9f00790c4eca30f22f8e1b44577b0a3d4fb1cbc
parentf645c6d127d5e2924a735853025172eb33e27dd7 (diff)
downloadfreebsd-ports-gnome-680fa11af73c171499b89cddc97315906b1fa6e0.tar.gz
freebsd-ports-gnome-680fa11af73c171499b89cddc97315906b1fa6e0.tar.zst
freebsd-ports-gnome-680fa11af73c171499b89cddc97315906b1fa6e0.zip
- Add a patch from Zsh CVS to fix a bug with acroread(1) completion:
http://zsh.cvs.sourceforge.net/zsh/zsh/Completion/X/Command/_acroread?r1=1.5&r2=1.6 PR: ports/100614 Submitted by: Simon Olofsson <simon at olofsson dot de>
-rw-r--r--shells/zsh/Makefile4
-rw-r--r--shells/zsh/files/patch-Completion-X-Command-_acroread17
2 files changed, 20 insertions, 1 deletions
diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index 64e0334930ce..d3de774c3680 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -12,7 +12,7 @@
# (default: on)
# WITHOUT_ZSH_MAILDIR=yes disable support for Maildirs in MAIL and MAILPATH
# (default: on)
-# WITHOUT_ZSH_MULTIBYTE=yes disable multibyte character support
+# WITHOUT_ZSH_MULTIBYTE=yes disable multibyte character support
# (default: on)
# ZSH_ETCDIR=<dir> directory for zsh system-wide configuration files:
# zshenv, zlogin, zprofile, zshrc, zlogout.
@@ -28,6 +28,7 @@
PORTNAME= zsh
PORTVERSION= 4.3.2
+PORTREVISION= 1
CATEGORIES= shells
MASTER_SITES= \
http://archive.progeny.com/zsh/ \
@@ -120,6 +121,7 @@ post-patch:
${REINPLACE_CMD} -e "s,/etc/,${LOCALBASE}/etc/," \
${WRKSRC}/Functions/MIME/zsh-mime-setup
${RM} -f ${WRKSRC}/Functions/MIME/zsh-mime-setup.bak
+ ${RM} -f ${WRKSRC}/Completion/X/Command/_acroread.orig
.if ${OSVERSION} >= 503000
${RM} -f ${WRKSRC}/Completion/Unix/Type/_tar_archive.orig
.endif
diff --git a/shells/zsh/files/patch-Completion-X-Command-_acroread b/shells/zsh/files/patch-Completion-X-Command-_acroread
new file mode 100644
index 000000000000..cef2aa9fee43
--- /dev/null
+++ b/shells/zsh/files/patch-Completion-X-Command-_acroread
@@ -0,0 +1,17 @@
+--- Completion/X/Command/_acroread 2005/05/10 12:26:24 1.5
++++ Completion/X/Command/_acroread 2006/03/26 15:15:10 1.6
+@@ -4,12 +4,12 @@
+
+ # Try extracting the version number directly from the executable.
+ # (This will fail if the executable is a wrapper script for acroread.)
+-local ver=${${${(f)"$(<$commands[$words[1]])"}:#^ver=*}##ver=}
++local ver=${${${(Mf)"$(<$commands[$words[1]])"}:#ver=*}##ver=}
+ [[ -n $ver ]] && _acroread_version=$ver
+
+ if (( ! $+_acroread_version )); then
+ local acropath=${${(s. .)${${(f)"$($words[1] -help 2>&1)"}[1]}}[2]}
+- _acroread_version=${${${(f)"$(<$acropath)"}:#^ver=*}##ver=}
++ _acroread_version=${${${(Mf)"$(<$acropath)"}:#ver=*}##ver=}
+ fi
+
+ if [[ $_acroread_version == 7.* ]]; then