Upgrade to 1.1.3

PR:		ports/89364
Submitted by:	chisan.tw at gmail dot com

10 files changed, 30 insertions, 32 deletions

diff --git a/chinese/gcin-devel/Makefile b/chinese/gcin-devel/Makefile
index 03e7eecf77e2..4ec0c1e458de 100644
--- a/chinese/gcin-devel/Makefile
+++ b/chinese/gcin-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gcin
-PORTVERSION=	1.1.2
-PORTREVISION=	0
+PORTVERSION=	1.1.3
 CATEGORIES=	chinese
 MASTER_SITES=	http://www.csie.nctu.edu.tw/~cp76/gcin/download/ \
 		http://edt1023.sayya.org/misc/ \
diff --git a/chinese/gcin-devel/distinfo b/chinese/gcin-devel/distinfo
index 44030956f1f9..d95153f8f526 100644
--- a/chinese/gcin-devel/distinfo
+++ b/chinese/gcin-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (gcin-1.1.2.tar.bz2) = d74f65616c6a1080072613a79969cbaa
-SHA256 (gcin-1.1.2.tar.bz2) = f5a7c5c0a9d39d44ebcf1e201569442ebc0fa5fc6f5df4224c44bb83aaa1d187
-SIZE (gcin-1.1.2.tar.bz2) = 1299000
+MD5 (gcin-1.1.3.tar.bz2) = 7e7e4e9dc8768ed6ee9d6e2cd5b39ec6
+SHA256 (gcin-1.1.3.tar.bz2) = 0e9e4ca4b008847dc1d5ef2e77fe6cda4a4f101b2b37366850cfb6b68f5909ac
+SIZE (gcin-1.1.3.tar.bz2) = 1366174
 MD5 (noseeing.tar.gz) = IGNORE
 SHA256 (noseeing.tar.gz) = IGNORE
diff --git a/chinese/gcin-devel/files/patch-script b/chinese/gcin-devel/files/patch-script
index 952b1d1c7836..59f7246fac13 100644
--- a/chinese/gcin-devel/files/patch-script
+++ b/chinese/gcin-devel/files/patch-script
@@ -1,6 +1,6 @@
 diff -ruN scripts.orig/Makefile scripts/Makefile
---- scripts.orig/Makefile	Thu Aug 11 22:03:33 2005
-+++ scripts/Makefile	Thu Aug 11 22:04:10 2005
+--- scripts.orig/Makefile	Mon Nov 21 19:57:34 2005
++++ scripts/Makefile	Mon Nov 21 19:57:54 2005
 @@ -1,13 +1,10 @@
  include ../config.mak
  
@@ -17,8 +17,8 @@ diff -ruN scripts.orig/Makefile scripts/Makefile
  	install -m 755 $(SCRIPTS) $(GCIN_SCRIPT_DIR_i)
  clean:
 diff -ruN scripts.orig/gcin-user-setup scripts/gcin-user-setup
---- scripts.orig/gcin-user-setup	Thu Aug 11 22:03:33 2005
-+++ scripts/gcin-user-setup	Thu Aug 11 22:03:40 2005
+--- scripts.orig/gcin-user-setup	Mon Nov 21 19:57:34 2005
++++ scripts/gcin-user-setup	Mon Nov 21 20:00:30 2005
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
@@ -26,8 +26,8 @@ diff -ruN scripts.orig/gcin-user-setup scripts/gcin-user-setup
  if [ -z "$1" -o -z "$2" ]; then
    echo "please specify gcin_table_dir gcin_bin_dir"
 diff -ruN scripts.orig/gcin-utf8-setup scripts/gcin-utf8-setup
---- scripts.orig/gcin-utf8-setup	Thu Aug 11 22:03:33 2005
-+++ scripts/gcin-utf8-setup	Thu Aug 11 22:03:40 2005
+--- scripts.orig/gcin-utf8-setup	Mon Nov 21 19:57:34 2005
++++ scripts/gcin-utf8-setup	Mon Nov 21 20:00:42 2005
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
@@ -35,16 +35,16 @@ diff -ruN scripts.orig/gcin-utf8-setup scripts/gcin-utf8-setup
  cd
  
 diff -ruN scripts.orig/utf8-edit scripts/utf8-edit
