Upgrade to 1.0.8.

PR:		ports/86558
Submitted by:	chinsan at gmail.com

8 files changed, 46 insertions, 44 deletions

diff --git a/chinese/gcin-devel/Makefile b/chinese/gcin-devel/Makefile
index 605f743f8524..56daccdd8e44 100644
--- a/chinese/gcin-devel/Makefile
+++ b/chinese/gcin-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gcin
-PORTVERSION=	1.0.7
+PORTVERSION=	1.0.8
 CATEGORIES=	chinese
 MASTER_SITES=	http://www.csie.nctu.edu.tw/~cp76/gcin/download/ \
 		http://edt1023.sayya.org/gcin/source/ \
diff --git a/chinese/gcin-devel/distinfo b/chinese/gcin-devel/distinfo
index 0c303e69e41f..11279c767a5d 100644
--- a/chinese/gcin-devel/distinfo
+++ b/chinese/gcin-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gcin-1.0.7.tar.bz2) = 46ad50a1e31729332ef080e5c86c02b1
-SIZE (gcin-1.0.7.tar.bz2) = 1290286
+MD5 (gcin-1.0.8.tar.bz2) = 8180feeac41138b824858b33d538b5ad
+SIZE (gcin-1.0.8.tar.bz2) = 1292364
 MD5 (noseeing.tar.gz) = IGNORE
diff --git a/chinese/gcin-devel/files/patch-configure b/chinese/gcin-devel/files/patch-configure
index b85112fcd4aa..56fab4b460d2 100644
--- a/chinese/gcin-devel/files/patch-configure
+++ b/chinese/gcin-devel/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	Fri Sep 16 13:38:02 2005
-+++ configure	Tue Sep 20 22:14:33 2005
+--- configure.orig	Sun Sep 25 21:38:24 2005
++++ configure	Sun Sep 25 21:46:15 2005
 @@ -1,12 +1,12 @@
 -#!/bin/bash
 +#!/bin/sh
@@ -16,7 +16,7 @@
  if [ $? = 0 ]; then
    FREEBSD=1
  else
-@@ -59,7 +59,7 @@
+@@ -65,7 +65,7 @@
  QT_IM='N'
  for i in qt3 qt4
  do
@@ -25,7 +25,7 @@
    echo "testing if you have QT_IM_MODULE dir:$QT_IM_DIR support"
    if [ -d  $QT_IM_DIR ]; then
      QT_IM='Y'
-@@ -77,7 +77,7 @@
+@@ -83,7 +83,7 @@
  
  bindir=$prefix/bin
  datadir=$prefix/share
@@ -34,18 +34,30 @@
  libdir=$prefix/lib
  includedir=$prefix/include
  optdir=/opt
-@@ -100,20 +100,13 @@
+@@ -96,8 +96,8 @@
+   GCIN_SETUP_DESKTOP=/opt/gnome/share/control-center-2.0/capplets
+   GCIN_SETUP_DESKTOP_rpm='$(optdir)/gnome/share/control-center-2.0/capplets'
+ else
+-  GCIN_SETUP_DESKTOP=/usr/share/control-center-2.0/capplets
+-  GCIN_SETUP_DESKTOP_rpm='$(datadir)/control-center-2.0/capplets'
++  GCIN_SETUP_DESKTOP=$prefix/share/gnome/control-center-2.0/capplets
++  GCIN_SETUP_DESKTOP_rpm='$(datadir)/gnome/control-center-2.0/capplets'
+ fi
+ 
+ 
+@@ -106,21 +106,12 @@
    grep -v qt3/plugins/inputmethods gcin.spec.tmp > gcin.spec
  fi
  
--grep Cooker /etc/mandriva-release 2>1 | grep 2006 >& /dev/null
+-grep Cooker /etc/mandriva-release 2>&1 | grep 2006 >& /dev/null
 -if [ $? = 0 ]; then
 -  NEW_GTK_IM='Y'
 -  echo "!!!! new gtk-im(im-gcin.so) will be enabled because you are using Cooker 2006."
 -  echo "!!!! You have to install the latest libwidget_gtk2.so"
+-  echo "http://www.csie.nctu.edu.tw/~cp76/linux/mozilla/mdk-firefox-thunderbird-1.0.6/cooker-new-gtkim-libwidget_gtk2.so.gz"
 -fi
 -
- 
+-
  OPTFLAGS="-g"
  if [ $prefix = /usr ]; then
    OPTFLAGS="-O"
@@ -56,7 +68,7 @@
  echo "MAKE=$MAKE" >> config.mak
  echo "GTKINC=$GTKINC" >> config.mak
  echo "prefix=$prefix" >> config.mak
