diff --git a/japanese/cmigemo-dict/Makefile b/japanese/cmigemo-dict/Makefile
index dd57a926ccaf..6711ac65b4a6 100644
--- a/japanese/cmigemo-dict/Makefile
+++ b/japanese/cmigemo-dict/Makefile
@@ -1,28 +1,28 @@
 CATEGORIES=	japanese
-MASTER_SITES=	LOCAL/nobutaka:skkdic
+MASTER_SITES=	https://github.com/skk-dev/dict/raw/4eb91a3bbfef70bde940668ec60f3beae291e971/:skkdic
 PKGNAMESUFFIX=	-dict
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${SKKDIC_FILE}:skkdic
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	Dictionary for C/Migemo Japanese incremental search tool
 
 LICENSE=	GPLv2
 
 MASTERDIR=	${.CURDIR}/../../japanese/cmigemo
 PKGDIR=		${.CURDIR}
 
 USES=		perl5
 USE_PERL5=	patch build run
 
 ALL_TARGET=	gcc-dict
 INSTALL_TARGET=	gcc-install-dict
 
-SKKDIC_FILE=	SKK-JISYO.L-20110813.bz2
+SKKDIC_FILE=	SKK-JISYO.L
 LICENSE_DISTFILES=	${SKKDIC_FILE}
 
 post-extract:
-	${BZCAT} ${DISTDIR}/${DIST_SUBDIR}/${SKKDIC_FILE} > ${WRKSRC}/dict/SKK-JISYO.L
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/${SKKDIC_FILE} ${WRKSRC}/dict/
 
 .include "${MASTERDIR}/Makefile"
diff --git a/japanese/cmigemo/Makefile b/japanese/cmigemo/Makefile
index ba9aa3385cfe..382e877cc390 100644
--- a/japanese/cmigemo/Makefile
+++ b/japanese/cmigemo/Makefile
@@ -1,47 +1,47 @@
 PORTNAME=	cmigemo
-PORTVERSION=	20141220
+PORTVERSION=	20220623
 CATEGORIES=	japanese
 DIST_SUBDIR=	cmigemo
 
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	C implementation of Migemo Japanese incremental search tool
 WWW=		https://www.kaoriya.net/software/cmigemo
 
 .if !defined(PKGNAMESUFFIX)
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE_MIT.txt
 
 RUN_DEPENDS=	${LOCALBASE}/${DATADIR_REL}/cp932/migemo-dict:japanese/cmigemo-dict
 
 USE_LDCONFIG=	yes
 
 ALL_TARGET=	gcc-rel gcc-dat
 INSTALL_TARGET=	gcc-install
 
 DOCSDIR=	${PREFIX}/share/doc/ja/${PORTNAME}
 PORTDOCS=	README_j.txt
 .endif
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/nkf:japanese/nkf
 
 USES+=		gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	koron
-GH_TAGNAME=	6a1c438
+GH_TAGNAME=	e0f6145
 
 OPTIONS_DEFINE+=DOCS
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${STAGEDIR}${PREFIX}
 MAKE_JOBS_UNSAFE=	yes
 
 .include <bsd.port.options.mk>
 
 .if !defined(PKGNAMESUFFIX) && ${PORT_OPTIONS:MDOCS}
 INSTALL_TARGET+=gcc-install-doc
 .endif
 
 post-patch:
 	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/compile/config.mk.in
 
 .include <bsd.port.mk>
