summaryrefslogtreecommitdiff
path: root/shells
diff options
context:
space:
mode:
authorsnj <snj@pkgsrc.org>2015-02-04 09:22:34 +0000
committersnj <snj@pkgsrc.org>2015-02-04 09:22:34 +0000
commit0d15d753719daf6905b9a8683a09a7f6aa66a151 (patch)
tree934e1663f6c441cd9a6b0b0b0bf966997d5f056c /shells
parentf2847c45823a7924684eb95875f5da47923124d5 (diff)
downloadpkgsrc-0d15d753719daf6905b9a8683a09a7f6aa66a151.tar.gz
Apply upstream revision 22c4ea424ce2e8febce04d324c5ec9898f5d534b.
Thix fixes, at the very least, issues with cvs command/filename completion. Bump PKGREVISION to 1.
Diffstat (limited to 'shells')
-rw-r--r--shells/zsh/Makefile3
-rw-r--r--shells/zsh/distinfo3
-rw-r--r--shells/zsh/patches/patch-Completion_Base_Utility__call__program19
3 files changed, 23 insertions, 2 deletions
diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index fa42f5ad00a..51316113fc5 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.67 2014/12/12 08:27:47 wiz Exp $
+# $NetBSD: Makefile,v 1.68 2015/02/04 09:22:34 snj Exp $
.include "../../shells/zsh/Makefile.common"
ZSH_VERSION= 5.0.7
+PKGREVISION= 1
ZSH_MAINTAINER= uebayasi@NetBSD.org
CONFIGURE_ARGS+= --disable-gdbm
diff --git a/shells/zsh/distinfo b/shells/zsh/distinfo
index 8409b3489c2..7c5c4257196 100644
--- a/shells/zsh/distinfo
+++ b/shells/zsh/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.49 2014/12/12 08:27:47 wiz Exp $
+$NetBSD: distinfo,v 1.50 2015/02/04 09:22:34 snj Exp $
SHA1 (zsh-5.0.7.tar.bz2) = 1500191d16af8a71aec4f719a92775a074682096
RMD160 (zsh-5.0.7.tar.bz2) = 4b1aac38996414783522762b5a8677533bf77d2d
Size (zsh-5.0.7.tar.bz2) = 3181030 bytes
+SHA1 (patch-Completion_Base_Utility__call__program) = 3abf3a4f8ef77e6e84038a1fb552f1ac0e1e5041
SHA1 (patch-ac) = ee0cb8f39bdfd6f9a8facc3ba861c4f438aabcee
SHA1 (patch-aczsh.m4) = 36c270d8d7cf727f48787ef889b2bd89cbf065e2
SHA1 (patch-configure.ac) = e34bbae6385442b51a7263b22681898203d0c013
diff --git a/shells/zsh/patches/patch-Completion_Base_Utility__call__program b/shells/zsh/patches/patch-Completion_Base_Utility__call__program
new file mode 100644
index 00000000000..cbbb57481c4
--- /dev/null
+++ b/shells/zsh/patches/patch-Completion_Base_Utility__call__program
@@ -0,0 +1,19 @@
+$NetBSD: patch-Completion_Base_Utility__call__program,v 1.1 2015/02/04 09:22:34 snj Exp $
+
+Revision 22c4ea424ce2e8febce04d324c5ec9898f5d534b upstream.
+
+Thix fixes, at the very least, issues with cvs command/filename completion.
+
+--- Completion/Base/Utility/_call_program.orig 2014-09-24 11:03:17.000000000 -0700
++++ Completion/Base/Utility/_call_program 2015-02-04 00:52:56.000000000 -0800
+@@ -2,8 +2,8 @@
+
+ local tmp err_fd=-1
+
+-if (( ${debug_fd:--1} > 2 ))
+-then exec {err_fd}>&2 # debug_fd is saved stderr, 2 is log file
++if (( ${debug_fd:--1} > 2 )) || [[ ! -t 2 ]]
++then exec {err_fd}>&2 # debug_fd is saved stderr, 2 is trace or redirect
+ else exec {err_fd}>/dev/null
+ fi
+