Update m17n-lib to 1.7.0.

* Changes in the m17n library 1.7.0

** The mechanism of fallback input method is implemented.  For that, a
new variable fallback-input-method and new commands switch-im,
push-im, pop-im are supported.

9 files changed, 37 insertions, 22 deletions

diff --git a/devel/m17n-lib/Makefile b/devel/m17n-lib/Makefile
index 685f996c6a4..4535a09dc26 100644
--- a/devel/m17n-lib/Makefile
+++ b/devel/m17n-lib/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2013/09/04 12:31:24 obache Exp $
+# $NetBSD: Makefile,v 1.28 2014/12/14 07:53:53 obache Exp $
 #
 
-DISTNAME=	m17n-lib-1.6.4
-PKGREVISION=	6
+DISTNAME=	m17n-lib-1.7.0
 CATEGORIES=	devel converters editors inputmethod textproc time
 MASTER_SITES=	http://download.savannah.gnu.org/releases/m17n/
 
diff --git a/devel/m17n-lib/distinfo b/devel/m17n-lib/distinfo
index ab165ffb6e7..97bea78183f 100644
--- a/devel/m17n-lib/distinfo
+++ b/devel/m17n-lib/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.9 2013/01/12 07:26:04 obache Exp $
+$NetBSD: distinfo,v 1.10 2014/12/14 07:53:53 obache Exp $
 
-SHA1 (m17n-lib-1.6.4.tar.gz) = 83f2fc4facfd70a580bb95d9381eac7472d85171
-RMD160 (m17n-lib-1.6.4.tar.gz) = a15057981fdf215e5ba9569283842c59cfdb595d
-Size (m17n-lib-1.6.4.tar.gz) = 1034422 bytes
-SHA1 (patch-aa) = b5968890245e1679734abe0f4ca77d39d8ae06e3
-SHA1 (patch-ab) = 1de680f683b895bf24aff90e0635d461cd7c8d83
-SHA1 (patch-ac) = 8ab1e6c62b6a57e1d0dfd9973efe81b3a89f7d4f
-SHA1 (patch-ad) = 45063876c023625ebd363f5dce341e84e1a4441d
-SHA1 (patch-ae) = f9a272534d2af3d3490fede7bf508a2cc10a0903
-SHA1 (patch-af) = c6015cc9290928a97af42fd5a88c368048b7bc9e
+SHA1 (m17n-lib-1.7.0.tar.gz) = 6ebc98680ffb575c5f58190f054d60fdb8b0f301
+RMD160 (m17n-lib-1.7.0.tar.gz) = 0cea262546a185768946b74e0ac340a6656cdc35
+Size (m17n-lib-1.7.0.tar.gz) = 1063169 bytes
+SHA1 (patch-aa) = 412b0cd68241e334c7d5a9d0e98c672089e4f19d
+SHA1 (patch-ab) = 9069402aa83fe6248914363eadfa917cda6d607e
+SHA1 (patch-ac) = 56e719f3c7fb6fb1018c66cff9261d31d7c3c329
+SHA1 (patch-ad) = 92ab488679a65618389528ddc3e02e31ec3a8026
+SHA1 (patch-ae) = 94eaee7662cdba55c227712ecfdb45b41df60bb3
+SHA1 (patch-af) = 5cdbbb6efb86db8bc0ae7a9ee8175922b7add673
diff --git a/devel/m17n-lib/options.mk b/devel/m17n-lib/options.mk
index 408f87ac0e6..a2628099350 100644
--- a/devel/m17n-lib/options.mk
+++ b/devel/m17n-lib/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.4 2010/07/21 13:11:11 obache Exp $
+# $NetBSD: options.mk,v 1.5 2014/12/14 07:53:53 obache Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.m17n-lib
-PKG_SUPPORTED_OPTIONS=	anthy x11 libthai
+PKG_SUPPORTED_OPTIONS=	anthy ispell x11 libthai
 PKG_SUGGESTED_OPTIONS=	x11
 
 .include "../../mk/bsd.options.mk"
@@ -12,6 +12,10 @@ PLIST_VARS+=		x11
 .include "../../inputmethod/anthy/buildlink3.mk"
 .endif
 
+.if !empty(PKG_OPTIONS:Mispell)
+DEPENDS+=	ispell-[0-9]*:../../textproc/ispell
+.endif
+
 .if !empty(PKG_OPTIONS:Mx11)
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
@@ -22,7 +26,7 @@ BUILDLINK_API_DEPENDS.libotf+=	libotf>=0.9.11
 .include "../../mk/xaw.buildlink3.mk"
 PLIST.x11=		yes
 .else
-CONFIGURE_ARGS+=	--without-gui
+CONFIGURE_ARGS+=	--enable-gui=no
 .endif
 
 .if !empty(PKG_OPTIONS:Mlibthai)
diff --git a/devel/m17n-lib/patches/patch-aa b/devel/m17n-lib/patches/patch-aa
index 755842de31f..6deaa801978 100644
--- a/devel/m17n-lib/patches/patch-aa
+++ b/devel/m17n-lib/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.3 2009/11/25 06:12:32 obache Exp $
+$NetBSD: patch-aa,v 1.4 2014/12/14 07:53:54 obache Exp $
+
+* portability fix
 
 --- configure.ac.orig	2009-07-29 08:14:45.000000000 +0000
 +++ configure.ac
diff --git a/devel/m17n-lib/patches/patch-ab b/devel/m17n-lib/patches/patch-ab
index 773071246d5..1402985e7d8 100644
--- a/devel/m17n-lib/patches/patch-ab
+++ b/devel/m17n-lib/patches/patch-ab
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.5 2010/04/27 01:14:32 obache Exp $
+$NetBSD: patch-ab,v 1.6 2014/12/14 07:53:54 obache Exp $
+
+* portability fix
 
 --- configure.orig	2010-04-14 05:13:26.000000000 +0000
 +++ configure
diff --git a/devel/m17n-lib/patches/patch-ac b/devel/m17n-lib/patches/patch-ac
index 7278adc5390..00705a5a2af 100644
--- a/devel/m17n-lib/patches/patch-ac
+++ b/devel/m17n-lib/patches/patch-ac
@@ -1,4 +1,6 @@
-$NetBSD: patch-ac,v 1.2 2009/05/12 08:19:54 obache Exp $
+$NetBSD: patch-ac,v 1.3 2014/12/14 07:53:54 obache Exp $
+
+* fixes required libraries
 
 --- src/Makefile.am.orig	2008-06-13 05:51:25.000000000 +0000
 +++ src/Makefile.am
diff --git a/devel/m17n-lib/patches/patch-ad b/devel/m17n-lib/patches/patch-ad
index 09ccefdf337..3849cc73a85 100644
--- a/devel/m17n-lib/patches/patch-ad
+++ b/devel/m17n-lib/patches/patch-ad
@@ -1,4 +1,6 @@
-$NetBSD: patch-ad,v 1.4 2009/11/25 06:12:32 obache Exp $
+$NetBSD: patch-ad,v 1.5 2014/12/14 07:53:54 obache Exp $
+
+* fixes required libraries
 
 --- src/Makefile.in.orig	2009-07-29 08:16:35.000000000 +0000
 +++ src/Makefile.in
diff --git a/devel/m17n-lib/patches/patch-ae b/devel/m17n-lib/patches/patch-ae
index 25d59f6ce0b..f242c422dac 100644
--- a/devel/m17n-lib/patches/patch-ae
+++ b/devel/m17n-lib/patches/patch-ae
@@ -1,4 +1,6 @@
-$NetBSD: patch-ae,v 1.3 2009/05/12 08:19:54 obache Exp $
+$NetBSD: patch-ae,v 1.4 2014/12/14 07:53:54 obache Exp $
+
+* fixes required libraries
 
 --- example/Makefile.am.orig	2007-11-13 02:29:20.000000000 +0000
 +++ example/Makefile.am
diff --git a/devel/m17n-lib/patches/patch-af b/devel/m17n-lib/patches/patch-af
index e43633168f6..5050804076c 100644
--- a/devel/m17n-lib/patches/patch-af
+++ b/devel/m17n-lib/patches/patch-af
@@ -1,4 +1,6 @@
-$NetBSD: patch-af,v 1.5 2009/11/25 06:12:32 obache Exp $
+$NetBSD: patch-af,v 1.6 2014/12/14 07:53:54 obache Exp $
+
+* fixes required libraries
 
 --- example/Makefile.in.orig	2009-07-29 08:16:34.000000000 +0000
 +++ example/Makefile.in