- Update to 1.3.3

PR:		ports/108604
Submitted by:	chinsan (maintainer)

6 files changed, 22 insertions, 20 deletions

diff --git a/chinese/gcin-devel/Makefile b/chinese/gcin-devel/Makefile
index 892be468de35..e48c757ca606 100644
--- a/chinese/gcin-devel/Makefile
+++ b/chinese/gcin-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gcin
-PORTVERSION=	1.3.2
+PORTVERSION=	1.3.3
 CATEGORIES=	chinese textproc gnome
 MASTER_SITES=	http://cle.linux.org.tw/gcin/download/:main \
 		http://ftp.twaren.net/local-distfiles/gcin/:main \
@@ -42,15 +42,15 @@ post-extract:
 		> noseeing.cin
 	@${REINPLACE_CMD} -e 's,cj.gtab,cj.gtab noseeing.gtab,' \
 		${WRKSRC}/data/Makefile
+	@${REINPLACE_CMD} -e '/CJK/ d' ${WRKSRC}/data/noseeing.cin
 .endif
 
 pre-patch:
-	${MV} ${WRKSRC}/icons/3/pingin.png ${WRKSRC}/icons/3/pinyin.png
 	@${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,; 164 s,/gcin,,; \
-		133,134 s,control-center-2\.0,gnome\/control-center-2\.0,g; \
+		s,/usr/share,$$prefix/share,; s,libdir)\/gcin,libdir),; \
+		140 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,/usr/local,/usr,g' \
@@ -66,10 +66,10 @@ pre-patch:
 	@${REINPLACE_CMD} -e 's,gcin-im-client.h,im-client/gcin-im-client.h,' \
 		${WRKSRC}/gtk-im/gtkimcontextgcin.c
 	@${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},' \
-		${WRKSRC}/IMdkit/lib/Makefile \
-		${WRKSRC}/IMdkit/Xi18n_sample/Makefile ${WRKSRC}/Makefile \
+		${WRKSRC}/IMdkit/lib/Makefile ${WRKSRC}/Makefile \
 		${WRKSRC}/qt-im/Makefile ${WRKSRC}/scripts/modify-XIM \
 		${WRKSRC}/scripts/utf8-edit
+	@${REINPLACE_CMD} -e '/make/ d' ${WRKSRC}/IMdkit/lib/Makefile
 
 .if defined(WITH_BOSHIAMY)
 post-patch:
diff --git a/chinese/gcin-devel/distinfo b/chinese/gcin-devel/distinfo
index 93bea5f89fae..8c77a788ece7 100644
--- a/chinese/gcin-devel/distinfo
+++ b/chinese/gcin-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (gcin-1.3.2.tar.bz2) = 9de142b3c491ee446b9234a35a878159
-SHA256 (gcin-1.3.2.tar.bz2) = 99ac8a9d6edc2c5090c0fd941e53f318188809578de96a8948a03e983c210dbf
-SIZE (gcin-1.3.2.tar.bz2) = 1621176
+MD5 (gcin-1.3.3.tar.bz2) = 8cf166c401b23eb42454170befbcacad
+SHA256 (gcin-1.3.3.tar.bz2) = 8943f6c472c71ffc8557b565c876e42b62b640b520e006b0d29ec1a6f2593e14
+SIZE (gcin-1.3.3.tar.bz2) = 1592711
 MD5 (noseeing-7.cin.gz) = b16c3ab0ec9350eced7135d99896541f
 SHA256 (noseeing-7.cin.gz) = 1c950a7403f4b224855ee5b3172eec63d508c0cd07bebf843eb1bc4a32859e27
 SIZE (noseeing-7.cin.gz) = 136650
diff --git a/chinese/gcin-devel/pkg-plist b/chinese/gcin-devel/pkg-plist
index bd71bf3e7241..a9d373240b40 100644
--- a/chinese/gcin-devel/pkg-plist
+++ b/chinese/gcin-devel/pkg-plist
@@ -17,7 +17,7 @@ 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.0.2
 lib/libgcin-im-client.so.1
 %%DATADIR%%/script/gcin-user-setup
 %%DATADIR%%/script/gtab.append_prepare
@@ -40,6 +40,7 @@ lib/libgcin-im-client.so.1
 %%DATADIR%%/table/jyutping.gtab
 %%DATADIR%%/table/kana-nippon.gtab
 %%DATADIR%%/table/latin-letters.gtab
+%%DATADIR%%/table/mitac.kbm
 %%BOSHIAMY%%%%DATADIR%%/table/noseeing.gtab
 %%DATADIR%%/table/pho-huge.tab
 %%DATADIR%%/table/pho.tab
