Upgrade mlterm package from 2.0.0 to 2.2.0.

Provided in PR 15436 by Masao Uebayashi (uebayasi@soum.co.jp) - the patch
files were modified by me to apply cleanly.

Changes since 2.0.0:

        * variable length column is supported.
        * ISCII support codes are imported(but is not still supported
          formally).
        * fribidi 0.10.0 is supported.
        * Full Reset button is added to mlconfig.
        * color fading is supported.
        * big5 unstandard characters can be converted to and from ucs4.
        * cursor form is changed when window is focused or unfocused.
        * Background of color-reversed characters is drawn with fg color event
          under wall paper or tranparent mode.
        * ESC ] 20 ; pt BEL sequence is supported.
        * mlterm configuration protocol is decided and implemented.
        * w3mmlconfig(w3m local-CGI) is contributed by Sakamoto Hironori san.
        * mlconf_curses(perl + curses) is contributed by Minami Hirokazu san.
        * etc/{font|vfont|aafont|vaafont} format is changed.
          (Dynalab font can be shown correctly by using this extension)
        * some characters of CP932 based true type fonts couldn't be shown,
          but fixed.
        * CP932 gaiji characters (IBM , NEC , NECIBM) <=> UCS conversion is
          supported.
        * and many minor bugs are fixed.

6 files changed, 29 insertions, 28 deletions

diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index ff82e4c0643..51fd5dab41d 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2001/12/30 20:19:56 agc Exp $
+# $NetBSD: Makefile,v 1.3 2002/01/31 14:34:39 agc Exp $
 
-DISTNAME=	mlterm-2.0.0
+DISTNAME=	mlterm-2.2.0
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mlterm/}
 
@@ -16,9 +16,9 @@ USE_BUILDLINK_ONLY=	yes
 GNU_CONFIGURE=	yes
 
 USE_LIBTOOL=	yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/autoconf/libtool
-LIBTOOL_OVERRIDE+=	${WRKSRC}/kiklib/autoconf/libtool
-LIBTOOL_OVERRIDE+=	${WRKSRC}/mkf/autoconf/libtool
+LIBTOOL_OVERRIDE=	${WRKSRC}/autoconf/ltmain.sh
+LIBTOOL_OVERRIDE+=	${WRKSRC}/kiklib/autoconf/ltmain.sh
+LIBTOOL_OVERRIDE+=	${WRKSRC}/mkf/autoconf/ltmain.sh
 
 .include "../../devel/glib/buildlink.mk"
 .include "../../x11/gtk/buildlink.mk"
diff --git a/x11/mlterm/PLIST b/x11/mlterm/PLIST
index da79975f106..254f55757ba 100644
--- a/x11/mlterm/PLIST
+++ b/x11/mlterm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2001/12/21 12:15:37 agc Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/01/31 14:34:39 agc Exp $
 bin/mlterm
 etc/mlterm/aafont
 etc/mlterm/color
@@ -6,6 +6,8 @@ etc/mlterm/font
 etc/mlterm/key
 etc/mlterm/main
 etc/mlterm/termcap
+etc/mlterm/vaafont
+etc/mlterm/vfont
 etc/mlterm/xim
 lib/libkik.a
 lib/libkik.la
@@ -15,8 +17,8 @@ lib/libkik.so.3.0
 lib/libmkf.a
 lib/libmkf.la
 lib/libmkf.so
-lib/libmkf.so.9
-lib/libmkf.so.9.0
+lib/libmkf.so.12
+lib/libmkf.so.12.0
 lib/mlterm/libsample.a
 lib/mlterm/libsample.la
 lib/mlterm/libsample.so
diff --git a/x11/mlterm/distinfo b/x11/mlterm/distinfo
index 0928f57ff87..6ec278ab9ad 100644
--- a/x11/mlterm/distinfo
+++ b/x11/mlterm/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/12/21 11:33:28 agc Exp $
+$NetBSD: distinfo,v 1.2 2002/01/31 14:34:39 agc Exp $
 
-SHA1 (mlterm-2.0.0.tar.gz) = 6381a5f195d858a4ba381c6a63a87256092a9248
-Size (mlterm-2.0.0.tar.gz) = 1346691 bytes
-SHA1 (patch-aa) = bbf05e4c136485d99d2ee5fe78a04e94ff43f00e
-SHA1 (patch-ab) = 5b113fdf21f98e47099a97b14903874bf8ec5c3f
-SHA1 (patch-ac) = 5fdfbd67d21cbc867e948ec3ac669155f7229092
+SHA1 (mlterm-2.2.0.tar.gz) = d8684e0d1c59ea02ab7306440340378abc8cf1ed
+Size (mlterm-2.2.0.tar.gz) = 1512809 bytes
+SHA1 (patch-aa) = b5d35c9aafb9165769c896895732f9a878a134f2
+SHA1 (patch-ab) = 7dc4ead9e242042f61d657af2750f32fea01cc38
+SHA1 (patch-ac) = 16926c5cc26b950862d089d16f983747ebb566a9
diff --git a/x11/mlterm/patches/patch-aa b/x11/mlterm/patches/patch-aa
index df49e2d15d3..6b8b061fdf4 100644
--- a/x11/mlterm/patches/patch-aa
+++ b/x11/mlterm/patches/patch-aa
@@ -1,18 +1,17 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/12/21 11:33:28 agc Exp $
+$NetBSD: patch-aa,v 1.2 2002/01/31 14:34:39 agc Exp $
 
 --- src/Makefile.in	2001/12/21 11:13:54	1.1
 +++ src/Makefile.in	2001/12/21 11:15:14
