Upgrade to 1.1.6.

PR:		ports/92685
Submitted by:	chinsan

10 files changed, 30 insertions, 68 deletions

diff --git a/chinese/gcin-devel/Makefile b/chinese/gcin-devel/Makefile
index cfddd8cf585a..f11cd90e04fe 100644
--- a/chinese/gcin-devel/Makefile
+++ b/chinese/gcin-devel/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gcin
-PORTVERSION=	1.1.5
+PORTVERSION=	1.1.6
 CATEGORIES=	chinese textproc gnome
 MASTER_SITES=	http://www.csie.nctu.edu.tw/~cp76/gcin/download/ \
-		http://edt1023.sayya.org/misc/ \
-		http://bbs.ilc.edu.tw/~chinsan/gcin/
+		http://edt1023.sayya.org/misc/
 .if defined(WITH_BOSHIAMY)
 DISTFILES=	${GCINFILE} ${BOSHIAMYFILE}
 EXTRACT_ONLY=	${GCINFILE}
diff --git a/chinese/gcin-devel/distinfo b/chinese/gcin-devel/distinfo
index c9c79a302ef0..a409f39d40cb 100644
--- a/chinese/gcin-devel/distinfo
+++ b/chinese/gcin-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (gcin-1.1.5.tar.bz2) = 0ad1b0c3525455111adbc5eee3e1948b
-SHA256 (gcin-1.1.5.tar.bz2) = 66d29b62cd30455c10a1de225904feabfaf36a9faae7176b0fcd980ff1eefc98
-SIZE (gcin-1.1.5.tar.bz2) = 1375846
+MD5 (gcin-1.1.6.tar.bz2) = ba260cdb45777e847dff405bec55c7f1
+SHA256 (gcin-1.1.6.tar.bz2) = bd3148027b7f827990e7b936339b392cd3140f9b49ac5616329cc7d85b7ebeb1
+SIZE (gcin-1.1.6.tar.bz2) = 1391691
 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 59f7246fac13..736197ca08f0 100644
--- a/chinese/gcin-devel/files/patch-script
+++ b/chinese/gcin-devel/files/patch-script
@@ -1,11 +1,11 @@
 diff -ruN scripts.orig/Makefile scripts/Makefile
---- scripts.orig/Makefile	Mon Nov 21 19:57:34 2005
-+++ scripts/Makefile	Mon Nov 21 19:57:54 2005
+--- scripts.orig/Makefile	Wed Feb  1 23:09:30 2006
++++ scripts/Makefile	Wed Feb  1 23:10:09 2006
 @@ -1,13 +1,10 @@
  include ../config.mak
  
--SCRIPTS=gcin-user-setup gcin-utf8-setup modify-XIM utf8-edit
-+SCRIPTS=gcin-user-setup gcin-utf8-setup utf8-edit
+-SCRIPTS=gcin-user-setup modify-XIM utf8-edit
++SCRIPTS=gcin-user-setup utf8-edit
  
  all:	$(SCRIPTS)
  
@@ -17,31 +17,23 @@ 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	Mon Nov 21 19:57:34 2005
-+++ scripts/gcin-user-setup	Mon Nov 21 20:00:30 2005
+--- scripts.orig/gcin-user-setup	Wed Feb  1 23:09:30 2006
++++ scripts/gcin-user-setup	Wed Feb  1 23:11:10 2006
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
  
  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	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
- 
- cd
- 
 diff -ruN scripts.orig/utf8-edit scripts/utf8-edit
---- scripts.orig/utf8-edit	Mon Nov 21 19:57:34 2005
-+++ scripts/utf8-edit	Mon Nov 21 20:00:11 2005
+--- scripts.orig/utf8-edit	Wed Feb  1 23:09:30 2006
++++ scripts/utf8-edit	Wed Feb  1 23:16:32 2006
 @@ -1,10 +1,10 @@
 -#!/bin/bash
 +#!/bin/sh
  
