6 files changed, 74 insertions, 38 deletions

diff --git a/chinese/gcin-devel/Makefile b/chinese/gcin-devel/Makefile
index 0266ada01f43..fd61e5deb241 100644
--- a/chinese/gcin-devel/Makefile
+++ b/chinese/gcin-devel/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	gcin
-PORTVERSION=	1.2.8
-PORTREVISION=	3
+PORTVERSION=	1.3.1
 CATEGORIES=	chinese textproc gnome
-MASTER_SITES=	http://www.csie.nctu.edu.tw/~cp76/gcin/download/:main \
-		LOCAL/chinsan:main \
-		http://yilan.twbbs.org/chinsan/gcin/:main
+MASTER_SITES=	http://cle.linux.org.tw/gcin/download/:main \
+		http://yilan.twbbs.org/chinsan/gcin/:main \
+		LOCAL/chinsan:main
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:main
 EXTRACT_ONLY=	gcin-${PORTVERSION}.tar.bz2
 
@@ -44,19 +43,20 @@ post-extract:
 .endif
 
 pre-patch:
-	@${REINPLACE_CMD} -e 's/&//; s/bash/sh/; \
-		s/QT_IM_DIR=\/usr/QT_IM_DIR=$$prefix/; \
-		s/mandir=$$datadir/mandir=$$prefix/; \
-		s/\/usr\/share/$$prefix\/share/; 151 s,/gcin,,; \
-		123,124 s/control-center-2\.0/gnome\/control-center-2\.0/g; \
-		s/gcc/$$CC/; s/gcin-$$GCIN_VERSION/gcin/' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's,&,,; 1 s,bash,sh,; \
+		s,QT_IM_DIR=/usr,QT_IM_DIR=$$prefix,; \
+		s,mandir=$$datadir,mandir=$$prefix,; \
+		s,/usr/share,$$prefix/share,; 161 s,/gcin,,; \
+		133,134 s,control-center-2\.0,gnome\/control-center-2\.0,g; \
+		s,gcc,$$CC,; s,gcin-$$GCIN_VERSION,gcin,' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's,\/usr\/share,$$(prefix)\/share,' ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e 's,qsort,mergesort,' ${WRKSRC}/gcin2tab.c
-	@${REINPLACE_CMD} -e 's|/usr/local|/usr|g' \
+	@${REINPLACE_CMD} -e 's,/usr/local,/usr,g' \
 	    	${WRKSRC}/gtk-im/Makefile ${WRKSRC}/menu/Makefile
