6 files changed, 22 insertions, 16 deletions

diff --git a/chinese/gcin-devel/Makefile b/chinese/gcin-devel/Makefile
index 405dbd486afd..6c212a791f43 100644
--- a/chinese/gcin-devel/Makefile
+++ b/chinese/gcin-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gcin
-PORTVERSION=	1.3.4
-PORTREVISION=	1
+PORTVERSION=	1.3.5
 CATEGORIES=	chinese textproc gnome
 MASTER_SITES=	http://cle.linux.org.tw/gcin/download/:main \
 		http://ftp.twaren.net/local-distfiles/gcin/:main \
@@ -48,15 +47,17 @@ pre-patch:
 		s,QT_IM_DIR=/usr,QT_IM_DIR=$$prefix,; \
 		s,mandir=$$datadir,mandir=$$prefix,; \
 		s,/usr/share,$$prefix/share,; s,libdir)\/gcin,libdir),; \
-		140 s,control-center-2\.0,gnome\/control-center-2\.0,g; \
+		143,150 d; \
 		s,gcc,$$CC,; s,gcin-$$GCIN_VERSION,gcin,' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's,\/usr\/share,$$(prefix)\/share,' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's,\/usr\/share,$$(prefix)\/share,' \
+		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's,/usr/local,/usr,g' \
 		${WRKSRC}/gtk-im/Makefile ${WRKSRC}/menu/Makefile
 	@${REINPLACE_CMD} -e 's,/usr/lib,${LOCALBASE}/lib,g; \
 		s,/usr/include,${X11BASE}/include,g; s,Xft2/X11/Xft,X11/Xft,' \
 		${WRKSRC}/qt-im/Makefile
-	@${REINPLACE_CMD} -e 's,modify-XIM ,,; 8,10 d' ${WRKSRC}/scripts/Makefile
+	@${REINPLACE_CMD} -e 's,modify-XIM ,,; 8,10 d' \
+		${WRKSRC}/scripts/Makefile
 	@${REINPLACE_CMD} -e 's,bash,sh,; s/&//; s,/opt/gnome,${X11BASE},;' \
 		${WRKSRC}/scripts/utf8-edit ${WRKSRC}/scripts/gcin-user-setup \
 		${WRKSRC}/scripts/gtab.append_prepare
diff --git a/chinese/gcin-devel/distinfo b/chinese/gcin-devel/distinfo
index 077ad274ff45..987f5c2be8bd 100644
--- a/chinese/gcin-devel/distinfo
+++ b/chinese/gcin-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (gcin-1.3.4.tar.bz2) = 20ae604f49fd57c38b9395941ef66cc2
-SHA256 (gcin-1.3.4.tar.bz2) = d428739c07db7bd1c1381258d1ca43e281c9d6afb2c0508d44aca5ba192b92c7
-SIZE (gcin-1.3.4.tar.bz2) = 1769427
+MD5 (gcin-1.3.5.tar.bz2) = e557a24b81e78f95c7570e2a8d31cd45
+SHA256 (gcin-1.3.5.tar.bz2) = 50cb1a7d6cb26705a78b0e57392c4d59ad1bb56103715bb42c644c65b2401ce8
+SIZE (gcin-1.3.5.tar.bz2) = 1783062
 MD5 (noseeing-8.tar.gz) = c91f487fb1efe389481bcac29a7ad797
 SHA256 (noseeing-8.tar.gz) = f041077102313e84b61ba5276d646d82f3224c7151fa41e277ff1a1d59ef0489
 SIZE (noseeing-8.tar.gz) = 404023
diff --git a/chinese/gcin-devel/pkg-plist b/chinese/gcin-devel/pkg-plist
index 82f4169a1c1b..a4875cdc2f0b 100644
--- a/chinese/gcin-devel/pkg-plist
+++ b/chinese/gcin-devel/pkg-plist
@@ -2,6 +2,7 @@ bin/gcin
 bin/gcin-gb-toggle
 bin/gcin-message
 bin/gcin-setup
+bin/gcin-setup-tab
 bin/gcin2tab
 bin/gtab-merge
 bin/juyin-learn
@@ -42,6 +43,7 @@ lib/libgcin-im-client.so.1
 %%DATADIR%%/table/latin-letters.gtab
 %%DATADIR%%/table/mitac.kbm
 %%BOSHIAMY%%%%DATADIR%%/table/noseeing.gtab
+%%DATADIR%%/table/phrase-ctrl.table
 %%DATADIR%%/table/pho-huge.tab
 %%DATADIR%%/table/pho.tab
 %%DATADIR%%/table/phrase.table
