Thu Aug 16 13:31:21 2012 UTC ()
Fix build on NetBSD-5.99.40.
Patch from Peter Stephenson <Peter.Stephenson@csr.com> on zsh-workers.


(wiz)
diff -r1.34 -r1.35 pkgsrc/shells/zsh/distinfo
diff -r0 -r1.1 pkgsrc/shells/zsh/patches/patch-Src_prototypes.h
diff -r0 -r1.1 pkgsrc/shells/zsh/patches/patch-Src_zsh__system.h
cvs diff -r1.34 -r1.35 pkgsrc/shells/zsh/distinfo (expand / switch to unified diff)

--- pkgsrc/shells/zsh/distinfo 2012/07/22 10:03:40 1.34
+++ pkgsrc/shells/zsh/distinfo 2012/08/16 13:31:20 1.35
@@ -1,9 +1,11 @@ @@ -1,9 +1,11 @@
1$NetBSD: distinfo,v 1.34 2012/07/22 10:03:40 ryoon Exp $ 1$NetBSD: distinfo,v 1.35 2012/08/16 13:31:20 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
 7SHA1 (patch-Src_zsh__system.h) = 1d5827a571b897ae139cb7b0c31d3e5a429aa190
6SHA1 (patch-ab) = 577a98385f258cbc47ff49d0b4bc6cc9134e864a 8SHA1 (patch-ab) = 577a98385f258cbc47ff49d0b4bc6cc9134e864a
7SHA1 (patch-ac) = 23c086e61120f9c533e4a3a53e44c5b6b48b1352 9SHA1 (patch-ac) = 23c086e61120f9c533e4a3a53e44c5b6b48b1352
8SHA1 (patch-af) = cedd6fb7369b0fc9debbaab29aaf40c25c587123 10SHA1 (patch-af) = cedd6fb7369b0fc9debbaab29aaf40c25c587123
9SHA1 (patch-ag) = e18e26bae0996d42fa9f98730a8fb844ce4b7a44 11SHA1 (patch-ag) = e18e26bae0996d42fa9f98730a8fb844ce4b7a44
File Added: pkgsrc/shells/zsh/patches/Attic/patch-Src_prototypes.h
$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)
File Added: pkgsrc/shells/zsh/patches/Attic/patch-Src_zsh__system.h
$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