- PATH=$PATH:/opt/gnome/bin:/usr/local/bin
+-PATH=$PATH:/opt/gnome/bin:/usr/local/bin
++PATH=$PATH:/usr/X11R6/bin:/usr/local/bin
  
 -for i in leafpad gedit kedit kate
 +for i in leafpad gedit gvim kedit kate jedit
diff --git a/chinese/gcin-devel/pkg-message b/chinese/gcin-devel/pkg-message
index 81e392cada3c..ff76b52a96fa 100644
--- a/chinese/gcin-devel/pkg-message
+++ b/chinese/gcin-devel/pkg-message
@@ -5,15 +5,6 @@ Remember to set environment varible:
   setenv XMODIFIERS @im=xcin		export XMODIFIERS='@im=xcin'
   setenv GTK_IM_MODULE xim		export GTK_IM_MODULE=xim
 
-and set LANG, LC_CTYPE to one of zh_TW.UTF-8, zh_TW.Big5 value:
-  	(csh/tcsh)			(sh/bash)
-Big5:  	setenv LC_CTYPE zh_TW.Big5	export LC_CTYPE=zh_TW.Big5
-  	setenv LANG zh_TW.Big5		export LANG=zh_TW.Big5
-or
-UTF-8:
-	setenv LC_CTYPE zh_TW.UTF-8	export LC_CTYPE=zh_TW.UTF-8
-	setenv LANG zh_TW.UTF-8		export LANG=zh_TW.UTF-8
-
 Finally, to start the GCIN input method daemon, use command:
 
   exec gcin &
diff --git a/chinese/gcin-devel/pkg-plist b/chinese/gcin-devel/pkg-plist
index c297dd25cc21..0bc8e191990b 100644
--- a/chinese/gcin-devel/pkg-plist
+++ b/chinese/gcin-devel/pkg-plist
@@ -12,7 +12,6 @@ include/gcin-im-client.h
 lib/gtk-2.0/immodules/im-gcin.so
 lib/libgcin-im-client.so
 %%DATADIR%%/script/gcin-user-setup
-%%DATADIR%%/script/gcin-utf8-setup
 %%DATADIR%%/script/utf8-edit
 %%DATADIR%%/table/ar30.gtab
 %%DATADIR%%/table/cj-punc.gtab
diff --git a/chinese/gcin/Makefile b/chinese/gcin/Makefile
index cfddd8cf585a..f11cd90e04fe 100644
--- a/chinese/gcin/Makefile
+++ b/chinese/gcin/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gcin
-PORTVERSION=	1.1.5
+PORTVERSION=	1.1.6
 CATEGORIES=	chinese textproc gnome
 MASTER_SITES=	http://www.csie.nctu.edu.tw/~cp76/gcin/download/ \
-		http://edt1023.sayya.org/misc/ \
-		http://bbs.ilc.edu.tw/~chinsan/gcin/
+		http://edt1023.sayya.org/misc/
 .if defined(WITH_BOSHIAMY)
 DISTFILES=	${GCINFILE} ${BOSHIAMYFILE}
 EXTRACT_ONLY=	${GCINFILE}
diff --git a/chinese/gcin/distinfo b/chinese/gcin/distinfo
index c9c79a302ef0..a409f39d40cb 100644
--- a/chinese/gcin/distinfo
+++ b/chinese/gcin/distinfo
@@ -1,5 +1,5 @@
-MD5 (gcin-1.1.5.tar.bz2) = 0ad1b0c3525455111adbc5eee3e1948b
-SHA256 (gcin-1.1.5.tar.bz2) = 66d29b62cd30455c10a1de225904feabfaf36a9faae7176b0fcd980ff1eefc98
-SIZE (gcin-1.1.5.tar.bz2) = 1375846
+MD5 (gcin-1.1.6.tar.bz2) = ba260cdb45777e847dff405bec55c7f1
+SHA256 (gcin-1.1.6.tar.bz2) = bd3148027b7f827990e7b936339b392cd3140f9b49ac5616329cc7d85b7ebeb1
+SIZE (gcin-1.1.6.tar.bz2) = 1391691
 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 59f7246fac13..736197ca08f0 100644
