Index: MOVED
===================================================================
--- MOVED
+++ MOVED
@@ -9320,7 +9320,6 @@
 textproc/chm2pdf||2017-04-30|Has expired: Unfetchable for more than six months (google code has gone away)
 textproc/dtdinst||2017-04-30|Has expired: Unfetchable for more than six months (google code has gone away)
 textproc/py-xmltv||2017-04-30|Has expired: Unfetchable for more than six months (google code has gone away)
-textproc/ibus-m17n||2017-04-30|Has expired: Unfetchable for more than six months (google code has gone away)
 textproc/libroxml||2017-04-30|Has expired: Unfetchable for more than six months (google code has gone away)
 mail/gnome-gmail-notifier||2017-04-30|Has expired: Unfetchable for more than six months (google code has gone away)
 irc/py-gozerbot||2017-04-30|Has expired: Unfetchable for more than six months (google code has gone away)
Index: textproc/Makefile
===================================================================
--- textproc/Makefile
+++ textproc/Makefile
@@ -332,6 +332,7 @@
     SUBDIR += ibus
     SUBDIR += ibus-el
     SUBDIR += ibus-kmfl
+    SUBDIR += ibus-m17n
     SUBDIR += ibus-qt
     SUBDIR += ibus-typing-booster
     SUBDIR += icdiff
Index: textproc/ibus-m17n/Makefile
===================================================================
--- textproc/ibus-m17n/Makefile
+++ textproc/ibus-m17n/Makefile
@@ -2,29 +2,27 @@
 # $FreeBSD$
 
 PORTNAME=	ibus-m17n
-PORTVERSION=	1.3.3
-PORTREVISION=	5
+DISTVERSION=	1.3.4-16
+DISTVERSIONSUFFIX=	-g791efdd
 CATEGORIES=	textproc
-MASTER_SITES=	GOOGLE_CODE
 
-MAINTAINER=	nikola.lecic@anthesphoria.net
-COMMENT=	The m17n IMEngine for IBus framework
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	m17n IM engine for IBus framework
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN=		Unfetchable (google code has gone away)
-DEPRECATED=	Unfetchable for more than six months (google code has gone away)
-EXPIRATION_DATE=	2017-04-30
-
 LIB_DEPENDS=	libibus-1.0.so:textproc/ibus \
-		libm17n.so:devel/m17n-lib
+		libm17n.so:devel/m17n-lib \
+		libfreetype.so:print/freetype2 \
+		libfontconfig.so:x11-fonts/fontconfig
 RUN_DEPENDS=	ibus-daemon:textproc/ibus
 
-PROJECTHOST=	ibus
-
-USES=		gmake pkgconfig
+USES=		autoreconf gmake libtool pkgconfig
 GNU_CONFIGURE=	yes
+USE_GITHUB=	yes
+GH_ACCOUNT=	ibus
+USE_GNOME=	glib20 gtk20 atk gdkpixbuf2 cairo pango intltool
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
Index: textproc/ibus-m17n/distinfo
===================================================================
--- textproc/ibus-m17n/distinfo
+++ textproc/ibus-m17n/distinfo
@@ -1,2 +1,3 @@
-SHA256 (ibus-m17n-1.3.3.tar.gz) = 0374aef2149bcf1a337c39ab642ee39da4dbb17758ee8c095f954ca835dc10bf
-SIZE (ibus-m17n-1.3.3.tar.gz) = 431113
+TIMESTAMP = 1513736377
+SHA256 (ibus-ibus-m17n-1.3.4-16-g791efdd_GH0.tar.gz) = 3c5e7563d7a7143ee71aa646d784c1443ac95debb49d142310950112c30050d0
+SIZE (ibus-ibus-m17n-1.3.4-16-g791efdd_GH0.tar.gz) = 37723
Index: textproc/ibus-m17n/pkg-descr
===================================================================
--- textproc/ibus-m17n/pkg-descr
+++ textproc/ibus-m17n/pkg-descr
@@ -4,4 +4,4 @@
 standard IBus interface. m17n-lib currenty supports input of more than 60
 languages with more than 70 language-specific input methods.
 
-WWW: http://code.google.com/p/ibus
+WWW: https://github.com/ibus/ibus-m17n
Index: textproc/ibus-m17n/pkg-plist
===================================================================
--- textproc/ibus-m17n/pkg-plist
+++ textproc/ibus-m17n/pkg-plist
@@ -1,7 +1,8 @@
 libexec/ibus-engine-m17n
 libexec/ibus-setup-m17n
 share/ibus/component/m17n.xml
+%%DATADIR%%/default.xml
 %%DATADIR%%/icons/ibus-m17n.svg
-%%DATADIR%%/setup/default.xml
 %%DATADIR%%/setup/ibus-m17n-preferences.ui
+share/applications/ibus-setup-m17n.desktop
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/ibus-m17n.mo