diff options
| -rw-r--r-- | lang/elk/distinfo | 7 | ||||
| -rw-r--r-- | lang/elk/patches/patch-au | 33 | ||||
| -rw-r--r-- | lang/elk/patches/patch-av | 46 | ||||
| -rw-r--r-- | lang/elk/patches/patch-aw | 33 | ||||
| -rw-r--r-- | lang/elk/patches/patch-ax | 33 |
5 files changed, 144 insertions, 8 deletions
diff --git a/lang/elk/distinfo b/lang/elk/distinfo index 2170e8ebf4e..a5612fae1a3 100644 --- a/lang/elk/distinfo +++ b/lang/elk/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2002/09/23 08:45:42 jlam Exp $ +$NetBSD: distinfo,v 1.4 2004/03/28 15:51:25 uebayasi Exp $ SHA1 (elk-3.0.tar.gz) = d62ae8a88e3206a578195611ace50168e6078661 Size (elk-3.0.tar.gz) = 762484 bytes @@ -22,4 +22,7 @@ SHA1 (patch-aq) = 0d10cc53d0284ce56bb6929579962c7b29afcbe6 SHA1 (patch-ar) = a145d0b1aba3d201bda60b9c82eff8c642c5919f SHA1 (patch-as) = 69b51d90a4e34cd7b1c3a2a290343420ffee51eb SHA1 (patch-at) = 133495a41196a4017c232cf7d1de2c8283f36968 -SHA1 (patch-au) = 031585595a93d111f517befc35a4190ff45076c3 +SHA1 (patch-au) = 6bba0055e67418cdb3a0da1c9754cad8de4bb03d +SHA1 (patch-av) = f764b4ca96f8c837ad1a392137e96b90d8102cd1 +SHA1 (patch-aw) = 3fa21da8be16407ece0cfae3f6510b7ee8052e6c +SHA1 (patch-ax) = 3e7e0c0a4cff6b33acd818579f743bf8f6665dec diff --git a/lang/elk/patches/patch-au b/lang/elk/patches/patch-au index 8eae08b0c1a..fdf3643f376 100644 --- a/lang/elk/patches/patch-au +++ b/lang/elk/patches/patch-au @@ -1,19 +1,40 @@ -$NetBSD: patch-au,v 1.1 2002/01/09 23:04:59 seb Exp $ +$NetBSD: patch-au,v 1.2 2004/03/28 15:51:25 uebayasi Exp $ ---- src/print.c.orig Thu Apr 4 15:25:04 1996 +--- src/print.c.orig Thu Apr 4 22:25:04 1996 +++ src/print.c -@@ -6,6 +6,7 @@ +@@ -5,7 +5,8 @@ + #include <errno.h> #include <ctype.h> - #include <varargs.h> +-#include <varargs.h> ++#include <stdarg.h> +#include <sys/param.h> #ifdef FLUSH_TIOCFLUSH # include <sys/ioctl.h> -@@ -556,7 +557,7 @@ +@@ -95,15 +96,11 @@ vsprintf (s, fmt, ap) register char *s, + #endif + + /*VARARGS0*/ +-Printf (va_alist) va_dcl { ++Printf (Object port, char *fmt, ...) { + va_list args; +- Object port; +- char *fmt; + char buf[1024]; + +- va_start (args); +- port = va_arg (args, Object); +- fmt = va_arg (args, char *); ++ va_start (args, fmt); + if (PORT(port)->flags & P_STRING) { + vsprintf (buf, fmt, args); + Print_String (port, buf, strlen (buf)); +@@ -555,8 +552,7 @@ Format (port, fmt, len, argc, argv) Obje + char *p; register c; char buf[256]; - extern sys_nerr; +- extern sys_nerr; -#ifndef __bsdi__ +#if !(defined(BSD) && (BSD >= 199306)) extern char *sys_errlist[]; diff --git a/lang/elk/patches/patch-av b/lang/elk/patches/patch-av new file mode 100644 index 00000000000..c9bb6344efb --- /dev/null +++ b/lang/elk/patches/patch-av @@ -0,0 +1,46 @@ +$NetBSD: patch-av,v 1.1 2004/03/28 15:51:25 uebayasi Exp $ + +--- src/error.c.orig Sat Aug 5 19:33:48 1995 ++++ src/error.c +@@ -1,5 +1,5 @@ + #include <ctype.h> +-#include <varargs.h> ++#include <stdarg.h> + + #include "kernel.h" + +@@ -40,13 +40,11 @@ void Set_App_Name (name) char *name; { + /*VARARGS1*/ + Fatal_Error (foo) char *foo; { foo = foo; } + #else +-Fatal_Error (va_alist) va_dcl { ++Fatal_Error (char *fmt, ...) { + va_list args; +- char *fmt; + + Disable_Interrupts; +- va_start (args); +- fmt = va_arg (args, char *); ++ va_start (args, fmt); + (void)fflush (stdout); + if (appname) + fprintf (stderr, "\n%s: fatal error: ", appname); +@@ -89,15 +87,14 @@ Uncatchable_Error (errmsg) char *errmsg; + /*VARARGS1*/ + Primitive_Error (foo) char *foo; { foo = foo; } + #else +-Primitive_Error (va_alist) va_dcl { ++Primitive_Error (char *fmt, ...) { + va_list args; +- register char *p, *fmt; ++ register char *p; + register i, n; + Object msg, sym, argv[10]; + GC_Node; GCNODE gcv; + +- va_start (args); +- fmt = va_arg (args, char *); ++ va_start (args, fmt); + for (n = 0, p = fmt; *p; p++) + if (*p == '~' && p[1] != '~' && p[1] != '%' + && p[1] != 'E' && p[1] != 'e') diff --git a/lang/elk/patches/patch-aw b/lang/elk/patches/patch-aw new file mode 100644 index 00000000000..359290e3a49 --- /dev/null +++ b/lang/elk/patches/patch-aw @@ -0,0 +1,33 @@ +$NetBSD: patch-aw,v 1.1 2004/03/28 15:51:25 uebayasi Exp $ + +--- src/terminate.c.orig Mon Aug 7 16:30:12 1995 ++++ src/terminate.c +@@ -1,7 +1,7 @@ + /* Termination functions, weak pointers. + */ + +-#include <varargs.h> ++#include <stdarg.h> + + #include "kernel.h" + +@@ -50,17 +50,11 @@ void Deregister_Object (obj) Object obj; + * Null is returned when the object has not been found. + */ + /*VARARGS*/ +-Object Find_Object (va_alist) va_dcl { ++Object Find_Object (int type, GENERIC group, MATCHFUN match, ...) { + WEAK_NODE *p; +- int type; +- GENERIC group; +- MATCHFUN match; + va_list args; + +- va_start (args); +- type = va_arg (args, int); +- group = va_arg (args, GENERIC); +- match = va_arg (args, MATCHFUN); ++ va_start (args, match); + for (p = first; p; p = p->next) { + if (TYPE(p->obj) != type || p->group != group) + continue; diff --git a/lang/elk/patches/patch-ax b/lang/elk/patches/patch-ax new file mode 100644 index 00000000000..9e11879e66a --- /dev/null +++ b/lang/elk/patches/patch-ax @@ -0,0 +1,33 @@ +$NetBSD: patch-ax,v 1.1 2004/03/28 15:51:25 uebayasi Exp $ + +--- include/extern.h.orig Mon Aug 7 16:32:17 1995 ++++ include/extern.h +@@ -82,8 +82,8 @@ extern Object The_Environment, Global_En + + /* Error handling + */ +-extern Primitive_Error P_((ELLIPSIS)); +-extern Fatal_Error P_((ELLIPSIS)); ++extern Primitive_Error P_((char *, ...)); ++extern Fatal_Error P_((char *, ...)); + extern Range_Error P_((Object)); + extern Panic P_((const char*)); + extern Object P_Error P_((int, Object*)); +@@ -313,7 +313,7 @@ extern Object P_Print P_((int, Object*)) + extern Object P_Get_Output_String P_((Object)); + extern Check_Output_Port P_((Object)); + extern Discard_Output P_((Object)); +-extern Printf P_((ELLIPSIS)); ++extern Printf P_((Object, char *, ...)); + extern Print_Object P_((Object, Object, int, int, int)); + extern General_Print_Object P_((Object, Object, int)); + extern Format P_((Object, const char*, int, int, Object*)); +@@ -433,7 +433,7 @@ extern Object Bits_To_Symbols P_((unsign + */ + extern void Register_Object P_((Object, GENERIC, PFO, int)); + extern void Deregister_Object P_((Object)); +-extern Object Find_Object P_((ELLIPSIS)); ++extern Object Find_Object P_((int, GENERIC, MATCHFUN, ...)); + extern void Terminate_Group P_((GENERIC)); + extern void Terminate_Type P_((int)); + |