Thu Aug 16 14:19:35 2012 UTC ()
Add comments to patches.


(wiz)
diff -r1.35 -r1.36 pkgsrc/shells/zsh/distinfo
diff -r1.13 -r1.14 pkgsrc/shells/zsh/patches/patch-ab
diff -r1.23 -r1.24 pkgsrc/shells/zsh/patches/patch-ac
cvs diff -r1.35 -r1.36 pkgsrc/shells/zsh/distinfo (expand / switch to unified diff)

--- pkgsrc/shells/zsh/distinfo 2012/08/16 13:31:20 1.35
+++ pkgsrc/shells/zsh/distinfo 2012/08/16 14:19:34 1.36
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.35 2012/08/16 13:31:20 wiz Exp $ 1$NetBSD: distinfo,v 1.36 2012/08/16 14:19:34 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) = 577a98385f258cbc47ff49d0b4bc6cc9134e864a 8SHA1 (patch-ab) = 1162d9dff51a55abba0a983846181407f4f051df
9SHA1 (patch-ac) = 23c086e61120f9c533e4a3a53e44c5b6b48b1352 9SHA1 (patch-ac) = 52e53fa75cfa1443594a603409bdce53b14f75aa
10SHA1 (patch-af) = cedd6fb7369b0fc9debbaab29aaf40c25c587123 10SHA1 (patch-af) = cedd6fb7369b0fc9debbaab29aaf40c25c587123
11SHA1 (patch-ag) = e18e26bae0996d42fa9f98730a8fb844ce4b7a44 11SHA1 (patch-ag) = e18e26bae0996d42fa9f98730a8fb844ce4b7a44
cvs diff -r1.13 -r1.14 pkgsrc/shells/zsh/patches/Attic/patch-ab (expand / switch to unified diff)

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

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