-@@ -31,11 +31,11 @@
- CFLAGS=$(CFLAGS_LOCAL) @KIK_CFLAGS@ @MKF_CFLAGS@ @DEB_CFLAGS@ @IMLIB_CFLAGS@ \
- 	@AA_CFLAGS@ @UCS4_CFLAGS@ @PTY_CFLAGS@ @CFLAGS@ \
+@@ -33,10 +33,10 @@
+ CFLAGS=$(CFLAGS_LOCAL) @KIK_CFLAGS@ @MKF_CFLAGS@ @DEB_CFLAGS@ @IMLIB_CFLAGS@ @FRIBIDI_CFLAGS@ \
+ 	@AA_CFLAGS@ @UCS4_CFLAGS@ @PTY_CFLAGS@ @IND_CFLAGS@ @CFLAGS@ \
  	-DLIBDIR=\"$(LIBDIR)\" -DLIBEXECDIR=\"$(LIBEXECDIR)\" -DSYSCONFDIR=\"$(SYSCONFDIR)\" \
 -	-I/usr/X11R6/include -I/usr/local/include
 +	-I${X11BASE}/include -I${LOCALBASE}/include
- LIBS=$(CFLAGS_LOCAL) \
- 	@X_EXTRA_LIBS@ @XPG4_LIBS@ @DL_LIBS@ @IMLIB_LIBS@ @AA_LIBS@ \
- 	$(LKIK) $(LMKF) -lX11 \
--	-L/usr/X11R6/lib -L/usr/local/lib
-+	-L${X11BASE}/lib -Wl,-R${X11BASE}/lib -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib
+ LIBS=$(CFLAGS_LOCAL) @FRIBIDI_LIBS@ @IMLIB_LIBS@ @AA_LIBS@ @IND_LIBS@ \
+ 	@X_EXTRA_LIBS@ -lX11 $(LKIK) $(LMKF) @DL_LIBS@ @XPG4_LIBS@ \
+-	-L/usr/X11R6/lib -L/usr/local/lib -R/usr/X11R6/lib -R/usr/local/lib
++	-L${X11BASE}/lib -L${LOCALBASE}/lib -R${X11BASE}/lib -R${LOCALBASE}/lib
  
  PROG = mlterm
  
diff --git a/x11/mlterm/patches/patch-ab b/x11/mlterm/patches/patch-ab
index 303da1daba8..dae8cdeb8a7 100644
--- a/x11/mlterm/patches/patch-ab
+++ b/x11/mlterm/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/12/21 11:33:28 agc Exp $
+$NetBSD: patch-ab,v 1.2 2002/01/31 14:34:39 agc Exp $
 
 --- mkf/lib/Makefile.in	2001/12/21 11:20:59	1.1
 +++ mkf/lib/Makefile.in	2001/12/21 11:21:17
@@ -10,4 +10,4 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/12/21 11:33:28 agc Exp $
 +CFLAGS = $(CFLAGS_LOCAL) @DEB_CFLAGS@ @KIK_CFLAGS@ @CFLAGS@ -I${LOCALBASE}/include
  LIBS = $(LIBS_LOCAL)
  
- PARSER_OBJ = mkf_parser.o mkf_iso2022_parser.o mkf_iso8859_parser.o mkf_eucjp_parser.o \
+ PARSER_OBJ = mkf_parser.o mkf_iso2022_parser.o mkf_iso8859_parser.o mkf_xct_parser.o \
diff --git a/x11/mlterm/patches/patch-ac b/x11/mlterm/patches/patch-ac
index 2f3c7fbc980..2b91a541a4e 100644
--- a/x11/mlterm/patches/patch-ac
+++ b/x11/mlterm/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/12/21 11:33:28 agc Exp $
+$NetBSD: patch-ac,v 1.2 2002/01/31 14:34:39 agc Exp $
 
 --- tool/mlconfig/Makefile.in	2001/12/21 11:22:17	1.1
 +++ tool/mlconfig/Makefile.in	2001/12/21 11:23:22
@@ -10,8 +10,8 @@ $NetBSD: patch-ac,v 1.1.1.1 2001/12/21 11:33:28 agc Exp $
 +	-I../../src -I${X11BASE}/include -I${LOCALBASE}/include \
  	-DSYSCONFDIR=\"$(SYSCONFDIR)\"
  LIBS = `$(GTK_CONFIG) --libs` $(LIBS_LOCAL) $(LKIK) \
--	-L/usr/X11R6/lib -L/usr/local/lib
-+	-L${X11BASE}/lib -Wl,-R${X11BASE}/lib -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib
+-	-L/usr/X11R6/lib -L/usr/local/lib -R/usr/X11R6/lib -R/usr/local/lib
++	-L${X11BASE}/lib -L${LOCALBASE}/lib -R${X11BASE}/lib -R${LOCALBASE}/lib
  
  LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC)
  LIBTOOL_INSTALL = $(LIBTOOL) --mode=install $(INSTALL)