diff -ubBNr cmigemo.orig/Makefile cmigemo/Makefile
--- cmigemo.orig/Makefile	2014-07-04 17:46:52.000000000 +0900
+++ cmigemo/Makefile	2014-09-04 16:18:11.000000000 +0900
@@ -2,18 +2,23 @@
 # $FreeBSD: head/japanese/cmigemo/Makefile 360575 2014-07-04 08:46:52Z antoine $
 
 PORTNAME=	cmigemo
-PORTVERSION=	20110227
+PORTVERSION=	20140309
 CATEGORIES=	japanese
-MASTER_SITES?=	${MASTER_SITE_GOOGLE_CODE}
-DISTNAME=	${PORTNAME}-default-src-${PORTVERSION}
+MASTER_SITES?=	GH
 DIST_SUBDIR=	cmigemo
 
+USE_GITHUB= yes
+GH_ACCOUNT= koron
+GH_PROJECT= cmigemo
+GH_COMMIT=  ${GH_TAGNAME}
+GH_TAGNAME= b248baa
+
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	C implementation of Migemo Japanese incremental search tool
 
 .if !defined(PKGNAMESUFFIX)
 LICENSE=	MIT
-LICENSE_FILE=	${WRKSRC}/doc/LICENSE_MIT.txt
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${DATADIR}/cp932/migemo-dict:${PORTSDIR}/japanese/cmigemo-dict
 
@@ -28,13 +33,12 @@
 .endif
 
 OPTIONS_DEFINE+=DOCS
-USES+=		iconv:build,wchar_t gmake zip
+USES+=		gmake
+BUILD_DEPENDS=	${LOCALBASE}/bin/nkf:${PORTSDIR}/japanese/nkf
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${STAGEDIR}${PREFIX}
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-default-src
-
 .include <bsd.port.options.mk>
 
 .if !defined(PKGNAMESUFFIX) && ${PORT_OPTIONS:MDOCS}
diff -ubBNr cmigemo.orig/distinfo cmigemo/distinfo
--- cmigemo.orig/distinfo	2014-01-23 00:30:13.000000000 +0900
+++ cmigemo/distinfo	2014-09-04 05:17:03.000000000 +0900
@@ -1,4 +1,4 @@
-SHA256 (cmigemo/cmigemo-default-src-20110227.zip) = 4aa759b2e055ef3c3fbeb9e92f7f0aacc1fd1f8602fdd2f122719793ee14414c
-SIZE (cmigemo/cmigemo-default-src-20110227.zip) = 116574
+SHA256 (cmigemo/cmigemo-20140309.tar.gz) = 2510450c29715ece3ecc6483626d2db46c2631d75496f81e2e17e22a69a80528
+SIZE (cmigemo/cmigemo-20140309.tar.gz) = 73661
 SHA256 (cmigemo/SKK-JISYO.L-20110813.bz2) = 560da93401f0a58417d61e2ff41a43a24f0886877797bbea879ba9db3e70e3d9
 SIZE (cmigemo/SKK-JISYO.L-20110813.bz2) = 1694235
diff -ubBNr cmigemo.orig/files/patch-compile_config.mk.in cmigemo/files/patch-compile_config.mk.in
--- cmigemo.orig/files/patch-compile_config.mk.in	2014-06-17 23:36:11.000000000 +0900
+++ cmigemo/files/patch-compile_config.mk.in	2014-09-04 16:03:26.000000000 +0900
@@ -18,9 +18,9 @@
 -FILTER_CP932	= ${PROGRAM_ENCODEFILTER} -s
 -FILTER_EUCJP	= ${PROGRAM_ENCODEFILTER} -e
 -FILTER_UTF8	= iconv -t utf-8 -f cp932
-+FILTER_CP932	= %%LOCALBASE%%/bin/iconv -t cp932 -f euc-jp
-+FILTER_EUCJP	= %%LOCALBASE%%/bin/iconv -t euc-jp -f cp932
-+FILTER_UTF8	= %%LOCALBASE%%/bin/iconv -t utf-8 -f cp932
++ICONV_EUCJP_TO_CP932	= %%LOCALBASE%%/bin/nkf --ic=eucJP-ms --oc=CP932
++ICONV_CP932_TO_EUCJP	= %%LOCALBASE%%/bin/nkf --ic=CP932 --oc=eucJP-ms
++ICONV_CP932_TO_UTF8	= %%LOCALBASE%%/bin/nkf --ic=CP932 --oc=UTF-8
  INSTALL		= ${PROGRAM_INSTALL} -c
  INSTALL_PROGRAM	= $(INSTALL) -m 755
  INSTALL_DATA	= $(INSTALL) -m 644
diff -ubBNr cmigemo.orig/files/patch-dict_dict.mak cmigemo/files/patch-dict_dict.mak
--- cmigemo.orig/files/patch-dict_dict.mak	2014-01-23 02:40:44.000000000 +0900
+++ cmigemo/files/patch-dict_dict.mak	2014-09-04 05:14:02.000000000 +0900
@@ -34,7 +34,7 @@
  ##############################################################################
  # for GNU/gcc(Linux‘¼)
  #
--gcc:		euc-jp
+-gcc:		euc-jp utf-8
 +gcc-dict:		euc-jp-dict utf-8-dict
 +gcc-dat:		euc-jp-dat utf-8-dat
  
diff -ubBNr cmigemo.orig/files/patch-src_wordbuf.c cmigemo/files/patch-src_wordbuf.c
--- cmigemo.orig/files/patch-src_wordbuf.c	2014-01-23 02:40:44.000000000 +0900
+++ cmigemo/files/patch-src_wordbuf.c	1970-01-01 09:00:00.000000000 +0900
@@ -1,10 +0,0 @@
---- src/wordbuf.c.orig	2011-08-13 23:52:52.000000000 +0900
-+++ src/wordbuf.c	2011-08-13 23:53:22.000000000 +0900
-@@ -9,6 +9,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <limits.h>
- #include "wordbuf.h"
- 
- #define WORDLEN_DEF 64
diff -ubBNr cmigemo-dict.orig/Makefile cmigemo-dict/Makefile
--- cmigemo-dict.orig/Makefile	2014-06-16 23:33:03.000000000 +0900
+++ cmigemo-dict/Makefile	2014-09-04 04:23:22.000000000 +0900
@@ -2,7 +2,7 @@
 # $FreeBSD: head/japanese/cmigemo-dict/Makefile 358003 2014-06-16 14:33:03Z nobutaka $
 
 CATEGORIES=	japanese
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE} \
+MASTER_SITES=	GH \
 		${MASTER_SITE_LOCAL:S/$/:skkdic/}
 MASTER_SITE_SUBDIR=	nobutaka/:skkdic
 PKGNAMESUFFIX=	-dict