---- scripts.orig/utf8-edit	Thu Aug 11 22:03:33 2005
-+++ scripts/utf8-edit	Thu Aug 11 22:15:12 2005
+--- scripts.orig/utf8-edit	Mon Nov 21 19:57:34 2005
++++ scripts/utf8-edit	Mon Nov 21 20:00:11 2005
 @@ -1,10 +1,10 @@
 -#!/bin/bash
 +#!/bin/sh
  
  PATH=$PATH:/opt/gnome/bin:/usr/local/bin
  
--for i in gedit kedit kate
-+for i in gedit leafpad kedit kate gvim vim jedit
+-for i in leafpad gedit kedit kate
++for i in leafpad gedit gvim kedit kate jedit
  do
 -  which $i >& /dev/null
 +  which $i > /dev/null
diff --git a/chinese/gcin-devel/pkg-message b/chinese/gcin-devel/pkg-message
index 92fe31db5589..81e392cada3c 100644
--- a/chinese/gcin-devel/pkg-message
+++ b/chinese/gcin-devel/pkg-message
@@ -4,7 +4,6 @@ Remember to set environment varible:
   (csh/tcsh) 				(sh/bash)
   setenv XMODIFIERS @im=xcin		export XMODIFIERS='@im=xcin'
   setenv GTK_IM_MODULE xim		export GTK_IM_MODULE=xim
-  setenv QT_IM_MODULE xim		export QT_IM_MODULE=xim
 
 and set LANG, LC_CTYPE to one of zh_TW.UTF-8, zh_TW.Big5 value:
   	(csh/tcsh)			(sh/bash)
diff --git a/chinese/gcin-devel/pkg-plist b/chinese/gcin-devel/pkg-plist
index 6251bf331c0a..f2f1e4d76e3b 100644
--- a/chinese/gcin-devel/pkg-plist
+++ b/chinese/gcin-devel/pkg-plist
@@ -15,6 +15,7 @@ lib/libgcin-im-client.so
 %%DATADIR%%/script/gcin-utf8-setup
 %%DATADIR%%/script/utf8-edit
 %%DATADIR%%/table/ar30.gtab
+%%DATADIR%%/table/cj-punc.gtab
 %%DATADIR%%/table/cj.gtab
 %%DATADIR%%/table/cj5.gtab
 %%DATADIR%%/table/dayi3.gtab
diff --git a/chinese/gcin/Makefile b/chinese/gcin/Makefile
index 03e7eecf77e2..4ec0c1e458de 100644
--- a/chinese/gcin/Makefile
+++ b/chinese/gcin/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gcin
-PORTVERSION=	1.1.2
-PORTREVISION=	0
+PORTVERSION=	1.1.3
 CATEGORIES=	chinese
 MASTER_SITES=	http://www.csie.nctu.edu.tw/~cp76/gcin/download/ \
 		http://edt1023.sayya.org/misc/ \
diff --git a/chinese/gcin/distinfo b/chinese/gcin/distinfo
index 44030956f1f9..d95153f8f526 100644
--- a/chinese/gcin/distinfo
+++ b/chinese/gcin/distinfo
@@ -1,5 +1,5 @@
-MD5 (gcin-1.1.2.tar.bz2) = d74f65616c6a1080072613a79969cbaa
-SHA256 (gcin-1.1.2.tar.bz2) = f5a7c5c0a9d39d44ebcf1e201569442ebc0fa5fc6f5df4224c44bb83aaa1d187
-SIZE (gcin-1.1.2.tar.bz2) = 1299000
+MD5 (gcin-1.1.3.tar.bz2) = 7e7e4e9dc8768ed6ee9d6e2cd5b39ec6
+SHA256 (gcin-1.1.3.tar.bz2) = 0e9e4ca4b008847dc1d5ef2e77fe6cda4a4f101b2b37366850cfb6b68f5909ac
+SIZE (gcin-1.1.3.tar.bz2) = 1366174
 MD5 (noseeing.tar.gz) = IGNORE
 SHA256 (noseeing.tar.gz) = IGNORE
diff --git a/chinese/gcin/files/patch-script b/chinese/gcin/files/patch-script
index 952b1d1c7836..59f7246fac13 100644
--- a/chinese/gcin/files/patch-script
+++ b/chinese/gcin/files/patch-script
@@ -1,6 +1,6 @@
 diff -ruN scripts.orig/Makefile scripts/Makefile
