Update m17n-lib to 1.5.4.

* Changes in the m17n library 1.5.4

** New coding system names "Shift_JIS" and "windows-XXXX" are
recognized.

8 files changed, 30 insertions, 28 deletions

diff --git a/devel/m17n-lib/Makefile b/devel/m17n-lib/Makefile
index 23c96db95e6..cc41b3c0643 100644
--- a/devel/m17n-lib/Makefile
+++ b/devel/m17n-lib/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2009/01/12 12:17:22 obache Exp $
+# $NetBSD: Makefile,v 1.6 2009/05/12 08:19:54 obache Exp $
 #
 
-DISTNAME=	m17n-lib-1.5.3
+DISTNAME=	m17n-lib-1.5.4
 CATEGORIES=	devel converters editors inputmethod textproc time
 MASTER_SITES=	http://www.m17n.org/m17n-lib-download/
 
@@ -9,6 +9,8 @@ MAINTAINER=	obache@NetBSD.org
 HOMEPAGE=	http://www.m17n.org/m17n-lib/
 COMMENT=	Multilingualization library
 
+LICENSE=	gnu-lgpl-v2.1
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 MAKE_JOBS_SAFE=	no
diff --git a/devel/m17n-lib/distinfo b/devel/m17n-lib/distinfo
index 9ccd39c1a11..66362b2d46f 100644
--- a/devel/m17n-lib/distinfo
+++ b/devel/m17n-lib/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.3 2009/01/12 12:17:22 obache Exp $
+$NetBSD: distinfo,v 1.4 2009/05/12 08:19:54 obache Exp $
 
-SHA1 (m17n-lib-1.5.3.tar.gz) = 80d5f10329bf7c3caf85359e568da1efa41b81b8
-RMD160 (m17n-lib-1.5.3.tar.gz) = 40c01ca60ae9a7976edcbcfffff4c608cc402689
-Size (m17n-lib-1.5.3.tar.gz) = 998339 bytes
-SHA1 (patch-aa) = 607c6e8daf53c9c5dbcc6b15a7c637250464b6ca
-SHA1 (patch-ab) = fc5c5a19add5bc5630f18119b3da0c5d94b74703
-SHA1 (patch-ac) = b5326cc9eacf84cc4f81a00605a51e51f3809c45
-SHA1 (patch-ad) = b56219667045a844ddde54b76f5e7f0426685721
-SHA1 (patch-ae) = a7375830c044fb256078a08831e15b1eb4637edf
-SHA1 (patch-af) = ee47e8944677d98b9529ed3e266ba9815905677e
+SHA1 (m17n-lib-1.5.4.tar.gz) = d4f5bb38a0dabdaecbb6bd9e52606f57894ce1af
+RMD160 (m17n-lib-1.5.4.tar.gz) = 122c566e308df48191ebb37399110f5253623292
+Size (m17n-lib-1.5.4.tar.gz) = 962454 bytes
+SHA1 (patch-aa) = 1b59dd5fd886f136c2b16c05893b30bffa341898
+SHA1 (patch-ab) = 2dc5b1d63132e8a1fcae87c880438787a0fd8f0d
+SHA1 (patch-ac) = 8ab1e6c62b6a57e1d0dfd9973efe81b3a89f7d4f
+SHA1 (patch-ad) = 032012776e2a6744409ded956b219c0e689a9d70
+SHA1 (patch-ae) = f9a272534d2af3d3490fede7bf508a2cc10a0903
+SHA1 (patch-af) = e6457bb853848e2c9e3b1fdbd918a77e14848618
diff --git a/devel/m17n-lib/patches/patch-aa b/devel/m17n-lib/patches/patch-aa
index 56e138998ef..517b1177792 100644
--- a/devel/m17n-lib/patches/patch-aa
+++ b/devel/m17n-lib/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/02/27 13:48:28 obache Exp $
+$NetBSD: patch-aa,v 1.2 2009/05/12 08:19:54 obache Exp $
 
---- configure.ac.orig	2008-01-15 06:42:46.000000000 +0000
+--- configure.ac.orig	2009-02-25 02:43:55.000000000 +0000
 +++ configure.ac
 @@ -351,7 +351,7 @@ dnl In addition, set THAI_WORDSEG_LD_FLA
  PKG_CHECK_MODULES(LIBTHAI, libthai, HAVE_LIBTHAI=yes, HAVE_LIBTHAI=no)
diff --git a/devel/m17n-lib/patches/patch-ab b/devel/m17n-lib/patches/patch-ab
index abb03518c91..aa068ad3a08 100644
--- a/devel/m17n-lib/patches/patch-ab
+++ b/devel/m17n-lib/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2008/10/09 12:41:17 obache Exp $
+$NetBSD: patch-ab,v 1.3 2009/05/12 08:19:54 obache Exp $
 
