Index: Makefile
===================================================================
--- Makefile	(revision 357892)
+++ Makefile	(working copy)
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	m17n-db
-PORTVERSION=	1.6.4
-CATEGORIES=	devel
+PORTVERSION=	1.6.5
+CATEGORIES=	devel textproc
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}:m17n \
 		${MASTER_SITE_GNU:S/$/:glibc/}
 MASTER_SITE_SUBDIR=	m17n/:m17n \
@@ -30,6 +30,8 @@
 GLIBC_DISTFILE=	glibc-${GLIBC_VERSION}.tar.bz2
 CHARMAPSDIR=	glibc-${GLIBC_VERSION}/localedata/charmaps
 
+M17N_DATADIR=	${PREFIX}/share/m17n
+
 post-extract:
 	cd ${WRKSRC}; ${TAR} xjf ${DISTDIR}/${GLIBC_DISTFILE} ${CHARMAPSDIR}
 
@@ -36,5 +38,11 @@
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|$${datadir}/pkgconfig|$${prefix}/libdata/pkgconfig|g'
+	@${REINPLACE_CMD} -E 's|(m17n_scriptdir = ).*|\1${PREFIX}/bin|' \
+		${WRKSRC}/Makefile.in
 
+post-install:
+	@${MKDIR} ${STAGEDIR}${M17N_DATADIR}/icons
+	@${MV} ${STAGEDIR}${M17N_DATADIR}/*.png ${STAGEDIR}${M17N_DATADIR}/icons/
+
 .include <bsd.port.mk>
Index: distinfo
===================================================================
--- distinfo	(revision 357892)
+++ distinfo	(working copy)
@@ -1,4 +1,6 @@
-SHA256 (m17n-db-1.6.4.tar.gz) = 530ecb1615a9a64d4caca9ffc59c0dd1c551d34e0c19e39694d083db0506d017
-SIZE (m17n-db-1.6.4.tar.gz) = 1390344
+SHA256 (m17n-db-1.6.5.tar.gz) = 408aae0f3e7bed97bbcb9334ce8d91848617e52b54bfe3f61e79551ea0a06841
+SIZE (m17n-db-1.6.5.tar.gz) = 1937268
+SHA256 (m17n-contrib-1.1.14.tar.gz) = 4f623be23979e2d52c1275621b3d4488c24b9fbd81f5a9d28260d88f93d23d2c
+SIZE (m17n-contrib-1.1.14.tar.gz) = 698611
 SHA256 (glibc-2.3.6.tar.bz2) = e73ff5eddea95d09238b41d3c9c4d9ccddcf99fcc93d04956599c91c704f4a8e
 SIZE (glibc-2.3.6.tar.bz2) = 14014977
Index: files/patch-configure
===================================================================
--- files/patch-configure	(revision 357892)
+++ files/patch-configure	(working copy)
@@ -1,5 +1,15 @@
 --- configure~	2010-04-16 11:53:12.000000000 +0000
-+++ configure	2010-06-02 09:53:04.000000000 +0000
++++ configure	2014-06-15 18:00:10.000000000 +0400
+@@ -5078,8 +5078,7 @@
+       fi
+     fi
+ 
+-    if test "$gt_use_preinstalled_gnugettext" = "yes" \
+-       || test "$nls_cv_use_gnu_gettext" = "yes"; then
++	if test "$USE_NLS" = "yes"; then
+ 
+ $as_echo "#define ENABLE_NLS 1" >>confdefs.h
+ 
 @@ -5104,12 +5104,6 @@
  fi
  
Index: files/patch-tbl2mim.awk
===================================================================
--- files/patch-tbl2mim.awk	(revision 0)
+++ files/patch-tbl2mim.awk	(working copy)
@@ -0,0 +1,16 @@
+--- tbl2mim.awk.orig	2006-12-08 03:01:57.000000000 +0100
++++ tbl2mim.awk	2008-03-30 19:20:34.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/gawk
++#!/usr/bin/awk
+ # Copyright (C) 2006
+ #   National Institute of Advanced Industrial Science and Technology (AIST)
+ #   Registration Number H15PRO112
+@@ -25,6 +25,7 @@
+     begin_table = 0;
+ }
+ 
++/^ *###/ { next; }
+ /^ICON *=/ { ICON = " \""$3"\""; next; }
+ /^NAME *=/ { NAME = tolower($3); next; }
+ /^LANGUAGES *=/ { LANG = $3; next; }
Index: pkg-descr
===================================================================
--- pkg-descr	(revision 357892)
+++ pkg-descr	(working copy)
@@ -1,5 +1,14 @@
 This package contains the data files for the m17n library. m17n-lib
-currently supports input of more than 60 languages with more than 70
+currently supports input of more than 60 languages with more than 150
 language specific input methods.
 
+m17n-db now incorporates a set of user-contributed input methods,
+formerly known as m17n-contrib.
+
+The package also provides the tbl2mim.awk script for conversion of keyboard
+files used by table based IMEngines of SCIM/IBus into m17n-lib's .mim
+format.
+
+The documentation is available through devel/m17n-docs.
+
 WWW: http://www.nongnu.org/m17n/
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 357892)
+++ pkg-plist	(working copy)
@@ -1,7 +1,9 @@
 %%NLS%%share/locale/de/LC_MESSAGES/m17n-db.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/m17n-db.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/m17n-db.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/m17n-db.mo
 bin/m17n-db
+bin/tbl2mim.awk
 libdata/pkgconfig/m17n-db.pc
 share/m17n/8859-10.map
 share/m17n/8859-11.map
@@ -186,16 +188,25 @@
 share/m17n/am.lnm
 share/m17n/ar-kbd.mim
 share/m17n/ar.lnm
+share/m17n/as-inscript.mim
 share/m17n/as-itrans.mim
+share/m17n/as-phonetic.mim
 share/m17n/as.lnm
+share/m17n/ath-phonetic.mim
 share/m17n/az.lnm
 share/m17n/az_Cyrl.lnm
 share/m17n/az_Latn.lnm
+share/m17n/be-kbd.mim
 share/m17n/be.lnm
 share/m17n/bg.lnm
+share/m17n/bla-phonetic.mim
+share/m17n/bn-disha.mim
+share/m17n/bn-inscript.mim
 share/m17n/bn-itrans.mim
+share/m17n/bn-probhat.mim
 share/m17n/bn-unijoy.mim
 share/m17n/bn.lnm
+share/m17n/bo-ewts.mim
 share/m17n/bo-tcrc.mim
 share/m17n/bo-wylie.mim
 share/m17n/bs.lnm
@@ -203,6 +214,8 @@
 share/m17n/ca.lnm
 share/m17n/cjk-util.mim
 share/m17n/cmc-kbd.mim
+share/m17n/cr-western.mim
+share/m17n/cs-kbd.mim
 share/m17n/cs.lnm
 share/m17n/cy.lnm
 share/m17n/da-post.mim
@@ -215,6 +228,12 @@
 share/m17n/el-kbd.mim
 share/m17n/el.lnm
 share/m17n/en.lnm
+share/m17n/eo-h-f.mim
+share/m17n/eo-h.mim
+share/m17n/eo-plena.mim
+share/m17n/eo-q.mim
+share/m17n/eo-vi.mim
+share/m17n/eo-x.mim
 share/m17n/eo.lnm
 share/m17n/es.lnm
 share/m17n/et.lnm
@@ -232,14 +251,20 @@
 share/m17n/gl.lnm
 share/m17n/global.mim
 share/m17n/grc-mizuochi.mim
+share/m17n/gu-inscript.mim
 share/m17n/gu-itrans.mim
+share/m17n/gu-phonetic.mim
 share/m17n/gu.lnm
 share/m17n/gv.lnm
 share/m17n/haw.lnm
 share/m17n/he-kbd.mim
 share/m17n/he.lnm
+share/m17n/hi-inscript.mim
 share/m17n/hi-itrans.mim
+share/m17n/hi-phonetic.mim
+share/m17n/hi-remington.mim
 share/m17n/hi-typewriter.mim
+share/m17n/hi-vedmata.mim
 share/m17n/hi.lnm
 share/m17n/hr-kbd.mim
 share/m17n/hr.lnm
@@ -248,22 +273,41 @@
 share/m17n/hy.lnm
 share/m17n/icons/am-sera.png
 share/m17n/icons/ar-kbd.png
+share/m17n/icons/as-inscript.png
 share/m17n/icons/as-itrans.png
+share/m17n/icons/as-phonetic.png
+share/m17n/icons/be-kbd.png
+share/m17n/icons/bn-disha.png
+share/m17n/icons/bn-inscript.png
 share/m17n/icons/bn-itrans.png
+share/m17n/icons/bn-probhat.png
 share/m17n/icons/bn-unijoy.png
 share/m17n/icons/bo-wylie.png
 share/m17n/icons/bopo-kbd.png
 share/m17n/icons/cmc-kbd.png
+share/m17n/icons/cs-kbd.png
 share/m17n/icons/dv-phonetic.png
 share/m17n/icons/el-kbd.png
 share/m17n/icons/en-ispell.png
+share/m17n/icons/eo-h-fundamente.png
+share/m17n/icons/eo-h-sistemo.png
+share/m17n/icons/eo-plena.png
+share/m17n/icons/eo-q-sistemo.png
+share/m17n/icons/eo-x-sistemo.png
 share/m17n/icons/fa-isiri.png
+share/m17n/icons/gu-inscript.png
 share/m17n/icons/gu-itrans.png
+share/m17n/icons/gu-phonetic.png
 share/m17n/icons/he-kbd.png
+share/m17n/icons/hi-inscript.png
 share/m17n/icons/hi-itrans.png
+share/m17n/icons/hi-phonetic.png
+share/m17n/icons/hi-remington.png
 share/m17n/icons/hi-typewriter.png
+share/m17n/icons/hi-vedmata.png
 share/m17n/icons/hr-kbd.png
 share/m17n/icons/hy-kbd.png
+share/m17n/icons/ii-phonetic.png
 share/m17n/icons/ja-anthy.png
 share/m17n/icons/ja-tcode.png
 share/m17n/icons/ka-kbd.png
@@ -270,7 +314,9 @@
 share/m17n/icons/kk-arabic.png
 share/m17n/icons/kk-kbd.png
 share/m17n/icons/km-yannis.png
+share/m17n/icons/kn-inscript.png
 share/m17n/icons/kn-itrans.png
+share/m17n/icons/kn-kgp.png
 share/m17n/icons/ko-han2.png
 share/m17n/icons/ko-romaja.png
 share/m17n/icons/latn-post.png
@@ -277,22 +323,50 @@
 share/m17n/icons/latn-pre.png
 share/m17n/icons/lo-kbd.png
 share/m17n/icons/lo-lrt.png
+share/m17n/icons/math-latex.png
+share/m17n/icons/ml-inscript.png
 share/m17n/icons/ml-itrans.png
+share/m17n/icons/ml-mozhi.png
+share/m17n/icons/ml-remington.png
+share/m17n/icons/ml-swanalekha.png
+share/m17n/icons/mr-inscript.png
 share/m17n/icons/my-kbd.png
+share/m17n/icons/ne-rom.png
+share/m17n/icons/ne-trad.png
+share/m17n/icons/or-inscript.png
 share/m17n/icons/or-itrans.png
+share/m17n/icons/pa-inscript.png
 share/m17n/icons/pa-itrans.png
+share/m17n/icons/pa-jhelum.png
+share/m17n/icons/pa-phonetic.png
+share/m17n/icons/ps-phonetic.png
 share/m17n/icons/rfc1345.png
 share/m17n/icons/ru-kbd.png
 share/m17n/icons/ru-phonetic.png
 share/m17n/icons/ru-yawerty.png
+share/m17n/icons/sa-IAST.png
+share/m17n/icons/sa-itrans.png
+share/m17n/icons/sd-inscript.png
+share/m17n/icons/si-phonetic-dynamic.png
 share/m17n/icons/si-samanala.png
+share/m17n/icons/si-sumihiri.png
+share/m17n/icons/si-transliteration.png
 share/m17n/icons/si-wijesekera.png
 share/m17n/icons/sk-kbd.png
 share/m17n/icons/sr-kbd.png
 share/m17n/icons/sv-post.png
 share/m17n/icons/syrc-phonetic.png
+share/m17n/icons/ta-inscript.png
 share/m17n/icons/ta-itrans.png
+share/m17n/icons/ta-phonetic.png
+share/m17n/icons/ta-tamil99.png
+share/m17n/icons/ta-typewriter.png
+share/m17n/icons/ta-vutam.png
+share/m17n/icons/te-apple.png
+share/m17n/icons/te-inscript.png
 share/m17n/icons/te-itrans.png
+share/m17n/icons/te-pothana.png
+share/m17n/icons/te-sarala.png
 share/m17n/icons/th-kesmanee-2.png
 share/m17n/icons/th-kesmanee.png
 share/m17n/icons/th-pattachote-2.png
@@ -301,10 +375,15 @@
 share/m17n/icons/th-tis820.png
 share/m17n/icons/ua-kbd.png
 share/m17n/icons/unicode.png
+share/m17n/icons/ur-phonetic.png
+share/m17n/icons/uz-kbd.png
+share/m17n/icons/vi-nom-vni.png
+share/m17n/icons/vi-nom.png
 share/m17n/icons/vi-tcvn.png
 share/m17n/icons/vi-telex.png
 share/m17n/icons/vi-viqr.png
 share/m17n/icons/vi-vni.png
+share/m17n/icons/yi-yivo.png
 share/m17n/icons/zh-bopomofo.png
 share/m17n/icons/zh-cangjie.png
 share/m17n/icons/zh-pinyin.png
@@ -315,10 +394,13 @@
 share/m17n/icons/zh-tonepy-b5.png
 share/m17n/icons/zh-tonepy-gb.png
 share/m17n/icons/zh-tonepy.png
+share/m17n/icons/zh-zhuyin.png
 share/m17n/id.lnm
+share/m17n/ii-phonetic.mim
 share/m17n/is.lnm
 share/m17n/ispell.mim
 share/m17n/it.lnm
+share/m17n/iu-phonetic.mim
 share/m17n/iu.lnm
 share/m17n/ja-anthy.mim
 share/m17n/ja-tcode.mim
@@ -332,12 +414,17 @@
 share/m17n/kl.lnm
 share/m17n/km-yannis.mim
 share/m17n/km.lnm
+share/m17n/kn-inscript.mim
 share/m17n/kn-itrans.mim
+share/m17n/kn-kgp.mim
+share/m17n/kn-typewriter.mim
 share/m17n/kn.lnm
 share/m17n/ko-han2.mim
 share/m17n/ko-romaja.mim
 share/m17n/ko.lnm
 share/m17n/kok.lnm
+share/m17n/ks-inscript.mim
+share/m17n/ks-kbd.mim
 share/m17n/ku.lnm
 share/m17n/kw.lnm
 share/m17n/ky.lnm
@@ -349,24 +436,44 @@
 share/m17n/lo.lnm
 share/m17n/lt.lnm
 share/m17n/lv.lnm
+share/m17n/mai-inscript.mim
+share/m17n/math-latex.mim
 share/m17n/mdb.dir
 share/m17n/mk.lnm
+share/m17n/ml-inscript.mim
 share/m17n/ml-itrans.mim
+share/m17n/ml-mozhi.mim
+share/m17n/ml-remington.mim
+share/m17n/ml-swanalekha.mim
 share/m17n/ml.lnm
 share/m17n/mn.lnm
+share/m17n/mr-inscript.mim
+share/m17n/mr-itrans.mim
+share/m17n/mr-phonetic.mim
 share/m17n/mr.lnm
 share/m17n/ms.lnm
 share/m17n/mt.lnm
 share/m17n/my-kbd.mim
 share/m17n/nb.lnm
+share/m17n/ne-rom.mim
+share/m17n/ne-trad.mim
 share/m17n/nl.lnm
 share/m17n/nn.lnm
+share/m17n/nsk-phonetic.mim
+share/m17n/oj-phonetic.mim
 share/m17n/om.lnm
+share/m17n/or-inscript.mim
 share/m17n/or-itrans.mim
+share/m17n/or-phonetic.mim
 share/m17n/or.lnm
+share/m17n/pa-anmollipi.mim
+share/m17n/pa-inscript.mim
 share/m17n/pa-itrans.mim
+share/m17n/pa-jhelum.mim
+share/m17n/pa-phonetic.mim
 share/m17n/pa.lnm
 share/m17n/pl.lnm
+share/m17n/ps-phonetic.mim
 share/m17n/ps.lnm
 share/m17n/pt.lnm
 share/m17n/rfc1345.mim
@@ -373,12 +480,20 @@
 share/m17n/ro.lnm
 share/m17n/ru-kbd.mim
 share/m17n/ru-phonetic.mim
+share/m17n/ru-translit.mim
 share/m17n/ru-yawerty.mim
 share/m17n/ru.lnm
 share/m17n/sa-harvard-kyoto.mim
+share/m17n/sa-iast.mim
+share/m17n/sa-itrans.mim
 share/m17n/sa.lnm
+share/m17n/sd-inscript.mim
 share/m17n/se.lnm
+share/m17n/si-phonetic-dynamic.mim
 share/m17n/si-samanala.mim
+share/m17n/si-singlish.mim
+share/m17n/si-sumihiri.mim
+share/m17n/si-trans.mim
 share/m17n/si-wijesekera.mim
 share/m17n/sid.lnm
 share/m17n/sk-kbd.mim
@@ -394,10 +509,21 @@
 share/m17n/sw.lnm
 share/m17n/syr.lnm
 share/m17n/syrc-phonetic.mim
+share/m17n/ta-inscript.mim
 share/m17n/ta-itrans.mim
 share/m17n/ta-lk-renganathan.mim
+share/m17n/ta-phonetic.mim
+share/m17n/ta-tamil99.mim
+share/m17n/ta-typewriter.mim
+share/m17n/ta-vutam.mim
 share/m17n/ta.lnm
+share/m17n/tai-sonla.mim
+share/m17n/te-apple.mim
+share/m17n/te-inscript.mim
 share/m17n/te-itrans.mim
+share/m17n/te-pothana.mim
+share/m17n/te-rts.mim
+share/m17n/te-sarala.mim
 share/m17n/te.lnm
 share/m17n/tg.lnm
 share/m17n/th-kesmanee.mim
@@ -413,11 +539,16 @@
 share/m17n/ug-kbd.mim
 share/m17n/uk.lnm
 share/m17n/unicode.mim
+share/m17n/ur-phonetic.mim
 share/m17n/ur.lnm
+share/m17n/uz-kbd.mim
 share/m17n/uz.lnm
 share/m17n/uz_Arab.lnm
 share/m17n/uz_Latn.lnm
 share/m17n/vi-base.mim
+share/m17n/vi-han.mim
+share/m17n/vi-nom-vni.mim
+share/m17n/vi-nom.mim
 share/m17n/vi-tcvn.mim
 share/m17n/vi-telex.mim
 share/m17n/vi-viqr.mim
@@ -425,8 +556,10 @@
 share/m17n/vi.lnm
 share/m17n/wal.lnm
 share/m17n/xfont.fst
+share/m17n/yi-yivo.mim
 share/m17n/zh-bopomofo.mim
 share/m17n/zh-cangjie.mim
+share/m17n/zh-pinyin-vi.mim
 share/m17n/zh-pinyin.mim
 share/m17n/zh-py-b5.mim
 share/m17n/zh-py-gb.mim
@@ -436,8 +569,9 @@
 share/m17n/zh-tonepy-gb.mim
 share/m17n/zh-tonepy.mim
 share/m17n/zh-util.mim
+share/m17n/zh-zhuyin.mim
 share/m17n/zh.lnm
 share/m17n/zh_Hans.lnm
 share/m17n/zh_Hant.lnm
-@dirrmtry share/m17n/icons
-@dirrmtry share/m17n
+@dirrm share/m17n/icons
+@dirrm share/m17n