Upgrade to 1.0.7.

PR:		ports/86373
Submitted by:	chinsan

8 files changed, 94 insertions, 22 deletions

diff --git a/chinese/gcin-devel/Makefile b/chinese/gcin-devel/Makefile
index 6f443916bb71..605f743f8524 100644
--- a/chinese/gcin-devel/Makefile
+++ b/chinese/gcin-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gcin
-PORTVERSION=	1.0.4
-PORTREVISION=	0
+PORTVERSION=	1.0.7
 CATEGORIES=	chinese
 MASTER_SITES=	http://www.csie.nctu.edu.tw/~cp76/gcin/download/ \
 		http://edt1023.sayya.org/gcin/source/ \
@@ -53,8 +52,11 @@ post-extract:
 		noseeing.cin
 	@${REINPLACE_CMD} -e 's,cj.gtab,cj.gtab noseeing.gtab,' \
 		${WRKSRC}/data/Makefile
+
+.endif
+
+.if defined(WITH_BOSHIAMY)
 post-patch:
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-data-Makefile
 PLIST_SUB+=	BOSHIAMY=""
 .else
 PLIST_SUB+=	BOSHIAMY="@comment "
diff --git a/chinese/gcin-devel/distinfo b/chinese/gcin-devel/distinfo
index c3acb786af03..0c303e69e41f 100644
--- a/chinese/gcin-devel/distinfo
+++ b/chinese/gcin-devel/distinfo
@@ -1,2 +1,3 @@
-MD5 (gcin-1.0.4.tar.bz2) = e0ed93c70222427fd1b1c722e3f57b99
-SIZE (gcin-1.0.4.tar.bz2) = 1286644
+MD5 (gcin-1.0.7.tar.bz2) = 46ad50a1e31729332ef080e5c86c02b1
+SIZE (gcin-1.0.7.tar.bz2) = 1290286
+MD5 (noseeing.tar.gz) = IGNORE
diff --git a/chinese/gcin-devel/files/patch-configure b/chinese/gcin-devel/files/patch-configure
index c4906975f463..b85112fcd4aa 100644
--- a/chinese/gcin-devel/files/patch-configure
+++ b/chinese/gcin-devel/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	Tue May 24 19:14:40 2005
-+++ configure	Mon Jun 13 23:57:03 2005
+--- configure.orig	Fri Sep 16 13:38:02 2005
++++ configure	Tue Sep 20 22:14:33 2005
 @@ -1,12 +1,12 @@
 -#!/bin/bash
 +#!/bin/sh
@@ -16,7 +16,16 @@
  if [ $? = 0 ]; then
    FREEBSD=1
  else
-@@ -50,7 +50,7 @@
+@@ -59,7 +59,7 @@
+ QT_IM='N'
+ for i in qt3 qt4
+ do
+-  QT_IM_DIR=/usr/lib/$i/plugins/lib/inputmethods
++  QT_IM_DIR=$prefix/lib/$i/plugins/lib/inputmethods
+   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 @@
  
  bindir=$prefix/bin
  datadir=$prefix/share
@@ -24,8 +33,21 @@
 +mandir=$prefix/man
  libdir=$prefix/lib
  includedir=$prefix/include
- GCIN_VERSION=`cat VERSION.gcin`
-@@ -61,7 +61,7 @@
+ optdir=/opt
+@@ -100,20 +100,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'
+-  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"
+-fi
+-
+ 
+ OPTFLAGS="-g"
+ if [ $prefix = /usr ]; then
    OPTFLAGS="-O"
  fi
  
@@ -34,7 +56,7 @@
  echo "MAKE=$MAKE" >> config.mak
  echo "GTKINC=$GTKINC" >> config.mak
  echo "prefix=$prefix" >> config.mak
