summaryrefslogtreecommitdiff
path: root/shells
diff options
context:
space:
mode:
authorwiz <wiz>2012-08-17 07:53:38 +0000
committerwiz <wiz>2012-08-17 07:53:38 +0000
commit2d3270383f3b40a831c2d372e6201ceaa88d5dd3 (patch)
treed47a4a6a21e47452b273391b9eccb3c066bb25ca /shells
parentbd8dc1989691fce0eff2cf60005c882f81db96e4 (diff)
downloadpkgsrc-2d3270383f3b40a831c2d372e6201ceaa88d5dd3.tar.gz
Mention that these patches have been integrated upstream.
Diffstat (limited to 'shells')
-rw-r--r--shells/zsh/distinfo6
-rw-r--r--shells/zsh/patches/patch-ab4
-rw-r--r--shells/zsh/patches/patch-ac6
3 files changed, 11 insertions, 5 deletions
diff --git a/shells/zsh/distinfo b/shells/zsh/distinfo
index 604fd853e4f..3dd7742414a 100644
--- a/shells/zsh/distinfo
+++ b/shells/zsh/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.37 2012/08/16 16:26:46 ryoon Exp $
+$NetBSD: distinfo,v 1.38 2012/08/17 07:53:38 wiz 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-Src_prototypes.h) = 14a766668bda382b3fc736ef4fccf49670e1be9c
SHA1 (patch-Src_zsh__system.h) = 1d5827a571b897ae139cb7b0c31d3e5a429aa190
-SHA1 (patch-ab) = 1162d9dff51a55abba0a983846181407f4f051df
-SHA1 (patch-ac) = 52e53fa75cfa1443594a603409bdce53b14f75aa
+SHA1 (patch-ab) = ebde4d35de2754dc9113988930764552c4bf811e
+SHA1 (patch-ac) = 9bfa22be47ce6478f48bb121b93d972cb28fe6cf
diff --git a/shells/zsh/patches/patch-ab b/shells/zsh/patches/patch-ab
index e154fcded90..75d1f64a1cc 100644
--- a/shells/zsh/patches/patch-ab
+++ b/shells/zsh/patches/patch-ab
@@ -1,7 +1,9 @@
-$NetBSD: patch-ab,v 1.14 2012/08/16 14:19:35 wiz Exp $
+$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
diff --git a/shells/zsh/patches/patch-ac b/shells/zsh/patches/patch-ac
index 497c0562af7..c9507fbc885 100644
--- a/shells/zsh/patches/patch-ac
+++ b/shells/zsh/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.24 2012/08/16 14:19:35 wiz Exp $
+$NetBSD: patch-ac,v 1.25 2012/08/17 07:53:39 wiz Exp $
All chunks:
Make this package build on Interix. Patches provided by Hiramatsu
@@ -7,6 +7,10 @@ Last chunk only:
Don't force -Wl,--whole-archive for NetBSD, it breaks the build with
clang, which doesn't have a reason to disable it again.
+All chunks:
+Accepted by Peter Stephenson <p.w.stephenson@ntlworld.com> on
+zsh-workers on 2012-08-16.
+
--- configure.orig 2011-05-16 15:49:15.000000000 +0000
+++ configure
@@ -11443,6 +11443,10 @@ $as_echo "$zsh_cv_sys_elf" >&6; }