Wed Nov 25 06:12:32 2009 UTC ()
Update m17n-lib to 1.5.5.
Bugs fixed.


(obache)
diff -r1.8 -r1.9 pkgsrc/devel/m17n-lib/Makefile
diff -r1.4 -r1.5 pkgsrc/devel/m17n-lib/distinfo
diff -r1.2 -r1.3 pkgsrc/devel/m17n-lib/patches/patch-aa
diff -r1.3 -r1.4 pkgsrc/devel/m17n-lib/patches/patch-ab
diff -r1.3 -r1.4 pkgsrc/devel/m17n-lib/patches/patch-ad
diff -r1.4 -r1.5 pkgsrc/devel/m17n-lib/patches/patch-af
cvs diff -r1.8 -r1.9 pkgsrc/devel/m17n-lib/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/m17n-lib/Makefile 2009/08/26 19:56:51 1.8
+++ pkgsrc/devel/m17n-lib/Makefile 2009/11/25 06:12:32 1.9
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.8 2009/08/26 19:56:51 sno Exp $ 1# $NetBSD: Makefile,v 1.9 2009/11/25 06:12:32 obache Exp $
2# 2#
3 3
4DISTNAME= m17n-lib-1.5.4 4DISTNAME= m17n-lib-1.5.5
5PKGREVISION= 1 
6CATEGORIES= devel converters editors inputmethod textproc time 5CATEGORIES= devel converters editors inputmethod textproc time
7MASTER_SITES= http://www.m17n.org/m17n-lib-download/ 6MASTER_SITES= http://www.m17n.org/m17n-lib-download/
8 7
9MAINTAINER= obache@NetBSD.org 8MAINTAINER= obache@NetBSD.org
10HOMEPAGE= http://www.m17n.org/m17n-lib/ 9HOMEPAGE= http://www.m17n.org/m17n-lib/
11COMMENT= Multilingualization library 10COMMENT= Multilingualization library
12LICENSE= gnu-lgpl-v2.1 11LICENSE= gnu-lgpl-v2.1
13 12
14PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
15 14
16MAKE_JOBS_SAFE= no 15MAKE_JOBS_SAFE= no
17GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
18USE_LIBTOOL= yes 17USE_LIBTOOL= yes
cvs diff -r1.4 -r1.5 pkgsrc/devel/m17n-lib/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/m17n-lib/distinfo 2009/05/12 08:19:54 1.4
+++ pkgsrc/devel/m17n-lib/distinfo 2009/11/25 06:12:32 1.5
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.4 2009/05/12 08:19:54 obache Exp $ 1$NetBSD: distinfo,v 1.5 2009/11/25 06:12:32 obache Exp $
2 2
3SHA1 (m17n-lib-1.5.4.tar.gz) = d4f5bb38a0dabdaecbb6bd9e52606f57894ce1af 3SHA1 (m17n-lib-1.5.5.tar.gz) = 31cc7523f0d70a62ffe1e14f2e6e81bbc2d2d3dd
4RMD160 (m17n-lib-1.5.4.tar.gz) = 122c566e308df48191ebb37399110f5253623292 4RMD160 (m17n-lib-1.5.5.tar.gz) = 80abcd635f6ae34aba679454172e4f67f5e67489
5Size (m17n-lib-1.5.4.tar.gz) = 962454 bytes 5Size (m17n-lib-1.5.5.tar.gz) = 954476 bytes
6SHA1 (patch-aa) = 1b59dd5fd886f136c2b16c05893b30bffa341898 6SHA1 (patch-aa) = b5968890245e1679734abe0f4ca77d39d8ae06e3
7SHA1 (patch-ab) = 2dc5b1d63132e8a1fcae87c880438787a0fd8f0d 7SHA1 (patch-ab) = 29b5da4b84cbbbc7886ed35bbefafe0dfa8f5a7d
8SHA1 (patch-ac) = 8ab1e6c62b6a57e1d0dfd9973efe81b3a89f7d4f 8SHA1 (patch-ac) = 8ab1e6c62b6a57e1d0dfd9973efe81b3a89f7d4f
9SHA1 (patch-ad) = 032012776e2a6744409ded956b219c0e689a9d70 9SHA1 (patch-ad) = 45063876c023625ebd363f5dce341e84e1a4441d
10SHA1 (patch-ae) = f9a272534d2af3d3490fede7bf508a2cc10a0903 10SHA1 (patch-ae) = f9a272534d2af3d3490fede7bf508a2cc10a0903
11SHA1 (patch-af) = e6457bb853848e2c9e3b1fdbd918a77e14848618 11SHA1 (patch-af) = c6015cc9290928a97af42fd5a88c368048b7bc9e
cvs diff -r1.2 -r1.3 pkgsrc/devel/m17n-lib/patches/patch-aa (expand / switch to unified diff)

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

