diff --git a/chinese/ibus-cangjie/Makefile b/chinese/ibus-cangjie/Makefile
index b75da7541654..c308a20c9c39 100644
--- a/chinese/ibus-cangjie/Makefile
+++ b/chinese/ibus-cangjie/Makefile
@@ -1,36 +1,33 @@
 # Created by: blubee <hello@blubee.me>
 
-PORTNAME=		ibus-cangjie
-PORTVERSION=		2.4
+PORTNAME=	ibus-cangjie
+PORTVERSION=	2.4
 DISTVERSIONPREFIX=	v
-CATEGORIES=		chinese
+CATEGORIES=	chinese
 
 MAINTAINER=	hello@blubee.me
 COMMENT=	IBus engine for users of the Cangjie and Quick
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libibus-1.0.so:textproc/ibus
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/cangjie/_core.so:chinese/pycangjie \
 		${PYTHON_SITELIBDIR}/pycanberra/pycanberra.py:devel/pycanberra@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/cangjie/_core.so:chinese/pycangjie \
-		${PYTHON_SITELIBDIR}/pycanberra/pycanberra.py:devel/pycanberra@${PY_FLAVOR}
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		autoreconf gmake gnome libtool pkgconfig python:3.4+
 USE_GNOME=	introspection:run pygobject3 intltool
 GLIB_SCHEMAS=	org.cangjians.ibus.cangjie.gschema.xml \
 		org.cangjians.ibus.quick.gschema.xml
+INSTALLS_ICONS=	yes
+GNU_CONFIGURE=	yes
 
-OPTIONS_DEFINE=		NLS
-NLS_USES=		gettext
-NLS_CONFIGURE_ENABLE=	gettext
-
-INSTALLS_ICONS=		yes
-GNU_CONFIGURE=		yes
+USE_GITHUB=	yes
+GH_ACCOUNT=	Cangjians
 
-USE_GITHUB=		yes
-GH_ACCOUNT=		Cangjians
-GH_PROJECT=		ibus-cangjie
+OPTIONS_DEFINE=	NLS
+NLS_USES=	gettext
+NLS_CONFIGURE_ENABLE=	gettext
 
 .include <bsd.port.mk>
diff --git a/chinese/ibus-cangjie/pkg-descr b/chinese/ibus-cangjie/pkg-descr
index 1f06b3172b5f..b735d946a582 100644
--- a/chinese/ibus-cangjie/pkg-descr
+++ b/chinese/ibus-cangjie/pkg-descr
@@ -1,8 +1,6 @@
-This is an IBus engine for users of the Cangjie and 
-Quick input methods.
+This is an IBus engine for users of the Cangjie and Quick input methods.
 
-It is primarily intended to Hong Kong people 
-who want to input Traditional Chinese,
-as they are (by far) the majority of Cangjie and Quick users.
+It is primarily intended to Hong Kong people who want to input Traditional
+Chinese, as they are (by far) the majority of Cangjie and Quick users.
 
 WWW: http://cangjians.github.io/projects/ibus-cangjie/
diff --git a/chinese/libcangjie/Makefile b/chinese/libcangjie/Makefile
index b92882af6454..5ceac3e1b63f 100644
--- a/chinese/libcangjie/Makefile
+++ b/chinese/libcangjie/Makefile
@@ -1,33 +1,30 @@
 # Created by: blubee <hello@blubee.me>
 
-PORTNAME=		libcangjie
-PORTVERSION=		1.3
-PORTREVISION=		1
+PORTNAME=	libcangjie
+PORTVERSION=	1.3
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
-CATEGORIES=		chinese
+CATEGORIES=	chinese
 
 MAINTAINER=	hello@blubee.me
 COMMENT=	C library implementing the Cangjie input method
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libsqlite3.so:databases/sqlite3		\
 		libfreetype.so:print/freetype2          \
 		libdbus-1.so:devel/dbus
 
 USES=		autoreconf gmake libtool localbase pkgconfig sqlite xorg
-
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-
 USE_XORG=	xi
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Cangjians
-GH_PROJECT=	libcangjie
 
 post-install:
 	@(${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so)
 
 .include <bsd.port.mk>
diff --git a/chinese/pycangjie/Makefile b/chinese/pycangjie/Makefile
index 347ba9a1fe13..02d83bdc20a3 100644
--- a/chinese/pycangjie/Makefile
+++ b/chinese/pycangjie/Makefile
@@ -1,30 +1,29 @@
 # Created by: blubee <hello@blubee.me>
 
-PORTNAME=		pycangjie
-PORTVERSION=		1.3
+PORTNAME=	pycangjie
+PORTVERSION=	1.3
 DISTVERSIONPREFIX=	v
-CATEGORIES=		chinese
+CATEGORIES=	chinese
 
 MAINTAINER=	hello@blubee.me
 COMMENT=	Python wrapper to libcangjie
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libcangjie.so:chinese/libcangjie
 
 USES=		autoreconf gmake libtool pkgconfig sqlite python:3.4+
 USE_PYTHON=	cython
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CYTHON=${LOCALBASE}/bin/cython-${PYTHON_VER}
 USE_GITHUB=	yes
 GH_ACCOUNT=	Cangjians
-GH_PROJECT=	pycangjie
 
 post-install:
 	(cd ${STAGEDIR}${PREFIX} \
   	&& ${PYTHON_CMD} ${PYTHON_LIBDIR}/*.py \
    	-d ${PREFIX} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;})
 	@(${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}/site-packages/cangjie/*.so)
 
 .include <bsd.port.mk>
diff --git a/chinese/pycangjie/pkg-descr b/chinese/pycangjie/pkg-descr
index 7898c5e39018..9a6c43fb9c5b 100644
--- a/chinese/pycangjie/pkg-descr
+++ b/chinese/pycangjie/pkg-descr
@@ -1,4 +1,4 @@
-This is a Python wrapper to libcangjie,
-the library implementing the Cangjie input method.
+This is a Python wrapper to libcangjie, the library implementing the
+Cangjie input method.
 
 WWW: http://cangjians.github.io/projects/pycangjie/