-@@ -81,8 +81,8 @@
+@@ -133,8 +126,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
new file mode 100644
index 000000000000..d3e6c616dded
--- /dev/null
+++ b/chinese/gcin-devel/files/patch-tsin.c
@@ -0,0 +1,11 @@
+--- 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 6f443916bb71..605f743f8524 100644
--- a/chinese/gcin/Makefile
+++ b/chinese/gcin/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gcin
-PORTVERSION=	1.0.4
-PORTREVISION=	0
+PORTVERSION=	1.0.7
 CATEGORIES=	chinese
 MASTER_SITES=	http://www.csie.nctu.edu.tw/~cp76/gcin/download/ \
 		http://edt1023.sayya.org/gcin/source/ \
@@ -53,8 +52,11 @@ post-extract:
 		noseeing.cin
 	@${REINPLACE_CMD} -e 's,cj.gtab,cj.gtab noseeing.gtab,' \
 		${WRKSRC}/data/Makefile
+
+.endif
+
+.if defined(WITH_BOSHIAMY)
 post-patch:
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-data-Makefile
 PLIST_SUB+=	BOSHIAMY=""
 .else
 PLIST_SUB+=	BOSHIAMY="@comment "
diff --git a/chinese/gcin/distinfo b/chinese/gcin/distinfo
index c3acb786af03..0c303e69e41f 100644
--- a/chinese/gcin/distinfo
+++ b/chinese/gcin/distinfo
@@ -1,2 +1,3 @@
-MD5 (gcin-1.0.4.tar.bz2) = e0ed93c70222427fd1b1c722e3f57b99
-SIZE (gcin-1.0.4.tar.bz2) = 1286644
+MD5 (gcin-1.0.7.tar.bz2) = 46ad50a1e31729332ef080e5c86c02b1
+SIZE (gcin-1.0.7.tar.bz2) = 1290286
+MD5 (noseeing.tar.gz) = IGNORE
diff --git a/chinese/gcin/files/patch-configure b/chinese/gcin/files/patch-configure
index c4906975f463..b85112fcd4aa 100644
--- a/chinese/gcin/files/patch-configure
+++ b/chinese/gcin/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	Tue May 24 19:14:40 2005
-+++ configure	Mon Jun 13 23:57:03 2005
+--- configure.orig	Fri Sep 16 13:38:02 2005
++++ configure	Tue Sep 20 22:14:33 2005
 @@ -1,12 +1,12 @@
 -#!/bin/bash
 +#!/bin/sh
@@ -16,7 +16,16 @@
  if [ $? = 0 ]; then
    FREEBSD=1
  else
-@@ -50,7 +50,7 @@
+@@ -59,7 +59,7 @@
+ QT_IM='N'
+ for i in qt3 qt4
+ do
+-  QT_IM_DIR=/usr/lib/$i/plugins/lib/inputmethods
++  QT_IM_DIR=$prefix/lib/$i/plugins/lib/inputmethods
+   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 @@
  
  bindir=$prefix/bin
  datadir=$prefix/share
@@ -24,8 +33,21 @@
 +mandir=$prefix/man
  libdir=$prefix/lib
  includedir=$prefix/include
- GCIN_VERSION=`cat VERSION.gcin`
-@@ -61,7 +61,7 @@
+ optdir=/opt
+@@ -100,20 +100,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'
+-  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"
+-fi
+-
+ 
+ OPTFLAGS="-g"
+ if [ $prefix = /usr ]; then
    OPTFLAGS="-O"
  fi
  
@@ -34,7 +56,7 @@
  echo "MAKE=$MAKE" >> config.mak
  echo "GTKINC=$GTKINC" >> config.mak
  echo "prefix=$prefix" >> config.mak
-@@ -81,8 +81,8 @@
+@@ -133,8 +126,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
new file mode 100644
index 000000000000..d3e6c616dded
--- /dev/null
+++ b/chinese/gcin/files/patch-tsin.c
@@ -0,0 +1,11 @@
+--- 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()
+ {