--- pkgsrc/devel/m17n-lib/patches/patch-ab 2009/05/12 08:19:54 1.3
+++ pkgsrc/devel/m17n-lib/patches/patch-ab 2009/11/25 06:12:32 1.4
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ab,v 1.3 2009/05/12 08:19:54 obache Exp $ 1$NetBSD: patch-ab,v 1.4 2009/11/25 06:12:32 obache Exp $
2 2
3--- configure.orig 2009-03-02 02:40:45.000000000 +0000 3--- configure.orig 2009-07-29 08:16:22.000000000 +0000
4+++ configure 4+++ configure
5@@ -25076,7 +25076,7 @@ echo "${ECHO_T}yes" >&6; } 5@@ -25045,7 +25045,7 @@ echo "${ECHO_T}yes" >&6; }
6 HAVE_WORDCUT=yes 6 HAVE_WORDCUT=yes
7 fi 7 fi
8  8
9-if test "x$HAVE_LIBTHAI" == "xyes"; then 9-if test "x$HAVE_LIBTHAI" == "xyes"; then
10+if test "x$HAVE_LIBTHAI" = "xyes"; then 10+if test "x$HAVE_LIBTHAI" = "xyes"; then
11  11
12  12
13 cat >>confdefs.h <<\_ACEOF 13 cat >>confdefs.h <<\_ACEOF
cvs diff -r1.3 -r1.4 pkgsrc/devel/m17n-lib/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/devel/m17n-lib/patches/patch-ad 2009/05/12 08:19:54 1.3
+++ pkgsrc/devel/m17n-lib/patches/patch-ad 2009/11/25 06:12:32 1.4
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1$NetBSD: patch-ad,v 1.3 2009/05/12 08:19:54 obache Exp $ 1$NetBSD: patch-ad,v 1.4 2009/11/25 06:12:32 obache Exp $
2 2
3--- src/Makefile.in.orig 2009-03-02 02:40:42.000000000 +0000 3--- src/Makefile.in.orig 2009-07-29 08:16:35.000000000 +0000
4+++ src/Makefile.in 4+++ src/Makefile.in
5@@ -408,7 +408,7 @@ libm17n_core_la_SOURCES = \ 5@@ -404,7 +404,7 @@ libm17n_core_la_SOURCES = \
6 textprop.h textprop.c \ 6 textprop.h textprop.c \
7 mtext-lbrk.c mtext-wseg.c 7 mtext-lbrk.c mtext-wseg.c
8  8
9-libm17n_core_la_LIBADD = @XML2_LD_FLAGS@ @THAI_WORDSEG_LD_FLAGS@ 9-libm17n_core_la_LIBADD = @XML2_LD_FLAGS@ @THAI_WORDSEG_LD_FLAGS@
10+libm17n_core_la_LIBADD = @XML2_LD_FLAGS@ @THAI_WORDSEG_LD_FLAGS@ @INTLLIBS@ 10+libm17n_core_la_LIBADD = @XML2_LD_FLAGS@ @THAI_WORDSEG_LD_FLAGS@ @INTLLIBS@
11 libm17n_core_la_LDFLAGS = -export-dynamic ${VINFO} 11 libm17n_core_la_LDFLAGS = -export-dynamic ${VINFO}
12 libm17n_la_SOURCES = \ 12 libm17n_la_SOURCES = \
13 charset.h charset.c \ 13 charset.h charset.c \
14@@ -418,7 +418,7 @@ libm17n_la_SOURCES = \ 14@@ -414,7 +414,7 @@ libm17n_la_SOURCES = \
15 mlocale.h locale.c \ 15 mlocale.h locale.c \
16 m17n.h m17n.c 16 m17n.h m17n.c
17  17
18-libm17n_la_LIBADD = ${top_builddir}/src/libm17n-core.la -ldl 18-libm17n_la_LIBADD = ${top_builddir}/src/libm17n-core.la -ldl
19+libm17n_la_LIBADD = ${top_builddir}/src/libm17n-core.la @INTLLIBS@ 19+libm17n_la_LIBADD = ${top_builddir}/src/libm17n-core.la @INTLLIBS@
20 libm17n_la_LDFLAGS = -export-dynamic ${VINFO} 20 libm17n_la_LDFLAGS = -export-dynamic ${VINFO}
21 FLT_SOURCES = \ 21 FLT_SOURCES = \
22 internal-flt.h \ 22 internal-flt.h \
cvs diff -r1.4 -r1.5 pkgsrc/devel/m17n-lib/patches/patch-af (expand / switch to unified diff)

