Fri Aug 17 07:53:39 2012 UTC ()
Mention that these patches have been integrated upstream.


(wiz)
diff -r1.37 -r1.38 pkgsrc/shells/zsh/distinfo
diff -r1.14 -r1.15 pkgsrc/shells/zsh/patches/patch-ab
diff -r1.24 -r1.25 pkgsrc/shells/zsh/patches/patch-ac
cvs diff -r1.37 -r1.38 pkgsrc/shells/zsh/distinfo (expand / switch to unified diff)

--- pkgsrc/shells/zsh/distinfo 2012/08/16 16:26:46 1.37
+++ pkgsrc/shells/zsh/distinfo 2012/08/17 07:53:38 1.38
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.37 2012/08/16 16:26:46 ryoon Exp $ 1$NetBSD: distinfo,v 1.38 2012/08/17 07:53:38 wiz Exp $
2 2
3SHA1 (zsh-5.0.0.tar.bz2) = 692669243433c55384a54b397a1cc926e582e9f2 3SHA1 (zsh-5.0.0.tar.bz2) = 692669243433c55384a54b397a1cc926e582e9f2
4RMD160 (zsh-5.0.0.tar.bz2) = d2aff295e245dd5e805215c6dcca1e76af8b9725 4RMD160 (zsh-5.0.0.tar.bz2) = d2aff295e245dd5e805215c6dcca1e76af8b9725
5Size (zsh-5.0.0.tar.bz2) = 3014362 bytes 5Size (zsh-5.0.0.tar.bz2) = 3014362 bytes
6SHA1 (patch-Src_prototypes.h) = 14a766668bda382b3fc736ef4fccf49670e1be9c 6SHA1 (patch-Src_prototypes.h) = 14a766668bda382b3fc736ef4fccf49670e1be9c
7SHA1 (patch-Src_zsh__system.h) = 1d5827a571b897ae139cb7b0c31d3e5a429aa190 7SHA1 (patch-Src_zsh__system.h) = 1d5827a571b897ae139cb7b0c31d3e5a429aa190
8SHA1 (patch-ab) = 1162d9dff51a55abba0a983846181407f4f051df 8SHA1 (patch-ab) = ebde4d35de2754dc9113988930764552c4bf811e
9SHA1 (patch-ac) = 52e53fa75cfa1443594a603409bdce53b14f75aa 9SHA1 (patch-ac) = 9bfa22be47ce6478f48bb121b93d972cb28fe6cf
cvs diff -r1.14 -r1.15 pkgsrc/shells/zsh/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/shells/zsh/patches/Attic/patch-ab 2012/08/16 14:19:35 1.14
+++ pkgsrc/shells/zsh/patches/Attic/patch-ab 2012/08/17 07:53:39 1.15
@@ -1,17 +1,19 @@ @@ -1,17 +1,19 @@
1$NetBSD: patch-ab,v 1.14 2012/08/16 14:19:35 wiz Exp $ 1$NetBSD: patch-ab,v 1.15 2012/08/17 07:53:39 wiz Exp $
2 2
3Make this package build on Interix. Patches provided by Hiramatsu 3Make this package build on Interix. Patches provided by Hiramatsu
4Yoshifumi in PR pkg/25946. 4Yoshifumi in PR pkg/25946.
 5Accepted by Peter Stephenson <p.w.stephenson@ntlworld.com> on
 6zsh-workers on 2012-08-16.
5 7
6--- Src/zsh.h.orig 2011-05-16 15:49:11.000000000 +0000 8--- Src/zsh.h.orig 2011-05-16 15:49:11.000000000 +0000
7+++ Src/zsh.h 9+++ Src/zsh.h
8@@ -2122,6 +2122,7 @@ struct ttyinfo { 10@@ -2122,6 +2122,7 @@ struct ttyinfo {
9 #endif 11 #endif
10 }; 12 };
11  13
12+#ifndef __INTERIX 14+#ifndef __INTERIX
13 /* defines for whether tabs expand to spaces */ 15 /* defines for whether tabs expand to spaces */
14 #if defined(HAVE_TERMIOS_H) || defined(HAVE_TERMIO_H) 16 #if defined(HAVE_TERMIOS_H) || defined(HAVE_TERMIO_H)
15 #define SGTTYFLAG shttyinfo.tio.c_oflag 17 #define SGTTYFLAG shttyinfo.tio.c_oflag
16@@ -2139,6 +2140,7 @@ struct ttyinfo { 18@@ -2139,6 +2140,7 @@ struct ttyinfo {
17 # endif 19 # endif
cvs diff -r1.24 -r1.25 pkgsrc/shells/zsh/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/shells/zsh/patches/Attic/patch-ac 2012/08/16 14:19:35 1.24
+++ pkgsrc/shells/zsh/patches/Attic/patch-ac 2012/08/17 07:53:39 1.25
@@ -1,22 +1,26 @@ @@ -1,22 +1,26 @@
1$NetBSD: patch-ac,v 1.24 2012/08/16 14:19:35 wiz Exp $ 1$NetBSD: patch-ac,v 1.25 2012/08/17 07:53:39 wiz Exp $
2 2
3All chunks: 3All chunks:
4Make this package build on Interix. Patches provided by Hiramatsu 4Make this package build on Interix. Patches provided by Hiramatsu
5Yoshifumi in PR pkg/25946. 5Yoshifumi in PR pkg/25946.
6Last chunk only: 6Last chunk only:
7Don't force -Wl,--whole-archive for NetBSD, it breaks the build with 7Don't force -Wl,--whole-archive for NetBSD, it breaks the build with
8clang, which doesn't have a reason to disable it again. 8clang, which doesn't have a reason to disable it again.
9 9
 10All chunks:
 11Accepted by Peter Stephenson <p.w.stephenson@ntlworld.com> on
 12zsh-workers on 2012-08-16.
 13
10--- configure.orig 2011-05-16 15:49:15.000000000 +0000 14--- configure.orig 2011-05-16 15:49:15.000000000 +0000
11+++ configure 15+++ configure
12@@ -11443,6 +11443,10 @@ $as_echo "$zsh_cv_sys_elf" >&6; } 16@@ -11443,6 +11443,10 @@ $as_echo "$zsh_cv_sys_elf" >&6; }
13 DLLD="${DLLD=$CC}" 17 DLLD="${DLLD=$CC}"
14 DLLDARG="" 18 DLLDARG=""
15 ;; 19 ;;
16+ *interix*) 20+ *interix*)
17+ DLLD="${DLLD=$CC}" 21+ DLLD="${DLLD=$CC}"
18+ DLLDARG="" 22+ DLLDARG=""
19+ ;; 23+ ;;
20 * ) 24 * )
21 DLLD="${DLLD=ld}" 25 DLLD="${DLLD=ld}"
22 DLLDARG="" 26 DLLDARG=""