diff options
| -rw-r--r-- | shells/zsh/Makefile | 5 | ||||
| -rw-r--r-- | shells/zsh/PLIST | 20 | ||||
| -rw-r--r-- | shells/zsh/distinfo | 9 | ||||
| -rw-r--r-- | shells/zsh/patches/patch-Src_Builtins_rlimits.c | 62 |
4 files changed, 23 insertions, 73 deletions
diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile index f164797ccc6..fa42f5ad00a 100644 --- a/shells/zsh/Makefile +++ b/shells/zsh/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.66 2014/06/25 08:39:11 wiz Exp $ +# $NetBSD: Makefile,v 1.67 2014/12/12 08:27:47 wiz Exp $ .include "../../shells/zsh/Makefile.common" -ZSH_VERSION= 5.0.5 -PKGREVISION= 1 +ZSH_VERSION= 5.0.7 ZSH_MAINTAINER= uebayasi@NetBSD.org CONFIGURE_ARGS+= --disable-gdbm diff --git a/shells/zsh/PLIST b/shells/zsh/PLIST index 7473e1df9a1..bb0a01bf195 100644 --- a/shells/zsh/PLIST +++ b/shells/zsh/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.29 2014/01/08 16:30:01 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.30 2014/12/12 08:27:47 wiz Exp $ bin/zsh bin/${PKGNAME} info/zsh.info @@ -92,7 +92,7 @@ share/zsh/${PKGVERSION}/functions/VCS_INFO_quilt share/zsh/${PKGVERSION}/functions/VCS_INFO_realpath share/zsh/${PKGVERSION}/functions/VCS_INFO_reposub share/zsh/${PKGVERSION}/functions/VCS_INFO_set -share/zsh/${PKGVERSION}/functions/_SuSEconfig +share/zsh/${PKGVERSION}/functions/_SUSEconfig share/zsh/${PKGVERSION}/functions/_a2ps share/zsh/${PKGVERSION}/functions/_a2utils share/zsh/${PKGVERSION}/functions/_aap @@ -126,6 +126,7 @@ share/zsh/${PKGVERSION}/functions/_arrays share/zsh/${PKGVERSION}/functions/_assign share/zsh/${PKGVERSION}/functions/_at share/zsh/${PKGVERSION}/functions/_attr +share/zsh/${PKGVERSION}/functions/_augeas share/zsh/${PKGVERSION}/functions/_auto-apt share/zsh/${PKGVERSION}/functions/_autocd share/zsh/${PKGVERSION}/functions/_awk @@ -139,6 +140,7 @@ share/zsh/${PKGVERSION}/functions/_bindkey share/zsh/${PKGVERSION}/functions/_bison share/zsh/${PKGVERSION}/functions/_bittorrent share/zsh/${PKGVERSION}/functions/_bogofilter +share/zsh/${PKGVERSION}/functions/_bpython share/zsh/${PKGVERSION}/functions/_brace_parameter share/zsh/${PKGVERSION}/functions/_brctl share/zsh/${PKGVERSION}/functions/_bsd_pkg @@ -166,6 +168,7 @@ share/zsh/${PKGVERSION}/functions/_chkconfig share/zsh/${PKGVERSION}/functions/_chmod share/zsh/${PKGVERSION}/functions/_chown share/zsh/${PKGVERSION}/functions/_chrt +share/zsh/${PKGVERSION}/functions/_chsh share/zsh/${PKGVERSION}/functions/_clay share/zsh/${PKGVERSION}/functions/_combination share/zsh/${PKGVERSION}/functions/_comm @@ -236,6 +239,7 @@ share/zsh/${PKGVERSION}/functions/_django share/zsh/${PKGVERSION}/functions/_dladm share/zsh/${PKGVERSION}/functions/_dlocate share/zsh/${PKGVERSION}/functions/_dmidecode +share/zsh/${PKGVERSION}/functions/_docker share/zsh/${PKGVERSION}/functions/_domains share/zsh/${PKGVERSION}/functions/_dpatch-edit-patch share/zsh/${PKGVERSION}/functions/_dpkg @@ -244,6 +248,7 @@ share/zsh/${PKGVERSION}/functions/_dpkg-cross share/zsh/${PKGVERSION}/functions/_dpkg-repack share/zsh/${PKGVERSION}/functions/_dpkg_source share/zsh/${PKGVERSION}/functions/_dput +share/zsh/${PKGVERSION}/functions/_dsh share/zsh/${PKGVERSION}/functions/_dtrace share/zsh/${PKGVERSION}/functions/_du share/zsh/${PKGVERSION}/functions/_dumpadm @@ -267,6 +272,7 @@ share/zsh/${PKGVERSION}/functions/_ethtool share/zsh/${PKGVERSION}/functions/_expand share/zsh/${PKGVERSION}/functions/_expand_alias share/zsh/${PKGVERSION}/functions/_expand_word +share/zsh/${PKGVERSION}/functions/_extensions share/zsh/${PKGVERSION}/functions/_fakeroot share/zsh/${PKGVERSION}/functions/_fc share/zsh/${PKGVERSION}/functions/_feh @@ -437,6 +443,7 @@ share/zsh/${PKGVERSION}/functions/_module-assistant share/zsh/${PKGVERSION}/functions/_modutils share/zsh/${PKGVERSION}/functions/_mondo share/zsh/${PKGVERSION}/functions/_monotone +share/zsh/${PKGVERSION}/functions/_moosic share/zsh/${PKGVERSION}/functions/_mosh share/zsh/${PKGVERSION}/functions/_most_recent_file share/zsh/${PKGVERSION}/functions/_mount @@ -472,6 +479,7 @@ share/zsh/${PKGVERSION}/functions/_notmuch share/zsh/${PKGVERSION}/functions/_npm share/zsh/${PKGVERSION}/functions/_nslookup share/zsh/${PKGVERSION}/functions/_object_classes +share/zsh/${PKGVERSION}/functions/_od share/zsh/${PKGVERSION}/functions/_okular share/zsh/${PKGVERSION}/functions/_oldlist share/zsh/${PKGVERSION}/functions/_open @@ -581,6 +589,7 @@ share/zsh/${PKGVERSION}/functions/_schroot share/zsh/${PKGVERSION}/functions/_screen share/zsh/${PKGVERSION}/functions/_sed share/zsh/${PKGVERSION}/functions/_sep_parts +share/zsh/${PKGVERSION}/functions/_sequence share/zsh/${PKGVERSION}/functions/_service share/zsh/${PKGVERSION}/functions/_services share/zsh/${PKGVERSION}/functions/_set @@ -604,6 +613,7 @@ share/zsh/${PKGVERSION}/functions/_source share/zsh/${PKGVERSION}/functions/_spamassassin share/zsh/${PKGVERSION}/functions/_sqlite share/zsh/${PKGVERSION}/functions/_sqsh +share/zsh/${PKGVERSION}/functions/_ss share/zsh/${PKGVERSION}/functions/_ssh share/zsh/${PKGVERSION}/functions/_sshfs share/zsh/${PKGVERSION}/functions/_stat @@ -626,6 +636,8 @@ share/zsh/${PKGVERSION}/functions/_svcs share/zsh/${PKGVERSION}/functions/_svcs_fmri share/zsh/${PKGVERSION}/functions/_svn-buildpackage share/zsh/${PKGVERSION}/functions/_sysctl +share/zsh/${PKGVERSION}/functions/_sysstat +share/zsh/${PKGVERSION}/functions/_system_profiler share/zsh/${PKGVERSION}/functions/_systemd share/zsh/${PKGVERSION}/functions/_tags share/zsh/${PKGVERSION}/functions/_tar @@ -671,7 +683,6 @@ share/zsh/${PKGVERSION}/functions/_unhash share/zsh/${PKGVERSION}/functions/_uniq share/zsh/${PKGVERSION}/functions/_unison share/zsh/${PKGVERSION}/functions/_units -share/zsh/${PKGVERSION}/functions/_unsetopt share/zsh/${PKGVERSION}/functions/_update-alternatives share/zsh/${PKGVERSION}/functions/_update-rc.d share/zsh/${PKGVERSION}/functions/_urls @@ -817,6 +828,7 @@ share/zsh/${PKGVERSION}/functions/delete-whole-word-match share/zsh/${PKGVERSION}/functions/down-case-word-match share/zsh/${PKGVERSION}/functions/down-line-or-beginning-search share/zsh/${PKGVERSION}/functions/edit-command-line +share/zsh/${PKGVERSION}/functions/expand-absolute-path share/zsh/${PKGVERSION}/functions/forward-word-match share/zsh/${PKGVERSION}/functions/getjobs share/zsh/${PKGVERSION}/functions/harden @@ -865,6 +877,7 @@ share/zsh/${PKGVERSION}/functions/quote-and-complete-word share/zsh/${PKGVERSION}/functions/read-from-minibuffer share/zsh/${PKGVERSION}/functions/regexp-replace share/zsh/${PKGVERSION}/functions/relative +share/zsh/${PKGVERSION}/functions/replace-argument share/zsh/${PKGVERSION}/functions/replace-string share/zsh/${PKGVERSION}/functions/replace-string-again share/zsh/${PKGVERSION}/functions/run-help @@ -914,6 +927,7 @@ share/zsh/${PKGVERSION}/functions/which-command share/zsh/${PKGVERSION}/functions/xtermctl share/zsh/${PKGVERSION}/functions/zargs share/zsh/${PKGVERSION}/functions/zcalc +share/zsh/${PKGVERSION}/functions/zcalc-auto-insert share/zsh/${PKGVERSION}/functions/zed share/zsh/${PKGVERSION}/functions/zed-set-file-name ${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfanon diff --git a/shells/zsh/distinfo b/shells/zsh/distinfo index 4c08e37c8fb..8409b3489c2 100644 --- a/shells/zsh/distinfo +++ b/shells/zsh/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.48 2014/06/25 12:19:09 wiz Exp $ +$NetBSD: distinfo,v 1.49 2014/12/12 08:27:47 wiz Exp $ -SHA1 (zsh-5.0.5.tar.bz2) = 75426146bce45ee176d9d50b32f1ced78418ae16 -RMD160 (zsh-5.0.5.tar.bz2) = 4299f33ba0de2542f7567ae4f16a4de16ba560a0 -Size (zsh-5.0.5.tar.bz2) = 3104375 bytes -SHA1 (patch-Src_Builtins_rlimits.c) = f35b74b34415c6dfda2a7429f9bc6170bb68e980 +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-ac) = ee0cb8f39bdfd6f9a8facc3ba861c4f438aabcee SHA1 (patch-aczsh.m4) = 36c270d8d7cf727f48787ef889b2bd89cbf065e2 SHA1 (patch-configure.ac) = e34bbae6385442b51a7263b22681898203d0c013 diff --git a/shells/zsh/patches/patch-Src_Builtins_rlimits.c b/shells/zsh/patches/patch-Src_Builtins_rlimits.c deleted file mode 100644 index 8178415e745..00000000000 --- a/shells/zsh/patches/patch-Src_Builtins_rlimits.c +++ /dev/null @@ -1,62 +0,0 @@ -$NetBSD: patch-Src_Builtins_rlimits.c,v 1.5 2014/06/25 12:19:09 wiz Exp $ - -Fix thread limit display in ulimit. -From upstream, Peter Stephenson <p.stephenson@samsung.com>. - ---- Src/Builtins/rlimits.c.orig 2013-11-27 19:00:20.000000000 +0000 -+++ Src/Builtins/rlimits.c -@@ -32,12 +32,17 @@ - - #if defined(HAVE_GETRLIMIT) && defined(RLIM_INFINITY) - --#ifdef RLIMIT_POSIXLOCKS -+#if defined(HAVE_RLIMIT_POSIXLOCKS) && !defined(HAVE_RLIMIT_LOCKS) - # define RLIMIT_LOCKS RLIMIT_POSIXLOCKS -+# define HAVE_RLIMIT_LOCKS 1 - #endif - --#ifdef RLIMIT_NTHR -+#if defined(HAVE_RLIMIT_NTHR) && !defined(HAVE_RLIMIT_PTHREAD) - # define RLIMIT_PTHREAD RLIMIT_NTHR -+# define HAVE_RLIMIT_PTHREAD 1 -+# define THREAD_FMT "-T: threads " -+#else -+# define THREAD_FMT "-T: threads per process " - #endif - - enum { -@@ -373,7 +378,7 @@ printulimit(char *nam, int lim, int hard - # ifdef HAVE_RLIMIT_PTHREAD - case RLIMIT_PTHREAD: - if (head) -- printf("-T: threads per process "); -+ printf(THREAD_FMT); - break; - # endif /* HAVE_RLIMIT_PTHREAD */ - # ifdef HAVE_RLIMIT_NICE -@@ -860,6 +865,13 @@ bin_ulimit(char *name, char **argv, UNUS - case 'r': - res = RLIMIT_RTPRIO; - break; -+# else -+# ifdef HAVE_RLIMIT_NTHR -+ /* For compatibility with sh on NetBSD */ -+ case 'r': -+ res = RLIMIT_NTHR; -+ break; -+# endif /* HAVE_RLIMIT_NTHR */ - # endif - # ifdef HAVE_RLIMIT_NPTS - case 'p': -@@ -876,6 +888,11 @@ bin_ulimit(char *name, char **argv, UNUS - res = RLIMIT_KQUEUES; - break; - # endif -+# ifdef HAVE_RLIMIT_PTHREAD -+ case 'T': -+ res = RLIMIT_PTHREAD; -+ break; -+# endif - default: - /* unrecognised limit */ - zwarnnam(name, "bad option: -%c", *options); |