- upgrade to 1.1.1

- remove old patch
- add new patch(gcin2tab)

PR:		88310
Submitted by:	chinsan <chinsan dot tw AT gmail dot com>

10 files changed, 44 insertions, 116 deletions

diff --git a/chinese/gcin-devel/Makefile b/chinese/gcin-devel/Makefile
index ce5b43b3ad5a..2920f98fc411 100644
--- a/chinese/gcin-devel/Makefile
+++ b/chinese/gcin-devel/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	gcin
-PORTVERSION=	1.0.9
+PORTVERSION=	1.1.1
 CATEGORIES=	chinese
 MASTER_SITES=	http://www.csie.nctu.edu.tw/~cp76/gcin/download/ \
-		http://edt1023.sayya.org/gcin/source/ \
 		http://edt1023.sayya.org/misc/ \
 		http://bbs.ilc.edu.tw/~chinsan/gcin/
 .if defined(WITH_BOSHIAMY)
diff --git a/chinese/gcin-devel/distinfo b/chinese/gcin-devel/distinfo
index 7457837523b5..cff8436aa078 100644
--- a/chinese/gcin-devel/distinfo
+++ b/chinese/gcin-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gcin-1.0.9.tar.bz2) = cdb51a89e44f152278528353634bfff1
-SIZE (gcin-1.0.9.tar.bz2) = 1294391
+MD5 (gcin-1.1.1.tar.bz2) = c117422e8c83556ebd976bbb36ddb0f8
+SIZE (gcin-1.1.1.tar.bz2) = 1297587
 MD5 (noseeing.tar.gz) = IGNORE