diff --git a/chinese/gcin/Makefile b/chinese/gcin/Makefile
index 405dbd486afd..6c212a791f43 100644
--- a/chinese/gcin/Makefile
+++ b/chinese/gcin/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gcin
-PORTVERSION=	1.3.4
-PORTREVISION=	1
+PORTVERSION=	1.3.5
 CATEGORIES=	chinese textproc gnome
 MASTER_SITES=	http://cle.linux.org.tw/gcin/download/:main \
 		http://ftp.twaren.net/local-distfiles/gcin/:main \
@@ -48,15 +47,17 @@ pre-patch:
 		s,QT_IM_DIR=/usr,QT_IM_DIR=$$prefix,; \
 		s,mandir=$$datadir,mandir=$$prefix,; \
 		s,/usr/share,$$prefix/share,; s,libdir)\/gcin,libdir),; \
-		140 s,control-center-2\.0,gnome\/control-center-2\.0,g; \
+		143,150 d; \
 		s,gcc,$$CC,; s,gcin-$$GCIN_VERSION,gcin,' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's,\/usr\/share,$$(prefix)\/share,' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's,\/usr\/share,$$(prefix)\/share,' \
+		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's,/usr/local,/usr,g' \
 		${WRKSRC}/gtk-im/Makefile ${WRKSRC}/menu/Makefile
 	@${REINPLACE_CMD} -e 's,/usr/lib,${LOCALBASE}/lib,g; \
 		s,/usr/include,${X11BASE}/include,g; s,Xft2/X11/Xft,X11/Xft,' \
 		${WRKSRC}/qt-im/Makefile
-	@${REINPLACE_CMD} -e 's,modify-XIM ,,; 8,10 d' ${WRKSRC}/scripts/Makefile
+	@${REINPLACE_CMD} -e 's,modify-XIM ,,; 8,10 d' \
+		${WRKSRC}/scripts/Makefile
 	@${REINPLACE_CMD} -e 's,bash,sh,; s/&//; s,/opt/gnome,${X11BASE},;' \
 		${WRKSRC}/scripts/utf8-edit ${WRKSRC}/scripts/gcin-user-setup \
 		${WRKSRC}/scripts/gtab.append_prepare
diff --git a/chinese/gcin/distinfo b/chinese/gcin/distinfo
index 077ad274ff45..987f5c2be8bd 100644
--- a/chinese/gcin/distinfo
+++ b/chinese/gcin/distinfo
@@ -1,6 +1,6 @@
-MD5 (gcin-1.3.4.tar.bz2) = 20ae604f49fd57c38b9395941ef66cc2
-SHA256 (gcin-1.3.4.tar.bz2) = d428739c07db7bd1c1381258d1ca43e281c9d6afb2c0508d44aca5ba192b92c7
-SIZE (gcin-1.3.4.tar.bz2) = 1769427
+MD5 (gcin-1.3.5.tar.bz2) = e557a24b81e78f95c7570e2a8d31cd45
+SHA256 (gcin-1.3.5.tar.bz2) = 50cb1a7d6cb26705a78b0e57392c4d59ad1bb56103715bb42c644c65b2401ce8
+SIZE (gcin-1.3.5.tar.bz2) = 1783062
 MD5 (noseeing-8.tar.gz) = c91f487fb1efe389481bcac29a7ad797
 SHA256 (noseeing-8.tar.gz) = f041077102313e84b61ba5276d646d82f3224c7151fa41e277ff1a1d59ef0489
 SIZE (noseeing-8.tar.gz) = 404023
diff --git a/chinese/gcin/pkg-plist b/chinese/gcin/pkg-plist
index 82f4169a1c1b..a4875cdc2f0b 100644
--- a/chinese/gcin/pkg-plist
+++ b/chinese/gcin/pkg-plist
@@ -2,6 +2,7 @@ bin/gcin
 bin/gcin-gb-toggle
 bin/gcin-message
 bin/gcin-setup
+bin/gcin-setup-tab
 bin/gcin2tab
 bin/gtab-merge
 bin/juyin-learn
@@ -42,6 +43,7 @@ lib/libgcin-im-client.so.1
 %%DATADIR%%/table/latin-letters.gtab
 %%DATADIR%%/table/mitac.kbm
 %%BOSHIAMY%%%%DATADIR%%/table/noseeing.gtab
+%%DATADIR%%/table/phrase-ctrl.table
 %%DATADIR%%/table/pho-huge.tab
 %%DATADIR%%/table/pho.tab
 %%DATADIR%%/table/phrase.table