diff --git a/chinese/gcin-devel/Makefile b/chinese/gcin-devel/Makefile
index 0c335f60e9ac..fc98cca95d7e 100644
--- a/chinese/gcin-devel/Makefile
+++ b/chinese/gcin-devel/Makefile
@@ -7,12 +7,11 @@
 
 PORTNAME=	gcin
 PORTVERSION=	1.2.2
+PORTREVISION=	1
 CATEGORIES=	chinese textproc gnome
-MASTER_SITES=	http://www.csie.nctu.edu.tw/~cp76/gcin/download/:main \
-		http://edt1023.sayya.org/misc/:boshiamy
-DISTFILES=	gcin-${PORTVERSION}.tar.bz2:main \
-		noseeing.tar.gz:boshiamy
-EXTRACT_ONLY=	gcin-${PORTVERSION}.tar.bz2
+MASTER_SITES=	http://www.csie.nctu.edu.tw/~cp76/gcin/download/:main
+DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:main
+EXTRACT_ONLY=	gcin-1.2.2.tar.bz2
 
 MAINTAINER=	chinsan.tw@gmail.com
 COMMENT=	A traditional chinese input utility in X
@@ -24,9 +23,8 @@ USE_GNOME=	gtk20
 USE_GMAKE=	YES
 USE_GCC=	3.4+
 INSTALLS_ICONS=	YES
-USE_LDCONFIG=	YES
+INSTALLS_SHLIB=	YES
 OPTIONS=	BOSHIAMY	"enable Boshiamy Input Method"	off
-IGNOREFILES=	noseeing.tar.gz
 
 CONFIGURE_ENV+=	"--new_gtk_im=Y"
 
@@ -35,8 +33,10 @@ MAN1=		gcin.1 gcin2tab.1
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_BOSHIAMY)
+MASTER_SITES+=	http://edt1023.sayya.org/misc/:boshiamy
+DISTFILES+=	noseeing-6.tar.gz:boshiamy
 post-extract:
-	@${TAR} -C ${WRKSRC}/data/ -zxf ${DISTDIR}/noseeing.tar.gz \
+	@${TAR} -C ${WRKSRC}/data/ -zxf ${DISTDIR}/noseeing-6.tar.gz \
 		noseeing.cin
 	@${REINPLACE_CMD} -e 's,cj.gtab,cj.gtab noseeing.gtab,' \
 		${WRKSRC}/data/Makefile
@@ -51,6 +51,7 @@ pre-patch:
 		s/\/usr\/share/$$prefix\/share/; \
 		109,110 s/control-center-2\.0/gnome\/control-center-2\.0/; \
 		s/gcc/$$CC/; s/gcin-$$GCIN_VERSION/gcin/' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's/qsort/mergesort/' ${WRKSRC}/gcin2tab.c
 	@${REINPLACE_CMD} -e 's/modify-XIM //; 8,10 d' ${WRKSRC}/scripts/Makefile
 	@${REINPLACE_CMD} -e 's/bash/sh/;' ${WRKSRC}/scripts/gcin-user-setup
 	@${REINPLACE_CMD} -e 's/bash/sh/; s/&//; s/opt\/gnome/usr\/X11R6/;' \
diff --git a/chinese/gcin-devel/distinfo b/chinese/gcin-devel/distinfo
index dc57792b3872..04321b376255 100644
--- a/chinese/gcin-devel/distinfo
+++ b/chinese/gcin-devel/distinfo
@@ -1,5 +1,6 @@
 MD5 (gcin-1.2.2.tar.bz2) = 2adc21cad0e3f9451d6e4662c3b99425
 SHA256 (gcin-1.2.2.tar.bz2) = 6d088a00dd3f90c0ea97081fbaa2d7d1682de9c8f8f769c1e747c745ad728264
 SIZE (gcin-1.2.2.tar.bz2) = 1441781
-MD5 (noseeing.tar.gz) = IGNORE
-SHA256 (noseeing.tar.gz) = IGNORE
+MD5 (noseeing-6.tar.gz) = c67e5c85b2805f12bb2f092dfa1814b7
+SHA256 (noseeing-6.tar.gz) = 2f240c8dbb15c2249dff74102842bbccfe307a721cf2c092c75dc6234e470f9b
+SIZE (noseeing-6.tar.gz) = 400429
diff --git a/chinese/gcin-devel/pkg-plist b/chinese/gcin-devel/pkg-plist
index ef6c726c51a4..18f6587905a3 100644
--- a/chinese/gcin-devel/pkg-plist
+++ b/chinese/gcin-devel/pkg-plist
@@ -46,6 +46,8 @@ lib/libgcin-im-client.so
 share/applications/gcin
 share/applications/gcin-setup
 share/gnome/control-center-2.0/capplets/gcin-setup.desktop
+share/icons/gcin-tray-sim.png
+share/icons/gcin-tray.png
 share/icons/gcin.png
 share/icons/gcin/pin-fixed24.png
 share/icons/gcin/pin-float16.png