-@@ -133,8 +126,8 @@
+@@ -140,8 +131,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
diff --git a/chinese/gcin-devel/files/patch-tsin.c b/chinese/gcin-devel/files/patch-tsin.c
deleted file mode 100644
index d3e6c616dded..000000000000
--- a/chinese/gcin-devel/files/patch-tsin.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- tsin.c.orig	Tue Sep 20 22:26:31 2005
-+++ tsin.c	Tue Sep 20 23:01:14 2005
-@@ -469,7 +469,7 @@
- }
- 
- #define PH_SHIFT_N (tsin_buffer_size - 1)
--void compact_win0_x();
-+//void compact_win0_x();
- 
- static void shift_ins()
- {
diff --git a/chinese/gcin/Makefile b/chinese/gcin/Makefile
index 605f743f8524..56daccdd8e44 100644
--- a/chinese/gcin/Makefile
+++ b/chinese/gcin/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gcin
-PORTVERSION=	1.0.7
+PORTVERSION=	1.0.8
 CATEGORIES=	chinese
 MASTER_SITES=	http://www.csie.nctu.edu.tw/~cp76/gcin/download/ \
 		http://edt1023.sayya.org/gcin/source/ \
diff --git a/chinese/gcin/distinfo b/chinese/gcin/distinfo
index 0c303e69e41f..11279c767a5d 100644
--- a/chinese/gcin/distinfo
+++ b/chinese/gcin/distinfo
@@ -1,3 +1,3 @@
-MD5 (gcin-1.0.7.tar.bz2) = 46ad50a1e31729332ef080e5c86c02b1
-SIZE (gcin-1.0.7.tar.bz2) = 1290286
+MD5 (gcin-1.0.8.tar.bz2) = 8180feeac41138b824858b33d538b5ad
+SIZE (gcin-1.0.8.tar.bz2) = 1292364
 MD5 (noseeing.tar.gz) = IGNORE
diff --git a/chinese/gcin/files/patch-configure b/chinese/gcin/files/patch-configure
index b85112fcd4aa..56fab4b460d2 100644
--- a/chinese/gcin/files/patch-configure
+++ b/chinese/gcin/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	Fri Sep 16 13:38:02 2005
-+++ configure	Tue Sep 20 22:14:33 2005
+--- configure.orig	Sun Sep 25 21:38:24 2005
++++ configure	Sun Sep 25 21:46:15 2005
 @@ -1,12 +1,12 @@
 -#!/bin/bash
 +#!/bin/sh
@@ -16,7 +16,7 @@
  if [ $? = 0 ]; then
    FREEBSD=1
  else
-@@ -59,7 +59,7 @@
+@@ -65,7 +65,7 @@
  QT_IM='N'
  for i in qt3 qt4
  do
@@ -25,7 +25,7 @@
    echo "testing if you have QT_IM_MODULE dir:$QT_IM_DIR support"
    if [ -d  $QT_IM_DIR ]; then
      QT_IM='Y'
-@@ -77,7 +77,7 @@
+@@ -83,7 +83,7 @@
  
  bindir=$prefix/bin
  datadir=$prefix/share
@@ -34,18 +34,30 @@
  libdir=$prefix/lib
  includedir=$prefix/include
  optdir=/opt
-@@ -100,20 +100,13 @@
+@@ -96,8 +96,8 @@
+   GCIN_SETUP_DESKTOP=/opt/gnome/share/control-center-2.0/capplets
+   GCIN_SETUP_DESKTOP_rpm='$(optdir)/gnome/share/control-center-2.0/capplets'
+ else
+-  GCIN_SETUP_DESKTOP=/usr/share/control-center-2.0/capplets
+-  GCIN_SETUP_DESKTOP_rpm='$(datadir)/control-center-2.0/capplets'
++  GCIN_SETUP_DESKTOP=$prefix/share/gnome/control-center-2.0/capplets
++  GCIN_SETUP_DESKTOP_rpm='$(datadir)/gnome/control-center-2.0/capplets'
+ fi
+ 
+ 
+@@ -106,21 +106,12 @@
    grep -v qt3/plugins/inputmethods gcin.spec.tmp > gcin.spec
  fi
  
--grep Cooker /etc/mandriva-release 2>1 | grep 2006 >& /dev/null
+-grep Cooker /etc/mandriva-release 2>&1 | grep 2006 >& /dev/null
 -if [ $? = 0 ]; then
 -  NEW_GTK_IM='Y'
 -  echo "!!!! new gtk-im(im-gcin.so) will be enabled because you are using Cooker 2006."
 -  echo "!!!! You have to install the latest libwidget_gtk2.so"
+-  echo "http://www.csie.nctu.edu.tw/~cp76/linux/mozilla/mdk-firefox-thunderbird-1.0.6/cooker-new-gtkim-libwidget_gtk2.so.gz"
 -fi
 -
- 
+-
  OPTFLAGS="-g"
  if [ $prefix = /usr ]; then
    OPTFLAGS="-O"
@@ -56,7 +68,7 @@
  echo "MAKE=$MAKE" >> config.mak
  echo "GTKINC=$GTKINC" >> config.mak
  echo "prefix=$prefix" >> config.mak
-@@ -133,8 +126,8 @@
+@@ -140,8 +131,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
diff --git a/chinese/gcin/files/patch-tsin.c b/chinese/gcin/files/patch-tsin.c
deleted file mode 100644
index d3e6c616dded..000000000000
--- a/chinese/gcin/files/patch-tsin.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- tsin.c.orig	Tue Sep 20 22:26:31 2005
-+++ tsin.c	Tue Sep 20 23:01:14 2005
-@@ -469,7 +469,7 @@
- }
- 
- #define PH_SHIFT_N (tsin_buffer_size - 1)
--void compact_win0_x();
-+//void compact_win0_x();
- 
- static void shift_ins()
- {