Wed Sep 22 09:33:42 2010 UTC ()
Update mlterm to 3.0.1.
Based on PR#43822 by YAMASHIRO, Jun.
Additional clean up by me.

pkgsrc changes:
* set LICENSE=modified-bsd (with uim option, gnu-lgpl-v2 additionally).
* add m17nlib option.

ver 3.0.1
* Improvements for performance of changing 256 colors by
  "\x1b]4;N;rgb:RR/GG/BB\x07" sequence. (Thanks to Konosuke Watanabe san)
* Support "ESC[9Nm" and "ESC[10Nm" sequences.
* Add --button3/button3_behavior option. (If "menu1" is specified, pressing
  button3 shows conf_menu_path_1 program (mlterm-menu) like gnome-terminal.)
* Add "Copy" & "Paste" menus to mlterm-menu.
* Improvements for compatibility with xterm about RGB of system colors.
* Add 'col_size_of_width_a' to configuration protocol. (doc/en/PROTOCOL)
* Merge SF patches:
  #2988801, #2987646 (Thanks to Ahmed El-Mahmoudy)
* Other bug fixes:
  #2818015(partly),#2818018 (Thanks to Thomas Wolff)

ver 3.0.0
* Support 256 colors. (Thanks to Shinichiro Hamaji san)
* Character convertion tables are separated from libmkf library.
* Support win32(Windows 2000-XP) native GUI.
  ('--with-gui=win32' in mingw, msys and cygwin)
* Support font and color configuration protocol.
  (doc/en/PROTOCOL.font,PROTOCOL.color)
* Change 'aafont' format as follows. (Elements in parentheses are optional.)
  [Family]-[Encoding](:[Percentage])
  => [Family]( [Weight] [Slant] [Size]-[Encoding]:[Percentage])
* Add 'DEFAULT' key which specifies fonts used by default
  for font configuration files.
* Add --maxptys option.
* Add 'mlclient', 'mlclientx', 'static_backscroll_mode' and 'type_engine' to
  configuration protocol. (doc/en/PROTOCOL)
* Add 'mlclientx' command.
* Merge SF patches -
  #1574764 (Thanks to Christian Biere)
  #        (Thanks to Frederic Heulin)
  #2879800 (Thanks to Kouichi Kusanagi san)
* Other bug fixes:
  #1999220 (Thanks to Christian Biere)

ver 2.9.4
* Arabic translation of mlconfig [Khaled Hosny]
* Selected region can be expanded by right-clicking [minami]
  (Thanks to ssakane)
