head 1.4; access; symbols pkgsrc-2021Q1:1.3.0.72 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.70 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.68 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.64 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.44 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.66 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.62 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.60 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.58 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.56 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.54 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.52 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.50 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.48 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.46 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.42 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.40 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.38 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.36 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.34 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.32 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.30 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.28 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.26 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.24 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.22 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.20 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.18 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.16 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.14 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.12 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.10 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.8 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.6 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.4 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.2 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.2.0.80 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.78 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.76 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.74 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.72 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.70 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.68 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.66 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.64 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.62 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.60 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.58 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.56 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.54 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.52 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.50 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.48 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.46 pkgsrc-2008Q1:1.2.0.44 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.42 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.40 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.38 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.36 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.34 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.32 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.30 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.28 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.26 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.24 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.22 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.20 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.18 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.16 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.14 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.12 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.10 pkgsrc-2003Q4-base:1.2 netbsd-1-6-1:1.2.0.6 netbsd-1-6-1-base:1.2 netbsd-1-6:1.2.0.8 netbsd-1-6-RELEASE-base:1.2 pkgviews:1.2.0.4 pkgviews-base:1.2 buildlink2:1.2.0.2 buildlink2-base:1.2 netbsd-1-5-PATCH003:1.2 netbsd-1-5-PATCH001:1.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.4 date 2021.04.13.08.09.23; author nia; state dead; branches; next 1.3; commitid FGQXwEGgxtpDE6PC; 1.3 date 2012.05.04.16.38.44; author joerg; state Exp; branches; next 1.2; 1.2 date 2001.05.01.09.35.41; author agc; state Exp; branches; next 1.1; 1.1 date 2000.12.14.00.57.42; author wiz; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2000.12.14.00.57.42; author wiz; state Exp; branches; next ; desc @@ 1.4 log @remove x11/9term fails to build on everything, never mind not being 64-bit clean, being dead upstream, its DESCR saying it's incomplete, and only being packaged by us @ text @$NetBSD: patch-ab,v 1.3 2012/05/04 16:38:44 joerg Exp $ --- 9term/9term.c.orig 1994-06-03 08:35:39.000000000 +0000 +++ 9term/9term.c @@@@ -10,10 +10,22 @@@@ #include #include +#include + +#if (defined(BSD) && BSD >= 199306) +#include +#else #include +#endif #include #include +#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) } } - setenv("TERM", "9term", 1); + O_setenv("TERM", "9term", 1); /* Cope with BSD-oid systems. - cks */ - setenv("TERMCAP", "9term: :am:bl=^G:do=^J:nl=^J:", 1); + O_setenv("TERMCAP", "9term: :am:bl=^G:do=^J:nl=^J:", 1); signal(SIGINT, SIG_IGN); init_display(&argc, argv, cmd, resource); @@@@ -718,7 +730,7 @@@@ interrupt(Text *t, Rune r) texthighlight(t, t->length, t->length, F&~D); #ifdef REMOTE flushstream(); - killpg(r == quitchar ? SIGQUIT : SIGINT); + O_killpg(r == quitchar ? SIGQUIT : SIGINT); #else sendrunes(&r, 1); #endif @@@@ -803,8 +815,8 @@@@ worderase(Text *t) /* * export a name-value pair to environment */ -int -setenv(char *name, char *value, int overwrite) +void +O_setenv(char *name, char *value, int overwrite) { char *p; @ 1.3 log @Fix missing prototypes. Fix conflicts with X11 headers. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.2 2001/05/01 09:35:41 agc Exp $ @ 1.2 log @+ Now that editors/sam installs header files and libraries, use a conventional DEPENDS mechanism. + Avoid hardcoded "/usr/X11R6" in Makefiles + Split patch-ab into multiple patches. Should fix bulk-build problems, as well as getting rid of one more "eccentric" package. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.1.1.1 2000/12/14 00:57:42 wiz Exp $ d3 3 a5 3 --- 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 @@@@ d19 19 a37 1 @@@@ -153,9 +159,9 @@@@ d49 1 a49 1 @@@@ -718,7 +724,7 @@@@ d58 2 a59 1 @@@@ -804,7 +810,7 @@@@ d62 1 a62 1 int d64 1 @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.7 2000/07/20 11:12:07 agc Exp $ a48 233 --- 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 @@@@ extern int isig; extern void specialchars(int); -extern int setenv(char *, char *, int); +extern int O_setenv(char *, char *, int); extern void init_display(int *, char **, char**, char*); #ifdef NEEDVARARG extern void error(); @@@@ -58,13 +58,24 @@@@ extern void setborder(void); extern void ctlmsg(Event *); +#ifndef MAX #define MAX(x, y) (((x) > (y)) ? (x) : (y)) +#endif +#ifndef MIN #define MIN(x, y) (((x) < (y)) ? (x) : (y)) +#endif #ifndef NULL #define NULL ((void *)0) #endif #ifdef SUNOS +#define POSIXPTYS +#define BSDPTYS +#endif + +#include + +#if (defined(BSD) && BSD >= 199306) #define POSIXPTYS #define BSDPTYS #endif --- 9term/Makefile.orig Mon Mar 14 04:50:54 1994 +++ 9term/Makefile Fri Sep 26 16:44:27 1997 @@@@ -11,27 +11,29 @@@@ # Define RISCOS for Mips RISC/os # Define BSDPTYS for BSD-style pty support # Define POSIXPTYS for POSIX ptys -OS=-DSOLARIS -# where we'll install it -BINDIR=/usr/pgrad/matty/bin/$(cputype) +OS= -D_LIBXG_EXTENSION -DSUNOS + +SAMPATH=${PKGSRCDIR}/editors/sam/${WRKDIR:T} + +BINDIR=. # where we'll install it HEADERFILE=9term.h TARGET=9term -INCLUDES=-I. -I../include -I/usr/openwin/include -CFLAGS=-g $(OS) $(INCLUDES) -fno-builtin -D_LIBXG_EXTENSION -LDFLAGS=-g -R/usr/openwin/lib -L/usr/openwin/lib -R/usr/ucblib -L/usr/ucblib +INCLUDES=-I. -I../libtext -I$(SAMPATH)/include -I/usr/X11R6/include +CFLAGS= -O2 $(OS) $(INCLUDES) +LDFLAGS?= CC=gcc # change this if your X11 libraries are in different places # or if you need extra libraries to load with X11 applications -LIBS=../libtext/libtext.a ../libframe/libframe.a ../libXg/libXg.a -XLIBS=-lXt -lX11 +LIBS=../libtext/libtext.a $(SAMPATH)/libframe/libframe.a $(SAMPATH)/libXg/libXg.a +XLIBS= -L/usr/X11R6/lib -lXt -lX11 OBJECTS=9term.o command.o display.o pty.o $(TARGET): $(OBJECTS) - $(CC) $(LDFLAGS) -o $(TARGET) $(OBJECTS) $(LIBS) $(XLIBS) -lm -lucb + $(CC) $(LDFLAGS) -o $(TARGET) $(OBJECTS) $(LIBS) $(XLIBS) -lm wloc: wloc.o $(CC) $(LDFLAGS) -o wloc wloc.o $(LIBS) $(XLIBS) -lm @@@@ -39,21 +41,17 @@@@ label: wloc ln wloc label -unicode: unicode.o - $(CC) $(LDFLAGS) -o unicode unicode.o $(LIBS) $(XLIBS) -lm - install: $(TARGET) wloc label cp $(TARGET) $(BINDIR) chown root $(BINDIR)/$(TARGET) chmod 04755 $(BINDIR)/$(TARGET) mv wloc $(BINDIR) mv label $(BINDIR) - mv unicode $(BINDIR) clean: rm -f *.o core nuke: clean - rm -f $(TARGET) wloc label unicode + rm -f $(TARGET) wloc label $(OBJECTS): 9term.h --- 9term/command.c.orig Mon Mar 7 01:50:51 1994 +++ 9term/command.c Fri Sep 26 16:46:53 1997 @@@@ -13,7 +13,12 @@@@ #include #include #include +#include +#if (defined(BSD) && BSD >= 199306) +#include +#else #include +#endif #ifdef SOLARIS #include #endif @@@@ -204,7 +209,7 @@@@ */ void -killpg(int sig) +O_killpg(int sig) { if (comm_pid) kill(-comm_pid, sig); --- 9term/display.c.orig Thu Dec 15 14:48:28 1994 +++ 9term/display.c Fri Sep 26 16:44:28 1997 @@@@ -114,7 +114,7 @@@@ delwin(Widget w, XEvent *event, String *params, Cardinal *n) { if (w == _toplevel) - killpg(SIGHUP); + O_killpg(SIGHUP); } /* @@@@ -185,7 +185,7 @@@@ else if (!strcasecmp(s, "plan9")) kbdmode = PLAN9; if (s = get_resource(resource, class, "p9font", "P9font")) - setenv("font", s, 1); + O_setenv("font", s, 1); if (s = get_resource(resource, class, "highwater", "Highwater")) highwater = atoi(s); if (s = get_resource(resource, class, "lowwater", "Lowwater")) @@@@ -230,7 +230,7 @@@@ #endif /* export window id to environment */ sprintf(id, "%d", XtWindow(_toplevel)); - setenv("WINDOWID", id, 1); + O_setenv("WINDOWID", id, 1); /* register mouse and keyboard events */ einit(Ekeyboard | Emouse); --- 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 @@@@ #include #include -#ifdef SUNOS + +#include + +#if (defined(BSD) && BSD >= 199306) +# include + +/* # include */ + /* Isn't POSIX and portability so much fun? */ +# define VRPRNT VREPRINT +#endif + +#if defined(SUNOS) && !(defined(BSD) && BSD >= 199306) # undef _POSIX_SOURCE # include # include @@@@ -41,7 +52,7 @@@@ # define VEOL2 _VEOL2 #endif -#ifdef RISCOS +#ifdef RISCOS # include # include /* to defeat posix version */ # define VLNEXT V_LNEXT @@@@ -49,10 +60,12 @@@@ # define VRPRNT V_RPRNT # define VWERASE V_WERAS #else +#if !(defined(BSD) && BSD >= 199306) # include #endif +#endif -#ifdef OSF1 +#if defined(OSF1) # define V_START VSTART # define V_STOP VSTOP # define V_SUSP VSUSP @@@@ -115,7 +128,7 @@@@ char udef, p9def; }; -#if defined(SUNOS) || defined(IRIX) || defined(SOLARIS) +#if defined(SUNOS) || defined(IRIX) || defined(SOLARIS) || (defined(BSD) && BSD >= 199306) # define V_START VSTART # define V_STOP VSTOP # define V_SUSP VSUSP @@@@ -139,7 +152,7 @@@@ #ifndef _POSIX_SOURCE { "eol2", 4, VEOL2, 0, 0 }, #endif -#if !defined(_OSF_SOURCE) && !defined(_POSIX_SOURCE) +#if !defined(_OSF_SOURCE) && !defined(_POSIX_SOURCE) && !(defined(BSD) && BSD >= 199306) { "swtch", 5, VSWTCH, 0, 0 }, #endif { "start", 5, V_START, ctrl('q'), ctrl('q') }, @@@@ -292,10 +305,16 @@@@ /* Insure some sanity. */ ttmode.c_lflag |= ECHO; ttmode.c_oflag &= ~(ONLCR); +#if !(defined(BSD) && BSD >= 199306) ttmode.c_oflag |= ONLRET; +#endif } else { ttmode.c_iflag = BRKINT | IGNPAR | ICRNL | IXON; +#if (defined(BSD) && BSD >= 199306) + ttmode.c_oflag = OPOST; +#else ttmode.c_oflag = OPOST | ONLRET; +#endif ttmode.c_cflag = B9600 | PARENB | CS8 | CREAD; ttmode.c_lflag = ISIG | ICANON | ECHO | ECHOK; #ifdef __ultrix @ 1.1.1.1 log @Move 9term from plan9 to x11. @ text @@