diff --git a/chinese/gcin/Makefile b/chinese/gcin/Makefile
index 892be468de35..e48c757ca606 100644
--- a/chinese/gcin/Makefile
+++ b/chinese/gcin/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gcin
-PORTVERSION=	1.3.2
+PORTVERSION=	1.3.3
 CATEGORIES=	chinese textproc gnome
 MASTER_SITES=	http://cle.linux.org.tw/gcin/download/:main \
 		http://ftp.twaren.net/local-distfiles/gcin/:main \
@@ -42,15 +42,15 @@ post-extract:
 		> noseeing.cin
 	@${REINPLACE_CMD} -e 's,cj.gtab,cj.gtab noseeing.gtab,' \
 		${WRKSRC}/data/Makefile
+	@${REINPLACE_CMD} -e '/CJK/ d' ${WRKSRC}/data/noseeing.cin
 .endif
 
 pre-patch:
-	${MV} ${WRKSRC}/icons/3/pingin.png ${WRKSRC}/icons/3/pinyin.png
 	@${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,; 164 s,/gcin,,; \
-		133,134 s,control-center-2\.0,gnome\/control-center-2\.0,g; \
+		s,/usr/share,$$prefix/share,; s,libdir)\/gcin,libdir),; \
+		140 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,/usr/local,/usr,g' \
@@ -66,10 +66,10 @@ pre-patch:
 	@${REINPLACE_CMD} -e 's,gcin-im-client.h,im-client/gcin-im-client.h,' \
 		${WRKSRC}/gtk-im/gtkimcontextgcin.c
 	@${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},' \
-		${WRKSRC}/IMdkit/lib/Makefile \
-		${WRKSRC}/IMdkit/Xi18n_sample/Makefile ${WRKSRC}/Makefile \
+		${WRKSRC}/IMdkit/lib/Makefile ${WRKSRC}/Makefile \
 		${WRKSRC}/qt-im/Makefile ${WRKSRC}/scripts/modify-XIM \
 		${WRKSRC}/scripts/utf8-edit
+	@${REINPLACE_CMD} -e '/make/ d' ${WRKSRC}/IMdkit/lib/Makefile
 
 .if defined(WITH_BOSHIAMY)
 post-patch:
diff --git a/chinese/gcin/distinfo b/chinese/gcin/distinfo
index 93bea5f89fae..8c77a788ece7 100644
--- a/chinese/gcin/distinfo
+++ b/chinese/gcin/distinfo
@@ -1,6 +1,6 @@
-MD5 (gcin-1.3.2.tar.bz2) = 9de142b3c491ee446b9234a35a878159
-SHA256 (gcin-1.3.2.tar.bz2) = 99ac8a9d6edc2c5090c0fd941e53f318188809578de96a8948a03e983c210dbf
-SIZE (gcin-1.3.2.tar.bz2) = 1621176
+MD5 (gcin-1.3.3.tar.bz2) = 8cf166c401b23eb42454170befbcacad
+SHA256 (gcin-1.3.3.tar.bz2) = 8943f6c472c71ffc8557b565c876e42b62b640b520e006b0d29ec1a6f2593e14
+SIZE (gcin-1.3.3.tar.bz2) = 1592711
 MD5 (noseeing-7.cin.gz) = b16c3ab0ec9350eced7135d99896541f
 SHA256 (noseeing-7.cin.gz) = 1c950a7403f4b224855ee5b3172eec63d508c0cd07bebf843eb1bc4a32859e27
 SIZE (noseeing-7.cin.gz) = 136650
diff --git a/chinese/gcin/pkg-plist b/chinese/gcin/pkg-plist
index bd71bf3e7241..a9d373240b40 100644
--- a/chinese/gcin/pkg-plist
+++ b/chinese/gcin/pkg-plist
@@ -17,7 +17,7 @@ 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.0.2
 lib/libgcin-im-client.so.1
 %%DATADIR%%/script/gcin-user-setup
 %%DATADIR%%/script/gtab.append_prepare
@@ -40,6 +40,7 @@ lib/libgcin-im-client.so.1
 %%DATADIR%%/table/jyutping.gtab
 %%DATADIR%%/table/kana-nippon.gtab
 %%DATADIR%%/table/latin-letters.gtab
+%%DATADIR%%/table/mitac.kbm
 %%BOSHIAMY%%%%DATADIR%%/table/noseeing.gtab
 %%DATADIR%%/table/pho-huge.tab
 %%DATADIR%%/table/pho.tab