diff --git a/japanese/cmigemo/distinfo b/japanese/cmigemo/distinfo
index ecd7e1d9c83d..38542e49a535 100644
--- a/japanese/cmigemo/distinfo
+++ b/japanese/cmigemo/distinfo
@@ -1,4 +1,5 @@
-SHA256 (cmigemo/koron-cmigemo-20141220-6a1c438_GH0.tar.gz) = 833b85f9b4ba5e5fe54e902b1631c0e56b235ef1c99d3523a16326a37efa3929
-SIZE (cmigemo/koron-cmigemo-20141220-6a1c438_GH0.tar.gz) = 69764
-SHA256 (cmigemo/SKK-JISYO.L-20110813.bz2) = 560da93401f0a58417d61e2ff41a43a24f0886877797bbea879ba9db3e70e3d9
-SIZE (cmigemo/SKK-JISYO.L-20110813.bz2) = 1694235
+TIMESTAMP = 1770463919
+SHA256 (cmigemo/koron-cmigemo-20220623-e0f6145_GH0.tar.gz) = 4bf52dfa13294cfba913a664c8e712b332f0652c81c5a064865e670a69de2c9c
+SIZE (cmigemo/koron-cmigemo-20220623-e0f6145_GH0.tar.gz) = 70111
+SHA256 (cmigemo/SKK-JISYO.L) = e896fc45e4185a0bc6216cf4e4be415cbc0128171d3ec42bc96c6f58f7a10f24
+SIZE (cmigemo/SKK-JISYO.L) = 4489815
diff --git a/japanese/cmigemo/files/patch-compile_Make_gcc.mak b/japanese/cmigemo/files/patch-compile_Make__gcc.mak
similarity index 65%
rename from japanese/cmigemo/files/patch-compile_Make_gcc.mak
rename to japanese/cmigemo/files/patch-compile_Make__gcc.mak
index efd04d71526a..9c870838a32e 100644
--- a/japanese/cmigemo/files/patch-compile_Make_gcc.mak
+++ b/japanese/cmigemo/files/patch-compile_Make__gcc.mak
@@ -1,11 +1,11 @@
---- compile/Make_gcc.mak.orig	2014-12-20 04:39:02 UTC
+--- compile/Make_gcc.mak.orig	2022-06-23 01:52:51 UTC
 +++ compile/Make_gcc.mak
-@@ -44,4 +44,7 @@ uninstall-lib:
+@@ -44,4 +44,7 @@ dictionary:
  	$(RM) $(libdir)/$(libmigemo)
  
  dictionary:
 -	cd dict && $(MAKE) gcc
 +	cd dict && $(MAKE) gcc-dict
 +
 +dat:
 +	cd dict && $(MAKE) gcc-dat
diff --git a/japanese/cmigemo/files/patch-compile_unix.mak b/japanese/cmigemo/files/patch-compile_unix.mak
index f042c8bdc489..976384d3c1d1 100644
--- a/japanese/cmigemo/files/patch-compile_unix.mak
+++ b/japanese/cmigemo/files/patch-compile_unix.mak
@@ -1,57 +1,61 @@
---- compile/unix.mak.orig	2014-12-20 04:39:02 UTC
+--- compile/unix.mak.orig	2022-06-23 01:52:51 UTC
 +++ compile/unix.mak
-@@ -39,36 +39,48 @@ install-mkdir:
+@@ -39,27 +39,37 @@ install-mkdir:
  	$(MKDIR) $(bindir)
  	$(MKDIR) $(libdir)
  	$(MKDIR) $(incdir)
 -	$(MKDIR) $(docdir)
 +
 +install-mkdir-dict:
  	$(MKDIR) $(dictdir)
  	$(MKDIR) $(dictdir)/cp932
  	$(MKDIR) $(dictdir)/euc-jp
  	$(MKDIR) $(dictdir)/utf-8
  
--install-dict:
+-install-dict: install-mkdir
 +install-mkdir-doc:
 +	$(MKDIR) $(docdir)
 +
 +install-dict: install-mkdir-dict
  	$(INSTALL_DATA) dict/migemo-dict $(dictdir)/cp932
 +	if [ -d dict/euc-jp.d ]; then \
 +	  $(INSTALL_DATA) dict/euc-jp.d/migemo-dict $(dictdir)/euc-jp; \
 +	fi
 +	if [ -d dict/utf-8.d ]; then \
 +	  $(INSTALL_DATA) dict/utf-8.d/migemo-dict $(dictdir)/utf-8; \
 +	fi
 +
 +install-dat: install-mkdir-dict
  	$(INSTALL_DATA) dict/han2zen.dat $(dictdir)/cp932
  	$(INSTALL_DATA) dict/hira2kata.dat $(dictdir)/cp932
  	$(INSTALL_DATA) dict/roma2hira.dat $(dictdir)/cp932
  	$(INSTALL_DATA) dict/zen2han.dat $(dictdir)/cp932
  	if [ -d dict/euc-jp.d ]; then \
 -	  $(INSTALL_DATA) dict/euc-jp.d/migemo-dict $(dictdir)/euc-jp; \
  	  $(INSTALL_DATA) dict/euc-jp.d/han2zen.dat $(dictdir)/euc-jp; \
  	  $(INSTALL_DATA) dict/euc-jp.d/hira2kata.dat $(dictdir)/euc-jp; \
  	  $(INSTALL_DATA) dict/euc-jp.d/roma2hira.dat $(dictdir)/euc-jp; \
  	  $(INSTALL_DATA) dict/euc-jp.d/zen2han.dat $(dictdir)/euc-jp; \
  	fi
  	if [ -d dict/utf-8.d ]; then \
 -	  $(INSTALL_DATA) dict/utf-8.d/migemo-dict $(dictdir)/utf-8; \
  	  $(INSTALL_DATA) dict/utf-8.d/han2zen.dat $(dictdir)/utf-8; \
  	  $(INSTALL_DATA) dict/utf-8.d/hira2kata.dat $(dictdir)/utf-8; \
  	  $(INSTALL_DATA) dict/utf-8.d/roma2hira.dat $(dictdir)/utf-8; \
