14 files changed, 44 insertions, 76 deletions

diff --git a/chinese/gcin-devel/Makefile b/chinese/gcin-devel/Makefile
index 7fb258c1316f..7590690f7408 100644
--- a/chinese/gcin-devel/Makefile
+++ b/chinese/gcin-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gcin
-PORTVERSION=	0.8.9
+PORTVERSION=	0.9.0
 CATEGORIES=	chinese
 MASTER_SITES=	http://www.csie.nctu.edu.tw/~cp76/gcin/download/
 
diff --git a/chinese/gcin-devel/distinfo b/chinese/gcin-devel/distinfo
index 56ba286860f8..662b522e6876 100644
--- a/chinese/gcin-devel/distinfo
+++ b/chinese/gcin-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (gcin-0.8.9.tar.bz2) = 9463493fe8d1e3506858310f109e1c40
-SIZE (gcin-0.8.9.tar.bz2) = 990183
+MD5 (gcin-0.9.0.tar.bz2) = 285d724f7d9a07a01e21fc282c389c93
+SIZE (gcin-0.8.9.tar.bz2) = 1096190
diff --git a/chinese/gcin-devel/files/patch-Makefile b/chinese/gcin-devel/files/patch-Makefile
deleted file mode 100644
index f8d6f0887a94..000000000000
--- a/chinese/gcin-devel/files/patch-Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
---- Makefile.orig	Fri Feb 25 21:40:34 2005
-+++ Makefile	Wed Mar  2 18:27:45 2005
-@@ -85,12 +85,12 @@
- 	$(MAKE) -C gtk-im install
- 	if [ $(prefix) = /usr/local ]; then \
- 	   install -m 644 gcin.png /usr/share/icons; \
--	   install -d $(DOC_DIR); \
--	   install -m 644 README $(DOC_DIR); \
- 	   install $(PROGS) $(bindir); \
- 	else \
- 	   install -s $(PROGS) $(bindir); \
- 	fi
-+	install -d $(DOC_DIR); \
-+	install -m 644 README $(DOC_DIR); \
- 	$(MAKE) -C scripts install
- 	$(MAKE) -C menu install
- clean:
diff --git a/chinese/gcin-devel/files/patch-configure b/chinese/gcin-devel/files/patch-configure
index aa44e7cc069a..fca55df3d394 100644
--- a/chinese/gcin-devel/files/patch-configure
+++ b/chinese/gcin-devel/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	Sat Feb 26 03:40:57 2005
-+++ configure	Sun Mar 20 16:09:31 2005
+--- configure.orig	Thu Apr  7 08:59:13 2005
++++ configure	Thu Apr  7 09:01:06 2005
 @@ -1,12 +1,12 @@
 -#!/bin/bash
 +#!/bin/sh
@@ -25,12 +25,14 @@
  echo "MAKE=$MAKE" >> config.mak
  echo "GTKINC=$GTKINC" >> config.mak
  echo "prefix=$prefix" >> config.mak
-@@ -78,7 +78,7 @@
+@@ -78,8 +78,8 @@
  echo "GCIN_SCRIPT_DIR=\$(datadir_r)/gcin/script" >> config.mak
  echo "GCIN_SCRIPT_DIR_i=\$(datadir)/gcin/script" >> config.mak
  echo "OPTFLAGS=$OPTFLAGS" >> config.mak
 -echo "DOC_DIR=\$(datadir_r)/doc/gcin-$GCIN_VERSION" >> config.mak
+-echo "DOC_DIR_i=\$(datadir)/doc/gcin-$GCIN_VERSION" >> config.mak
 +echo "DOC_DIR=\$(datadir_r)/doc/gcin" >> config.mak
++echo "DOC_DIR_i=\$(datadir)/doc/gcin" >> config.mak
  echo "GCIN_ICON_DIR=\$(datadir_r)/icons/gcin" >> config.mak
  echo "SYS_ICON_DIR=\$(datadir_r)/icons" >> config.mak
  echo "GCIN_ICON_DIR_i=\$(datadir)/icons/gcin" >> config.mak