--- pkgsrc/devel/m17n-lib/patches/patch-af 2009/05/12 08:19:54 1.4
+++ pkgsrc/devel/m17n-lib/patches/patch-af 2009/11/25 06:12:32 1.5
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-af,v 1.4 2009/05/12 08:19:54 obache Exp $ 1$NetBSD: patch-af,v 1.5 2009/11/25 06:12:32 obache Exp $
2 2
3--- example/Makefile.in.orig 2009-03-02 02:40:41.000000000 +0000 3--- example/Makefile.in.orig 2009-07-29 08:16:34.000000000 +0000
4+++ example/Makefile.in 4+++ example/Makefile.in
5@@ -347,7 +347,7 @@ m17n_conv_SOURCES = mconv.c 5@@ -343,7 +343,7 @@ m17n_conv_SOURCES = mconv.c
6 m17n_conv_LDADD = ${common_ldflags} 6 m17n_conv_LDADD = ${common_ldflags}
7 X_LD_FLAGS = ${X_PRE_LIBS} ${X_LIBS} @XAW_LD_FLAGS@ @X11_LD_FLAGS@ ${X_EXTRA_LIBS} 7 X_LD_FLAGS = ${X_PRE_LIBS} ${X_LIBS} @XAW_LD_FLAGS@ @X11_LD_FLAGS@ ${X_EXTRA_LIBS}
8 m17n_edit_SOURCES = medit.c 8 m17n_edit_SOURCES = medit.c
9-m17n_edit_LDADD = ${X_LD_FLAGS} ${common_ldflags_gui} -ldl 9-m17n_edit_LDADD = ${X_LD_FLAGS} ${common_ldflags_gui} -ldl
10+m17n_edit_LDADD = ${X_LD_FLAGS} ${common_ldflags_gui} ${DL_LDFLAGS} ${DL_LIBS} 10+m17n_edit_LDADD = ${X_LD_FLAGS} ${common_ldflags_gui} ${DL_LDFLAGS} ${DL_LIBS}
11 m17n_view_SOURCES = mview.c 11 m17n_view_SOURCES = mview.c
12 m17n_view_LDADD = ${X_LD_FLAGS} ${common_ldflags_gui} 12 m17n_view_LDADD = ${X_LD_FLAGS} ${common_ldflags_gui}
13 m17n_dump_SOURCES = mdump.c 13 m17n_dump_SOURCES = mdump.c