* New config key string "title" to allow change pty title [minami]
* Set DISPLAY correctly for ptys opened by -P option [nokada] (SF Bug #1534313)
* Fixed compile errors with gcc 4.3 [mfabian]
* Fixed a potentiol off-by-one bug [mfabian] (Thanks to Dominique Leuenberger)
* Fixed compile errors on biarch systems [Kenshi Muto] (Debian Bug #396532)
* Plugged file-desctiptor leaks [Christian Biere] (SF Patch #1576044)
* Made "restore cursor" work properly with alternate screens [minami]
  (SF Bug#1472143)
* Fixed broken handling of Atom [Kusanagi Kouichi]
* Other bug fixes:
 - Debian BUG #329194 [David Kolovratnik]
 - SF Bug #1568596 [nokada]
 - SF Patch #1574241 [Christian Biere]


(obache)
diff -r1.56 -r1.57 pkgsrc/x11/mlterm/Makefile
diff -r1.20 -r1.21 pkgsrc/x11/mlterm/PLIST
diff -r1.19 -r1.20 pkgsrc/x11/mlterm/distinfo
diff -r1.3 -r1.4 pkgsrc/x11/mlterm/options.mk
diff -r1.2 -r0 pkgsrc/x11/mlterm/patches/patch-ad
diff -r1.1 -r0 pkgsrc/x11/mlterm/patches/patch-af
diff -r1.1 -r0 pkgsrc/x11/mlterm/patches/patch-ag
diff -r1.1 -r0 pkgsrc/x11/mlterm/patches/patch-ah
diff -r1.1 -r0 pkgsrc/x11/mlterm/patches/patch-ai
diff -r1.1 -r0 pkgsrc/x11/mlterm/patches/patch-aj
diff -r1.1 -r0 pkgsrc/x11/mlterm/patches/patch-ak
diff -r1.1 -r0 pkgsrc/x11/mlterm/patches/patch-al
diff -r1.1 -r0 pkgsrc/x11/mlterm/patches/patch-am
diff -r1.1 -r0 pkgsrc/x11/mlterm/patches/patch-an
diff -r1.1 -r0 pkgsrc/x11/mlterm/patches/patch-ao
diff -r1.1 -r0 pkgsrc/x11/mlterm/patches/patch-ap
diff -r1.1 -r0 pkgsrc/x11/mlterm/patches/patch-aq
cvs diff -r1.56 -r1.57 pkgsrc/x11/mlterm/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/mlterm/Makefile 2010/09/14 11:03:03 1.56
+++ pkgsrc/x11/mlterm/Makefile 2010/09/22 09:33:41 1.57
@@ -1,60 +1,56 @@ @@ -1,60 +1,56 @@
1# $NetBSD: Makefile,v 1.56 2010/09/14 11:03:03 wiz Exp $ 1# $NetBSD: Makefile,v 1.57 2010/09/22 09:33:41 obache Exp $
2 2
3DISTNAME= mlterm-2.9.3 3DISTNAME= mlterm-3.0.1
4PKGREVISION= 4 
5CATEGORIES= x11 4CATEGORIES= x11
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mlterm/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mlterm/}
7 6
8MAINTAINER= uebayasi@NetBSD.org,hira@NetBSD.org 7MAINTAINER= uebayasi@NetBSD.org,hira@NetBSD.org
9HOMEPAGE= http://mlterm.sourceforge.net/ 8HOMEPAGE= http://mlterm.sourceforge.net/
10COMMENT= Multilingual terminal emulator 9COMMENT= Multilingual terminal emulator
 10LICENSE= modified-bsd
11 11
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13MAKE_JOBS_SAFE= no 13MAKE_JOBS_SAFE= no
14 14
15# CODESET is only supported on NetBSD in 1.5T and later - see <langinfo.h> 15# CODESET is only supported on NetBSD in 1.5T and later - see <langinfo.h>
16NOT_FOR_PLATFORM= NetBSD-1.[0-4]*-* NetBSD-1.5[A-S]-* 16NOT_FOR_PLATFORM= NetBSD-1.[0-4]*-* NetBSD-1.5[A-S]-*
17 17
18USE_TOOLS+= pkg-config msgfmt 18USE_TOOLS+= pkg-config msgfmt
19USE_LIBTOOL= yes 19USE_LIBTOOL= yes
20GNU_CONFIGURE= yes 20GNU_CONFIGURE= yes
21USE_PKGLOCALEDIR= yes 21USE_PKGLOCALEDIR= yes
22 22
23PKG_SYSCONFSUBDIR= mlterm 23PKG_SYSCONFSUBDIR= mlterm
24EGDIR= ${PREFIX}/share/examples/mlterm 24EGDIR= ${PREFIX}/share/examples/mlterm
25.for f in aafont color font key main menu taafont termcap tfont vaafont vfont \ 25.for f in aafont color font key main menu taafont termcap tfont vaafont vfont \
26 xim 26 xim
27CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} 27CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
28.endfor 28.endfor
29 29
30.include "../../mk/bsd.prefs.mk" 
31 
32CONFIGURE_ARGS+= --with-imagelib=gdk-pixbuf 30CONFIGURE_ARGS+= --with-imagelib=gdk-pixbuf
33CONFIGURE_ARGS+= --without-libiconv-prefix 31CONFIGURE_ARGS+= --without-libiconv-prefix
34CONFIGURE_ARGS+= --without-libintl-prefix 32CONFIGURE_ARGS+= --without-libintl-prefix
35CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE:Q} 33CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR:Q}
 34
 35INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples
