ports/86373: [UPDATE] chinese/gcin: upgrade to 1.0.7

[chinsan]

>Number:         86373
>Category:       ports
>Synopsis:       [UPDATE] chinese/gcin: upgrade to 1.0.7
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 20 15:10:05 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     chinsan
>Release:        FreeBSD 5.4-STABLE i386
>Organization:
Giga
>Environment:
System: FreeBSD chinsan.twbbs.org 5.4-STABLE FreeBSD 5.4-STABLE #0: Sun Aug 14 21:25:08 CST 2005 root at chinsan.twbbs.org:/usr/obj/usr/src/sys/TAKAKO i386
>Description:

	- upgrade to 1.0.7
	- fix some new bug...

	Thank you! :)

>How-To-Repeat:
>Fix:

--- gcin.diff begins here ---
diff -ruN gcin.orig/Makefile gcin/Makefile
--- gcin.orig/Makefile	Tue Sep 20 21:17:00 2005
+++ gcin/Makefile	Tue Sep 20 22:19:09 2005
@@ -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 @@
 		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 -ruN gcin.orig/distinfo gcin/distinfo
--- gcin.orig/distinfo	Tue Sep 20 21:17:00 2005
+++ gcin/distinfo	Tue Sep 20 22:19:14 2005
@@ -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 -ruN gcin.orig/files/patch-configure gcin/files/patch-configure
--- gcin.orig/files/patch-configure	Tue Sep 20 21:17:00 2005
+++ gcin/files/patch-configure	Tue Sep 20 22:14:39 2005
@@ -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 -ruN gcin.orig/files/patch-tsin.c gcin/files/patch-tsin.c
--- gcin.orig/files/patch-tsin.c	Thu Jan  1 08:00:00 1970
+++ gcin/files/patch-tsin.c	Tue Sep 20 23:03:04 2005
@@ -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()
+ {
--- gcin.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: