Sun Dec 14 07:53:54 2014 UTC ()
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.


(obache)
diff -r1.27 -r1.28 pkgsrc/devel/m17n-lib/Makefile
diff -r1.9 -r1.10 pkgsrc/devel/m17n-lib/distinfo
diff -r1.4 -r1.5 pkgsrc/devel/m17n-lib/options.mk
diff -r1.3 -r1.4 pkgsrc/devel/m17n-lib/patches/patch-aa
diff -r1.3 -r1.4 pkgsrc/devel/m17n-lib/patches/patch-ae
diff -r1.5 -r1.6 pkgsrc/devel/m17n-lib/patches/patch-ab
diff -r1.5 -r1.6 pkgsrc/devel/m17n-lib/patches/patch-af
diff -r1.2 -r1.3 pkgsrc/devel/m17n-lib/patches/patch-ac
diff -r1.4 -r1.5 pkgsrc/devel/m17n-lib/patches/patch-ad
cvs diff -r1.27 -r1.28 pkgsrc/devel/m17n-lib/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/m17n-lib/Makefile 2013/09/04 12:31:24 1.27
+++ pkgsrc/devel/m17n-lib/Makefile 2014/12/14 07:53:53 1.28
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.27 2013/09/04 12:31:24 obache Exp $ 1# $NetBSD: Makefile,v 1.28 2014/12/14 07:53:53 obache Exp $
2# 2#
3 3
4DISTNAME= m17n-lib-1.6.4 4DISTNAME= m17n-lib-1.7.0
5PKGREVISION= 6 
6CATEGORIES= devel converters editors inputmethod textproc time 5CATEGORIES= devel converters editors inputmethod textproc time
7MASTER_SITES= http://download.savannah.gnu.org/releases/m17n/ 6MASTER_SITES= http://download.savannah.gnu.org/releases/m17n/
8 7
9MAINTAINER= obache@NetBSD.org 8MAINTAINER= obache@NetBSD.org
10HOMEPAGE= http://www.nongnu.org/m17n/ 9HOMEPAGE= http://www.nongnu.org/m17n/
11COMMENT= Multilingualization library 10COMMENT= Multilingualization library
12LICENSE= gnu-lgpl-v2.1 11LICENSE= gnu-lgpl-v2.1
13 12
14MAKE_JOBS_SAFE= no 13MAKE_JOBS_SAFE= no
15GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
16USE_LIBTOOL= yes 15USE_LIBTOOL= yes
17USE_TOOLS+= pkg-config 16USE_TOOLS+= pkg-config
18 17
cvs diff -r1.9 -r1.10 pkgsrc/devel/m17n-lib/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/m17n-lib/distinfo 2013/01/12 07:26:04 1.9
+++ pkgsrc/devel/m17n-lib/distinfo 2014/12/14 07:53:53 1.10
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.9 2013/01/12 07:26:04 obache Exp $ 1$NetBSD: distinfo,v 1.10 2014/12/14 07:53:53 obache Exp $
2 2
3SHA1 (m17n-lib-1.6.4.tar.gz) = 83f2fc4facfd70a580bb95d9381eac7472d85171 3SHA1 (m17n-lib-1.7.0.tar.gz) = 6ebc98680ffb575c5f58190f054d60fdb8b0f301
4RMD160 (m17n-lib-1.6.4.tar.gz) = a15057981fdf215e5ba9569283842c59cfdb595d 4RMD160 (m17n-lib-1.7.0.tar.gz) = 0cea262546a185768946b74e0ac340a6656cdc35
5Size (m17n-lib-1.6.4.tar.gz) = 1034422 bytes 5Size (m17n-lib-1.7.0.tar.gz) = 1063169 bytes
6SHA1 (patch-aa) = b5968890245e1679734abe0f4ca77d39d8ae06e3 6SHA1 (patch-aa) = 412b0cd68241e334c7d5a9d0e98c672089e4f19d
7SHA1 (patch-ab) = 1de680f683b895bf24aff90e0635d461cd7c8d83 7SHA1 (patch-ab) = 9069402aa83fe6248914363eadfa917cda6d607e
8SHA1 (patch-ac) = 8ab1e6c62b6a57e1d0dfd9973efe81b3a89f7d4f 8SHA1 (patch-ac) = 56e719f3c7fb6fb1018c66cff9261d31d7c3c329
9SHA1 (patch-ad) = 45063876c023625ebd363f5dce341e84e1a4441d 9SHA1 (patch-ad) = 92ab488679a65618389528ddc3e02e31ec3a8026
10SHA1 (patch-ae) = f9a272534d2af3d3490fede7bf508a2cc10a0903 10SHA1 (patch-ae) = 94eaee7662cdba55c227712ecfdb45b41df60bb3
11SHA1 (patch-af) = c6015cc9290928a97af42fd5a88c368048b7bc9e 11SHA1 (patch-af) = 5cdbbb6efb86db8bc0ae7a9ee8175922b7add673
cvs diff -r1.4 -r1.5 pkgsrc/devel/m17n-lib/options.mk (expand / switch to unified diff)

--- pkgsrc/devel/m17n-lib/options.mk 2010/07/21 13:11:11 1.4
+++ pkgsrc/devel/m17n-lib/options.mk 2014/12/14 07:53:53 1.5
@@ -1,30 +1,34 @@ @@ -1,30 +1,34 @@
1# $NetBSD: options.mk,v 1.4 2010/07/21 13:11:11 obache Exp $ 1# $NetBSD: options.mk,v 1.5 2014/12/14 07:53:53 obache Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.m17n-lib 3PKG_OPTIONS_VAR= PKG_OPTIONS.m17n-lib
4PKG_SUPPORTED_OPTIONS= anthy x11 libthai 4PKG_SUPPORTED_OPTIONS= anthy ispell x11 libthai
5PKG_SUGGESTED_OPTIONS= x11 5PKG_SUGGESTED_OPTIONS= x11
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9PLIST_VARS+= x11 9PLIST_VARS+= x11
10 10
11.if !empty(PKG_OPTIONS:Manthy) 11.if !empty(PKG_OPTIONS:Manthy)
12.include "../../inputmethod/anthy/buildlink3.mk" 12.include "../../inputmethod/anthy/buildlink3.mk"
13.endif 13.endif
14 14
 15.if !empty(PKG_OPTIONS:Mispell)
 16DEPENDS+= ispell-[0-9]*:../../textproc/ispell
 17.endif
 18
15.if !empty(PKG_OPTIONS:Mx11) 19.if !empty(PKG_OPTIONS:Mx11)
16.include "../../fonts/fontconfig/buildlink3.mk" 20.include "../../fonts/fontconfig/buildlink3.mk"
17.include "../../graphics/freetype2/buildlink3.mk" 21.include "../../graphics/freetype2/buildlink3.mk"
18.include "../../graphics/gd/buildlink3.mk" 22.include "../../graphics/gd/buildlink3.mk"
19BUILDLINK_API_DEPENDS.libotf+= libotf>=0.9.11 23BUILDLINK_API_DEPENDS.libotf+= libotf>=0.9.11
20.include "../../graphics/libotf/buildlink3.mk" 24.include "../../graphics/libotf/buildlink3.mk"
21.include "../../x11/libXft/buildlink3.mk" 25.include "../../x11/libXft/buildlink3.mk"
22.include "../../mk/xaw.buildlink3.mk" 26.include "../../mk/xaw.buildlink3.mk"
23PLIST.x11= yes 27PLIST.x11= yes
24.else 28.else
25CONFIGURE_ARGS+= --without-gui 29CONFIGURE_ARGS+= --enable-gui=no
26.endif 30.endif
27 31
28.if !empty(PKG_OPTIONS:Mlibthai) 32.if !empty(PKG_OPTIONS:Mlibthai)
29.include "../../devel/libthai/buildlink3.mk" 33.include "../../devel/libthai/buildlink3.mk"
30.endif 34.endif
cvs diff -r1.3 -r1.4 pkgsrc/devel/m17n-lib/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/devel/m17n-lib/patches/patch-aa 2009/11/25 06:12:32 1.3
+++ pkgsrc/devel/m17n-lib/patches/patch-aa 2014/12/14 07:53:54 1.4
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1$NetBSD: patch-aa,v 1.3 2009/11/25 06:12:32 obache Exp $ 1$NetBSD: patch-aa,v 1.4 2014/12/14 07:53:54 obache Exp $
 2
 3* portability fix
2 4
3--- configure.ac.orig 2009-07-29 08:14:45.000000000 +0000 5--- configure.ac.orig 2009-07-29 08:14:45.000000000 +0000
4+++ configure.ac 6+++ configure.ac
5@@ -347,7 +347,7 @@ dnl In addition, set THAI_WORDSEG_LD_FLA 7@@ -347,7 +347,7 @@ dnl In addition, set THAI_WORDSEG_LD_FLA
6 PKG_CHECK_MODULES(LIBTHAI, libthai, HAVE_LIBTHAI=yes, HAVE_LIBTHAI=no) 8 PKG_CHECK_MODULES(LIBTHAI, libthai, HAVE_LIBTHAI=yes, HAVE_LIBTHAI=no)
7 PKG_CHECK_MODULES(WORDCUT, wordcut, HAVE_WORDCUT=yes, HAVE_WORDCUT=no) 9 PKG_CHECK_MODULES(WORDCUT, wordcut, HAVE_WORDCUT=yes, HAVE_WORDCUT=no)
8  10
9-if test "x$HAVE_LIBTHAI" == "xyes"; then 11-if test "x$HAVE_LIBTHAI" == "xyes"; then
10+if test "x$HAVE_LIBTHAI" = "xyes"; then 12+if test "x$HAVE_LIBTHAI" = "xyes"; then
11  13
12 AC_DEFINE(HAVE_LIBTHAI, 1, [Define if you have libthai]) 14 AC_DEFINE(HAVE_LIBTHAI, 1, [Define if you have libthai])
13 THAI_WORDSEG_LD_FLAGS="$LIBTHAI_LIBS" 15 THAI_WORDSEG_LD_FLAGS="$LIBTHAI_LIBS"
cvs diff -r1.3 -r1.4 pkgsrc/devel/m17n-lib/patches/patch-ae (expand / switch to unified diff)

--- pkgsrc/devel/m17n-lib/patches/patch-ae 2009/05/12 08:19:54 1.3
+++ pkgsrc/devel/m17n-lib/patches/patch-ae 2014/12/14 07:53:54 1.4
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1$NetBSD: patch-ae,v 1.3 2009/05/12 08:19:54 obache Exp $ 1$NetBSD: patch-ae,v 1.4 2014/12/14 07:53:54 obache Exp $
 2
 3* fixes required libraries
2 4
3--- example/Makefile.am.orig 2007-11-13 02:29:20.000000000 +0000 5--- example/Makefile.am.orig 2007-11-13 02:29:20.000000000 +0000
4+++ example/Makefile.am 6+++ example/Makefile.am
5@@ -45,7 +45,7 @@ m17n_conv_LDADD = ${common_ldflags} 7@@ -45,7 +45,7 @@ m17n_conv_LDADD = ${common_ldflags}
6 X_LD_FLAGS = ${X_PRE_LIBS} ${X_LIBS} @XAW_LD_FLAGS@ @X11_LD_FLAGS@ ${X_EXTRA_LIBS} 8 X_LD_FLAGS = ${X_PRE_LIBS} ${X_LIBS} @XAW_LD_FLAGS@ @X11_LD_FLAGS@ ${X_EXTRA_LIBS}
7  9
8 m17n_edit_SOURCES = medit.c 10 m17n_edit_SOURCES = medit.c
9-m17n_edit_LDADD = ${X_LD_FLAGS} ${common_ldflags_gui} -ldl 11-m17n_edit_LDADD = ${X_LD_FLAGS} ${common_ldflags_gui} -ldl
10+m17n_edit_LDADD = ${X_LD_FLAGS} ${common_ldflags_gui} ${DL_LDFLAGS} ${DL_LIBS} 12+m17n_edit_LDADD = ${X_LD_FLAGS} ${common_ldflags_gui} ${DL_LDFLAGS} ${DL_LIBS}
11  13
12 m17n_view_SOURCES = mview.c 14 m17n_view_SOURCES = mview.c
13 m17n_view_LDADD = ${X_LD_FLAGS} ${common_ldflags_gui} 15 m17n_view_LDADD = ${X_LD_FLAGS} ${common_ldflags_gui}
cvs diff -r1.5 -r1.6 pkgsrc/devel/m17n-lib/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/devel/m17n-lib/patches/patch-ab 2010/04/27 01:14:32 1.5
+++ pkgsrc/devel/m17n-lib/patches/patch-ab 2014/12/14 07:53:54 1.6
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1$NetBSD: patch-ab,v 1.5 2010/04/27 01:14:32 obache Exp $ 1$NetBSD: patch-ab,v 1.6 2014/12/14 07:53:54 obache Exp $
 2
 3* portability fix
2 4
3--- configure.orig 2010-04-14 05:13:26.000000000 +0000 5--- configure.orig 2010-04-14 05:13:26.000000000 +0000
4+++ configure 6+++ configure
5@@ -18650,7 +18650,7 @@ $as_echo "yes" >&6; } 7@@ -18650,7 +18650,7 @@ $as_echo "yes" >&6; }
6 HAVE_WORDCUT=yes 8 HAVE_WORDCUT=yes
7 fi 9 fi
8  10
9-if test "x$HAVE_LIBTHAI" == "xyes"; then 11-if test "x$HAVE_LIBTHAI" == "xyes"; then
10+if test "x$HAVE_LIBTHAI" = "xyes"; then 12+if test "x$HAVE_LIBTHAI" = "xyes"; then
11  13
12  14
13 $as_echo "#define HAVE_LIBTHAI 1" >>confdefs.h 15 $as_echo "#define HAVE_LIBTHAI 1" >>confdefs.h
cvs diff -r1.5 -r1.6 pkgsrc/devel/m17n-lib/patches/patch-af (expand / switch to unified diff)

--- pkgsrc/devel/m17n-lib/patches/patch-af 2009/11/25 06:12:32 1.5
+++ pkgsrc/devel/m17n-lib/patches/patch-af 2014/12/14 07:53:54 1.6
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1$NetBSD: patch-af,v 1.5 2009/11/25 06:12:32 obache Exp $ 1$NetBSD: patch-af,v 1.6 2014/12/14 07:53:54 obache Exp $
 2
 3* fixes required libraries
2 4
3--- example/Makefile.in.orig 2009-07-29 08:16:34.000000000 +0000 5--- example/Makefile.in.orig 2009-07-29 08:16:34.000000000 +0000
4+++ example/Makefile.in 6+++ example/Makefile.in
5@@ -343,7 +343,7 @@ m17n_conv_SOURCES = mconv.c 7@@ -343,7 +343,7 @@ m17n_conv_SOURCES = mconv.c
6 m17n_conv_LDADD = ${common_ldflags} 8 m17n_conv_LDADD = ${common_ldflags}
7 X_LD_FLAGS = ${X_PRE_LIBS} ${X_LIBS} @XAW_LD_FLAGS@ @X11_LD_FLAGS@ ${X_EXTRA_LIBS} 9 X_LD_FLAGS = ${X_PRE_LIBS} ${X_LIBS} @XAW_LD_FLAGS@ @X11_LD_FLAGS@ ${X_EXTRA_LIBS}
8 m17n_edit_SOURCES = medit.c 10 m17n_edit_SOURCES = medit.c
9-m17n_edit_LDADD = ${X_LD_FLAGS} ${common_ldflags_gui} -ldl 11-m17n_edit_LDADD = ${X_LD_FLAGS} ${common_ldflags_gui} -ldl
10+m17n_edit_LDADD = ${X_LD_FLAGS} ${common_ldflags_gui} ${DL_LDFLAGS} ${DL_LIBS} 12+m17n_edit_LDADD = ${X_LD_FLAGS} ${common_ldflags_gui} ${DL_LDFLAGS} ${DL_LIBS}
11 m17n_view_SOURCES = mview.c 13 m17n_view_SOURCES = mview.c
12 m17n_view_LDADD = ${X_LD_FLAGS} ${common_ldflags_gui} 14 m17n_view_LDADD = ${X_LD_FLAGS} ${common_ldflags_gui}
13 m17n_dump_SOURCES = mdump.c 15 m17n_dump_SOURCES = mdump.c
cvs diff -r1.2 -r1.3 pkgsrc/devel/m17n-lib/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/devel/m17n-lib/patches/patch-ac 2009/05/12 08:19:54 1.2
+++ pkgsrc/devel/m17n-lib/patches/patch-ac 2014/12/14 07:53:54 1.3
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-ac,v 1.2 2009/05/12 08:19:54 obache Exp $ 1$NetBSD: patch-ac,v 1.3 2014/12/14 07:53:54 obache Exp $
 2
 3* fixes required libraries
