- Update to 1.1.5

- Add additional categories: textproc gnome

PR:		91787
Submitted by:	chinsan <chinsan.tw@gmail.com>

8 files changed, 42 insertions, 30 deletions

diff --git a/chinese/gcin-devel/Makefile b/chinese/gcin-devel/Makefile
index a05e37f6ed9b..cfddd8cf585a 100644
--- a/chinese/gcin-devel/Makefile
+++ b/chinese/gcin-devel/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	gcin
-PORTVERSION=	1.1.4
-CATEGORIES=	chinese
+PORTVERSION=	1.1.5
+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/
diff --git a/chinese/gcin-devel/distinfo b/chinese/gcin-devel/distinfo
index 4e83fa75d616..c9c79a302ef0 100644
--- a/chinese/gcin-devel/distinfo
+++ b/chinese/gcin-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (gcin-1.1.4.tar.bz2) = 8212df93ff9fd4247c64172aad3ac15b
-SHA256 (gcin-1.1.4.tar.bz2) = 51237c7e98589a8b4ea63ecfed93a2d44a96517ea3e7ec59e00edaac21505fff
-SIZE (gcin-1.1.4.tar.bz2) = 1367019
+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 (noseeing.tar.gz) = IGNORE
 SHA256 (noseeing.tar.gz) = IGNORE
diff --git a/chinese/gcin-devel/files/patch-configure b/chinese/gcin-devel/files/patch-configure
index 56fab4b460d2..a43718efd328 100644
--- a/chinese/gcin-devel/files/patch-configure
+++ b/chinese/gcin-devel/files/patch-configure
@@ -1,9 +1,14 @@
---- configure.orig	Sun Sep 25 21:38:24 2005
-+++ configure	Sun Sep 25 21:46:15 2005
-@@ -1,12 +1,12 @@
+--- configure.orig	Sat Jan 14 18:08:41 2006
++++ configure	Sat Jan 14 18:12:44 2006
+@@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
  
+ if [ "$1" = "-h" -o "$1" = "--help" -o "$1" = "-help" ]; then
+     echo "** valid options:"
+@@ -9,12 +9,12 @@
+ fi
+ 
  MAKE=make
 -which gmake >& /dev/null
 +which gmake > /dev/null
@@ -16,7 +21,7 @@
  if [ $? = 0 ]; then
    FREEBSD=1
  else
-@@ -65,7 +65,7 @@
+@@ -70,7 +70,7 @@
  QT_IM='N'
  for i in qt3 qt4
  do
@@ -25,7 +30,7 @@
    echo "testing if you have QT_IM_MODULE dir:$QT_IM_DIR support"
    if [ -d  $QT_IM_DIR ]; then
      QT_IM='Y'
-@@ -83,7 +83,7 @@
+@@ -88,7 +88,7 @@
  
  bindir=$prefix/bin
  datadir=$prefix/share
@@ -34,7 +39,7 @@
  libdir=$prefix/lib
  includedir=$prefix/include
  optdir=/opt
-@@ -96,8 +96,8 @@
+@@ -101,8 +101,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
@@ -45,19 +50,19 @@
  fi
  
  
-@@ -106,21 +106,12 @@
+@@ -111,21 +111,13 @@
    grep -v qt3/plugins/inputmethods gcin.spec.tmp > gcin.spec
  fi
  
 -grep Cooker /etc/mandriva-release 2>&1 | grep 2006 >& /dev/null
 -if [ $? = 0 ]; then
--  NEW_GTK_IM='Y'
+-  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"
@@ -68,7 +73,7 @@
  echo "MAKE=$MAKE" >> config.mak
  echo "GTKINC=$GTKINC" >> config.mak
  echo "prefix=$prefix" >> config.mak
-@@ -140,8 +131,8 @@
+@@ -145,8 +137,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/pkg-plist b/chinese/gcin-devel/pkg-plist
index f2f1e4d76e3b..07bfd4f13968 100644
--- a/chinese/gcin-devel/pkg-plist
+++ b/chinese/gcin-devel/pkg-plist
@@ -29,6 +29,7 @@ lib/libgcin-im-client.so
 %%DATADIR%%/table/ibm.kbm
 %%DATADIR%%/table/jyutping.gtab
 %%DATADIR%%/table/kana-nippon.gtab
