From b94c547bf2d712269ccd8527ea66a25ec131dd5d Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Wed, 25 Jun 2014 12:19:09 +0000
Subject: Update to upgraded patch from upstream. Ride bump.

---
 shells/zsh/distinfo                             |  4 ++--
 shells/zsh/patches/patch-Src_Builtins_rlimits.c | 32 ++++++++++++++++++++++---
 2 files changed, 31 insertions(+), 5 deletions(-)

(limited to 'shells')

diff --git a/shells/zsh/distinfo b/shells/zsh/distinfo
index 0f887e6c334..4c08e37c8fb 100644
--- a/shells/zsh/distinfo
+++ b/shells/zsh/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.47 2014/06/25 08:39:11 wiz Exp $
+$NetBSD: distinfo,v 1.48 2014/06/25 12:19:09 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) = 45b0e661fbf3ec77fdba95c7b2586a155065fa2f
+SHA1 (patch-Src_Builtins_rlimits.c) = f35b74b34415c6dfda2a7429f9bc6170bb68e980
 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
index bfbc15569f9..8178415e745 100644
--- a/shells/zsh/patches/patch-Src_Builtins_rlimits.c
+++ b/shells/zsh/patches/patch-Src_Builtins_rlimits.c
@@ -1,11 +1,11 @@
-$NetBSD: patch-Src_Builtins_rlimits.c,v 1.4 2014/06/25 08:39:11 wiz Exp $
+$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,14 @@
+@@ -32,12 +32,17 @@
  
  #if defined(HAVE_GETRLIMIT) && defined(RLIM_INFINITY)
  
@@ -19,10 +19,36 @@ From upstream, Peter Stephenson <p.stephenson@samsung.com>.
 +#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 {
-@@ -876,6 +878,11 @@ bin_ulimit(char *name, char **argv, UNUS
+@@ -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
-- 
cgit v1.2.3