3 files changed, 34 insertions, 11 deletions

diff --git a/devel/m17n-db/Makefile b/devel/m17n-db/Makefile
index d81bd2879ab7..7cc110e4d986 100644
--- a/devel/m17n-db/Makefile
+++ b/devel/m17n-db/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	m17n-db
-PORTVERSION=	1.3.3
-PORTREVISION=	1
+PORTVERSION=	1.3.4
 CATEGORIES=	devel
 MASTER_SITES=	http://www.m17n.org/m17n-lib-download/:m17n \
 		${MASTER_SITE_GNU:S/$/:glibc/}
@@ -19,12 +18,19 @@ EXTRACT_ONLY=	${M17N_DISTFILE}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Data files for the m17n library
 
-USE_GNOME=	pkgconfig
+USE_GNOME=	gnometarget pkgconfig
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-charmaps=${CHARMAPSDIR}
 
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.endif
+
 M17N_DISTFILE=	${DISTNAME}${EXTRACT_SUFX}
 GLIBC_VERSION=	2.3.6
 GLIBC_DISTFILE=	glibc-${GLIBC_VERSION}.tar.bz2
@@ -33,7 +39,6 @@ CHARMAPSDIR=	glibc-${GLIBC_VERSION}/localedata/charmaps
 post-extract:
 	cd ${WRKSRC}; ${TAR} xjf ${DISTDIR}/${GLIBC_DISTFILE} ${CHARMAPSDIR}
 
-
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|$${libdir}/pkgconfig|$${prefix}/libdata/pkgconfig|g'
diff --git a/devel/m17n-db/distinfo b/devel/m17n-db/distinfo
index 4375ab0ef372..96273198c3a5 100644
--- a/devel/m17n-db/distinfo
+++ b/devel/m17n-db/distinfo
@@ -1,6 +1,6 @@
-MD5 (m17n-db-1.3.3.tar.gz) = a2aec22334c108565cc466d80a66292c
-SHA256 (m17n-db-1.3.3.tar.gz) = a3c101436085fe6f3a42eb4dbf406ab1040254c268885fb223a39d8fbda16257
-SIZE (m17n-db-1.3.3.tar.gz) = 929547
+MD5 (m17n-db-1.3.4.tar.gz) = 41dee6d06743b83a6950d5d0a500cef6
+SHA256 (m17n-db-1.3.4.tar.gz) = 1719579dcc9094113c908b07d4350f207b42889bab747202121dfa99e893960c
+SIZE (m17n-db-1.3.4.tar.gz) = 1111491
 MD5 (glibc-2.3.6.tar.bz2) = bfdce99f82d6dbcb64b7f11c05d6bc96
 SHA256 (glibc-2.3.6.tar.bz2) = e73ff5eddea95d09238b41d3c9c4d9ccddcf99fcc93d04956599c91c704f4a8e
 SIZE (glibc-2.3.6.tar.bz2) = 14014977
diff --git a/devel/m17n-db/pkg-plist b/devel/m17n-db/pkg-plist
index d3e695df44cb..564c7c00da0c 100644
--- a/devel/m17n-db/pkg-plist
+++ b/devel/m17n-db/pkg-plist
@@ -133,6 +133,7 @@ share/m17n/LANGUAGE.tbl
 share/m17n/LAOO-ALICE.flt
 share/m17n/LAOO-GENERIC.flt
 share/m17n/LAOO-MULE.flt
+share/m17n/LAOO-OTF.flt
 share/m17n/LINEBREAK.tab
 share/m17n/LOCALE.ali
 share/m17n/LOCALE.cs
@@ -146,6 +147,7 @@ share/m17n/ORYA-OTF.flt
 share/m17n/SCRIPT-LANGUAGE.tbl
 share/m17n/SCRIPT-OTF.tbl
 share/m17n/SCRIPT.tab
+share/m17n/SCRIPT.tbl
 share/m17n/SINH-OTF.flt
 share/m17n/SOFT-DOTTED.tab
 share/m17n/SYRC-OTF.flt
