Update mlterm to 3.6.0.

pkgsrc changes:
 - add fonts/unifont path in etc/font-fb example

Changes noted in doc/en/ReleaseNote:

ver 3.6.0
* Support MacOSX/Cocoa. (See doc/en/README.cocoa)
* Add "geometry" to OSC 5379.
* Add "mlconfig" to OSC 5379.
* Add "Columns" and "Rows" to "Others" tab of mlconfig.
* Bug fixes:
  Fix segfault of libvte compatible library if conf_menu_path_N option is specified.

4 files changed, 14 insertions, 17 deletions

diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index 963f367ccb0..f4de031c141 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.121 2015/08/30 16:06:12 tsutsui Exp $
+# $NetBSD: Makefile,v 1.122 2015/10/30 15:29:20 tsutsui Exp $
 
-DISTNAME=	mlterm-3.5.1
+DISTNAME=	mlterm-3.6.0
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mlterm/}
 
diff --git a/x11/mlterm/PLIST b/x11/mlterm/PLIST
index 3cf8f19423c..9d11a2a6f24 100644
--- a/x11/mlterm/PLIST
+++ b/x11/mlterm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.32 2015/06/13 21:25:45 tsutsui Exp $
+@comment $NetBSD: PLIST,v 1.33 2015/10/30 15:29:20 tsutsui Exp $
 bin/mlcc
 bin/mlclient
 bin/mlclientx
@@ -11,7 +11,6 @@ lib/mkf/libmkf_8bits.la
 lib/mkf/libmkf_jajp.la
 lib/mkf/libmkf_kokr.la
 lib/mkf/libmkf_zh.la
-lib/mlterm/libathena.la
 ${PLIST.bidi}lib/mlterm/libctl_bidi.la
 ${PLIST.ind}lib/mlterm/libctl_iscii.la
 ${PLIST.canna}lib/mlterm/libim-canna.la
@@ -41,10 +40,6 @@ ${PLIST.ind}lib/mlterm/libind_tamil.la
 ${PLIST.ind}lib/mlterm/libind_telugu.la
 ${PLIST.cairo}lib/mlterm/libtype_cairo.la
 ${PLIST.xft2}lib/mlterm/libtype_xft.la
-lib/mlterm/libmotif.la
-lib/mlterm/libmozmodern.la
-lib/mlterm/libnext.la
-lib/mlterm/libsample.la
 libexec/mlterm/mlconfig
 libexec/mlterm/mlimgloader
 libexec/mlterm/mlterm-menu
diff --git a/x11/mlterm/distinfo b/x11/mlterm/distinfo
index 07f31e49b68..fc9ffc013d9 100644
--- a/x11/mlterm/distinfo
+++ b/x11/mlterm/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.59 2015/08/30 16:06:12 tsutsui Exp $
+$NetBSD: distinfo,v 1.60 2015/10/30 15:29:20 tsutsui Exp $
 
-SHA1 (mlterm-3.5.1.tar.gz) = 03ce3058ae85d3e6e59ba7e9d7fe3a43cf7bf942
-RMD160 (mlterm-3.5.1.tar.gz) = 02b27500158c52fe53c6d2121ade7323ba864be0
-Size (mlterm-3.5.1.tar.gz) = 3714159 bytes
+SHA1 (mlterm-3.6.0.tar.gz) = a71fd2643e19e96bba9b452620c6ae80bdcce4df
+RMD160 (mlterm-3.6.0.tar.gz) = d3c39a04863d887bb56ce3d5f9404bcf754ff1ad
+Size (mlterm-3.6.0.tar.gz) = 3751065 bytes
 SHA1 (patch-configure) = 686754205102c2ffeb2456b4fad77f72b1a992a6
-SHA1 (patch-etc_font-fb) = e8d7b3171bfe7c3c26b50c0dacdafeca4fa4dfd7
+SHA1 (patch-etc_font-fb) = 03f0b2ecee20ef3201c8e4ce17f03ac90f657b00
diff --git a/x11/mlterm/patches/patch-etc_font-fb b/x11/mlterm/patches/patch-etc_font-fb
index dea19c51f04..187cc000179 100644
--- a/x11/mlterm/patches/patch-etc_font-fb
+++ b/x11/mlterm/patches/patch-etc_font-fb
@@ -1,11 +1,12 @@
-$NetBSD: patch-etc_font-fb,v 1.8 2015/02/13 18:21:28 tsutsui Exp $
+$NetBSD: patch-etc_font-fb,v 1.9 2015/10/30 15:29:20 tsutsui Exp $
 
 add more examples for typical NetBSD and pkgsrc installation
 
---- etc/font-fb.orig	2015-02-10 16:00:44.000000000 +0000
+--- etc/font-fb.orig	2015-10-24 16:18:15.000000000 +0000
 +++ etc/font-fb
 @@ -1,12 +1,19 @@
- #DEFAULT = /usr/share/fonts/X11/misc/unifont.pcf.gz:100
+-#DEFAULT = /usr/share/fonts/X11/misc/unifont.pcf.gz:100
++#DEFAULT = /usr/pkg/share/fonts/X11/misc/unifont.pcf.gz:100
 +#DEFAULT = /usr/pkg/share/fonts/X11/efont/b16.pcf.gz
  
  #ISO8859_1 = /usr/share/fonts/X11/misc/mplus_f12r.pcf.gz
@@ -19,7 +20,8 @@ add more examples for typical NetBSD and pkgsrc installation
 +#JISX0213_2000_1=/usr/pkg/share/fonts/X11/local/jiskan16-2000-1.pcf.gz
 +#JISX0213_2000_2=/usr/pkg/share/fonts/X11/local/jiskan16-2000-2.pcf.gz
  
- #ISO10646_UCS4_1 = /usr/share/fonts/X11/misc/unifont.pcf.gz:100
+-#ISO10646_UCS4_1 = /usr/share/fonts/X11/misc/unifont.pcf.gz:100
++#ISO10646_UCS4_1 = /usr/pkg/share/fonts/X11/misc/unifont.pcf.gz:100
 +#ISO10646_UCS4_1 = /usr/pkg/share/fonts/X11/efont/b16.pcf.gz
  ISO10646_UCS4_1_FULLWIDTH = &ISO10646_UCS4_1