Index: head/textproc/ibus-m17n/Makefile
===================================================================
--- head/textproc/ibus-m17n/Makefile	(revision 400056)
+++ head/textproc/ibus-m17n/Makefile	(revision 400057)
@@ -1,38 +1,34 @@
 # Created by: Nikola Lecic <nikola.lecic@anthesphoria.net>
 # $FreeBSD$
 
 PORTNAME=	ibus-m17n
 PORTVERSION=	1.3.3
 PORTREVISION=	5
 CATEGORIES=	textproc
 MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	nikola.lecic@anthesphoria.net
 COMMENT=	The m17n IMEngine for IBus framework
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 LIB_DEPENDS=	libibus-1.0.so:${PORTSDIR}/textproc/ibus \
 		libm17n.so:${PORTSDIR}/devel/m17n-lib
 RUN_DEPENDS=	ibus-daemon:${PORTSDIR}/textproc/ibus
 
 PROJECTHOST=	ibus
 
 USES=		gmake pkgconfig
 GNU_CONFIGURE=	yes
 
 OPTIONS_DEFINE=	NLS
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+OPTIONS_SUB=	yes
+NLS_USES=		gettext
+NLS_CONFIGURE_ENABLE=	nls
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/share/m17n|$${pkgdatadir}|g' \
 		${WRKSRC}/src/m17n.xml.in*
 
 .include <bsd.port.mk>
Index: head/textproc/ibus-m17n/pkg-plist
===================================================================
--- head/textproc/ibus-m17n/pkg-plist	(revision 400056)
+++ head/textproc/ibus-m17n/pkg-plist	(revision 400057)
@@ -1,10 +1,7 @@
 libexec/ibus-engine-m17n
 libexec/ibus-setup-m17n
 share/ibus/component/m17n.xml
 %%DATADIR%%/icons/ibus-m17n.svg
 %%DATADIR%%/setup/default.xml
 %%DATADIR%%/setup/ibus-m17n-preferences.ui
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/ibus-m17n.mo
-@dirrm %%DATADIR%%/icons
-@dirrm %%DATADIR%%/setup
-@dirrm %%DATADIR%%