Update to 3.0.3.

* make pkglint happy

Changelog:
Overview of changes from 3.0.2
==============================

ver 3.0.3
* Add support for iBus. (Experimental)
* Even if gdk-pixbuf is not linked to mlterm (--with-imagelib=gdk-pixbuf
  option is not specified in configure), wall picture, icon picture
  and pixmap_engine are supported by an external program (mlimgdisplay)
  which uses gdk-pixbuf.
* Support "wall_picture" option partially (BMP format alone) in win32.
* Support palette settings in libvte.
* libvte uses dpi of gdk for xft font instead of manually calculated one
  by DisplayWidthMM (,which can return wrong value in vmware) etc.
* Unsupported but valid formatted escape / CSI sequence is correctly ignored.
  (Thanks to Iwamoto Kouichi san)
* Support "use_clipboard" option which enables CLIPBOARD selection not only
  PRIMARY selection.
* Other bug fixes:
  Fix wrong drawing of background of DEC Special characters. (Thanks to Iwamoto Kouichi san)
  Unhighlight background of bold characters. (Thanks to Iwamoto Kouichi san)
  SF Bug #3158963 (Thanks to Jyun-Yan You)
  SF Bug #3053107 (Thanks to Nezmer, Thanks to Iwamoto Kouichi san)

Overview of changes from 3.0.1
==============================

ver 3.0.2
* Drop imlib, gdk-pixbuf1 and gtk-1.x support.
* Add libvte compatible library using mlterm engine. (Experimental)
* Support gnome-pty-helper. (configure with --enable-pty-helper option)
* Support "alpha" option in X11.
* Add "depth" option.
* Support "rgba:RR/GG/BB/AA" format to specify rgba color in 32-bit depth.
* Add "bidi_mode" option.
* Add "letter_space" option.
* Support execution of command like "mlclient -e w3m" in "button3_behavior" option.
* Other bug fixes:
  "ESC [ r" and "ESC c" reset scrolling region. (Thanks to Iwamoto Kouichi san)
  #3072833 (Thanks to Andreas Metzler)
  #3051467 (Thanks to David Kolovratnik)
  #3014219 (Thanks to Khaled Hosny)

4 files changed, 17 insertions, 19 deletions

diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index 8d640dd5bdc..6346c1014cb 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.60 2011/02/28 14:53:07 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2011/04/10 07:25:36 ryoon Exp $
 
-DISTNAME=	mlterm-3.0.1
-PKGREVISION=	2
+DISTNAME=	mlterm-3.0.3
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mlterm/}
 
@@ -31,7 +30,7 @@ CONF_FILES+=		${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 CONFIGURE_ARGS+=	--with-imagelib=gdk-pixbuf
 CONFIGURE_ARGS+=	--without-libiconv-prefix
 CONFIGURE_ARGS+=	--without-libintl-prefix
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR:Q}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR}
 
 INSTALL_MAKE_FLAGS+=	sysconfdir=${PREFIX}/share/examples
 
@@ -42,10 +41,10 @@ SUBST_MESSAGE.link=	Fixing hardcoded paths and link options.
 SUBST_STAGE.link=	post-patch
 SUBST_FILES.link=	Makefile.in */Makefile.in */*/Makefile.in \
 			*/*/*/Makefile.in man/mlterm.1
-SUBST_SED.link=		-e 's|(LIBTOOL_LINK).*(LIBS)|& ${X11_LDFLAGS}|g'
-SUBST_SED.link+=	-e 's|(LIBTOOL_LINK).*(LIBDIR)|& ${X11_LDFLAGS}|g'
+SUBST_SED.link=		-e 's|(LIBTOOL_LINK).*(LIBS)|& ${X11_LDFLAGS:M*:Q}|g'
+SUBST_SED.link+=	-e 's|(LIBTOOL_LINK).*(LIBDIR)|& ${X11_LDFLAGS:M*:Q}|g'
 SUBST_SED.link+=	-e 's|/usr/local/|${PREFIX}/|g'
-SUBST_SED.link+=	-e 's|/usr/X11R6/|${X11BASE}/|g'
+SUBST_SED.link+=	-e 's|/usr/X11R7/|${X11BASE}/|g'
 
 BUILDLINK_DEPMETHOD.libXt?=	build
 
diff --git a/x11/mlterm/PLIST b/x11/mlterm/PLIST
index 9ec85844b4e..c009aba25e5 100644
--- a/x11/mlterm/PLIST
+++ b/x11/mlterm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2010/09/22 09:33:41 obache Exp $
+@comment $NetBSD: PLIST,v 1.22 2011/04/10 07:25:36 ryoon Exp $
 bin/mlcc
 bin/mlclient
 bin/mlclientx
@@ -16,9 +16,8 @@ lib/mlterm/libmozmodern.la
 lib/mlterm/libnext.la
 lib/mlterm/libsample.la
 lib/mlterm/libsample2.la
-${PLIST.m17nlib}lib/mlterm/libim-m17nlib.la
-${PLIST.uim}lib/mlterm/libim-uim.la
 libexec/mlconfig
+libexec/mlimgloader
 libexec/mlterm-menu
 man/man1/mlclient.1
 man/man1/mlterm.1
diff --git a/x11/mlterm/distinfo b/x11/mlterm/distinfo
index a8929cf1cea..0a141533617 100644
--- a/x11/mlterm/distinfo
+++ b/x11/mlterm/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.20 2010/09/22 09:33:41 obache Exp $
+$NetBSD: distinfo,v 1.21 2011/04/10 07:25:36 ryoon Exp $
 
-SHA1 (mlterm-3.0.1.tar.gz) = fd2be79969fc094da81776ea9b5a12f08a2499d4
-RMD160 (mlterm-3.0.1.tar.gz) = 987b82f48c8a4c8e1419a7563f77c4beb37b1f34
-Size (mlterm-3.0.1.tar.gz) = 2645619 bytes
-SHA1 (patch-ae) = fde46b06d0dfb2c296c91a69e9e1f8ff11d68766
+SHA1 (mlterm-3.0.3.tar.gz) = bec5406a8d47eaa9e50afb2656ac876864f15228
+RMD160 (mlterm-3.0.3.tar.gz) = db4ff4c4d5f08a5055213debdbbdfd3d93773cc9
+Size (mlterm-3.0.3.tar.gz) = 2706811 bytes
+SHA1 (patch-ae) = e951a8917470484850cbd755420d7daf84e3ecec
diff --git a/x11/mlterm/patches/patch-ae b/x11/mlterm/patches/patch-ae
index 3d687397435..1128e2ee272 100644
--- a/x11/mlterm/patches/patch-ae
+++ b/x11/mlterm/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1 2005/03/06 17:50:49 hira Exp $
+$NetBSD: patch-ae,v 1.2 2011/04/10 07:25:37 ryoon Exp $
 
---- kiklib/src/kik_pty_bsd.c.orig	2005-03-05 22:05:13.000000000 +0900
-+++ kiklib/src/kik_pty_bsd.c	2005-03-05 22:05:25.000000000 +0900
-@@ -111,9 +111,9 @@
+--- kiklib/src/kik_pty_bsd.c.orig	2011-01-01 18:04:15.000000000 +0000
++++ kiklib/src/kik_pty_bsd.c
+@@ -110,9 +110,9 @@ open_pty(
  			{
  				if( errno == ENOENT)
  				{