Index: chinese/fcitx-rime/Makefile
===================================================================
--- chinese/fcitx-rime/Makefile
+++ chinese/fcitx-rime/Makefile
@@ -2,25 +2,27 @@
 # $FreeBSD$
 
 PORTNAME=	fcitx-rime
-PORTVERSION=	0.3.2
-PORTREVISION=	1
+DISTVERSION=	0.3.2
+PORTREVISION=	2
 CATEGORIES=	chinese
-MASTER_SITES=	http://download.fcitx-im.org/${PORTNAME}/
+MASTER_SITES=	https://download.fcitx-im.org/${PORTNAME}/
 DIST_SUBDIR=	fcitx
 
+PATCH_SITES=	https://github.com/fcitx/${PORTNAME}/commit/
+PATCHFILES=	a3a9fffb6ee89adc327ad8a7dec05d5f35414f9d.patch:-p1
+
 MAINTAINER=	lichray@gmail.com
 COMMENT=	RIME support for Fcitx
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bash:shells/bash
+BUILD_DEPENDS=	bash:shells/bash \
+		zh-rime-data>=g0:chinese/rime-data
 LIB_DEPENDS=	libfcitx-config.so:chinese/fcitx \
 		librime.so:chinese/librime
-RUN_DEPENDS=	${LOCALBASE}/share/brise/default.yaml:chinese/brise
+RUN_DEPENDS=	zh-rime-data>=g0:chinese/rime-data
 
-USES=		cmake gettext gnome pkgconfig tar:xz
+USES=		cmake gettext gnome localbase pkgconfig tar:xz
 INSTALLS_ICONS=	yes
 
-CMAKE_ARGS+=	-DBRISE_DIR=${LOCALBASE}/share/brise
-
 .include <bsd.port.mk>
Index: chinese/fcitx-rime/distinfo
===================================================================
--- chinese/fcitx-rime/distinfo
+++ chinese/fcitx-rime/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1536696850
+TIMESTAMP = 1608116604
 SHA256 (fcitx/fcitx-rime-0.3.2.tar.xz) = f97ea6f515fcc5f526cc25dce3d4ba05fa1c83001f68502d6c284ba39cd5a82d
 SIZE (fcitx/fcitx-rime-0.3.2.tar.xz) = 40960
+SHA256 (fcitx/a3a9fffb6ee89adc327ad8a7dec05d5f35414f9d.patch) = b108314263ab980947f92ad08ac42642cc5e5274f256bc3cb0d2e86825a78586
+SIZE (fcitx/a3a9fffb6ee89adc327ad8a7dec05d5f35414f9d.patch) = 3167
Index: chinese/rime-bopomofo/Makefile
===================================================================
--- chinese/rime-bopomofo/Makefile
+++ chinese/rime-bopomofo/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	rime-bopomofo
 DISTVERSION=	g20190120
+PORTREVISION=	1
 CATEGORIES=	chinese textproc
 
 MAINTAINER=	khng300@gmail.com