- 	  $(INSTALL_DATA) dict/utf-8.d/zen2han.dat $(dictdir)/utf-8; \
- 	fi
+@@ -69,10 +79,14 @@ install-lib: install-mkdir
+ # depends on $(libdir) to be already present
+ install-lib: install-mkdir
  
 -install: $(outdir)cmigemo$(EXEEXT) $(libmigemo_DSO) install-mkdir install-dict install-lib
 -	$(INSTALL_DATA) $(srcdir)migemo.h $(incdir)
 +install-doc: install-mkdir-doc
  	$(INSTALL_DATA) doc/README_j.txt $(docdir)
 +
 +install: $(outdir)cmigemo$(EXEEXT) $(libmigemo_DSO) install-mkdir install-dat install-lib
 +	$(INSTALL_DATA) $(srcdir)migemo.h $(incdir)
  	$(INSTALL_PROGRAM) $(outdir)cmigemo$(EXEEXT) $(bindir)
++
++
  
  ##############################################################################
+ # Uninstall
diff --git a/japanese/cmigemo/files/patch-dict_dict.mak b/japanese/cmigemo/files/patch-dict_dict.mak
index 09e3c148d3e3..5b574d42493a 100644
--- a/japanese/cmigemo/files/patch-dict_dict.mak
+++ b/japanese/cmigemo/files/patch-dict_dict.mak
@@ -1,82 +1,82 @@
---- dict/dict.mak.orig	2014-12-20 04:39:02 UTC
+--- dict/dict.mak.orig	2022-06-23 01:52:51 UTC
 +++ dict/dict.mak
-@@ -15,7 +15,7 @@ UTF8_DIR	= utf-8.d
+@@ -15,7 +15,7 @@ $(DICT): $(DICT_BASE)
  # Dictionary
  #
  $(DICT): $(DICT_BASE)
 -	$(FILTER_CP932) < $(DICT_BASE) > $@
 +	$(ICONV_EUCJP_TO_CP932) < $(DICT_BASE) > $@
  $(DICT_BASE): $(SKKDIC_FILE) ../tools/skk2migemo.pl ../tools/optimize-dict.pl
  	$(PERL) ../tools/skk2migemo.pl < $(SKKDIC_FILE) > dict.tmp
  	$(PERL) ../tools/optimize-dict.pl < dict.tmp > $@
 @@ -32,42 +32,42 @@ cp932:		$(DICT)
  ##############################################################################
  # Dictionary in euc-jp
  #
 -euc-jp: 	cp932 euc-jp-files
--euc-jp-files: $(EUCJP_DIR) $(EUCJP_DIR)/migemo-dict \
+-euc-jp-files: $(EUCJP_DIR)/migemo-dict \
 -	$(EUCJP_DIR)/zen2han.dat $(EUCJP_DIR)/han2zen.dat \
 -	$(EUCJP_DIR)/hira2kata.dat $(EUCJP_DIR)/roma2hira.dat
 +euc-jp-dict: 	cp932 $(EUCJP_DIR) $(EUCJP_DIR)/migemo-dict
 +euc-jp-dat: $(EUCJP_DIR) $(EUCJP_DIR)/zen2han.dat \
 +	    $(EUCJP_DIR)/han2zen.dat $(EUCJP_DIR)/hira2kata.dat \
 +	    $(EUCJP_DIR)/roma2hira.dat
  $(EUCJP_DIR):
  	$(MKDIR) $(EUCJP_DIR)
- $(EUCJP_DIR)/migemo-dict: migemo-dict
+ $(EUCJP_DIR)/migemo-dict: $(EUCJP_DIR) migemo-dict
 -	$(FILTER_EUCJP) < migemo-dict > $@
 +	$(ICONV_CP932_TO_EUCJP) < migemo-dict > $@