diff --git a/chinese/gcin-devel/files/patch-gcin-im-client.c b/chinese/gcin-devel/files/patch-gcin-im-client.c
index 55ce02b9fd48..d6a96ccd21cb 100644
--- a/chinese/gcin-devel/files/patch-gcin-im-client.c
+++ b/chinese/gcin-devel/files/patch-gcin-im-client.c
@@ -1,15 +1,11 @@
---- im-client/gcin-im-client.c.orig	Sat Feb 26 10:39:12 2005
-+++ im-client/gcin-im-client.c	Tue Mar 15 00:15:47 2005
-@@ -68,11 +68,7 @@
-       save_old_sigaction_single(SIGCHLD, &ori_act);
- 
-       if ((pid=fork())==0) {
--#if 	FREEBSD
--        setgrp();
--#else
+--- im-client/gcin-im-client.c.orig	Thu Apr  7 09:18:13 2005
++++ im-client/gcin-im-client.c	Thu Apr  7 09:18:27 2005
+@@ -71,7 +71,7 @@
+ #if 	FREEBSD
+         setgrp();
+ #else
 -        setpgrp();
--#endif
 +        setpgrp(0, 0);
+ #endif
          execl(execbin, "gcin", NULL);
        } else {
-         sleep(1);
diff --git a/chinese/gcin-devel/files/patch-im-srv.c b/chinese/gcin-devel/files/patch-im-srv.c
index b3b1ad197fa2..b5671f227660 100644
--- a/chinese/gcin-devel/files/patch-im-srv.c
+++ b/chinese/gcin-devel/files/patch-im-srv.c
@@ -1,10 +1,11 @@
---- im-srv/im-srv.c.orig	Mon Feb 14 10:18:04 2005
-+++ im-srv/im-srv.c	Fri Mar 11 01:43:51 2005
-@@ -121,7 +121,11 @@
+--- im-srv/im-srv.c.orig	Thu Apr  7 09:11:24 2005
++++ im-srv/im-srv.c	Thu Apr  7 09:11:01 2005
+@@ -121,7 +121,12 @@
    char sock_path[128];
    get_gcin_im_srv_sock_path(sock_path, sizeof(sock_path));
    strcpy(serv_addr.sun_path, sock_path);
-+#ifdef	SUN_LEN
++
++#ifdef SUN_LEN
 +  servlen = SUN_LEN (&serv_addr);
 +#else
    servlen = strlen(serv_addr.sun_path) + sizeof(serv_addr.sun_family);
diff --git a/chinese/gcin-devel/pkg-plist b/chinese/gcin-devel/pkg-plist
index bdbdea181273..0f590ebe6328 100644
--- a/chinese/gcin-devel/pkg-plist
+++ b/chinese/gcin-devel/pkg-plist
@@ -29,6 +29,7 @@ lib/menu/gcin-setup
 %%DATADIR%%/table/jyutping.gtab
 %%DATADIR%%/table/phrase.table
 %%DATADIR%%/table/pho.tab
+%%DATADIR%%/table/pho-huge.tab
 %%DATADIR%%/table/pinyin.gtab
 %%DATADIR%%/table/symbol-table
 %%DATADIR%%/table/tsin
@@ -36,6 +37,7 @@ lib/menu/gcin-setup
 %%DATADIR%%/table/zo.kbm
 %%DATADIR%%/table/zo-asdf.kbm
 %%DOCSDIR%%/README
+%%DOCSDIR%%/Changelog
 share/icons/gcin.png
 share/icons/gcin/pin-fixed24.png
 share/icons/gcin/pin-float16.png
diff --git a/chinese/gcin/Makefile b/chinese/gcin/Makefile
index 7fb258c1316f..7590690f7408 100644
--- a/chinese/gcin/Makefile
+++ b/chinese/gcin/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gcin
-PORTVERSION=	0.8.9
+PORTVERSION=	0.9.0
 CATEGORIES=	chinese
 MASTER_SITES=	http://www.csie.nctu.edu.tw/~cp76/gcin/download/
 
diff --git a/chinese/gcin/distinfo b/chinese/gcin/distinfo
index 56ba286860f8..662b522e6876 100644
--- a/chinese/gcin/distinfo
+++ b/chinese/gcin/distinfo
@@ -1,2 +1,2 @@
-MD5 (gcin-0.8.9.tar.bz2) = 9463493fe8d1e3506858310f109e1c40
-SIZE (gcin-0.8.9.tar.bz2) = 990183
+MD5 (gcin-0.9.0.tar.bz2) = 285d724f7d9a07a01e21fc282c389c93
+SIZE (gcin-0.8.9.tar.bz2) = 1096190
diff --git a/chinese/gcin/files/patch-Makefile b/chinese/gcin/files/patch-Makefile
deleted file mode 100644
index f8d6f0887a94..000000000000
--- a/chinese/gcin/files/patch-Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
---- Makefile.orig	Fri Feb 25 21:40:34 2005
-+++ Makefile	Wed Mar  2 18:27:45 2005
-@@ -85,12 +85,12 @@
- 	$(MAKE) -C gtk-im install
- 	if [ $(prefix) = /usr/local ]; then \
- 	   install -m 644 gcin.png /usr/share/icons; \
--	   install -d $(DOC_DIR); \
--	   install -m 644 README $(DOC_DIR); \
- 	   install $(PROGS) $(bindir); \
- 	else \
- 	   install -s $(PROGS) $(bindir); \
- 	fi
-+	install -d $(DOC_DIR); \
-+	install -m 644 README $(DOC_DIR); \
- 	$(MAKE) -C scripts install
- 	$(MAKE) -C menu install
- clean:
diff --git a/chinese/gcin/files/patch-configure b/chinese/gcin/files/patch-configure
index aa44e7cc069a..fca55df3d394 100644
--- a/chinese/gcin/files/patch-configure
+++ b/chinese/gcin/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	Sat Feb 26 03:40:57 2005
-+++ configure	Sun Mar 20 16:09:31 2005
+--- configure.orig	Thu Apr  7 08:59:13 2005
++++ configure	Thu Apr  7 09:01:06 2005
 @@ -1,12 +1,12 @@
 -#!/bin/bash
 +#!/bin/sh
@@ -25,12 +25,14 @@
  echo "MAKE=$MAKE" >> config.mak
  echo "GTKINC=$GTKINC" >> config.mak
  echo "prefix=$prefix" >> config.mak
-@@ -78,7 +78,7 @@
+@@ -78,8 +78,8 @@
  echo "GCIN_SCRIPT_DIR=\$(datadir_r)/gcin/script" >> config.mak
  echo "GCIN_SCRIPT_DIR_i=\$(datadir)/gcin/script" >> config.mak
  echo "OPTFLAGS=$OPTFLAGS" >> config.mak
 -echo "DOC_DIR=\$(datadir_r)/doc/gcin-$GCIN_VERSION" >> config.mak
+-echo "DOC_DIR_i=\$(datadir)/doc/gcin-$GCIN_VERSION" >> config.mak
 +echo "DOC_DIR=\$(datadir_r)/doc/gcin" >> config.mak
++echo "DOC_DIR_i=\$(datadir)/doc/gcin" >> config.mak
  echo "GCIN_ICON_DIR=\$(datadir_r)/icons/gcin" >> config.mak
  echo "SYS_ICON_DIR=\$(datadir_r)/icons" >> config.mak
  echo "GCIN_ICON_DIR_i=\$(datadir)/icons/gcin" >> config.mak
diff --git a/chinese/gcin/files/patch-gcin-im-client.c b/chinese/gcin/files/patch-gcin-im-client.c
index 55ce02b9fd48..d6a96ccd21cb 100644
--- a/chinese/gcin/files/patch-gcin-im-client.c
+++ b/chinese/gcin/files/patch-gcin-im-client.c
@@ -1,15 +1,11 @@
---- im-client/gcin-im-client.c.orig	Sat Feb 26 10:39:12 2005
-+++ im-client/gcin-im-client.c	Tue Mar 15 00:15:47 2005
-@@ -68,11 +68,7 @@
-       save_old_sigaction_single(SIGCHLD, &ori_act);
- 
-       if ((pid=fork())==0) {
--#if 	FREEBSD
--        setgrp();
--#else
+--- im-client/gcin-im-client.c.orig	Thu Apr  7 09:18:13 2005
++++ im-client/gcin-im-client.c	Thu Apr  7 09:18:27 2005
+@@ -71,7 +71,7 @@
+ #if 	FREEBSD
+         setgrp();
+ #else
 -        setpgrp();
--#endif
 +        setpgrp(0, 0);
+ #endif
          execl(execbin, "gcin", NULL);
        } else {
-         sleep(1);
diff --git a/chinese/gcin/files/patch-im-srv.c b/chinese/gcin/files/patch-im-srv.c
index b3b1ad197fa2..b5671f227660 100644
--- a/chinese/gcin/files/patch-im-srv.c
+++ b/chinese/gcin/files/patch-im-srv.c
@@ -1,10 +1,11 @@
---- im-srv/im-srv.c.orig	Mon Feb 14 10:18:04 2005
-+++ im-srv/im-srv.c	Fri Mar 11 01:43:51 2005
-@@ -121,7 +121,11 @@
+--- im-srv/im-srv.c.orig	Thu Apr  7 09:11:24 2005
++++ im-srv/im-srv.c	Thu Apr  7 09:11:01 2005
+@@ -121,7 +121,12 @@
    char sock_path[128];
    get_gcin_im_srv_sock_path(sock_path, sizeof(sock_path));
    strcpy(serv_addr.sun_path, sock_path);
-+#ifdef	SUN_LEN
++
++#ifdef SUN_LEN
 +  servlen = SUN_LEN (&serv_addr);
 +#else
    servlen = strlen(serv_addr.sun_path) + sizeof(serv_addr.sun_family);
diff --git a/chinese/gcin/pkg-plist b/chinese/gcin/pkg-plist
index bdbdea181273..0f590ebe6328 100644
--- a/chinese/gcin/pkg-plist
+++ b/chinese/gcin/pkg-plist
@@ -29,6 +29,7 @@ lib/menu/gcin-setup
 %%DATADIR%%/table/jyutping.gtab
 %%DATADIR%%/table/phrase.table
 %%DATADIR%%/table/pho.tab
+%%DATADIR%%/table/pho-huge.tab
 %%DATADIR%%/table/pinyin.gtab
 %%DATADIR%%/table/symbol-table
 %%DATADIR%%/table/tsin
@@ -36,6 +37,7 @@ lib/menu/gcin-setup
 %%DATADIR%%/table/zo.kbm
 %%DATADIR%%/table/zo-asdf.kbm
 %%DOCSDIR%%/README
+%%DOCSDIR%%/Changelog
 share/icons/gcin.png
 share/icons/gcin/pin-fixed24.png
 share/icons/gcin/pin-float16.png