@@ -45,7 +46,7 @@
 	@${MKDIR} ${MY_OUTDIR}
 	@${RLN} ${WRKSRC}/* ${MY_OUTDIR}
 .for i in ${PRELUDE_FILES} ${ESSAY_FILES} ${TERRA_PINYIN_FILES}
-	@${RLN} ${LOCALBASE}/share/rime-data/${i} ${MY_OUTDIR}
+	@${CP} ${LOCALBASE}/share/rime-data/${i} ${MY_OUTDIR}
 .endfor
 .for i in ${SCHEMA_FILES}
 	rime_deployer --compile ${WRKSRC}/${i} ${MY_OUTDIR}
Index: chinese/rime-cangjie/Makefile
===================================================================
--- chinese/rime-cangjie/Makefile
+++ chinese/rime-cangjie/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	rime-cangjie
 DISTVERSION=	g20201030
+PORTREVISION=	1
 CATEGORIES=	chinese textproc
 
 MAINTAINER=	khng300@gmail.com
@@ -38,7 +39,7 @@
 	@${MKDIR} ${MY_OUTDIR}
 	@${RLN} ${WRKSRC}/* ${MY_OUTDIR}
 .for i in ${PRELUDE_FILES} ${ESSAY_FILES}
-	@${RLN} ${LOCALBASE}/share/rime-data/${i} ${MY_OUTDIR}
+	@${CP} ${LOCALBASE}/share/rime-data/${i} ${MY_OUTDIR}
 .endfor
 .for i in ${SCHEMA_FILES}
 	rime_deployer --compile ${WRKSRC}/${i} ${MY_OUTDIR}
Index: chinese/rime-cantonese/Makefile
===================================================================
--- chinese/rime-cantonese/Makefile
+++ chinese/rime-cantonese/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	rime-cantonese
 DISTVERSION=	g20201212
+PORTREVISION=	1
 CATEGORIES=	chinese textproc
 
 MAINTAINER=	khng300@gmail.com
@@ -43,7 +44,7 @@
 	@${MKDIR} ${MY_OUTDIR}
 	@${RLN} ${WRKSRC}/* ${MY_OUTDIR}
 .for i in ${PRELUDE_FILES} ${ESSAY_FILES}
-	@${RLN} ${LOCALBASE}/share/rime-data/${i} ${MY_OUTDIR}
+	@${CP} ${LOCALBASE}/share/rime-data/${i} ${MY_OUTDIR}
 .endfor
 .for i in ${SCHEMA_FILES}
 	rime_deployer --compile ${WRKSRC}/${i} ${MY_OUTDIR}
Index: chinese/rime-luna-pinyin/Makefile
===================================================================
--- chinese/rime-luna-pinyin/Makefile
+++ chinese/rime-luna-pinyin/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	rime-luna-pinyin
 DISTVERSION=	g20201105
+PORTREVISION=	1
 CATEGORIES=	chinese textproc
 
 MAINTAINER=	khng300@gmail.com
@@ -43,7 +44,7 @@
 	@${MKDIR} ${MY_OUTDIR}
 	@${RLN} ${WRKSRC}/* ${MY_OUTDIR}
 .for i in ${PRELUDE_FILES} ${ESSAY_FILES}
-	@${RLN} ${LOCALBASE}/share/rime-data/${i} ${MY_OUTDIR}
+	@${CP} ${LOCALBASE}/share/rime-data/${i} ${MY_OUTDIR}
 .endfor
 .for i in ${SCHEMA_FILES}
 	rime_deployer --compile ${WRKSRC}/${i} ${MY_OUTDIR}
Index: chinese/rime-stroke/Makefile
===================================================================
--- chinese/rime-stroke/Makefile
+++ chinese/rime-stroke/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	rime-stroke
 DISTVERSION=	g20191221
+PORTREVISION=	1
 CATEGORIES=	chinese textproc
 
 MAINTAINER=	khng300@gmail.com
@@ -39,7 +40,7 @@
 	@${MKDIR} ${MY_OUTDIR}
 	@${RLN} ${WRKSRC}/* ${MY_OUTDIR}
 .for i in ${PRELUDE_FILES} ${ESSAY_FILES}
-	@${RLN} ${LOCALBASE}/share/rime-data/${i} ${MY_OUTDIR}
+	@${CP} ${LOCALBASE}/share/rime-data/${i} ${MY_OUTDIR}
 .endfor
 .for i in ${SCHEMA_FILES}
 	rime_deployer --compile ${WRKSRC}/${i} ${MY_OUTDIR}
Index: chinese/rime-terra-pinyin/Makefile
===================================================================
--- chinese/rime-terra-pinyin/Makefile
+++ chinese/rime-terra-pinyin/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	rime-terra-pinyin
 DISTVERSION=	g20201018
+PORTREVISION=	1
 CATEGORIES=	chinese textproc
 
 MAINTAINER=	khng300@gmail.com
@@ -39,7 +40,7 @@
 	@${MKDIR} ${MY_OUTDIR}
 	@${RLN} ${WRKSRC}/* ${MY_OUTDIR}
 .for i in ${PRELUDE_FILES} ${ESSAY_FILES}
-	@${RLN} ${LOCALBASE}/share/rime-data/${i} ${MY_OUTDIR}
+	@${CP} ${LOCALBASE}/share/rime-data/${i} ${MY_OUTDIR}
 .endfor
 .for i in ${SCHEMA_FILES}
 	rime_deployer --compile ${WRKSRC}/${i} ${MY_OUTDIR}