36 36
37.include "options.mk" 37.include "options.mk"
38 38
39SUBST_CLASSES+= link 39SUBST_CLASSES+= link
40SUBST_MESSAGE.link= Fixing hardcoded paths and link options. 40SUBST_MESSAGE.link= Fixing hardcoded paths and link options.
41SUBST_STAGE.link= post-patch 41SUBST_STAGE.link= post-patch
42SUBST_FILES.link= Makefile.in */Makefile.in */*/Makefile.in \ 42SUBST_FILES.link= Makefile.in */Makefile.in */*/Makefile.in \
43 */*/*/Makefile.in man/mlterm.1 \ 43 */*/*/Makefile.in man/mlterm.1
44 mlterm/ml_config_menu.c script/config.rpath \ 
45 tool/mlconfig/mc_im.c tool/mlconfig/mc_sb_view.c \ 
46 tool/mlmenu/main.c xwindow/x_im.c \ 
47 xwindow/x_sb_view_factory.c xwindow/x_screen.c 
48SUBST_SED.link= -e 's|(LIBTOOL_LINK).*(LIBS)|& ${X11_LDFLAGS}|g' 44SUBST_SED.link= -e 's|(LIBTOOL_LINK).*(LIBS)|& ${X11_LDFLAGS}|g'
49SUBST_SED.link+= -e 's|(LIBTOOL_LINK).*(LIBDIR)|& ${X11_LDFLAGS}|g' 45SUBST_SED.link+= -e 's|(LIBTOOL_LINK).*(LIBDIR)|& ${X11_LDFLAGS}|g'
50SUBST_SED.link+= -e 's|/usr/local/|${PREFIX}/|g' 46SUBST_SED.link+= -e 's|/usr/local/|${PREFIX}/|g'
51SUBST_SED.link+= -e 's|/usr/X11R6/|${X11BASE}/|g' 47SUBST_SED.link+= -e 's|/usr/X11R6/|${X11BASE}/|g'
52 48
53BUILDLINK_DEPMETHOD.libXt?= build 49BUILDLINK_DEPMETHOD.libXt?= build
54 50
55.include "../../converters/libiconv/buildlink3.mk" 51.include "../../converters/libiconv/buildlink3.mk"
56.include "../../devel/gettext-lib/buildlink3.mk" 52.include "../../devel/gettext-lib/buildlink3.mk"
57.include "../../x11/gtk2/buildlink3.mk" 53.include "../../x11/gtk2/buildlink3.mk"
58.include "../../x11/libSM/buildlink3.mk" 54.include "../../x11/libSM/buildlink3.mk"
59.include "../../x11/libX11/buildlink3.mk" 55.include "../../x11/libX11/buildlink3.mk"
60.include "../../x11/libXt/buildlink3.mk" 56.include "../../x11/libXt/buildlink3.mk"
cvs diff -r1.20 -r1.21 pkgsrc/x11/mlterm/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/mlterm/PLIST 2009/06/14 18:25:01 1.20
+++ pkgsrc/x11/mlterm/PLIST 2010/09/22 09:33:41 1.21
@@ -1,34 +1,41 @@ @@ -1,34 +1,41 @@
1@comment $NetBSD: PLIST,v 1.20 2009/06/14 18:25:01 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.21 2010/09/22 09:33:41 obache Exp $
2bin/mlcc 2bin/mlcc
3bin/mlclient 3bin/mlclient
 4bin/mlclientx
4bin/mlterm 5bin/mlterm
5lib/libkik.la 6lib/libkik.la
6lib/libmkf.la 7lib/libmkf.la
 8lib/mkf/libmkf_8bits.la
 9lib/mkf/libmkf_jajp.la
 10lib/mkf/libmkf_kokr.la
 11lib/mkf/libmkf_zh.la
7lib/mlterm/libathena.la 12lib/mlterm/libathena.la
8lib/mlterm/libim-kbd.la 13lib/mlterm/libim-kbd.la
9${PLIST.uim}lib/mlterm/libim-uim.la 
10lib/mlterm/libmotif.la 14lib/mlterm/libmotif.la
11lib/mlterm/libmozmodern.la 15lib/mlterm/libmozmodern.la
12lib/mlterm/libnext.la 16lib/mlterm/libnext.la
13lib/mlterm/libsample.la 17lib/mlterm/libsample.la
14lib/mlterm/libsample2.la 18lib/mlterm/libsample2.la
 19${PLIST.m17nlib}lib/mlterm/libim-m17nlib.la
 20${PLIST.uim}lib/mlterm/libim-uim.la
15libexec/mlconfig 21libexec/mlconfig
16libexec/mlterm-menu 22libexec/mlterm-menu
17man/man1/mlclient.1 23man/man1/mlclient.1
18man/man1/mlterm.1 24man/man1/mlterm.1
19share/examples/mlterm/aafont 25share/examples/mlterm/aafont
20share/examples/mlterm/color 26share/examples/mlterm/color
21share/examples/mlterm/font 27share/examples/mlterm/font
22share/examples/mlterm/key 28share/examples/mlterm/key
23share/examples/mlterm/main 29share/examples/mlterm/main
24share/examples/mlterm/menu 30share/examples/mlterm/menu
25share/examples/mlterm/taafont 31share/examples/mlterm/taafont
26share/examples/mlterm/termcap 32share/examples/mlterm/termcap
27share/examples/mlterm/tfont 33share/examples/mlterm/tfont
28share/examples/mlterm/vaafont 34share/examples/mlterm/vaafont
29share/examples/mlterm/vfont 35share/examples/mlterm/vfont
30share/examples/mlterm/xim 36share/examples/mlterm/xim
 37share/locale/ar/LC_MESSAGES/mlconfig.mo
31share/locale/de/LC_MESSAGES/mlconfig.mo 38share/locale/de/LC_MESSAGES/mlconfig.mo
32share/locale/ja/LC_MESSAGES/mlconfig.mo 39share/locale/ja/LC_MESSAGES/mlconfig.mo
33share/locale/vi/LC_MESSAGES/mlconfig.mo 40share/locale/vi/LC_MESSAGES/mlconfig.mo
34share/locale/zh_TW/LC_MESSAGES/mlconfig.mo 41share/locale/zh_TW/LC_MESSAGES/mlconfig.mo
cvs diff -r1.19 -r1.20 pkgsrc/x11/mlterm/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/mlterm/distinfo 2008/10/25 16:29:55 1.19
+++ pkgsrc/x11/mlterm/distinfo 2010/09/22 09:33:41 1.20
@@ -1,19 +1,6 @@ @@ -1,19 +1,6 @@
1$NetBSD: distinfo,v 1.19 2008/10/25 16:29:55 uebayasi Exp $ 1$NetBSD: distinfo,v 1.20 2010/09/22 09:33:41 obache Exp $
2 2
3SHA1 (mlterm-2.9.3.tar.gz) = 65ba5a7bd83accf7f621f84b84debb35c8f215ef 3SHA1 (mlterm-3.0.1.tar.gz) = fd2be79969fc094da81776ea9b5a12f08a2499d4
4RMD160 (mlterm-2.9.3.tar.gz) = 27f4381a8b8b68b07e53bbeb422581beb7527b48 4RMD160 (mlterm-3.0.1.tar.gz) = 987b82f48c8a4c8e1419a7563f77c4beb37b1f34
5Size (mlterm-2.9.3.tar.gz) = 1984977 bytes 5Size (mlterm-3.0.1.tar.gz) = 2645619 bytes
6SHA1 (patch-ad) = 4f6ef642002baa13bc4b7578cda0e45888fed27f 
7SHA1 (patch-ae) = fde46b06d0dfb2c296c91a69e9e1f8ff11d68766 6SHA1 (patch-ae) = fde46b06d0dfb2c296c91a69e9e1f8ff11d68766
8SHA1 (patch-af) = b9947c2a817093b71e3e91312bac173d5106c306 
9SHA1 (patch-ag) = 7f2ff30719dd9baecda31627b45f9516225ec602 
10SHA1 (patch-ah) = 93b0ad1445faec91d29f3a01b69d9ac0f4ddfe90 
11SHA1 (patch-ai) = c7dc11cdf4851e2e4018a5ec3111dd9f9ceffa63 
12SHA1 (patch-aj) = ff103698ff544fa22fa660268dccb51b8b9e8bda 
13SHA1 (patch-ak) = 3b06cfc41ed12be11ea81d097f0592bb6b977e29 
14SHA1 (patch-al) = 6b87b81e403a3fac9794c666c1e0260a3d5b5bd4 
15SHA1 (patch-am) = 83684bfa15e5596abddef92cf994bb92b9f21990 
16SHA1 (patch-an) = 156b8ebf5c7fdf68c39df7076849a05a90eb7e5a 
17SHA1 (patch-ao) = 680ac866197202e09c25d93b20a7e3b700f38370 
18SHA1 (patch-ap) = 3cfe668a591623d45043621813a68d8958cb81c7 
19SHA1 (patch-aq) = 6594315724a0ab34fb5af26c4bc59a6673c99340 
cvs diff -r1.3 -r1.4 pkgsrc/x11/mlterm/options.mk (expand / switch to unified diff)

--- pkgsrc/x11/mlterm/options.mk 2008/04/12 22:43:14 1.3
+++ pkgsrc/x11/mlterm/options.mk 2010/09/22 09:33:41 1.4
@@ -1,18 +1,26 @@ @@ -1,18 +1,26 @@
1# $NetBSD: options.mk,v 1.3 2008/04/12 22:43:14 jlam Exp $ 1# $NetBSD: options.mk,v 1.4 2010/09/22 09:33:41 obache Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.mlterm 3PKG_OPTIONS_VAR= PKG_OPTIONS.mlterm
4PKG_SUPPORTED_OPTIONS= uim xft2 4PKG_SUPPORTED_OPTIONS= m17nlib uim xft2
5PKG_SUGGESTED_OPTIONS= 5PKG_SUGGESTED_OPTIONS=
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9PLIST_VARS+= uim 9PLIST_VARS+= m17nlib uim
 10
 11.if !empty(PKG_OPTIONS:Mm17nlib)
 12.include "../../devel/m17n-lib/buildlink3.mk"
 13CONFIGURE_ARGS+= --enable-m17nlib
 14PLIST.m17nlib= yes
 15.endif
 16
10.if !empty(PKG_OPTIONS:Muim) 17.if !empty(PKG_OPTIONS:Muim)
11.include "../../inputmethod/uim/buildlink3.mk" 18.include "../../inputmethod/uim/buildlink3.mk"
12CONFIGURE_ARGS+= --enable-uim 19CONFIGURE_ARGS+= --enable-uim
13PLIST.uim= yes 20PLIST.uim= yes
 21LICENSE+= AND gnu-lgpl-v2
14.endif 22.endif
15 23
16.if !empty(PKG_OPTIONS:Mxft2) 24.if !empty(PKG_OPTIONS:Mxft2)
17CONFIGURE_ARGS+= --with-type-engines=xft 25CONFIGURE_ARGS+= --with-type-engines=xft
18.endif 26.endif
File Deleted: pkgsrc/x11/mlterm/patches/Attic/patch-ad
File Deleted: pkgsrc/x11/mlterm/patches/Attic/patch-af
File Deleted: pkgsrc/x11/mlterm/patches/Attic/patch-ag
File Deleted: pkgsrc/x11/mlterm/patches/Attic/patch-ah
File Deleted: pkgsrc/x11/mlterm/patches/Attic/patch-ai
File Deleted: pkgsrc/x11/mlterm/patches/Attic/patch-aj
File Deleted: pkgsrc/x11/mlterm/patches/Attic/patch-ak
File Deleted: pkgsrc/x11/mlterm/patches/Attic/patch-al
File Deleted: pkgsrc/x11/mlterm/patches/Attic/patch-am
File Deleted: pkgsrc/x11/mlterm/patches/Attic/patch-an
File Deleted: pkgsrc/x11/mlterm/patches/Attic/patch-ao
File Deleted: pkgsrc/x11/mlterm/patches/Attic/patch-ap
File Deleted: pkgsrc/x11/mlterm/patches/Attic/patch-aq