- $(EUCJP_DIR)/zen2han.dat: zen2han.dat
+ $(EUCJP_DIR)/zen2han.dat: $(EUCJP_DIR) zen2han.dat
 -	$(FILTER_EUCJP) < zen2han.dat > $@
 +	$(ICONV_CP932_TO_EUCJP) < zen2han.dat > $@
- $(EUCJP_DIR)/han2zen.dat: han2zen.dat
+ $(EUCJP_DIR)/han2zen.dat: $(EUCJP_DIR) han2zen.dat
 -	$(FILTER_EUCJP) < han2zen.dat > $@
 +	$(ICONV_CP932_TO_EUCJP) < han2zen.dat > $@
- $(EUCJP_DIR)/hira2kata.dat: hira2kata.dat
+ $(EUCJP_DIR)/hira2kata.dat: $(EUCJP_DIR) hira2kata.dat
 -	$(FILTER_EUCJP) < hira2kata.dat > $@
 +	$(ICONV_CP932_TO_EUCJP) < hira2kata.dat > $@
- $(EUCJP_DIR)/roma2hira.dat: roma2hira.dat
+ $(EUCJP_DIR)/roma2hira.dat: $(EUCJP_DIR) roma2hira.dat
 -	$(FILTER_EUCJP) < roma2hira.dat > $@
 +	$(ICONV_CP932_TO_EUCJP) < roma2hira.dat > $@
  
  ##############################################################################
  # Dictionary in utf-8
  #
 -utf-8: 	cp932 utf-8-files
--utf-8-files: $(UTF8_DIR) $(UTF8_DIR)/migemo-dict \
+-utf-8-files: $(UTF8_DIR)/migemo-dict \
 -	$(UTF8_DIR)/zen2han.dat $(UTF8_DIR)/han2zen.dat \
 -	$(UTF8_DIR)/hira2kata.dat $(UTF8_DIR)/roma2hira.dat
 +utf-8-dict: 	cp932 $(UTF8_DIR) $(UTF8_DIR)/migemo-dict
 +utf-8-dat: $(UTF8_DIR) $(UTF8_DIR)/zen2han.dat \
 +	   $(UTF8_DIR)/han2zen.dat $(UTF8_DIR)/hira2kata.dat \
 +	   $(UTF8_DIR)/roma2hira.dat
  $(UTF8_DIR):
  	$(MKDIR) $(UTF8_DIR)
- $(UTF8_DIR)/migemo-dict: migemo-dict
+ $(UTF8_DIR)/migemo-dict: $(UTF8_DIR) migemo-dict
 -	$(FILTER_UTF8) < migemo-dict > $@
 +	$(ICONV_CP932_TO_UTF8) < migemo-dict > $@
- $(UTF8_DIR)/zen2han.dat: zen2han.dat
+ $(UTF8_DIR)/zen2han.dat: $(UTF8_DIR) zen2han.dat
 -	$(FILTER_UTF8) < zen2han.dat > $@
 +	$(ICONV_CP932_TO_UTF8) < zen2han.dat > $@
- $(UTF8_DIR)/han2zen.dat: han2zen.dat
+ $(UTF8_DIR)/han2zen.dat: $(UTF8_DIR) han2zen.dat
 -	$(FILTER_UTF8) < han2zen.dat > $@
 +	$(ICONV_CP932_TO_UTF8) < han2zen.dat > $@
- $(UTF8_DIR)/hira2kata.dat: hira2kata.dat
+ $(UTF8_DIR)/hira2kata.dat: $(UTF8_DIR) hira2kata.dat
 -	$(FILTER_UTF8) < hira2kata.dat > $@
 +	$(ICONV_CP932_TO_UTF8) < hira2kata.dat > $@
- $(UTF8_DIR)/roma2hira.dat: roma2hira.dat
+ $(UTF8_DIR)/roma2hira.dat: $(UTF8_DIR) roma2hira.dat
 -	$(FILTER_UTF8) < roma2hira.dat > $@
 +	$(ICONV_CP932_TO_UTF8) < roma2hira.dat > $@
  
  ##############################################################################
  # for Microsoft Visual C
 @@ -92,7 +92,8 @@ mingw:		cp932 utf-8
  ##############################################################################
  # for GNU/gcc(Linux‘¼)
  #
 -gcc:		euc-jp utf-8
 +gcc-dict:		euc-jp-dict utf-8-dict
 +gcc-dat:		euc-jp-dat utf-8-dat
  
  ##############################################################################
  # for MacOS X