From 3328d323fa31fa4c6d22fc28f7c9f785c5ef3635 Mon Sep 17 00:00:00 2001 From: joerg Date: Fri, 4 May 2012 16:38:44 +0000 Subject: Fix missing prototypes. Fix conflicts with X11 headers. --- x11/9term/distinfo | 12 +++++++----- x11/9term/patches/patch-ab | 36 ++++++++++++++++++++++++++++-------- x11/9term/patches/patch-ad | 44 +------------------------------------------- x11/9term/patches/patch-af | 29 +++++++++++++++++------------ x11/9term/patches/patch-ai | 21 ++++++++++++--------- 5 files changed, 65 insertions(+), 77 deletions(-) (limited to 'x11') diff --git a/x11/9term/distinfo b/x11/9term/distinfo index 19469512ecf..5db3f0aab80 100644 --- a/x11/9term/distinfo +++ b/x11/9term/distinfo @@ -1,14 +1,16 @@ -$NetBSD: distinfo,v 1.7 2008/06/12 02:14:56 joerg Exp $ +$NetBSD: distinfo,v 1.8 2012/05/04 16:38:44 joerg Exp $ SHA1 (9term.1.6.3.tar.gz) = deb6248c9e441934ad8af522871034e24cb2bf5b RMD160 (9term.1.6.3.tar.gz) = cb5ba3c70c9d29b5c0cde2692b0bf56be05614fa Size (9term.1.6.3.tar.gz) = 135169 bytes SHA1 (patch-aa) = 8e06b589d762d0fd349b66a0e20a51f1ac728fd5 -SHA1 (patch-ab) = c79dc4ef6bbc75112f8fe1e9ef3dafeb380a2d09 +SHA1 (patch-ab) = 2a4bc97ecc05699df3399d7df437d085e247ba76 SHA1 (patch-ac) = c40285e9bdea8a4abf39689b9856099ee239ee23 -SHA1 (patch-ad) = c9993356b66653c231be106e6f96d6e55a688f89 +SHA1 (patch-ad) = d78034d7edd31e2643e4b8e5b746e6d9745e35ae SHA1 (patch-ae) = 434af20bb9096e7a3580f00b415a94355d69fc88 -SHA1 (patch-af) = d8de61ee74a08a58842fda21c4db3a471083faf3 +SHA1 (patch-af) = 515ce90558cc1d2ffcda3ad740db8a3214810859 SHA1 (patch-ag) = 2dcdadff6afa4307a54d4517599d7834d085eaf3 SHA1 (patch-ah) = fc5340b1d11a9e70266180302e312d15acd05347 -SHA1 (patch-ai) = 4875cdb9a89a559ae7e8274cb8240fbd0805a16e +SHA1 (patch-ai) = 8007f0d20ff93f379488abaa24e79406d84aa538 +SHA1 (patch-libtext_text.c) = 2f4d7fdf15453c247b3d4d0dc19cf9762ac4d2d2 +SHA1 (patch-libtext_text.h) = 892bce88f2f0be633fe286cd1a0bc766b8360832 diff --git a/x11/9term/patches/patch-ab b/x11/9term/patches/patch-ab index 3ea38a85c22..fa1f2c5edf1 100644 --- a/x11/9term/patches/patch-ab +++ b/x11/9term/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.2 2001/05/01 09:35:41 agc Exp $ +$NetBSD: patch-ab,v 1.3 2012/05/04 16:38:44 joerg Exp $ ---- 9term/9term.c.orig Fri Jun 3 09:35:39 1994 -+++ 9term/9term.c Fri Sep 26 16:45:48 1997 -@@ -10,7 +10,13 @@ +--- 9term/9term.c.orig 1994-06-03 08:35:39.000000000 +0000 ++++ 9term/9term.c +@@ -10,10 +10,22 @@ #include #include @@ -16,7 +16,25 @@ $NetBSD: patch-ab,v 1.2 2001/05/01 09:35:41 agc Exp $ #include #include -@@ -153,9 +159,9 @@ ++#define Cursor X11Cursor ++#define Font X11Font ++#include ++#undef Cursor ++#undef Font ++ + #include "9term.h" + + int flushing; +@@ -113,7 +125,7 @@ usage(char *s) + * Parse args, initialize display, spin off command interpreter + * and start handling keyboard, mouse, and command output events. + */ +-void ++int + main(int argc,char **argv) + { + int i, j; +@@ -153,9 +165,9 @@ main(int argc,char **argv) } } @@ -28,7 +46,7 @@ $NetBSD: patch-ab,v 1.2 2001/05/01 09:35:41 agc Exp $ signal(SIGINT, SIG_IGN); init_display(&argc, argv, cmd, resource); -@@ -718,7 +724,7 @@ +@@ -718,7 +730,7 @@ interrupt(Text *t, Rune r) texthighlight(t, t->length, t->length, F&~D); #ifdef REMOTE flushstream(); @@ -37,11 +55,13 @@ $NetBSD: patch-ab,v 1.2 2001/05/01 09:35:41 agc Exp $ #else sendrunes(&r, 1); #endif -@@ -804,7 +810,7 @@ +@@ -803,8 +815,8 @@ worderase(Text *t) + /* * export a name-value pair to environment */ - int +-int -setenv(char *name, char *value, int overwrite) ++void +O_setenv(char *name, char *value, int overwrite) { char *p; diff --git a/x11/9term/patches/patch-ad b/x11/9term/patches/patch-ad index 7a9a872cff8..e761871c3d7 100644 --- a/x11/9term/patches/patch-ad +++ b/x11/9term/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.1.1.1 2000/12/14 00:57:42 wiz Exp $ +$NetBSD: patch-ad,v 1.2 2012/05/04 16:38:44 joerg Exp $ --- libtext/scroll.c.orig Fri Nov 19 08:14:25 1993 +++ libtext/scroll.c Wed Oct 29 10:33:41 1997 @@ -12,45 +12,3 @@ $NetBSD: patch-ad,v 1.1.1.1 2000/12/14 00:57:42 wiz Exp $ static Rectangle -Return-Path: -Received: by juno.ccc.amdahl.com (/\==/\ Smail #25.1) - id ; Tue, 28 Oct 97 14:52 PST -Received: from orpheus.amdahl.com by minerva.amdahl.com with smtp - (Smail3.1.29.1 #5) id m0xQKT5-0000oPC; Tue, 28 Oct 97 14:50 PST -Received: from hawkwind.utcs.utoronto.ca by orpheus.amdahl.com with smtp - (Smail3.1.29.1 #3) id m0xQKU5-0001EkC; Tue, 28 Oct 97 14:51 PST -Received: from finch.cse.psu.edu ([130.203.12.29]) by hawkwind.utcs.utoronto.ca with SMTP id <24684>; Tue, 28 Oct 1997 17:43:51 -0500 -Received: (qmail 21504 invoked by uid 991); 28 Oct 1997 06:32:35 -0000 -Message-ID: <19971028063235.21502.qmail@finch.cse.psu.edu> -To: sam-fans@hawkwind.utcs.toronto.edu -Subject: 9term bug -Date: Tue, 28 Oct 1997 01:32:35 -0500 -From: Scott Schwartz - -Hi all, - -I don't recall if this has been reported or not, but libtext from fails -to initialize everything in a newly allocated Text. (bcheck is your -friend.) - ---- libtext/text.c.orig Thu Dec 15 15:01:45 1994 -+++ libtext/text.c Wed Oct 29 10:32:55 1997 -@@ -4,7 +4,10 @@ - #include - #include - -+#ifndef MAX - #define MAX(x, y) ((x > y) ? x : y) -+#endif -+ - #define BUTTON(n) (1<<(n-1)) - - static Menu edit; -@@ -47,6 +50,7 @@ - berror("textalloc: calloc"); - t->length = 0; - t->base = 0; -+ t->end = 0; - t->p0 = 0; - t->p1 = 0; - t->pout = 0; diff --git a/x11/9term/patches/patch-af b/x11/9term/patches/patch-af index af015a20fce..99148f304be 100644 --- a/x11/9term/patches/patch-af +++ b/x11/9term/patches/patch-af @@ -1,17 +1,20 @@ -$NetBSD: patch-af,v 1.1 2001/05/01 09:35:42 agc Exp $ +$NetBSD: patch-af,v 1.2 2012/05/04 16:38:44 joerg Exp $ ---- 9term/9term.h.orig Thu Dec 15 14:49:15 1994 -+++ 9term/9term.h Wed Oct 1 09:50:47 1997 -@@ -31,7 +31,7 @@ +--- 9term/9term.h.orig 1994-12-15 14:49:15.000000000 +0000 ++++ 9term/9term.h +@@ -30,8 +30,10 @@ extern int canonical; + extern int echo; extern int isig; ++extern void saveunixspecials(int); extern void specialchars(int); -extern int setenv(char *, char *, int); -+extern int O_setenv(char *, char *, int); ++extern void O_killpg(int); ++extern void O_setenv(char *, char *, int); extern void init_display(int *, char **, char**, char*); #ifdef NEEDVARARG extern void error(); -@@ -58,13 +58,24 @@ +@@ -58,8 +60,12 @@ extern void flushstream(void); extern void setborder(void); extern void ctlmsg(Event *); @@ -24,15 +27,17 @@ $NetBSD: patch-af,v 1.1 2001/05/01 09:35:42 agc Exp $ #ifndef NULL #define NULL ((void *)0) #endif +@@ -69,6 +75,13 @@ extern void ctlmsg(Event *); + #define BSDPTYS + #endif - #ifdef SUNOS ++#include ++ ++#if (defined(BSD) && BSD >= 199306) +#define POSIXPTYS +#define BSDPTYS +#endif + -+#include -+ -+#if (defined(BSD) && BSD >= 199306) + #ifdef __ultrix + /* Maybe only Ultrix 4.3. Joy. */ #define POSIXPTYS - #define BSDPTYS - #endif diff --git a/x11/9term/patches/patch-ai b/x11/9term/patches/patch-ai index ae3b23d61df..8df7cfbc02c 100644 --- a/x11/9term/patches/patch-ai +++ b/x11/9term/patches/patch-ai @@ -1,12 +1,15 @@ -$NetBSD: patch-ai,v 1.1 2001/05/01 09:35:42 agc Exp $ +$NetBSD: patch-ai,v 1.2 2012/05/04 16:38:44 joerg Exp $ ---- 9term/pty.c.orig Fri Jul 22 16:47:29 1994 -+++ 9term/pty.c Fri Sep 26 16:49:08 1997 -@@ -12,7 +12,18 @@ +--- 9term/pty.c.orig 1994-07-22 15:47:29.000000000 +0000 ++++ 9term/pty.c +@@ -11,8 +11,21 @@ + #include #include ++#include #include -#ifdef SUNOS ++#include + +#include + @@ -22,7 +25,7 @@ $NetBSD: patch-ai,v 1.1 2001/05/01 09:35:42 agc Exp $ # undef _POSIX_SOURCE # include # include -@@ -41,7 +52,7 @@ +@@ -41,7 +54,7 @@ # define VEOL2 _VEOL2 #endif @@ -31,7 +34,7 @@ $NetBSD: patch-ai,v 1.1 2001/05/01 09:35:42 agc Exp $ # include # include /* to defeat posix version */ # define VLNEXT V_LNEXT -@@ -49,10 +60,12 @@ +@@ -49,10 +62,12 @@ # define VRPRNT V_RPRNT # define VWERASE V_WERAS #else @@ -45,7 +48,7 @@ $NetBSD: patch-ai,v 1.1 2001/05/01 09:35:42 agc Exp $ # define V_START VSTART # define V_STOP VSTOP # define V_SUSP VSUSP -@@ -115,7 +128,7 @@ +@@ -115,7 +130,7 @@ struct modenames { char udef, p9def; }; @@ -54,7 +57,7 @@ $NetBSD: patch-ai,v 1.1 2001/05/01 09:35:42 agc Exp $ # define V_START VSTART # define V_STOP VSTOP # define V_SUSP VSUSP -@@ -139,7 +152,7 @@ +@@ -139,7 +154,7 @@ modenames ttymodelist[] = { #ifndef _POSIX_SOURCE { "eol2", 4, VEOL2, 0, 0 }, #endif @@ -63,7 +66,7 @@ $NetBSD: patch-ai,v 1.1 2001/05/01 09:35:42 agc Exp $ { "swtch", 5, VSWTCH, 0, 0 }, #endif { "start", 5, V_START, ctrl('q'), ctrl('q') }, -@@ -292,10 +305,16 @@ +@@ -292,10 +307,16 @@ gttymodes(int fd) /* Insure some sanity. */ ttmode.c_lflag |= ECHO; ttmode.c_oflag &= ~(ONLCR); -- cgit v1.2.3