-	@${REINPLACE_CMD} -e 's,/usr/lib,${LOCALBASE}/lib,' ${WRKSRC}/qt-im/Makefile
-	@${REINPLACE_CMD} -e 's/modify-XIM //; 8,10 d' ${WRKSRC}/scripts/Makefile
-	@${REINPLACE_CMD} -e 's/bash/sh/; s/&//; s,/opt/gnome,${X11BASE},;' \
+	@${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,bash,sh,; s/&//; s,/opt/gnome,${X11BASE},;' \
 		${WRKSRC}/scripts/utf8-edit ${WRKSRC}/scripts/gcin-user-setup
 	@${REINPLACE_CMD} -e 's,wget,fetch,' ${WRKSRC}/scripts/noseeing-inst
 	@${REINPLACE_CMD} -e 's,gcin-im-client.h,im-client/gcin-im-client.h,' \
@@ -66,6 +66,8 @@ pre-patch:
 		${WRKSRC}/IMdkit/Xi18n_sample/Makefile ${WRKSRC}/Makefile \
 		${WRKSRC}/qt-im/Makefile ${WRKSRC}/scripts/modify-XIM \
 		${WRKSRC}/scripts/utf8-edit
+	@${REINPLACE_CMD} -e 's,BIG_ENDIAN\(.*\)1,BIG_ENDIAN\1\0,' \
+		${WRKSRC}/gtab.h
 
 .if defined(WITH_BOSHIAMY)
 post-patch:
diff --git a/chinese/gcin-devel/distinfo b/chinese/gcin-devel/distinfo
index c546fcb9ad79..ca78105814bc 100644
--- a/chinese/gcin-devel/distinfo
+++ b/chinese/gcin-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (gcin-1.2.8.tar.bz2) = d4940efa38b3b3206f4d936104e2b37c
-SHA256 (gcin-1.2.8.tar.bz2) = 9b6702084d125fbdbc68a8d2bbb17938242dd855c25b3163514fd5e9331149de
-SIZE (gcin-1.2.8.tar.bz2) = 1542707
+MD5 (gcin-1.3.1.tar.bz2) = 3467166a035141c42f4d5f4efaca711e
+SHA256 (gcin-1.3.1.tar.bz2) = 1b1d8c59b92ade16723b8187290005e177da7c81e0d72229099309ca55890139
+SIZE (gcin-1.3.1.tar.bz2) = 1610772
 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 2f6cc8741bac..12280be1f19c 100644
--- a/chinese/gcin-devel/pkg-plist
+++ b/chinese/gcin-devel/pkg-plist
@@ -16,6 +16,8 @@ include/gcin-im-client.h
 lib/gtk-2.0/immodules/im-gcin.so
 lib/gcin1.so
 lib/libgcin-im-client.so
+lib/libgcin-im-client.so.1.0.1
+lib/libgcin-im-client.so.1
 %%DATADIR%%/script/gcin-user-setup
 %%DATADIR%%/script/noseeing-inst
 %%DATADIR%%/script/utf8-edit
@@ -24,6 +26,7 @@ lib/libgcin-im-client.so
 %%DATADIR%%/table/cj.gtab
 %%DATADIR%%/table/cj5.gtab
 %%DATADIR%%/table/dayi3.gtab
+%%DATADIR%%/table/dvorak.kbm
 %%DATADIR%%/table/et-asdf.kbm
 %%DATADIR%%/table/et.kbm
 %%DATADIR%%/table/et26-asdf.kbm
@@ -54,8 +57,21 @@ lib/libgcin-im-client.so
 %%PORTDOCS%%%%DOCSDIR%%/README
 share/applications/gcin
 share/applications/gcin-setup
+share/icons/gcin/NewCJ3.png
+share/icons/gcin/ar30.png
+share/icons/gcin/cj-punc.png
+share/icons/gcin/cj.png
+share/icons/gcin/cj5.png
+share/icons/gcin/dayi3.png
 share/icons/gcin/gcin-tray.png
 share/icons/gcin/greek.png
+share/icons/gcin/intcode.png
+share/icons/gcin/juyin.png
+share/icons/gcin/jyutping.png
+share/icons/gcin/kana-nippon.png
+share/icons/gcin/noseeing.png
+share/icons/gcin/pinyin.png
+share/icons/gcin/simplex.png
 share/icons/gcin/tsin.png
 share/icons/gcin.png
 share/icons/gcin/pin-fixed24.png
diff --git a/chinese/gcin/Makefile b/chinese/gcin/Makefile
index 0266ada01f43..fd61e5deb241 100644
--- a/chinese/gcin/Makefile
+++ b/chinese/gcin/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	gcin
-PORTVERSION=	1.2.8
-PORTREVISION=	3
+PORTVERSION=	1.3.1
 CATEGORIES=	chinese textproc gnome
-MASTER_SITES=	http://www.csie.nctu.edu.tw/~cp76/gcin/download/:main \
-		LOCAL/chinsan:main \
-		http://yilan.twbbs.org/chinsan/gcin/:main
+MASTER_SITES=	http://cle.linux.org.tw/gcin/download/:main \
+		http://yilan.twbbs.org/chinsan/gcin/:main \
+		LOCAL/chinsan:main
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:main
 EXTRACT_ONLY=	gcin-${PORTVERSION}.tar.bz2
 
@@ -44,19 +43,20 @@ post-extract:
 .endif
 
 pre-patch:
-	@${REINPLACE_CMD} -e 's/&//; s/bash/sh/; \
-		s/QT_IM_DIR=\/usr/QT_IM_DIR=$$prefix/; \
-		s/mandir=$$datadir/mandir=$$prefix/; \
-		s/\/usr\/share/$$prefix\/share/; 151 s,/gcin,,; \
-		123,124 s/control-center-2\.0/gnome\/control-center-2\.0/g; \
-		s/gcc/$$CC/; s/gcin-$$GCIN_VERSION/gcin/' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's,&,,; 1 s,bash,sh,; \
+		s,QT_IM_DIR=/usr,QT_IM_DIR=$$prefix,; \
+		s,mandir=$$datadir,mandir=$$prefix,; \
+		s,/usr/share,$$prefix/share,; 161 s,/gcin,,; \
+		133,134 s,control-center-2\.0,gnome\/control-center-2\.0,g; \
+		s,gcc,$$CC,; s,gcin-$$GCIN_VERSION,gcin,' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's,\/usr\/share,$$(prefix)\/share,' ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e 's,qsort,mergesort,' ${WRKSRC}/gcin2tab.c
-	@${REINPLACE_CMD} -e 's|/usr/local|/usr|g' \
+	@${REINPLACE_CMD} -e 's,/usr/local,/usr,g' \
 	    	${WRKSRC}/gtk-im/Makefile ${WRKSRC}/menu/Makefile
-	@${REINPLACE_CMD} -e 's,/usr/lib,${LOCALBASE}/lib,' ${WRKSRC}/qt-im/Makefile
-	@${REINPLACE_CMD} -e 's/modify-XIM //; 8,10 d' ${WRKSRC}/scripts/Makefile
-	@${REINPLACE_CMD} -e 's/bash/sh/; s/&//; s,/opt/gnome,${X11BASE},;' \
+	@${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,bash,sh,; s/&//; s,/opt/gnome,${X11BASE},;' \
 		${WRKSRC}/scripts/utf8-edit ${WRKSRC}/scripts/gcin-user-setup
 	@${REINPLACE_CMD} -e 's,wget,fetch,' ${WRKSRC}/scripts/noseeing-inst
 	@${REINPLACE_CMD} -e 's,gcin-im-client.h,im-client/gcin-im-client.h,' \
@@ -66,6 +66,8 @@ pre-patch:
 		${WRKSRC}/IMdkit/Xi18n_sample/Makefile ${WRKSRC}/Makefile \
 		${WRKSRC}/qt-im/Makefile ${WRKSRC}/scripts/modify-XIM \
 		${WRKSRC}/scripts/utf8-edit
+	@${REINPLACE_CMD} -e 's,BIG_ENDIAN\(.*\)1,BIG_ENDIAN\1\0,' \
+		${WRKSRC}/gtab.h
 
 .if defined(WITH_BOSHIAMY)
 post-patch:
diff --git a/chinese/gcin/distinfo b/chinese/gcin/distinfo
index c546fcb9ad79..ca78105814bc 100644
--- a/chinese/gcin/distinfo
+++ b/chinese/gcin/distinfo
@@ -1,6 +1,6 @@
-MD5 (gcin-1.2.8.tar.bz2) = d4940efa38b3b3206f4d936104e2b37c
-SHA256 (gcin-1.2.8.tar.bz2) = 9b6702084d125fbdbc68a8d2bbb17938242dd855c25b3163514fd5e9331149de
-SIZE (gcin-1.2.8.tar.bz2) = 1542707
+MD5 (gcin-1.3.1.tar.bz2) = 3467166a035141c42f4d5f4efaca711e
+SHA256 (gcin-1.3.1.tar.bz2) = 1b1d8c59b92ade16723b8187290005e177da7c81e0d72229099309ca55890139
+SIZE (gcin-1.3.1.tar.bz2) = 1610772
 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 2f6cc8741bac..12280be1f19c 100644
--- a/chinese/gcin/pkg-plist
+++ b/chinese/gcin/pkg-plist
@@ -16,6 +16,8 @@ include/gcin-im-client.h
 lib/gtk-2.0/immodules/im-gcin.so
 lib/gcin1.so
 lib/libgcin-im-client.so
+lib/libgcin-im-client.so.1.0.1
+lib/libgcin-im-client.so.1
 %%DATADIR%%/script/gcin-user-setup
 %%DATADIR%%/script/noseeing-inst
 %%DATADIR%%/script/utf8-edit
@@ -24,6 +26,7 @@ lib/libgcin-im-client.so
 %%DATADIR%%/table/cj.gtab
 %%DATADIR%%/table/cj5.gtab
 %%DATADIR%%/table/dayi3.gtab
+%%DATADIR%%/table/dvorak.kbm
 %%DATADIR%%/table/et-asdf.kbm
 %%DATADIR%%/table/et.kbm
 %%DATADIR%%/table/et26-asdf.kbm
@@ -54,8 +57,21 @@ lib/libgcin-im-client.so
 %%PORTDOCS%%%%DOCSDIR%%/README
 share/applications/gcin
 share/applications/gcin-setup
+share/icons/gcin/NewCJ3.png
+share/icons/gcin/ar30.png
+share/icons/gcin/cj-punc.png
+share/icons/gcin/cj.png
+share/icons/gcin/cj5.png
+share/icons/gcin/dayi3.png
 share/icons/gcin/gcin-tray.png
 share/icons/gcin/greek.png
+share/icons/gcin/intcode.png
+share/icons/gcin/juyin.png
+share/icons/gcin/jyutping.png
+share/icons/gcin/kana-nippon.png
+share/icons/gcin/noseeing.png
+share/icons/gcin/pinyin.png
+share/icons/gcin/simplex.png
 share/icons/gcin/tsin.png
 share/icons/gcin.png
 share/icons/gcin/pin-fixed24.png