diff --git a/chinese/gcin/Makefile b/chinese/gcin/Makefile
index 0c335f60e9ac..fc98cca95d7e 100644
--- a/chinese/gcin/Makefile
+++ b/chinese/gcin/Makefile
@@ -7,12 +7,11 @@
 
 PORTNAME=	gcin
 PORTVERSION=	1.2.2
+PORTREVISION=	1
 CATEGORIES=	chinese textproc gnome
-MASTER_SITES=	http://www.csie.nctu.edu.tw/~cp76/gcin/download/:main \
-		http://edt1023.sayya.org/misc/:boshiamy
-DISTFILES=	gcin-${PORTVERSION}.tar.bz2:main \
-		noseeing.tar.gz:boshiamy
-EXTRACT_ONLY=	gcin-${PORTVERSION}.tar.bz2
+MASTER_SITES=	http://www.csie.nctu.edu.tw/~cp76/gcin/download/:main
+DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:main
+EXTRACT_ONLY=	gcin-1.2.2.tar.bz2
 
 MAINTAINER=	chinsan.tw@gmail.com
 COMMENT=	A traditional chinese input utility in X
@@ -24,9 +23,8 @@ USE_GNOME=	gtk20
 USE_GMAKE=	YES
 USE_GCC=	3.4+
 INSTALLS_ICONS=	YES
-USE_LDCONFIG=	YES
+INSTALLS_SHLIB=	YES
 OPTIONS=	BOSHIAMY	"enable Boshiamy Input Method"	off
-IGNOREFILES=	noseeing.tar.gz
 
 CONFIGURE_ENV+=	"--new_gtk_im=Y"
 
@@ -35,8 +33,10 @@ MAN1=		gcin.1 gcin2tab.1
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_BOSHIAMY)
+MASTER_SITES+=	http://edt1023.sayya.org/misc/:boshiamy
+DISTFILES+=	noseeing-6.tar.gz:boshiamy
 post-extract:
-	@${TAR} -C ${WRKSRC}/data/ -zxf ${DISTDIR}/noseeing.tar.gz \
+	@${TAR} -C ${WRKSRC}/data/ -zxf ${DISTDIR}/noseeing-6.tar.gz \
 		noseeing.cin
 	@${REINPLACE_CMD} -e 's,cj.gtab,cj.gtab noseeing.gtab,' \
 		${WRKSRC}/data/Makefile
@@ -51,6 +51,7 @@ pre-patch:
 		s/\/usr\/share/$$prefix\/share/; \
 		109,110 s/control-center-2\.0/gnome\/control-center-2\.0/; \
 		s/gcc/$$CC/; s/gcin-$$GCIN_VERSION/gcin/' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's/qsort/mergesort/' ${WRKSRC}/gcin2tab.c
 	@${REINPLACE_CMD} -e 's/modify-XIM //; 8,10 d' ${WRKSRC}/scripts/Makefile
 	@${REINPLACE_CMD} -e 's/bash/sh/;' ${WRKSRC}/scripts/gcin-user-setup
 	@${REINPLACE_CMD} -e 's/bash/sh/; s/&//; s/opt\/gnome/usr\/X11R6/;' \
diff --git a/chinese/gcin/distinfo b/chinese/gcin/distinfo
index dc57792b3872..04321b376255 100644
--- a/chinese/gcin/distinfo
+++ b/chinese/gcin/distinfo
@@ -1,5 +1,6 @@
 MD5 (gcin-1.2.2.tar.bz2) = 2adc21cad0e3f9451d6e4662c3b99425
 SHA256 (gcin-1.2.2.tar.bz2) = 6d088a00dd3f90c0ea97081fbaa2d7d1682de9c8f8f769c1e747c745ad728264
 SIZE (gcin-1.2.2.tar.bz2) = 1441781
-MD5 (noseeing.tar.gz) = IGNORE
-SHA256 (noseeing.tar.gz) = IGNORE
+MD5 (noseeing-6.tar.gz) = c67e5c85b2805f12bb2f092dfa1814b7
+SHA256 (noseeing-6.tar.gz) = 2f240c8dbb15c2249dff74102842bbccfe307a721cf2c092c75dc6234e470f9b
+SIZE (noseeing-6.tar.gz) = 400429
diff --git a/chinese/gcin/pkg-plist b/chinese/gcin/pkg-plist
index ef6c726c51a4..18f6587905a3 100644
--- a/chinese/gcin/pkg-plist
+++ b/chinese/gcin/pkg-plist
@@ -46,6 +46,8 @@ lib/libgcin-im-client.so
 share/applications/gcin
 share/applications/gcin-setup
 share/gnome/control-center-2.0/capplets/gcin-setup.desktop
+share/icons/gcin-tray-sim.png
+share/icons/gcin-tray.png
 share/icons/gcin.png
 share/icons/gcin/pin-fixed24.png
 share/icons/gcin/pin-float16.png