diff --git a/MOVED b/MOVED
index 884683e73523..9bfe0855dec4 100644
--- a/MOVED
+++ b/MOVED
@@ -15792,6 +15792,7 @@ devel/py-gobject||2020-12-12|Has expired: Uses deprecated version of python
 games/gemrb||2020-12-18|Has expired: Uses deprecated version of python
 net/iplog||2020-12-18|Has expired: Unmaintained and dead upstream. Does not build with modern compilers.
 www/rubygem-rack21|www/rubygem-rack|2020-12-18|Obsolete, please use www/rubygem-rack
+chinese/rime-data||2020-12-23|Unneeded metaport
 devel/vulkan-headers|graphics/vulkan-headers|2020-12-23|Moved to a better category, aligning with vulkan-loader
 devel/vulkan-tools|graphics/vulkan-tools|2020-12-23|Moved to a better category, aligning with vulkan-loader
 devel/vulkan-vulkan-validation-layers|graphics/vulkan-vulkan-validation-layers|2020-12-23|Moved to a better category, aligning with vulkan-loader
diff --git a/chinese/Makefile b/chinese/Makefile
index f71d505b5034..14cb763cb03b 100644
--- a/chinese/Makefile
+++ b/chinese/Makefile
@@ -100,7 +100,6 @@
     SUBDIR += rime-cangjie
     SUBDIR += rime-cantonese
     SUBDIR += rime-combo-pinyin
-    SUBDIR += rime-data
     SUBDIR += rime-data-full
     SUBDIR += rime-double-pinyin
     SUBDIR += rime-emoji
diff --git a/chinese/ibus-rime/Makefile b/chinese/ibus-rime/Makefile
index b7c1bba769b2..175818283aa0 100644
--- a/chinese/ibus-rime/Makefile
+++ b/chinese/ibus-rime/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ibus-rime
 DISTVERSION=	1.4.0-14
+PORTREVISION=	1
 CATEGORIES=	chinese
 
 MAINTAINER=	khng300@gmail.com
@@ -11,11 +12,11 @@ COMMENT=	IBus engine for Rime users
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	zh-rime-data>=g0:chinese/rime-data
+BUILD_DEPENDS=	${_SCHEMA_DEPENDS}
 LIB_DEPENDS=	libibus-1.0.so:textproc/ibus \
 		libnotify.so:devel/libnotify \
 		librime.so:chinese/librime
-RUN_DEPENDS=	zh-rime-data>=g0:chinese/rime-data
+RUN_DEPENDS=	${_SCHEMA_DEPENDS}
 
 USES=		cmake gnome pkgconfig
 USE_CSTD=	c99
@@ -26,4 +27,10 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	rime
 GH_TAGNAME=	bfabe67
 
+_SCHEMA_DEPENDS=	\
+	${LOCALBASE}/share/rime-data/luna_pinyin.schema.yaml:chinese/rime-luna-pinyin	\
+	${LOCALBASE}/share/rime-data/bopomofo.schema.yaml:chinese/rime-bopomofo	\
+	${LOCALBASE}/share/rime-data/cangjie5.schema.yaml:chinese/rime-cangjie	\
+	${LOCALBASE}/share/rime-data/stroke.schema.yaml:chinese/rime-stroke
+
 .include <bsd.port.mk>
diff --git a/chinese/rime-data/Makefile b/chinese/rime-data/Makefile
deleted file mode 100644
index 425a5f147000..000000000000
--- a/chinese/rime-data/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Created by: Ka Ho Ng <khng300@gmail.com>
-# $FreeBSD$
-
-PORTNAME=	rime-data
-PORTVERSION=	g20201216
-CATEGORIES=	chinese textproc
-
-MAINTAINER=	khng300@gmail.com
-COMMENT=	Rime data files preset
-
-LICENSE=	LGPL3
-
-RUN_DEPENDS=	\
-	${LOCALBASE}/share/rime-data/luna_pinyin.schema.yaml:chinese/rime-luna-pinyin	\
-	${LOCALBASE}/share/rime-data/bopomofo.schema.yaml:chinese/rime-bopomofo	\
-	${LOCALBASE}/share/rime-data/cangjie5.schema.yaml:chinese/rime-cangjie	\
-	${LOCALBASE}/share/rime-data/stroke.schema.yaml:chinese/rime-stroke
-
-USES=		localbase metaport
-
-.include <bsd.port.mk>
diff --git a/chinese/rime-data/pkg-descr b/chinese/rime-data/pkg-descr
deleted file mode 100644
index 857d24587381..000000000000
--- a/chinese/rime-data/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Rime data files.  This is a metaport that provides an essential set of
-configuration ports and a preset of IME schema ports for the Rime IME
-framework.
-
-WWW: https://github.com/rime/plum