From fcd069a32d44eaa7234af8f8b5c8f733dc4499e7 Mon Sep 17 00:00:00 2001
From: Jimmy Olgeni <olgeni@FreeBSD.org>
Date: Fri, 14 Feb 2003 22:38:50 +0000
Subject: Update to version 0.9.2.
PR: 48259
Submitted by: Philip Paeps <philip@paeps.cx>
---
x11/eterm/files/patch-Eterm:theme.cfg.in | 20 --------
x11/eterm/files/patch-auto:theme.cfg.in | 11 -----
x11/eterm/files/patch-default_font_index | 33 -------------
x11/eterm/files/patch-doc:Makefile.in | 43 ++++++++++-------
x11/eterm/files/patch-src:Makefile.in | 12 ++---
x11/eterm/files/patch-src:command.c | 21 ---------
x11/eterm/files/patch-src:startup.c | 11 -----
x11/eterm/files/patch-vim_escape_handling | 77 -------------------------------
8 files changed, 33 insertions(+), 195 deletions(-)
delete mode 100644 x11/eterm/files/patch-Eterm:theme.cfg.in
delete mode 100644 x11/eterm/files/patch-auto:theme.cfg.in
delete mode 100644 x11/eterm/files/patch-default_font_index
delete mode 100644 x11/eterm/files/patch-src:command.c
delete mode 100644 x11/eterm/files/patch-src:startup.c
delete mode 100644 x11/eterm/files/patch-vim_escape_handling
(limited to 'x11/eterm/files')
diff --git a/x11/eterm/files/patch-Eterm:theme.cfg.in b/x11/eterm/files/patch-Eterm:theme.cfg.in
deleted file mode 100644
index 3a8d97ac0b46..000000000000
--- a/x11/eterm/files/patch-Eterm:theme.cfg.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- themes/Eterm/theme.cfg.in.orig Wed Jul 4 00:53:52 2001
-+++ themes/Eterm/theme.cfg.in Sat Sep 22 16:15:24 2001
-@@ -16,7 +16,7 @@
- begin color
-
- # Foreground, background, cursor, scrollbar, pointer colors
-- foreground #aaaaaa
-+ foreground #ffffff
- background black
- cursor #ffff00
- cursor_text #880000
-@@ -401,7 +401,7 @@
- # line_space 2
-
- # Value to use for $TERM
-- term_name Eterm
-+ term_name xterm-color
-
- # Program to exec (intended for use with themes)
- # exec foo
diff --git a/x11/eterm/files/patch-auto:theme.cfg.in b/x11/eterm/files/patch-auto:theme.cfg.in
deleted file mode 100644
index ffff2c0f143e..000000000000
--- a/x11/eterm/files/patch-auto:theme.cfg.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- themes/auto/theme.cfg.in.orig Sat Sep 22 16:17:07 2001
-+++ themes/auto/theme.cfg.in Sat Sep 22 16:16:09 2001
-@@ -1,7 +1,7 @@
- <Eterm-0.9.1>
-
- begin color
-- foreground #aaaaaa
-+ foreground #ffffff
- background black
- cursor #ffff00
- cursor_text #880000
diff --git a/x11/eterm/files/patch-default_font_index b/x11/eterm/files/patch-default_font_index
deleted file mode 100644
index da07f08e6e36..000000000000
--- a/x11/eterm/files/patch-default_font_index
+++ /dev/null
@@ -1,33 +0,0 @@
---- src/font.c.orig Sat Jul 21 22:25:23 2001
-+++ src/font.c Fri Sep 7 01:11:47 2001
-@@ -21,7 +21,7 @@
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
--static const char cvs_ident[] = "$Id: font.c,v 1.28 2001/07/22 03:25:23 mej Exp $";
-+static const char cvs_ident[] = "$Id: font.c,v 1.29 2001/09/06 22:26:20 mej Exp $";
-
- #include "config.h"
- #include "feature.h"
-@@ -41,7 +41,8 @@
- #include "windows.h"
-
- char **etfonts = NULL;
--unsigned char font_idx = DEF_FONT_IDX, def_font_idx = DEF_FONT_IDX, font_cnt = 0;
-+unsigned char font_idx = DEF_FONT_IDX, font_cnt = 0;
-+int def_font_idx = DEF_FONT_IDX;
- char *rs_font[NFONTS];
- #ifdef MULTI_CHARSET
- char *rs_mfont[NFONTS];
---- src/font.h.orig Thu Jun 14 00:31:08 2001
-+++ src/font.h Fri Sep 7 01:11:47 2001
-@@ -73,7 +73,8 @@
- } fontshadow_t;
-
- /************ Variables ************/
--extern unsigned char font_idx, def_font_idx, font_cnt, font_chg;
-+extern unsigned char font_idx, font_cnt, font_chg;
-+extern int def_font_idx;
- extern const char *def_fontName[];
- extern char *rs_font[NFONTS];
- extern char **etfonts, **etmfonts;
diff --git a/x11/eterm/files/patch-doc:Makefile.in b/x11/eterm/files/patch-doc:Makefile.in
index 6ebfc8c1596d..a2d79de08b83 100644
--- a/x11/eterm/files/patch-doc:Makefile.in
+++ b/x11/eterm/files/patch-doc:Makefile.in
@@ -1,25 +1,36 @@
---- doc/Makefile.in.orig Wed Aug 29 03:23:41 2001
-+++ doc/Makefile.in Fri Sep 7 01:40:20 2001
-@@ -267,15 +267,15 @@
- $(SED) -e 's%@''VERSION''@%$(VERSION)%g' -e 's%@''DATE''@%$(DATE)%g' -e 's%@THEMEDIR@%$(pkgdatadir)/themes%g' $(top_srcdir)/doc/$@.in > $@
+--- doc/Makefile.in.orig Thu Feb 13 20:03:45 2003
++++ doc/Makefile.in Thu Feb 13 20:04:52 2003
+@@ -215,7 +215,6 @@
+
+ install-data-am: install-man
+ @$(NORMAL_INSTALL)
+- $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+ install-data: install-data-am
+
+ install-am: all-am
+@@ -267,24 +266,10 @@
+ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
- Eterm.1.html: Eterm.1
-- (nroff -man $< | man2html -title Eterm > $@) || :
-+ (nroff -man Eterm.1 | man2html -title Eterm > $@) || :
- install-data-hook:
+-all: Makefile Eterm.1.html
++all: Makefile
+
+ Eterm.1: $(top_srcdir)/doc/Eterm.1.in
+ $(SED) -e 's%@''VERSION''@%$(VERSION)%g' -e 's%@''DATE''@%$(DATE)%g' -e 's%@THEMEDIR@%$(pkgdatadir)/themes%g' $(top_srcdir)/doc/$@.in > $@
+-
+-Eterm.1.html: Eterm.1
+- (nroff -man $< | man2html -title Eterm > $@) || :
+-
+-install-data-hook:
- $(TIC) Eterm.ti || (mkinstalldirs $(HOME)/.terminfo && $(TIC) -o$(HOME)/.terminfo Eterm.ti) || :
-- -infocmp -C -sc Eterm | sed -e '/Reconstructed/d' -e '/\.\.sa=/d' > Eterm.tcap.new && mv Eterm.tcap.new Eterm.tcap || rm -f Eterm.tcap.new
+- -(infocmp -C -sc Eterm | sed -e '/Reconstructed/d' -e '/\.\.sa=/d' \
+- -e 's!^\([[:space:]]:co#.*\):\\$$!\1:pa#64:Co#8:AF=\\E[3%dm:AB=\\E[4%dm:op=\\E[39m\\E[49m:\\!' \
+- -e 's!:$$!:\\!' ; echo ' :ac=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:' \
+- ) > Eterm.tcap.new && mv Eterm.tcap.new Eterm.tcap || rm -f Eterm.tcap.new
- -if test -f /usr/share/misc/termcap && test -f Eterm.tcap ; then \
-- grep 'Eterm-color' /usr/share/misc/termcap || cat Eterm.tcap >> /usr/share/misc/termcap ; \
+- grep -i 'Eterm Terminal Emulator' /usr/share/misc/termcap || cat Eterm.tcap >> /usr/share/misc/termcap ; \
- cap_mkdb termcap ; \
- fi || :
-+# $(TIC) Eterm.ti || (mkinstalldirs $(HOME)/.terminfo && $(TIC) -o$(HOME)/.terminfo Eterm.ti) || :
-+# -infocmp -C -sc Eterm | sed -e '/Reconstructed/d' -e '/\.\.sa=/d' > Eterm.tcap.new && mv Eterm.tcap.new Eterm.tcap || rm -f Eterm.tcap.new
-+# -if test -f /usr/share/misc/termcap && test -f Eterm.tcap ; then \
-+# grep 'Eterm-color' /usr/share/misc/termcap || cat Eterm.tcap >> /usr/share/misc/termcap ; \
-+# cap_mkdb termcap ; \
-+# fi || :
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/x11/eterm/files/patch-src:Makefile.in b/x11/eterm/files/patch-src:Makefile.in
index e8d99db3efe7..ecb4a23b248a 100644
--- a/x11/eterm/files/patch-src:Makefile.in
+++ b/x11/eterm/files/patch-src:Makefile.in
@@ -1,11 +1,11 @@
---- src/Makefile.in.orig Wed Aug 29 03:23:38 2001
-+++ src/Makefile.in Fri Sep 7 00:29:05 2001
-@@ -123,7 +123,7 @@
+--- src/Makefile.in.orig Fri Feb 14 00:23:27 2003
++++ src/Makefile.in Fri Feb 14 00:24:05 2003
+@@ -138,7 +138,7 @@
EXTRA_libEterm_la_SOURCES = $(MMX_SRCS)
-libEterm_la_LDFLAGS = -release $(VERSION)
+libEterm_la_LDFLAGS = -version-info 9:9:9
- @HAVE_MMX_TRUE@libEterm_la_DEPENDENCIES = feature.h $(MMX_OBJS)
- @HAVE_MMX_FALSE@libEterm_la_DEPENDENCIES = feature.h
- @HAVE_MMX_TRUE@libEterm_la_LIBADD = $(MMX_OBJS)
+ @HAVE_MMX_TRUE@libEterm_la_DEPENDENCIES = @HAVE_MMX_TRUE@feature.h $(MMX_OBJS)
+ @HAVE_MMX_FALSE@libEterm_la_DEPENDENCIES = @HAVE_MMX_FALSE@feature.h
+ @HAVE_MMX_TRUE@libEterm_la_LIBADD = @HAVE_MMX_TRUE@$(MMX_OBJS)
diff --git a/x11/eterm/files/patch-src:command.c b/x11/eterm/files/patch-src:command.c
deleted file mode 100644
index c75bc1d31398..000000000000
--- a/x11/eterm/files/patch-src:command.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/command.c.orig Mon Feb 7 22:20:41 2000
-+++ src/command.c Mon Feb 7 22:22:16 2000
-@@ -40,6 +40,8 @@
- #include "config.h"
- #include "feature.h"
-
-+#undef HAVE_SAVED_UIDS
-+
- /* System Headers */
- #include <stdio.h>
- #include <stdlib.h>
-@@ -1560,6 +1562,9 @@
- # endif
- # if VTIME != VEOL
- tio->c_cc[VTIME] = 0;
-+# endif
-+# ifdef VSTATUS
-+ tio->c_cc[VSTATUS] = CSTATUS;
- # endif
-
- /* input modes */
diff --git a/x11/eterm/files/patch-src:startup.c b/x11/eterm/files/patch-src:startup.c
deleted file mode 100644
index 1096a87aa40c..000000000000
--- a/x11/eterm/files/patch-src:startup.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/startup.c.orig Mon Feb 7 22:24:54 2000
-+++ src/startup.c Mon Feb 7 22:24:57 2000
-@@ -29,6 +29,8 @@
- #include "config.h"
- #include "feature.h"
-
-+#define NEED_LINUX_HACK 1
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/x11/eterm/files/patch-vim_escape_handling b/x11/eterm/files/patch-vim_escape_handling
deleted file mode 100644
index 6a5ff9d270c4..000000000000
--- a/x11/eterm/files/patch-vim_escape_handling
+++ /dev/null
@@ -1,77 +0,0 @@
---- src/term.c.orig Thu Aug 23 19:22:55 2001
-+++ src/term.c Fri Sep 7 01:13:07 2001
-@@ -21,7 +21,7 @@
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
--static const char cvs_ident[] = "$Id: term.c,v 1.68 2001/08/23 21:04:36 mej Exp $";
-+static const char cvs_ident[] = "$Id: term.c,v 1.69 2001/09/06 22:38:21 mej Exp $";
-
- #include "config.h"
- #include "feature.h"
-@@ -945,15 +945,12 @@
- process_csi_seq(void)
- {
-
-- unsigned char ch, priv;
-- unsigned int nargs;
-- int arg[ESC_ARGS];
--
-- nargs = 0;
-- arg[0] = 0;
-- arg[1] = 0;
-+ unsigned char ch;
-+ unsigned char priv = 0;
-+ unsigned int nargs = 0;
-+ int arg[ESC_ARGS] = {0, 0};
-+ int ignore = 0;
-
-- priv = 0;
- ch = cmd_getc(); /* Get the next character */
- if (ch >= '<' && ch <= '?') {
- priv = ch; /* DEC private mode sequence. Get next character. */
-@@ -977,6 +974,8 @@
- scr_add_lines(&ch, 0, 1); /* Insert verbatim non-printable character (NPC) */
- return;
- }
-+ if (ch == '-') /* HACK: Ignore this sequence, but finish reading */
-+ ignore = 1; /* xterm ignores more than this, but we need this for vim */
- if (ch < '@')
- ch = cmd_getc(); /* Separator. Go to next digit or operation. */
- } while (ch >= ' ' && ch < '@');
-@@ -986,6 +985,9 @@
- } else if (ch < ' ')
- return; /* An NPC. Punt. */
-
-+ if(ignore)
-+ return;
-+
- switch (ch) {
- case '@':
- scr_insdel_chars((arg[0] ? arg[0] : 1), INSERT);
-@@ -1067,6 +1069,8 @@
- break;
-
- case 'c':
-+ /* TODO: A different response should be sent depending on the value of
-+ priv and of arg[0], but what should those reponses be? */
- #ifndef NO_VT100_ANS
- tt_printf(VT100_ANS);
- #endif
-@@ -1403,7 +1407,7 @@
- process_terminal_mode(int mode, int priv, unsigned int nargs, int arg[])
- {
- unsigned int i;
-- int state;
-+ int state; /* This gets set by the PrivCases macro */
-
- if (nargs == 0)
- return;
-@@ -1526,6 +1530,7 @@
- else
- Options |= Opt_home_on_input;
- break;
-+
- case 1047: /* Alternate screen & clear */
- PrivCases(PrivMode_Screen);
- scr_change_screen(state);
--
cgit v1.2.3