diff --git a/chinese/gcin-devel/files/patch-gcin2tab.c b/chinese/gcin-devel/files/patch-gcin2tab.c
new file mode 100644
index 000000000000..d6923dc59f04
--- /dev/null
+++ b/chinese/gcin-devel/files/patch-gcin2tab.c
@@ -0,0 +1,14 @@
+--- gcin2tab.c.orig	Tue Nov  1 15:17:21 2005
++++ gcin2tab.c	Tue Nov  1 15:17:21 2005
+@@ -4,8 +4,11 @@
+ */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <stdarg.h>
+ #include <sys/types.h>
++#include <sys/param.h>
++#include <sys/stat.h>
+ #include <string.h>
+ #include "gcin.h"
+ #include "gtab.h"
diff --git a/chinese/gcin-devel/files/patch-win0.c b/chinese/gcin-devel/files/patch-win0.c
deleted file mode 100644
index 248105150034..000000000000
--- a/chinese/gcin-devel/files/patch-win0.c
+++ /dev/null
@@ -1,51 +0,0 @@
---- win0.c.orig	Tue Oct  4 22:35:52 2005
-+++ win0.c	Tue Oct  4 13:25:26 2005
-@@ -28,6 +28,8 @@
- static GtkWidget *button_eng_ph;
- static int max_yl;
- 
-+static void create_win0_gui();
-+
- static void recreate_win0()
- {
-   int i;
-@@ -41,8 +43,8 @@
- 
- void change_win0_style()
- {
--  if (!top_bin || current_pho_simple_win == pho_simple_win &&
--      current_gcin_inner_frame == gcin_inner_frame)
-+  if (!top_bin || (current_pho_simple_win == pho_simple_win &&
-+      current_gcin_inner_frame == gcin_inner_frame))
-     return;
- 
-   gtk_widget_destroy(top_bin);
-@@ -153,7 +155,7 @@
- }
- 
- 
--void disp_char(int index, u_char *ch)
-+void disp_char(int index, char *ch)
- {
-   char tt[CH_SZ+1];
- 
-@@ -342,6 +344,7 @@
-   raw_move(best_win_x, best_win_y);
- }
- 
-+gboolean tsin_has_input();
- 
- void move_win0(int x, int y)
- {
-@@ -505,9 +508,9 @@
-   pango_attr_list_insert (attr_list, white_fg);
- }
- 
-+void create_win1_gui();
- 
--
--void create_win0_gui()
-+static void create_win0_gui()
- {
-   if (top_bin)
-     return;
diff --git a/chinese/gcin-devel/pkg-plist b/chinese/gcin-devel/pkg-plist
index 5c32f15e6ac1..6251bf331c0a 100644
--- a/chinese/gcin-devel/pkg-plist
+++ b/chinese/gcin-devel/pkg-plist
@@ -1,8 +1,10 @@
 bin/gcin
 bin/gcin-setup
 bin/gcin2tab
+bin/juyin-learn
 bin/phoa2d
 bin/phod2a
+bin/sim2trad
 bin/tsa2d
 bin/tsd2a
 bin/tslearn
@@ -16,10 +18,10 @@ lib/libgcin-im-client.so
 %%DATADIR%%/table/cj.gtab
 %%DATADIR%%/table/cj5.gtab
 %%DATADIR%%/table/dayi3.gtab
-%%DATADIR%%/table/et.kbm
 %%DATADIR%%/table/et-asdf.kbm
-%%DATADIR%%/table/et26.kbm
+%%DATADIR%%/table/et.kbm
 %%DATADIR%%/table/et26-asdf.kbm
+%%DATADIR%%/table/et26.kbm
 %%DATADIR%%/table/greek.gtab
 %%DATADIR%%/table/gtab.list
 %%DATADIR%%/table/hsu.kbm
@@ -30,8 +32,8 @@ lib/libgcin-im-client.so
 %%DATADIR%%/table/pho-huge.tab
 %%DATADIR%%/table/pho.tab
 %%DATADIR%%/table/phrase.table
-%%DATADIR%%/table/simplex.gtab
 %%DATADIR%%/table/pinyin.gtab
+%%DATADIR%%/table/simplex.gtab
 %%DATADIR%%/table/symbol-table
 %%DATADIR%%/table/tsin
 %%DATADIR%%/table/tsin.idx
diff --git a/chinese/gcin/Makefile b/chinese/gcin/Makefile
index ce5b43b3ad5a..2920f98fc411 100644
--- a/chinese/gcin/Makefile
+++ b/chinese/gcin/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	gcin
-PORTVERSION=	1.0.9
+PORTVERSION=	1.1.1
 CATEGORIES=	chinese
 MASTER_SITES=	http://www.csie.nctu.edu.tw/~cp76/gcin/download/ \
-		http://edt1023.sayya.org/gcin/source/ \
 		http://edt1023.sayya.org/misc/ \
 		http://bbs.ilc.edu.tw/~chinsan/gcin/
 .if defined(WITH_BOSHIAMY)
diff --git a/chinese/gcin/distinfo b/chinese/gcin/distinfo
index 7457837523b5..cff8436aa078 100644
--- a/chinese/gcin/distinfo
+++ b/chinese/gcin/distinfo
@@ -1,3 +1,3 @@
-MD5 (gcin-1.0.9.tar.bz2) = cdb51a89e44f152278528353634bfff1
-SIZE (gcin-1.0.9.tar.bz2) = 1294391
+MD5 (gcin-1.1.1.tar.bz2) = c117422e8c83556ebd976bbb36ddb0f8
+SIZE (gcin-1.1.1.tar.bz2) = 1297587
 MD5 (noseeing.tar.gz) = IGNORE
diff --git a/chinese/gcin/files/patch-gcin2tab.c b/chinese/gcin/files/patch-gcin2tab.c
new file mode 100644
index 000000000000..d6923dc59f04
--- /dev/null
+++ b/chinese/gcin/files/patch-gcin2tab.c
@@ -0,0 +1,14 @@
+--- gcin2tab.c.orig	Tue Nov  1 15:17:21 2005
++++ gcin2tab.c	Tue Nov  1 15:17:21 2005
+@@ -4,8 +4,11 @@
+ */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <stdarg.h>
+ #include <sys/types.h>
++#include <sys/param.h>
++#include <sys/stat.h>
+ #include <string.h>
+ #include "gcin.h"
+ #include "gtab.h"
diff --git a/chinese/gcin/files/patch-win0.c b/chinese/gcin/files/patch-win0.c
deleted file mode 100644
index 248105150034..000000000000
--- a/chinese/gcin/files/patch-win0.c
+++ /dev/null
@@ -1,51 +0,0 @@
---- win0.c.orig	Tue Oct  4 22:35:52 2005
-+++ win0.c	Tue Oct  4 13:25:26 2005
-@@ -28,6 +28,8 @@
- static GtkWidget *button_eng_ph;
- static int max_yl;
- 
-+static void create_win0_gui();
-+
- static void recreate_win0()
- {
-   int i;
-@@ -41,8 +43,8 @@
- 
- void change_win0_style()
- {
--  if (!top_bin || current_pho_simple_win == pho_simple_win &&
--      current_gcin_inner_frame == gcin_inner_frame)
-+  if (!top_bin || (current_pho_simple_win == pho_simple_win &&
-+      current_gcin_inner_frame == gcin_inner_frame))
-     return;
- 
-   gtk_widget_destroy(top_bin);
-@@ -153,7 +155,7 @@
- }
- 
- 
--void disp_char(int index, u_char *ch)
-+void disp_char(int index, char *ch)
- {
-   char tt[CH_SZ+1];
- 
-@@ -342,6 +344,7 @@
-   raw_move(best_win_x, best_win_y);
- }
- 
-+gboolean tsin_has_input();
- 
- void move_win0(int x, int y)
- {
-@@ -505,9 +508,9 @@
-   pango_attr_list_insert (attr_list, white_fg);
- }
- 
-+void create_win1_gui();
- 
--
--void create_win0_gui()
-+static void create_win0_gui()
- {
-   if (top_bin)
-     return;
diff --git a/chinese/gcin/pkg-plist b/chinese/gcin/pkg-plist
index 5c32f15e6ac1..6251bf331c0a 100644
--- a/chinese/gcin/pkg-plist
+++ b/chinese/gcin/pkg-plist
@@ -1,8 +1,10 @@
 bin/gcin
 bin/gcin-setup
 bin/gcin2tab
+bin/juyin-learn
 bin/phoa2d
 bin/phod2a
+bin/sim2trad
 bin/tsa2d
 bin/tsd2a
 bin/tslearn
@@ -16,10 +18,10 @@ lib/libgcin-im-client.so
 %%DATADIR%%/table/cj.gtab
 %%DATADIR%%/table/cj5.gtab
 %%DATADIR%%/table/dayi3.gtab
-%%DATADIR%%/table/et.kbm
 %%DATADIR%%/table/et-asdf.kbm
-%%DATADIR%%/table/et26.kbm
+%%DATADIR%%/table/et.kbm
 %%DATADIR%%/table/et26-asdf.kbm
+%%DATADIR%%/table/et26.kbm
 %%DATADIR%%/table/greek.gtab
 %%DATADIR%%/table/gtab.list
 %%DATADIR%%/table/hsu.kbm
@@ -30,8 +32,8 @@ lib/libgcin-im-client.so
 %%DATADIR%%/table/pho-huge.tab
 %%DATADIR%%/table/pho.tab
 %%DATADIR%%/table/phrase.table
-%%DATADIR%%/table/simplex.gtab
 %%DATADIR%%/table/pinyin.gtab
+%%DATADIR%%/table/simplex.gtab
 %%DATADIR%%/table/symbol-table
 %%DATADIR%%/table/tsin
 %%DATADIR%%/table/tsin.idx