---- scripts.orig/Makefile	Thu Aug 11 22:03:33 2005
-+++ scripts/Makefile	Thu Aug 11 22:04:10 2005
+--- scripts.orig/Makefile	Mon Nov 21 19:57:34 2005
++++ scripts/Makefile	Mon Nov 21 19:57:54 2005
 @@ -1,13 +1,10 @@
  include ../config.mak
  
@@ -17,8 +17,8 @@ diff -ruN scripts.orig/Makefile scripts/Makefile
  	install -m 755 $(SCRIPTS) $(GCIN_SCRIPT_DIR_i)
  clean:
 diff -ruN scripts.orig/gcin-user-setup scripts/gcin-user-setup
---- scripts.orig/gcin-user-setup	Thu Aug 11 22:03:33 2005
-+++ scripts/gcin-user-setup	Thu Aug 11 22:03:40 2005
+--- scripts.orig/gcin-user-setup	Mon Nov 21 19:57:34 2005
++++ scripts/gcin-user-setup	Mon Nov 21 20:00:30 2005
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
@@ -26,8 +26,8 @@ diff -ruN scripts.orig/gcin-user-setup scripts/gcin-user-setup
  if [ -z "$1" -o -z "$2" ]; then
    echo "please specify gcin_table_dir gcin_bin_dir"
 diff -ruN scripts.orig/gcin-utf8-setup scripts/gcin-utf8-setup
---- scripts.orig/gcin-utf8-setup	Thu Aug 11 22:03:33 2005
-+++ scripts/gcin-utf8-setup	Thu Aug 11 22:03:40 2005
+--- scripts.orig/gcin-utf8-setup	Mon Nov 21 19:57:34 2005
++++ scripts/gcin-utf8-setup	Mon Nov 21 20:00:42 2005
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
@@ -35,16 +35,16 @@ diff -ruN scripts.orig/gcin-utf8-setup scripts/gcin-utf8-setup
  cd
  
 diff -ruN scripts.orig/utf8-edit scripts/utf8-edit
---- scripts.orig/utf8-edit	Thu Aug 11 22:03:33 2005
-+++ scripts/utf8-edit	Thu Aug 11 22:15:12 2005
+--- scripts.orig/utf8-edit	Mon Nov 21 19:57:34 2005
++++ scripts/utf8-edit	Mon Nov 21 20:00:11 2005
 @@ -1,10 +1,10 @@
 -#!/bin/bash
 +#!/bin/sh
  
  PATH=$PATH:/opt/gnome/bin:/usr/local/bin
  
--for i in gedit kedit kate
-+for i in gedit leafpad kedit kate gvim vim jedit
+-for i in leafpad gedit kedit kate
++for i in leafpad gedit gvim kedit kate jedit
  do
 -  which $i >& /dev/null
 +  which $i > /dev/null
diff --git a/chinese/gcin/pkg-message b/chinese/gcin/pkg-message
index 92fe31db5589..81e392cada3c 100644
--- a/chinese/gcin/pkg-message
+++ b/chinese/gcin/pkg-message
@@ -4,7 +4,6 @@ Remember to set environment varible:
   (csh/tcsh) 				(sh/bash)
   setenv XMODIFIERS @im=xcin		export XMODIFIERS='@im=xcin'
   setenv GTK_IM_MODULE xim		export GTK_IM_MODULE=xim
-  setenv QT_IM_MODULE xim		export QT_IM_MODULE=xim
 
 and set LANG, LC_CTYPE to one of zh_TW.UTF-8, zh_TW.Big5 value:
   	(csh/tcsh)			(sh/bash)
diff --git a/chinese/gcin/pkg-plist b/chinese/gcin/pkg-plist
index 6251bf331c0a..f2f1e4d76e3b 100644
--- a/chinese/gcin/pkg-plist
+++ b/chinese/gcin/pkg-plist
@@ -15,6 +15,7 @@ lib/libgcin-im-client.so
 %%DATADIR%%/script/gcin-utf8-setup
 %%DATADIR%%/script/utf8-edit
 %%DATADIR%%/table/ar30.gtab
+%%DATADIR%%/table/cj-punc.gtab
 %%DATADIR%%/table/cj.gtab
 %%DATADIR%%/table/cj5.gtab
 %%DATADIR%%/table/dayi3.gtab