--- a/chinese/gcin/files/patch-script
+++ b/chinese/gcin/files/patch-script
@@ -1,11 +1,11 @@
 diff -ruN scripts.orig/Makefile scripts/Makefile
---- scripts.orig/Makefile	Mon Nov 21 19:57:34 2005
-+++ scripts/Makefile	Mon Nov 21 19:57:54 2005
+--- scripts.orig/Makefile	Wed Feb  1 23:09:30 2006
++++ scripts/Makefile	Wed Feb  1 23:10:09 2006
 @@ -1,13 +1,10 @@
  include ../config.mak
  
--SCRIPTS=gcin-user-setup gcin-utf8-setup modify-XIM utf8-edit
-+SCRIPTS=gcin-user-setup gcin-utf8-setup utf8-edit
+-SCRIPTS=gcin-user-setup modify-XIM utf8-edit
++SCRIPTS=gcin-user-setup utf8-edit
  
  all:	$(SCRIPTS)
  
@@ -17,31 +17,23 @@ 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	Mon Nov 21 19:57:34 2005
-+++ scripts/gcin-user-setup	Mon Nov 21 20:00:30 2005
+--- scripts.orig/gcin-user-setup	Wed Feb  1 23:09:30 2006
++++ scripts/gcin-user-setup	Wed Feb  1 23:11:10 2006
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
  
  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	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
- 
- cd
- 
 diff -ruN scripts.orig/utf8-edit scripts/utf8-edit
---- scripts.orig/utf8-edit	Mon Nov 21 19:57:34 2005
-+++ scripts/utf8-edit	Mon Nov 21 20:00:11 2005
+--- scripts.orig/utf8-edit	Wed Feb  1 23:09:30 2006
++++ scripts/utf8-edit	Wed Feb  1 23:16:32 2006
 @@ -1,10 +1,10 @@
 -#!/bin/bash
 +#!/bin/sh
  
- PATH=$PATH:/opt/gnome/bin:/usr/local/bin
+-PATH=$PATH:/opt/gnome/bin:/usr/local/bin
++PATH=$PATH:/usr/X11R6/bin:/usr/local/bin
  
 -for i in leafpad gedit kedit kate
 +for i in leafpad gedit gvim kedit kate jedit
diff --git a/chinese/gcin/pkg-message b/chinese/gcin/pkg-message
index 81e392cada3c..ff76b52a96fa 100644
--- a/chinese/gcin/pkg-message
+++ b/chinese/gcin/pkg-message
@@ -5,15 +5,6 @@ Remember to set environment varible:
   setenv XMODIFIERS @im=xcin		export XMODIFIERS='@im=xcin'
   setenv GTK_IM_MODULE xim		export GTK_IM_MODULE=xim
 
-and set LANG, LC_CTYPE to one of zh_TW.UTF-8, zh_TW.Big5 value:
-  	(csh/tcsh)			(sh/bash)
-Big5:  	setenv LC_CTYPE zh_TW.Big5	export LC_CTYPE=zh_TW.Big5
-  	setenv LANG zh_TW.Big5		export LANG=zh_TW.Big5
-or
-UTF-8:
-	setenv LC_CTYPE zh_TW.UTF-8	export LC_CTYPE=zh_TW.UTF-8
-	setenv LANG zh_TW.UTF-8		export LANG=zh_TW.UTF-8
-
 Finally, to start the GCIN input method daemon, use command:
 
   exec gcin &
diff --git a/chinese/gcin/pkg-plist b/chinese/gcin/pkg-plist
index c297dd25cc21..0bc8e191990b 100644
--- a/chinese/gcin/pkg-plist
+++ b/chinese/gcin/pkg-plist
@@ -12,7 +12,6 @@ include/gcin-im-client.h
 lib/gtk-2.0/immodules/im-gcin.so
 lib/libgcin-im-client.so
 %%DATADIR%%/script/gcin-user-setup
-%%DATADIR%%/script/gcin-utf8-setup
 %%DATADIR%%/script/utf8-edit
 %%DATADIR%%/table/ar30.gtab
 %%DATADIR%%/table/cj-punc.gtab