@@ -155,6 +157,7 @@ share/m17n/TELU-OTF.flt
 share/m17n/THAA-OTF.flt
 share/m17n/THAI-GENERIC.flt
 share/m17n/THAI-NORASI.flt
+share/m17n/THAI-OTF.flt
 share/m17n/THAI-TIS620.flt
 share/m17n/TIBT-MTIB.flt
 share/m17n/TIBT-MULE.flt
@@ -168,14 +171,14 @@ share/m17n/as-itrans.mim
 share/m17n/bn-itrans.mim
 share/m17n/bn-unijoy.mim
 share/m17n/bo-wylie.mim
-share/m17n/bopo-kbd.mim
 share/m17n/cjk-util.mim
-share/m17n/command.mim
 share/m17n/default.fst
 share/m17n/dv-phonetic.mim
 share/m17n/el-kbd.mim
 share/m17n/fa-isiri.mim
 share/m17n/generic.fst
+share/m17n/global.mim
+share/m17n/grc-mizuochi.mim
 share/m17n/gu-itrans.mim
 share/m17n/he-kbd.mim
 share/m17n/hi-itrans.mim
@@ -225,7 +228,12 @@ share/m17n/icons/sv-post.png
 share/m17n/icons/syrc-phonetic.png
 share/m17n/icons/ta-itrans.png
 share/m17n/icons/te-itrans.png
+share/m17n/icons/th-kesmanee-2.png
 share/m17n/icons/th-kesmanee.png
+share/m17n/icons/th-pattachote-2.png
+share/m17n/icons/th-pattachote.png
+share/m17n/icons/th-tis820-2.png
+share/m17n/icons/th-tis820.png
 share/m17n/icons/unicode.png
 share/m17n/icons/vi-telex.png
 share/m17n/icons/vi-viqr.png
@@ -242,6 +250,7 @@ share/m17n/icons/zh-tonepy.png
 share/m17n/ispell.mim
 share/m17n/ja-anthy.mim
 share/m17n/ja-tcode.mim
+share/m17n/ja-trycode.mim
 share/m17n/ka-kbd.mim
 share/m17n/kk-arabic.mim
 share/m17n/kk-kbd.mim
@@ -260,8 +269,10 @@ share/m17n/or-itrans.mim
 share/m17n/pa-itrans.mim
 share/m17n/rfc1345.mim
 share/m17n/ru-kbd.mim
+share/m17n/ru-phonetic.mim
 share/m17n/ru-yawerty.mim
 share/m17n/si-samanala.mim
+share/m17n/si-wijesekera-preedit.mim
 share/m17n/si-wijesekera.mim
 share/m17n/sk-kbd.mim
 share/m17n/sr-kbd.mim
@@ -269,14 +280,20 @@ share/m17n/sv-post.mim
 share/m17n/syrc-phonetic.mim
 share/m17n/ta-itrans.mim
 share/m17n/te-itrans.mim
+share/m17n/th-kesmanee-2.mim
 share/m17n/th-kesmanee.mim
+share/m17n/th-pattachote-2.mim
+share/m17n/th-pattachote.mim
+share/m17n/th-tis820-2.mim
+share/m17n/th-tis820.mim
 share/m17n/truetype.fst
+share/m17n/ug-kbd.mim
 share/m17n/unicode.mim
-share/m17n/variable.mim
 share/m17n/vi-telex.mim
 share/m17n/vi-viqr.mim
 share/m17n/vi-vni.mim
 share/m17n/xfont.fst
+share/m17n/zh-bopomofo.mim
 share/m17n/zh-cangjie.mim
 share/m17n/zh-pinyin.mim
 share/m17n/zh-py-b5.mim
@@ -289,3 +306,4 @@ share/m17n/zh-tonepy.mim
 share/m17n/zh-util.mim
 @dirrm share/m17n/icons
 @dirrm share/m17n
+%%NLS%%share/locale/ja/LC_MESSAGES/m17n-db.mo