diff options
Diffstat (limited to 'shells')
| -rw-r--r-- | shells/zsh/Makefile | 5 | ||||
| -rw-r--r-- | shells/zsh/PLIST | 8 | ||||
| -rw-r--r-- | shells/zsh/distinfo | 18 | ||||
| -rw-r--r-- | shells/zsh/patches/patch-Doc_Zsh_builtins.yo | 39 | ||||
| -rw-r--r-- | shells/zsh/patches/patch-Src_Builtins_rlimits.awk | 15 | ||||
| -rw-r--r-- | shells/zsh/patches/patch-Src_Builtins_rlimits.c | 67 | ||||
| -rw-r--r-- | shells/zsh/patches/patch-Src_prototypes.h | 27 | ||||
| -rw-r--r-- | shells/zsh/patches/patch-Src_zsh__system.h | 15 | ||||
| -rw-r--r-- | shells/zsh/patches/patch-ab | 25 | ||||
| -rw-r--r-- | shells/zsh/patches/patch-ac | 28 | ||||
| -rw-r--r-- | shells/zsh/patches/patch-config.h.in | 17 | ||||
| -rw-r--r-- | shells/zsh/patches/patch-configure.ac | 15 |
12 files changed, 18 insertions, 261 deletions
diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile index 65a064d0c5f..01562a24b9e 100644 --- a/shells/zsh/Makefile +++ b/shells/zsh/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.60 2012/08/17 12:22:51 wiz Exp $ +# $NetBSD: Makefile,v 1.61 2013/01/03 15:37:23 ryoon Exp $ .include "../../shells/zsh/Makefile.common" -ZSH_VERSION= 5.0.0 +ZSH_VERSION= 5.0.2 ZSH_MAINTAINER= uebayasi@NetBSD.org -PKGREVISION= 2 CONFIGURE_ARGS+= --disable-gdbm diff --git a/shells/zsh/PLIST b/shells/zsh/PLIST index d0b63b7cc3a..ec086e93a58 100644 --- a/shells/zsh/PLIST +++ b/shells/zsh/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.27 2012/07/23 10:48:23 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.28 2013/01/03 15:37:23 ryoon Exp $ bin/zsh bin/${PKGNAME} info/zsh.info @@ -142,6 +142,7 @@ share/zsh/${PKGVERSION}/functions/_bogofilter share/zsh/${PKGVERSION}/functions/_brace_parameter share/zsh/${PKGVERSION}/functions/_brctl share/zsh/${PKGVERSION}/functions/_bsd_pkg +share/zsh/${PKGVERSION}/functions/_btrfs share/zsh/${PKGVERSION}/functions/_bts share/zsh/${PKGVERSION}/functions/_bug share/zsh/${PKGVERSION}/functions/_builtin @@ -165,6 +166,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/_clay share/zsh/${PKGVERSION}/functions/_combination share/zsh/${PKGVERSION}/functions/_comm share/zsh/${PKGVERSION}/functions/_command @@ -201,6 +203,7 @@ share/zsh/${PKGVERSION}/functions/_cygstart share/zsh/${PKGVERSION}/functions/_dak share/zsh/${PKGVERSION}/functions/_darcs share/zsh/${PKGVERSION}/functions/_date +share/zsh/${PKGVERSION}/functions/_dbus share/zsh/${PKGVERSION}/functions/_dchroot share/zsh/${PKGVERSION}/functions/_dchroot-dsa share/zsh/${PKGVERSION}/functions/_dcop @@ -376,6 +379,7 @@ share/zsh/${PKGVERSION}/functions/_last share/zsh/${PKGVERSION}/functions/_ld_debug share/zsh/${PKGVERSION}/functions/_ldd share/zsh/${PKGVERSION}/functions/_less +share/zsh/${PKGVERSION}/functions/_lha share/zsh/${PKGVERSION}/functions/_lighttpd share/zsh/${PKGVERSION}/functions/_limit share/zsh/${PKGVERSION}/functions/_limits @@ -459,6 +463,7 @@ share/zsh/${PKGVERSION}/functions/_newsgroups share/zsh/${PKGVERSION}/functions/_next_label share/zsh/${PKGVERSION}/functions/_next_tags share/zsh/${PKGVERSION}/functions/_nice +share/zsh/${PKGVERSION}/functions/_nkf share/zsh/${PKGVERSION}/functions/_nm share/zsh/${PKGVERSION}/functions/_nmap share/zsh/${PKGVERSION}/functions/_nmcli @@ -746,6 +751,7 @@ share/zsh/${PKGVERSION}/functions/_xt_session_id share/zsh/${PKGVERSION}/functions/_xterm share/zsh/${PKGVERSION}/functions/_xv share/zsh/${PKGVERSION}/functions/_xwit +share/zsh/${PKGVERSION}/functions/_xz share/zsh/${PKGVERSION}/functions/_yafc share/zsh/${PKGVERSION}/functions/_yast share/zsh/${PKGVERSION}/functions/_yast2 diff --git a/shells/zsh/distinfo b/shells/zsh/distinfo index 5da2ded25a0..4d12c289667 100644 --- a/shells/zsh/distinfo +++ b/shells/zsh/distinfo @@ -1,14 +1,6 @@ -$NetBSD: distinfo,v 1.40 2012/08/17 12:15:37 wiz Exp $ +$NetBSD: distinfo,v 1.41 2013/01/03 15:37:23 ryoon Exp $ -SHA1 (zsh-5.0.0.tar.bz2) = 692669243433c55384a54b397a1cc926e582e9f2 -RMD160 (zsh-5.0.0.tar.bz2) = d2aff295e245dd5e805215c6dcca1e76af8b9725 -Size (zsh-5.0.0.tar.bz2) = 3014362 bytes -SHA1 (patch-Doc_Zsh_builtins.yo) = 04dd90403760c5d774024cbe641d7cc5e6d0877f -SHA1 (patch-Src_Builtins_rlimits.awk) = dd397c3d9dd39da15d4338055ce909e787f67cba -SHA1 (patch-Src_Builtins_rlimits.c) = 3faf198d63bdc13eb91a70393a668438b9e9593c -SHA1 (patch-Src_prototypes.h) = 14a766668bda382b3fc736ef4fccf49670e1be9c -SHA1 (patch-Src_zsh__system.h) = 1d5827a571b897ae139cb7b0c31d3e5a429aa190 -SHA1 (patch-ab) = ebde4d35de2754dc9113988930764552c4bf811e -SHA1 (patch-ac) = a442cbf576582a7efb2f25d20c20db7f7fc64346 -SHA1 (patch-config.h.in) = 2853aa18096bedaa8864a2eb8a5948024712d466 -SHA1 (patch-configure.ac) = 7ce0c325557185485bf9462d030d4f64d579788f +SHA1 (zsh-5.0.2.tar.bz2) = 9f55ecaaae7cdc1495f91237ba2ec087777a4ad9 +RMD160 (zsh-5.0.2.tar.bz2) = eea2328a28e9f022ab9f49583622a9c3bd6114a7 +Size (zsh-5.0.2.tar.bz2) = 3025767 bytes +SHA1 (patch-ac) = c69a2b8f643f1ef819dec5e738a4c7c0e3acece0 diff --git a/shells/zsh/patches/patch-Doc_Zsh_builtins.yo b/shells/zsh/patches/patch-Doc_Zsh_builtins.yo deleted file mode 100644 index 67da37d11a2..00000000000 --- a/shells/zsh/patches/patch-Doc_Zsh_builtins.yo +++ /dev/null @@ -1,39 +0,0 @@ -$NetBSD: patch-Doc_Zsh_builtins.yo,v 1.2 2012/08/17 12:15:37 wiz Exp $ - -Add support for thread limits and socket buffer size. -From Peter Stephenson <Peter.Stephenson@csr.com> on zsh-workers. - ---- Doc/Zsh/builtins.yo.orig 2012-03-13 20:04:40.000000000 +0000 -+++ Doc/Zsh/builtins.yo -@@ -1736,7 +1736,7 @@ enditem() - findex(ulimit) - cindex(resource limits) - cindex(limits, resource) --item(tt(ulimit) [ [ tt(-SHacdfilmnpqstvx) | tt(-N) var(resource) [ var(limit) ] ... ])( -+item(tt(ulimit) [ [ tt(-SHacdfilmnpqrstvx) | tt(-N) var(resource) [ var(limit) ] ... ])( - Set or display resource limits of the shell and the processes started by - the shell. The value of var(limit) can be a number in the unit specified - below or one of the values `tt(unlimited)', which removes the limit on the -@@ -1757,8 +1757,12 @@ When looping over multiple resources, th - it detects a badly formed argument. However, if it fails to set a limit - for some other reason it will continue trying to set the remaining limits. - -+Not all the following resources are supported on all systems. Running -+tt(ulimit -a) will show which are supported. -+ - startsitem() - sitem(tt(-a))(Lists all of the current resource limits.) -+sitem(tt(-b))(Socket buffer size in bytes LPAR()N.B. not kilobytes+RPAR()) - sitem(tt(-c))(512-byte blocks on the size of core dumps.) - sitem(tt(-d))(K-bytes on the size of the data segment.) - sitem(tt(-f))(512-byte blocks on the size of files written.) -@@ -1769,7 +1773,8 @@ sitem(tt(-n))(open file descriptors.) - sitem(tt(-q))(Bytes in POSIX message queues.) - sitem(tt(-s))(K-bytes on the size of the stack.) - sitem(tt(-t))(CPU seconds to be used.) --sitem(tt(-u))(processes available to the user.) -+sitem(tt(-r))(The number of simultaneous threads available to the user.) -+sitem(tt(-u))(The number of processes available to the user.) - sitem(tt(-v))(K-bytes on the size of virtual memory. On some systems this - refers to the limit called `address space'.) - sitem(tt(-x))(The number of locks on files.) diff --git a/shells/zsh/patches/patch-Src_Builtins_rlimits.awk b/shells/zsh/patches/patch-Src_Builtins_rlimits.awk deleted file mode 100644 index c71f902cb5a..00000000000 --- a/shells/zsh/patches/patch-Src_Builtins_rlimits.awk +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-Src_Builtins_rlimits.awk,v 1.1 2012/08/17 10:53:10 wiz Exp $ - -Add support for thread limits. -From Peter Stephenson <Peter.Stephenson@csr.com> on zsh-workers. - ---- Src/Builtins/rlimits.awk.orig 2011-06-18 23:34:23.000000000 +0000 -+++ Src/Builtins/rlimits.awk -@@ -42,6 +42,7 @@ BEGIN {limidx = 0} - if (limnam == "MEMLOCK") { msg[limnum] = "Mmemorylocked" } - if (limnam == "NOFILE") { msg[limnum] = "Ndescriptors" } - if (limnam == "NPROC") { msg[limnum] = "Nmaxproc" } -+ if (limnam == "NTHR") { msg[limnum] = "Nmaxthr" } - if (limnam == "OFILE") { msg[limnum] = "Ndescriptors" } - if (limnam == "PTHREAD") { msg[limnum] = "Nmaxpthreads" } - if (limnam == "RSS") { msg[limnum] = "Mresident" } 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 62f8b824e3e..00000000000 --- a/shells/zsh/patches/patch-Src_Builtins_rlimits.c +++ /dev/null @@ -1,67 +0,0 @@ -$NetBSD: patch-Src_Builtins_rlimits.c,v 1.2 2012/08/17 12:15:37 wiz Exp $ - -Add support for thread limits and socket buffer size. -From Peter Stephenson <Peter.Stephenson@csr.com> on zsh-workers. - ---- Src/Builtins/rlimits.c.orig 2011-11-04 20:47:24.000000000 +0000 -+++ Src/Builtins/rlimits.c -@@ -314,6 +314,12 @@ printulimit(char *nam, int lim, int hard - printf("-u: processes "); - break; - # endif /* HAVE_RLIMIT_NPROC */ -+# ifdef HAVE_RLIMIT_NTHR -+ case RLIMIT_NTHR: -+ if (head) -+ printf("-r: threads "); -+ break; -+#endif /* HAVE_RLIMIT_NTHR */ - # if defined(HAVE_RLIMIT_VMEM) && (!defined(HAVE_RLIMIT_RSS) || !defined(RLIMIT_VMEM_IS_RSS)) - case RLIMIT_VMEM: - if (head) -@@ -359,9 +365,7 @@ printulimit(char *nam, int lim, int hard - # ifdef HAVE_RLIMIT_SBSIZE - case RLIMIT_SBSIZE: - if (head) -- printf("-N %2d: socket buffer size (kb) ", RLIMIT_SBSIZE); -- if (limit != RLIM_INFINITY) -- limit /= 1024; -+ printf("-b: socket buffer size (bytes) ", RLIMIT_SBSIZE); - break; - # endif /* HAVE_RLIMIT_SBSIZE */ - # ifdef HAVE_RLIMIT_PTHREAD -@@ -776,21 +780,31 @@ bin_ulimit(char *name, char **argv, UNUS - case 'c': - res = RLIMIT_CORE; - break; --# ifdef HAVE_RLIMIT_RSS -- case 'm': -- res = RLIMIT_RSS; -+# ifdef HAVE_RLIMIT_SBSIZE -+ case 'b': -+ res = RLIMIT_SBSIZE; - break; --# endif /* HAVE_RLIMIT_RSS */ -+# endif /* HAVE_RLIMIT_SBSIZE */ - # ifdef HAVE_RLIMIT_MEMLOCK - case 'l': - res = RLIMIT_MEMLOCK; - break; - # endif /* HAVE_RLIMIT_MEMLOCK */ -+# ifdef HAVE_RLIMIT_RSS -+ case 'm': -+ res = RLIMIT_RSS; -+ break; -+# endif /* HAVE_RLIMIT_RSS */ - # ifdef HAVE_RLIMIT_NOFILE - case 'n': - res = RLIMIT_NOFILE; - break; - # endif /* HAVE_RLIMIT_NOFILE */ -+# ifdef HAVE_RLIMIT_NTHR -+ case 'r': -+ res = RLIMIT_NTHR; -+ break; -+# endif /* HAVE_RLIMIT_NTHR */ - # ifdef HAVE_RLIMIT_NPROC - case 'u': - res = RLIMIT_NPROC; diff --git a/shells/zsh/patches/patch-Src_prototypes.h b/shells/zsh/patches/patch-Src_prototypes.h deleted file mode 100644 index f7cab206c74..00000000000 --- a/shells/zsh/patches/patch-Src_prototypes.h +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-Src_prototypes.h,v 1.1 2012/08/16 13:31:20 wiz Exp $ - -Fix build on NetBSD-5.99.40. -Patch from Peter Stephenson <Peter.Stephenson@csr.com> on zsh-workers. - ---- Src/prototypes.h.orig 2011-05-03 18:38:21.000000000 +0000 -+++ Src/prototypes.h -@@ -49,11 +49,18 @@ extern int tgetent _((char *bp, TC_CONST - extern int tgetnum _((char *id)); - extern int tgetflag _((char *id)); - extern char *tgetstr _((char *id, char **area)); --extern char *tgoto _((TC_CONST char *cm, int destcol, int destline)); - extern int tputs _((TC_CONST char *cp, int affcnt, int (*outc) (int))); - #undef TC_CONST - #endif - -+/* -+ * Some systems that do have termcap headers nonetheless don't -+ * declare tgoto, so we detect if that is missing separately. -+ */ -+#ifdef TGOTO_PROTO_MISSING -+char *tgoto(const char *cap, int col, int row); -+#endif -+ - /* MISSING PROTOTYPES FOR VARIOUS OPERATING SYSTEMS */ - - #if defined(__hpux) && defined(_HPUX_SOURCE) && !defined(_XPG4_EXTENDED) diff --git a/shells/zsh/patches/patch-Src_zsh__system.h b/shells/zsh/patches/patch-Src_zsh__system.h deleted file mode 100644 index 315ad4c3e84..00000000000 --- a/shells/zsh/patches/patch-Src_zsh__system.h +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-Src_zsh__system.h,v 1.1 2012/08/16 13:31:21 wiz Exp $ - -Fix build on NetBSD-5.99.40. -Patch from Peter Stephenson <Peter.Stephenson@csr.com> on zsh-workers. - ---- Src/zsh_system.h.orig 2012-06-21 18:36:09.000000000 +0000 -+++ Src/zsh_system.h -@@ -874,7 +874,3 @@ extern short ospeed; - # endif - # endif - #endif -- --#ifdef TGOTO_PROTO_MISSING --char *tgoto(const char *cap, int col, int row); --#endif diff --git a/shells/zsh/patches/patch-ab b/shells/zsh/patches/patch-ab deleted file mode 100644 index 75d1f64a1cc..00000000000 --- a/shells/zsh/patches/patch-ab +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-ab,v 1.15 2012/08/17 07:53:39 wiz Exp $ - -Make this package build on Interix. Patches provided by Hiramatsu -Yoshifumi in PR pkg/25946. -Accepted by Peter Stephenson <p.w.stephenson@ntlworld.com> on -zsh-workers on 2012-08-16. - ---- Src/zsh.h.orig 2011-05-16 15:49:11.000000000 +0000 -+++ Src/zsh.h -@@ -2122,6 +2122,7 @@ struct ttyinfo { - #endif - }; - -+#ifndef __INTERIX - /* defines for whether tabs expand to spaces */ - #if defined(HAVE_TERMIOS_H) || defined(HAVE_TERMIO_H) - #define SGTTYFLAG shttyinfo.tio.c_oflag -@@ -2139,6 +2140,7 @@ struct ttyinfo { - # endif - # endif - # endif -+#endif - - /* flags for termflags */ - diff --git a/shells/zsh/patches/patch-ac b/shells/zsh/patches/patch-ac index 428c53dce67..c41a465e213 100644 --- a/shells/zsh/patches/patch-ac +++ b/shells/zsh/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.26 2012/08/17 10:53:10 wiz Exp $ +$NetBSD: patch-ac,v 1.27 2013/01/03 15:37:23 ryoon Exp $ First chunk: Add support for thread limits. @@ -15,9 +15,9 @@ All chunks: Accepted by Peter Stephenson <p.w.stephenson@ntlworld.com> on zsh-workers on 2012-08-16. ---- configure.orig 2012-06-21 18:36:43.000000000 +0000 +--- configure.orig 2012-09-15 20:13:14.000000000 +0000 +++ configure -@@ -9608,6 +9608,42 @@ if test $zsh_cv_have_RLIMIT_NPROC = yes; +@@ -9645,6 +9645,42 @@ if test $zsh_cv_have_RLIMIT_NTHR = yes; fi @@ -60,7 +60,7 @@ zsh-workers on 2012-08-16. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for limit RLIMIT_NOFILE" >&5 $as_echo_n "checking for limit RLIMIT_NOFILE... " >&6; } if ${zsh_cv_have_RLIMIT_NOFILE+:} false; then : -@@ -11589,6 +11625,10 @@ $as_echo "$zsh_cv_sys_elf" >&6; } +@@ -11630,6 +11666,10 @@ $as_echo "$zsh_cv_sys_elf" >&6; } DLLD="${DLLD=$CC}" DLLDARG="" ;; @@ -71,23 +71,3 @@ zsh-workers on 2012-08-16. * ) DLLD="${DLLD=ld}" DLLDARG="" -@@ -11599,6 +11639,7 @@ $as_echo "$zsh_cv_sys_elf" >&6; } - case "$host_os" in - hpux*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;; - darwin*) DLCFLAGS="${DLCFLAGS=-fno-common}" ;; -+ interix*) DLCFLAGS="${DLCFLAGS=}" ;; - *) DLCFLAGS="${DLCFLAGS=-fPIC}" ;; - esac - else -@@ -11613,10 +11654,9 @@ $as_echo "$zsh_cv_sys_elf" >&6; } - fi - case "$host_os" in - osf*) DLLDFLAGS="${DLLDFLAGS=-shared -expect_unresolved '*'}" ;; -- *freebsd*|linux*|irix*|gnu*|dragonfly*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;; -+ *freebsd*|*netbsd*|linux*|irix*|gnu*|interix*|dragonfly*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;; - sunos*) DLLDFLAGS="${DLLDFLAGS=-assert nodefinitions}" ;; - sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G $ldflags}" ;; -- netbsd*) DLLDFLAGS="${DLLDFLAGS=${DLLDARG}-x -shared --whole-archive}" ;; - aix*) DLLDFLAGS="${DLLDFLAGS=-G -bexpall -lc}" ;; - solaris*|sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G}" ;; - darwin*) DLLDFLAGS="${DLLDFLAGS=-bundle -flat_namespace -undefined suppress}" ;; diff --git a/shells/zsh/patches/patch-config.h.in b/shells/zsh/patches/patch-config.h.in deleted file mode 100644 index 4c218a0becd..00000000000 --- a/shells/zsh/patches/patch-config.h.in +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-config.h.in,v 1.1 2012/08/17 10:53:10 wiz Exp $ - -Add support for thread limits. -From Peter Stephenson <Peter.Stephenson@csr.com> on zsh-workers. - ---- config.h.in.orig 2012-06-21 18:37:23.000000000 +0000 -+++ config.h.in -@@ -520,6 +520,9 @@ - /* Define to 1 if RLIMIT_NPROC is present (whether or not as a macro). */ - #undef HAVE_RLIMIT_NPROC - -+/* Define to 1 if RLIMIT_NTHR is present (whether or not as a macro). */ -+#undef HAVE_RLIMIT_NTHR -+ - /* Define to 1 if RLIMIT_PTHREAD is present (whether or not as a macro). */ - #undef HAVE_RLIMIT_PTHREAD - diff --git a/shells/zsh/patches/patch-configure.ac b/shells/zsh/patches/patch-configure.ac deleted file mode 100644 index 74376b8461b..00000000000 --- a/shells/zsh/patches/patch-configure.ac +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-configure.ac,v 1.1 2012/08/17 10:53:10 wiz Exp $ - -Add support for thread limits. -From Peter Stephenson <Peter.Stephenson@csr.com> on zsh-workers. - ---- configure.ac.orig 2012-06-21 18:36:03.000000000 +0000 -+++ configure.ac -@@ -1799,6 +1799,7 @@ zsh_LIMIT_PRESENT(RLIMIT_AS) - zsh_LIMIT_PRESENT(RLIMIT_LOCKS) - zsh_LIMIT_PRESENT(RLIMIT_MEMLOCK) - zsh_LIMIT_PRESENT(RLIMIT_NPROC) -+zsh_LIMIT_PRESENT(RLIMIT_NTHR) - zsh_LIMIT_PRESENT(RLIMIT_NOFILE) - zsh_LIMIT_PRESENT(RLIMIT_PTHREAD) - zsh_LIMIT_PRESENT(RLIMIT_RSS) |