17 files changed, 78 insertions, 228 deletions

diff --git a/japanese/eterm/files/extra-patch-configure.in b/japanese/eterm/files/extra-patch-configure.in
new file mode 100644
index 000000000000..58fa535c519e
--- /dev/null
+++ b/japanese/eterm/files/extra-patch-configure.in
@@ -0,0 +1,52 @@
+--- configure.in.orig	Fri Aug 24 09:22:54 2001
++++ configure.in	Sat Sep 15 17:13:21 2001
+@@ -319,11 +319,6 @@
+   AC_CHECK_LIB(Xmu, XmuInternAtom)
+ fi
+ 
+-# check X11R6 for XIM
+-if test "$XIM" = "TRUE"; then
+-  AC_CHECK_LIB(X11, XRegisterIMInstantiateCallback, AC_DEFINE(USE_X11R6_XIM))
+-fi
+-
+ dnl#
+ dnl# FEATURES
+ dnl#
+@@ -607,16 +602,16 @@
+     AC_DEFINE(MULTI_CHARSET)
+     DEF_FONT_IDX=0
+     MULTICHAR_ENCODING="eucj"
+-    FONT0="fixed"
+-    FONT1="8x16"
+-    FONT2="9x18"
+-    FONT3="12x24"
+-    FONT4="13x26"
++    FONT0="7x14"
++    FONT1="a10"
++    FONT2="r12"
++    FONT3="8x16"
++    FONT4="12x14"
+     MFONT0="k14"
+-    MFONT1="jiskan16"
+-    MFONT2="jiskan18"
+-    MFONT3="jiskan24"
+-    MFONT4="jiskan26"
++    MFONT1="k10"
++    MFONT2="k12"
++    MFONT3="kanji16"
++    MFONT4="kanji24"
+   elif test "$MULTI_CHARSET_TYPE" = "euc-kr" -o "$MULTI_CHARSET_TYPE" = "euckr"; then 
+     AC_MSG_RESULT(euckr)
+     AC_DEFINE(MULTI_CHARSET)
+@@ -724,6 +719,11 @@
+ 	        AC_DEFINE(USE_XIM)
+ 	        XIM="TRUE"
+ )
++
++# check X11R6 for XIM
++if test "$XIM" = "TRUE"; then
++  AC_CHECK_LIB(X11, XRegisterIMInstantiateCallback, AC_DEFINE(USE_X11R6_XIM))
++fi
+ 
+ AC_MSG_CHECKING(for Greek keyboard support)
+ AC_ARG_ENABLE(greek,
diff --git a/japanese/eterm/files/extra-patch-src:command.c b/japanese/eterm/files/extra-patch-src:command.c
new file mode 100644
index 000000000000..3168bb182bd2
--- /dev/null
+++ b/japanese/eterm/files/extra-patch-src:command.c
@@ -0,0 +1,13 @@
+--- src/command.c.orig	Sat Sep 15 16:57:02 2001
++++ src/command.c	Sat Sep 15 16:57:24 2001
+@@ -1737,10 +1737,6 @@
+     setlocale(LC_ALL, "");
+     fontset = XCreateFontSet(Xdisplay, fontname, &ml, &mc, &ds);
+     FREE(fontname);
+-    if (mc) {
+-      XFreeStringList(ml);
+-      fontset = 0;
+-    }
+   }
+   return fontset;
+ }
diff --git a/japanese/eterm/files/extra-patch-src:feature.h b/japanese/eterm/files/extra-patch-src:feature.h
new file mode 100644
index 000000000000..2db7651df7de
--- /dev/null
+++ b/japanese/eterm/files/extra-patch-src:feature.h
@@ -0,0 +1,13 @@
+--- src/feature.h.orig	Sat Sep 15 17:19:46 2001
++++ src/feature.h	Sat Sep 15 17:20:24 2001
+@@ -254,8 +254,8 @@
+ #define APL_NAME	"Eterm"
+ 
+ /* COLORTERM, TERM environment variables */
+-#define TERMENV       "Eterm"
+-#define COLORTERMENV  "Eterm"
++#define TERMENV       "kterm"
++#define COLORTERMENV  "kterm"
+ 
+ #ifdef NO_MOUSE_REPORT
+ # ifndef NO_MOUSE_REPORT_SCROLLBAR
diff --git a/japanese/eterm/files/patch-ae b/japanese/eterm/files/patch-ae
deleted file mode 100644
index c75bc1d31398..000000000000
--- a/japanese/eterm/files/patch-ae
+++ /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/japanese/eterm/files/patch-ah b/japanese/eterm/files/patch-ah
deleted file mode 100644
index df28d12363df..000000000000
--- a/japanese/eterm/files/patch-ah
+++ /dev/null
@@ -1,10 +0,0 @@
---- themes/Makefile.in.orig	Wed Feb  2 05:36:43 2000
-+++ themes/Makefile.in	Wed Feb  9 03:46:59 2000
-@@ -239,6 +239,7 @@
- 	    $(CHMOD) 755 $(DESTDIR)$(pkgdatadir)/themes/$$i ; \
- 	    $(CHMOD) 644 $(DESTDIR)$(pkgdatadir)/themes/$$i/???* ; \
- 	    rm -f $(DESTDIR)$(pkgdatadir)/themes/$$i/theme.cfg.in ; \
-+	    rm -f $(DESTDIR)$(pkgdatadir)/themes/$$i/theme.cfg.in.orig ; \
- 	  else \
- 	    echo "ALERT!  Not overwriting $$i theme in $(DESTDIR)$(pkgdatadir)/themes.  You will need to update this theme manually." ; \
- 	  fi ; \
diff --git a/japanese/eterm/files/patch-ar b/japanese/eterm/files/patch-ar
deleted file mode 100644
index 4b361a26877e..000000000000
--- a/japanese/eterm/files/patch-ar
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig	Mon Feb  7 21:50:25 2000
-+++ src/Makefile.in	Mon Feb  7 21:51:29 2000
-@@ -120,7 +120,7 @@
- 
- 
- libEterm_la_DEPENDENCIES = $(top_builddir)/libmej/libmej.la feature.h
--libEterm_la_LDFLAGS = -release $(VERSION)
-+libEterm_la_LDFLAGS = -version-info 9:9:9
- 
- bin_PROGRAMS = Eterm
- Eterm_SOURCES = main.c
diff --git a/japanese/eterm/files/patch-as b/japanese/eterm/files/patch-as
deleted file mode 100644
index d76485d51e06..000000000000
--- a/japanese/eterm/files/patch-as
+++ /dev/null
@@ -1,11 +0,0 @@
---- libmej/Makefile.in.orig	Mon Feb  7 21:52:12 2000
-+++ libmej/Makefile.in	Mon Feb  7 21:52:44 2000
-@@ -120,7 +120,7 @@
- 
- INCLUDES = -I. -I.. -I$(includedir) -I$(prefix)/include
- 
--libmej_la_LDFLAGS = -release $(VERSION)
-+libmej_la_LDFLAGS = -version-info 9:9:9
- 
- EXTRA_DIST = debug.h global.h mem.h strings.h strptime.h strptime.c
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/japanese/eterm/files/patch-at b/japanese/eterm/files/patch-at
deleted file mode 100644
index d6fe33afeabf..000000000000
--- a/japanese/eterm/files/patch-at
+++ /dev/null
@@ -1,28 +0,0 @@
---- configure.orig	Mon Feb  7 22:00:40 2000
-+++ configure	Mon Feb  7 22:04:47 2000
-@@ -4835,16 +4835,16 @@
- 
- 	      DEF_FONT_IDX=0
- 	      MULTICHAR_ENCODING="eucj"
--	      FONT0="fixed"
--              FONT1="8x16"
--              FONT2="9x18"
--              FONT3="12x24"
--              FONT4="13x26"
-+	      FONT0="7x14"
-+              FONT1="a10"
-+              FONT2="r12"
-+              FONT3="8x16"
-+              FONT4="12x24"
- 	      MFONT0="k14"
--              MFONT1="jiskan16"
--              MFONT2="jiskan18"
--              MFONT3="jiskan24"
--              MFONT4="jiskan26"
-+              MFONT1="k10"
-+              MFONT2="k12"
-+              MFONT3="kanji16"
-+              MFONT4="kanji24"
-             elif test "$enableval" = "euc-kr" -o "$enableval" = "euckr"; then 
-               echo "$ac_t""euckr" 1>&6
-               cat >> confdefs.h <<\EOF
diff --git a/japanese/eterm/files/patch-au b/japanese/eterm/files/patch-au
deleted file mode 100644
index 9bf3d08b3b68..000000000000
--- a/japanese/eterm/files/patch-au
+++ /dev/null
@@ -1,17 +0,0 @@
---- themes/Eterm/theme.cfg.in.orig	Mon Feb  7 21:54:05 2000
-+++ themes/Eterm/theme.cfg.in	Mon Feb  7 21:55:37 2000
-@@ -248,10 +248,10 @@
- # The XIM support options.
- # input_method: set the name of your favorate input method program
- # preedit_type: OverTheSpot or OffTheSpot or Root
--#  begin xim
--#    input_method Ami
--#    preedit_type OverTheSpot
--#  end xim
-+  begin xim
-+    input_method kinput2
-+    preedit_type OverTheSpot
-+  end xim
- 
- # Boolean variables.  The values can be "1", "on", or "true" for TRUE, or "0",
- # "off", or "false" for FALSE.
diff --git a/japanese/eterm/files/patch-av b/japanese/eterm/files/patch-av
deleted file mode 100644
index 5b1a54d147e5..000000000000
--- a/japanese/eterm/files/patch-av
+++ /dev/null
@@ -1,17 +0,0 @@
---- themes/auto/theme.cfg.in.orig	Mon Feb  7 22:07:25 2000
-+++ themes/auto/theme.cfg.in	Mon Feb  7 22:08:35 2000
-@@ -248,10 +248,10 @@
- # The XIM support options.
- # input_method: set the name of your favorate input method program
- # preedit_type: OverTheSpot or OffTheSpot or Root
--#  begin xim
--#    input_method Ami
--#    preedit_type OverTheSpot
--#  end xim
-+  begin xim
-+    input_method kinput2
-+    preedit_type OverTheSpot
-+  end xim
- 
- # Boolean variables.  The values can be "1", "on", or "true" for TRUE, or "0",
- # "off", or "false" for FALSE.
diff --git a/japanese/eterm/files/patch-aw b/japanese/eterm/files/patch-aw
deleted file mode 100644
index 2c1af79a6e4b..000000000000
--- a/japanese/eterm/files/patch-aw
+++ /dev/null
@@ -1,17 +0,0 @@
---- themes/cEterm/theme.cfg.in.orig	Mon Feb  7 22:09:32 2000
-+++ themes/cEterm/theme.cfg.in	Mon Feb  7 22:10:07 2000
-@@ -247,10 +247,10 @@
- # The XIM support options.
- # input_method: set the name of your favorate input method program
- # preedit_type: OverTheSpot or OffTheSpot or Root
--#  begin xim
--#    input_method Ami
--#    preedit_type OverTheSpot
--#  end xim
-+  begin xim
-+    input_method kinput2
-+    preedit_type OverTheSpot
-+  end xim
- 
- # Boolean variables.  The values can be "1", "on", or "true" for TRUE, or "0",
- # "off", or "false" for FALSE.
diff --git a/japanese/eterm/files/patch-ax b/japanese/eterm/files/patch-ax
deleted file mode 100644
index 5480ef1fe617..000000000000
--- a/japanese/eterm/files/patch-ax
+++ /dev/null
@@ -1,17 +0,0 @@
---- themes/chooser/theme.cfg.in.orig	Mon Feb  7 22:10:53 2000
-+++ themes/chooser/theme.cfg.in	Mon Feb  7 22:11:31 2000
-@@ -248,10 +248,10 @@
- # The XIM support options.
- # input_method: set the name of your favorate input method program
- # preedit_type: OverTheSpot or OffTheSpot or Root
--#  begin xim
--#    input_method Ami
--#    preedit_type OverTheSpot
--#  end xim
-+  begin xim
-+    input_method kinput2
-+    preedit_type OverTheSpot
-+  end xim
- 
- # Boolean variables.  The values can be "1", "on", or "true" for TRUE, or "0",
- # "off", or "false" for FALSE.
diff --git a/japanese/eterm/files/patch-ay b/japanese/eterm/files/patch-ay
deleted file mode 100644
index 3522c58bfcf5..000000000000
--- a/japanese/eterm/files/patch-ay
+++ /dev/null
@@ -1,17 +0,0 @@
---- themes/emacs/theme.cfg.in.orig	Mon Feb  7 22:12:28 2000
-+++ themes/emacs/theme.cfg.in	Mon Feb  7 22:12:49 2000
-@@ -248,10 +248,10 @@
- # The XIM support options.
- # input_method: set the name of your favorate input method program
- # preedit_type: OverTheSpot or OffTheSpot or Root
--#  begin xim
--#    input_method Ami
--#    preedit_type OverTheSpot
--#  end xim
-+  begin xim
-+    input_method kinput2
-+    preedit_type OverTheSpot
-+  end xim
- 
- # Boolean variables.  The values can be "1", "on", or "true" for TRUE, or "0",
- # "off", or "false" for FALSE.
diff --git a/japanese/eterm/files/patch-az b/japanese/eterm/files/patch-az
deleted file mode 100644
index 6a71a95f1e1a..000000000000
--- a/japanese/eterm/files/patch-az
+++ /dev/null
@@ -1,17 +0,0 @@
---- themes/irc/theme.cfg.in.orig	Mon Feb  7 22:13:53 2000
-+++ themes/irc/theme.cfg.in	Mon Feb  7 22:14:09 2000
-@@ -250,10 +250,10 @@
- # The XIM support options.
- # input_method: set the name of your favorate input method program
- # preedit_type: OverTheSpot or OffTheSpot or Root
--#  begin xim
--#    input_method Ami
--#    preedit_type OverTheSpot
--#  end xim
-+  begin xim
-+    input_method Ami
-+    preedit_type OverTheSpot
-+  end xim
- 
- # Boolean variables.  The values can be "1", "on", or "true" for TRUE, or "0",
- # "off", or "false" for FALSE.
diff --git a/japanese/eterm/files/patch-ba b/japanese/eterm/files/patch-ba
deleted file mode 100644
index b50e94671e07..000000000000
--- a/japanese/eterm/files/patch-ba
+++ /dev/null
@@ -1,17 +0,0 @@
---- themes/mutt/theme.cfg.in.orig	Mon Feb  7 22:14:53 2000
-+++ themes/mutt/theme.cfg.in	Mon Feb  7 22:15:08 2000
-@@ -194,10 +194,10 @@
- # The XIM support options.
- # input_method: set the name of your favorate input method program
- # preedit_type: OverTheSpot or OffTheSpot or Root
--#  begin xim
--#    input_method Ami
--#    preedit_type OverTheSpot
--#  end xim
-+  begin xim
-+    input_method Ami
-+    preedit_type OverTheSpot
-+  end xim
- 
- # Boolean variables.  The values can be "1", "on", or "true" for TRUE, or "0",
- # "off", or "false" for FALSE.
diff --git a/japanese/eterm/files/patch-bb b/japanese/eterm/files/patch-bb
deleted file mode 100644
index 0b3888c0affe..000000000000
--- a/japanese/eterm/files/patch-bb
+++ /dev/null
@@ -1,17 +0,0 @@
---- themes/trans/theme.cfg.in.orig	Mon Feb  7 22:29:10 2000
-+++ themes/trans/theme.cfg.in	Mon Feb  7 22:29:27 2000
-@@ -248,10 +248,10 @@
- # The XIM support options.
- # input_method: set the name of your favorate input method program
- # preedit_type: OverTheSpot or OffTheSpot or Root
--#  begin xim
--#    input_method Ami
--#    preedit_type OverTheSpot
--#  end xim
-+  begin xim
-+    input_method kinput2
-+    preedit_type OverTheSpot
-+  end xim
- 
- # Boolean variables.  The values can be "1", "on", or "true" for TRUE, or "0",
- # "off", or "false" for FALSE.
diff --git a/japanese/eterm/files/patch-bc b/japanese/eterm/files/patch-bc
deleted file mode 100644
index 1096a87aa40c..000000000000
--- a/japanese/eterm/files/patch-bc
+++ /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>