+%%DATADIR%%/table/latin-letters.gtab
 %%BOSHIAMY%%%%DATADIR%%/table/noseeing.gtab
 %%DATADIR%%/table/pho-huge.tab
 %%DATADIR%%/table/pho.tab
diff --git a/chinese/gcin/Makefile b/chinese/gcin/Makefile
index a05e37f6ed9b..cfddd8cf585a 100644
--- a/chinese/gcin/Makefile
+++ b/chinese/gcin/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	gcin
-PORTVERSION=	1.1.4
-CATEGORIES=	chinese
+PORTVERSION=	1.1.5
+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/
diff --git a/chinese/gcin/distinfo b/chinese/gcin/distinfo
index 4e83fa75d616..c9c79a302ef0 100644
--- a/chinese/gcin/distinfo
+++ b/chinese/gcin/distinfo
@@ -1,5 +1,5 @@
-MD5 (gcin-1.1.4.tar.bz2) = 8212df93ff9fd4247c64172aad3ac15b
-SHA256 (gcin-1.1.4.tar.bz2) = 51237c7e98589a8b4ea63ecfed93a2d44a96517ea3e7ec59e00edaac21505fff
-SIZE (gcin-1.1.4.tar.bz2) = 1367019
+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 (noseeing.tar.gz) = IGNORE
 SHA256 (noseeing.tar.gz) = IGNORE
diff --git a/chinese/gcin/files/patch-configure b/chinese/gcin/files/patch-configure
index 56fab4b460d2..a43718efd328 100644
--- a/chinese/gcin/files/patch-configure
+++ b/chinese/gcin/files/patch-configure
@@ -1,9 +1,14 @@
---- configure.orig	Sun Sep 25 21:38:24 2005
-+++ configure	Sun Sep 25 21:46:15 2005
-@@ -1,12 +1,12 @@
+--- configure.orig	Sat Jan 14 18:08:41 2006
++++ configure	Sat Jan 14 18:12:44 2006
+@@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
  
+ if [ "$1" = "-h" -o "$1" = "--help" -o "$1" = "-help" ]; then
+     echo "** valid options:"
+@@ -9,12 +9,12 @@
+ fi
+ 
  MAKE=make
 -which gmake >& /dev/null
 +which gmake > /dev/null
@@ -16,7 +21,7 @@
  if [ $? = 0 ]; then
    FREEBSD=1
  else
-@@ -65,7 +65,7 @@
+@@ -70,7 +70,7 @@
  QT_IM='N'
  for i in qt3 qt4
  do
@@ -25,7 +30,7 @@
    echo "testing if you have QT_IM_MODULE dir:$QT_IM_DIR support"
    if [ -d  $QT_IM_DIR ]; then
      QT_IM='Y'
-@@ -83,7 +83,7 @@
+@@ -88,7 +88,7 @@
  
  bindir=$prefix/bin
  datadir=$prefix/share
@@ -34,7 +39,7 @@
  libdir=$prefix/lib
  includedir=$prefix/include
  optdir=/opt
-@@ -96,8 +96,8 @@
+@@ -101,8 +101,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
@@ -45,19 +50,19 @@
  fi
  
  
-@@ -106,21 +106,12 @@
+@@ -111,21 +111,13 @@
    grep -v qt3/plugins/inputmethods gcin.spec.tmp > gcin.spec
  fi
  
 -grep Cooker /etc/mandriva-release 2>&1 | grep 2006 >& /dev/null
 -if [ $? = 0 ]; then
--  NEW_GTK_IM='Y'
+-  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"
@@ -68,7 +73,7 @@
  echo "MAKE=$MAKE" >> config.mak
  echo "GTKINC=$GTKINC" >> config.mak
  echo "prefix=$prefix" >> config.mak
-@@ -140,8 +131,8 @@
+@@ -145,8 +137,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/pkg-plist b/chinese/gcin/pkg-plist
index f2f1e4d76e3b..07bfd4f13968 100644
--- a/chinese/gcin/pkg-plist
+++ b/chinese/gcin/pkg-plist
@@ -29,6 +29,7 @@ lib/libgcin-im-client.so
 %%DATADIR%%/table/ibm.kbm
 %%DATADIR%%/table/jyutping.gtab
 %%DATADIR%%/table/kana-nippon.gtab
+%%DATADIR%%/table/latin-letters.gtab
 %%BOSHIAMY%%%%DATADIR%%/table/noseeing.gtab
 %%DATADIR%%/table/pho-huge.tab
 %%DATADIR%%/table/pho.tab