---- configure.orig	2008-06-23 05:59:46.000000000 +0000
+--- configure.orig	2009-03-02 02:40:45.000000000 +0000
 +++ configure
-@@ -34018,7 +34018,7 @@ echo "${ECHO_T}yes" >&6; }
+@@ -25076,7 +25076,7 @@ echo "${ECHO_T}yes" >&6; }
  	HAVE_WORDCUT=yes
  fi
  
diff --git a/devel/m17n-lib/patches/patch-ac b/devel/m17n-lib/patches/patch-ac
index 0672b5f55ba..7278adc5390 100644
--- a/devel/m17n-lib/patches/patch-ac
+++ b/devel/m17n-lib/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.1.1.1 2008/02/27 13:48:28 obache Exp $
+$NetBSD: patch-ac,v 1.2 2009/05/12 08:19:54 obache Exp $
 
---- src/Makefile.am.orig	2008-01-15 01:27:13.000000000 +0000
+--- src/Makefile.am.orig	2008-06-13 05:51:25.000000000 +0000
 +++ src/Makefile.am
 @@ -43,7 +43,7 @@ libm17n_core_la_SOURCES = \
  	textprop.h textprop.c \
diff --git a/devel/m17n-lib/patches/patch-ad b/devel/m17n-lib/patches/patch-ad
index ac40ccf75ec..42c28e9b3e5 100644
--- a/devel/m17n-lib/patches/patch-ad
+++ b/devel/m17n-lib/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2008/10/09 12:41:17 obache Exp $
+$NetBSD: patch-ad,v 1.3 2009/05/12 08:19:54 obache Exp $
 
---- src/Makefile.in.orig	2008-06-23 05:59:44.000000000 +0000
+--- src/Makefile.in.orig	2009-03-02 02:40:42.000000000 +0000
 +++ src/Makefile.in
-@@ -402,7 +402,7 @@ libm17n_core_la_SOURCES = \
+@@ -408,7 +408,7 @@ libm17n_core_la_SOURCES = \
  	textprop.h textprop.c \
  	mtext-lbrk.c mtext-wseg.c
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.2 2008/10/09 12:41:17 obache Exp $
  libm17n_core_la_LDFLAGS = -export-dynamic ${VINFO}
  libm17n_la_SOURCES = \
  	charset.h charset.c \
-@@ -412,7 +412,7 @@ libm17n_la_SOURCES = \
+@@ -418,7 +418,7 @@ libm17n_la_SOURCES = \
  	mlocale.h locale.c \
  	m17n.h m17n.c
  
diff --git a/devel/m17n-lib/patches/patch-ae b/devel/m17n-lib/patches/patch-ae
index 8d5c50b969d..25d59f6ce0b 100644
--- a/devel/m17n-lib/patches/patch-ae
+++ b/devel/m17n-lib/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.2 2009/01/12 12:17:22 obache Exp $
+$NetBSD: patch-ae,v 1.3 2009/05/12 08:19:54 obache Exp $
 
---- example/Makefile.am.orig	2007-11-13 02:22:21.000000000 +0000
+--- example/Makefile.am.orig	2007-11-13 02:29:20.000000000 +0000
 +++ example/Makefile.am
 @@ -45,7 +45,7 @@ m17n_conv_LDADD = ${common_ldflags}
  X_LD_FLAGS = ${X_PRE_LIBS} ${X_LIBS} @XAW_LD_FLAGS@ @X11_LD_FLAGS@ ${X_EXTRA_LIBS}
diff --git a/devel/m17n-lib/patches/patch-af b/devel/m17n-lib/patches/patch-af
index d48d3d14af7..a9b81d7b17a 100644
--- a/devel/m17n-lib/patches/patch-af
+++ b/devel/m17n-lib/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.3 2009/01/12 12:17:22 obache Exp $
+$NetBSD: patch-af,v 1.4 2009/05/12 08:19:54 obache Exp $
 
---- example/Makefile.in.orig	2008-06-23 05:59:44.000000000 +0000
+--- example/Makefile.in.orig	2009-03-02 02:40:41.000000000 +0000
 +++ example/Makefile.in
-@@ -341,7 +341,7 @@ m17n_conv_SOURCES = mconv.c
+@@ -347,7 +347,7 @@ m17n_conv_SOURCES = mconv.c
  m17n_conv_LDADD = ${common_ldflags}
  X_LD_FLAGS = ${X_PRE_LIBS} ${X_LIBS} @XAW_LD_FLAGS@ @X11_LD_FLAGS@ ${X_EXTRA_LIBS}
  m17n_edit_SOURCES = medit.c