2 4
3--- src/Makefile.am.orig 2008-06-13 05:51:25.000000000 +0000 5--- src/Makefile.am.orig 2008-06-13 05:51:25.000000000 +0000
4+++ src/Makefile.am 6+++ src/Makefile.am
5@@ -43,7 +43,7 @@ libm17n_core_la_SOURCES = \ 7@@ -43,7 +43,7 @@ libm17n_core_la_SOURCES = \
6 textprop.h textprop.c \ 8 textprop.h textprop.c \
7 mtext-lbrk.c mtext-wseg.c 9 mtext-lbrk.c mtext-wseg.c
8  10
9-libm17n_core_la_LIBADD = @XML2_LD_FLAGS@ @THAI_WORDSEG_LD_FLAGS@ 11-libm17n_core_la_LIBADD = @XML2_LD_FLAGS@ @THAI_WORDSEG_LD_FLAGS@
10+libm17n_core_la_LIBADD = @XML2_LD_FLAGS@ @THAI_WORDSEG_LD_FLAGS@ @INTLLIBS@ 12+libm17n_core_la_LIBADD = @XML2_LD_FLAGS@ @THAI_WORDSEG_LD_FLAGS@ @INTLLIBS@
11 libm17n_core_la_LDFLAGS = -export-dynamic ${VINFO} 13 libm17n_core_la_LDFLAGS = -export-dynamic ${VINFO}
12  14
13 libm17n_la_SOURCES = \ 15 libm17n_la_SOURCES = \
14@@ -53,7 +53,7 @@ libm17n_la_SOURCES = \ 16@@ -53,7 +53,7 @@ libm17n_la_SOURCES = \
cvs diff -r1.4 -r1.5 pkgsrc/devel/m17n-lib/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/devel/m17n-lib/patches/patch-ad 2009/11/25 06:12:32 1.4
+++ pkgsrc/devel/m17n-lib/patches/patch-ad 2014/12/14 07:53:54 1.5
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-ad,v 1.4 2009/11/25 06:12:32 obache Exp $ 1$NetBSD: patch-ad,v 1.5 2014/12/14 07:53:54 obache Exp $
 2
 3* fixes required libraries
2 4
3--- src/Makefile.in.orig 2009-07-29 08:16:35.000000000 +0000 5--- src/Makefile.in.orig 2009-07-29 08:16:35.000000000 +0000
4+++ src/Makefile.in 6+++ src/Makefile.in
5@@ -404,7 +404,7 @@ libm17n_core_la_SOURCES = \ 7@@ -404,7 +404,7 @@ libm17n_core_la_SOURCES = \
6 textprop.h textprop.c \ 8 textprop.h textprop.c \
7 mtext-lbrk.c mtext-wseg.c 9 mtext-lbrk.c mtext-wseg.c
8  10
9-libm17n_core_la_LIBADD = @XML2_LD_FLAGS@ @THAI_WORDSEG_LD_FLAGS@ 11-libm17n_core_la_LIBADD = @XML2_LD_FLAGS@ @THAI_WORDSEG_LD_FLAGS@
10+libm17n_core_la_LIBADD = @XML2_LD_FLAGS@ @THAI_WORDSEG_LD_FLAGS@ @INTLLIBS@ 12+libm17n_core_la_LIBADD = @XML2_LD_FLAGS@ @THAI_WORDSEG_LD_FLAGS@ @INTLLIBS@
11 libm17n_core_la_LDFLAGS = -export-dynamic ${VINFO} 13 libm17n_core_la_LDFLAGS = -export-dynamic ${VINFO}
12 libm17n_la_SOURCES = \ 14 libm17n_la_SOURCES = \
13 charset.h charset.c \ 15 charset.h charset.c \
14@@ -414,7 +414,7 @@ libm17n_la_SOURCES = \ 16@@ -414,7 +414,7 @@ libm17n_la_SOURCES = \