Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 22 Feb 2006 21:45:37 +0800 (CST)
From:      chinsan <chinsan.tw@gmail.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        vanilla@FreeBSD.org
Subject:   ports/93704: [PATCH] chinese/gcin: update to 1.1.7
Message-ID:  <20060222134537.80196F51BB3@chinsan.twbbs.org>
Resent-Message-ID: <200602221350.k1MDo4Ui008983@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         93704
>Category:       ports
>Synopsis:       [PATCH] chinese/gcin: update to 1.1.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:   Wed Feb 22 13:50:03 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     chinsan
>Release:        FreeBSD 5.4-STABLE i386
>Organization:
FreeBSD Taiwan
>Environment:
System: FreeBSD chinsan.twbbs.org 5.4-STABLE FreeBSD 5.4-STABLE #0: Mon Jan  9 00:28:33 CST
>Description:
- Update to 1.1.7

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- gcin-1.1.7.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/chinese/gcin/Makefile /usr/home/chinsan/project/gcin/Makefile
--- /usr/ports/chinese/gcin/Makefile	Thu Feb  2 12:16:36 2006
+++ /usr/home/chinsan/project/gcin/Makefile	Wed Feb 22 21:28:45 2006
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gcin
-PORTVERSION=	1.1.6
+PORTVERSION=	1.1.7
 CATEGORIES=	chinese textproc gnome
 MASTER_SITES=	http://www.csie.nctu.edu.tw/~cp76/gcin/download/ \
 		http://edt1023.sayya.org/misc/
@@ -24,6 +24,8 @@
 USE_GNOME=	gtk20
 USE_GMAKE=	YES
 USE_REINPLACE=	YES
+
+CONFIGURE_ENV+=	"--new_gtk_im=Y"
 
 MAN1=		gcin.1 gcin2tab.1
 
diff -ruN --exclude=CVS /usr/ports/chinese/gcin/distinfo /usr/home/chinsan/project/gcin/distinfo
--- /usr/ports/chinese/gcin/distinfo	Thu Feb  2 12:16:36 2006
+++ /usr/home/chinsan/project/gcin/distinfo	Wed Feb 22 21:40:20 2006
@@ -1,5 +1,5 @@
-MD5 (gcin-1.1.6.tar.bz2) = ba260cdb45777e847dff405bec55c7f1
-SHA256 (gcin-1.1.6.tar.bz2) = bd3148027b7f827990e7b936339b392cd3140f9b49ac5616329cc7d85b7ebeb1
-SIZE (gcin-1.1.6.tar.bz2) = 1391691
+MD5 (gcin-1.1.7.tar.bz2) = a2b08008e17c86d31fbed707c9d156ee
+SHA256 (gcin-1.1.7.tar.bz2) = 8e63077c2d9340492539334f8229893e231158ca192b7a3066a73daa7e5697ea
+SIZE (gcin-1.1.7.tar.bz2) = 1392767
 MD5 (noseeing.tar.gz) = IGNORE
 SHA256 (noseeing.tar.gz) = IGNORE
diff -ruN --exclude=CVS /usr/ports/chinese/gcin/files/patch-configure /usr/home/chinsan/project/gcin/files/patch-configure
--- /usr/ports/chinese/gcin/files/patch-configure	Sun Jan 15 18:19:20 2006
+++ /usr/home/chinsan/project/gcin/files/patch-configure	Wed Feb 22 21:34:47 2006
@@ -1,5 +1,5 @@
---- configure.orig	Sat Jan 14 18:08:41 2006
-+++ configure	Sat Jan 14 18:12:44 2006
+--- configure.orig	Wed Feb 22 21:25:55 2006
++++ configure	Wed Feb 22 21:34:26 2006
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
@@ -21,16 +21,16 @@
  if [ $? = 0 ]; then
    FREEBSD=1
  else
-@@ -70,7 +70,7 @@
+@@ -74,7 +74,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
+-  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'
-@@ -88,7 +88,7 @@
+@@ -92,7 +92,7 @@
  
  bindir=$prefix/bin
  datadir=$prefix/share
@@ -39,7 +39,7 @@
  libdir=$prefix/lib
  includedir=$prefix/include
  optdir=/opt
-@@ -101,8 +101,8 @@
+@@ -105,8 +105,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
@@ -50,7 +50,7 @@
  fi
  
  
-@@ -111,21 +111,13 @@
+@@ -115,14 +115,6 @@
    grep -v qt3/plugins/inputmethods gcin.spec.tmp > gcin.spec
  fi
  
@@ -65,15 +65,16 @@
  
  OPTFLAGS="-g"
  if [ $prefix = /usr ]; then
-   OPTFLAGS="-O"
+@@ -130,7 +122,7 @@
  fi
  
+ 
 -echo "CC=gcc" > config.mak
 +echo "CC=$CC" > config.mak
  echo "MAKE=$MAKE" >> config.mak
  echo "GTKINC=$GTKINC" >> config.mak
  echo "prefix=$prefix" >> config.mak
-@@ -145,8 +137,8 @@
+@@ -150,8 +142,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 --exclude=CVS /usr/ports/chinese/gcin/files/patch-script /usr/home/chinsan/project/gcin/files/patch-script
--- /usr/ports/chinese/gcin/files/patch-script	Thu Feb  2 12:16:36 2006
+++ /usr/home/chinsan/project/gcin/files/patch-script	Wed Feb 22 21:39:39 2006
@@ -1,6 +1,6 @@
 diff -ruN scripts.orig/Makefile scripts/Makefile
---- scripts.orig/Makefile	Wed Feb  1 23:09:30 2006
-+++ scripts/Makefile	Wed Feb  1 23:10:09 2006
+--- scripts.orig/Makefile	Wed Feb 22 21:35:19 2006
++++ scripts/Makefile	Wed Feb 22 21:36:28 2006
 @@ -1,13 +1,10 @@
  include ../config.mak
  
@@ -17,8 +17,8 @@
  	install -m 755 $(SCRIPTS) $(GCIN_SCRIPT_DIR_i)
  clean:
 diff -ruN scripts.orig/gcin-user-setup scripts/gcin-user-setup
---- scripts.orig/gcin-user-setup	Wed Feb  1 23:09:30 2006
-+++ scripts/gcin-user-setup	Wed Feb  1 23:11:10 2006
+--- scripts.orig/gcin-user-setup	Wed Feb 22 21:35:19 2006
++++ scripts/gcin-user-setup	Wed Feb 22 21:36:44 2006
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
@@ -26,8 +26,8 @@
  if [ -z "$1" -o -z "$2" ]; then
    echo "please specify gcin_table_dir gcin_bin_dir"
 diff -ruN scripts.orig/utf8-edit scripts/utf8-edit
---- scripts.orig/utf8-edit	Wed Feb  1 23:09:30 2006
-+++ scripts/utf8-edit	Wed Feb  1 23:16:32 2006
+--- scripts.orig/utf8-edit	Wed Feb 22 21:35:19 2006
++++ scripts/utf8-edit	Wed Feb 22 21:37:58 2006
 @@ -1,10 +1,10 @@
 -#!/bin/bash
 +#!/bin/sh
@@ -35,8 +35,8 @@
 -PATH=$PATH:/opt/gnome/bin:/usr/local/bin
 +PATH=$PATH:/usr/X11R6/bin:/usr/local/bin
  
--for i in leafpad gedit kedit kate
-+for i in leafpad gedit gvim kedit kate jedit
+-for i in leafpad gedit madedit kedit kate
++for i in leafpad gedit gvim madedit kedit kate
  do
 -  which $i >& /dev/null
 +  which $i > /dev/null
--- gcin-1.1.7.patch ends here ---

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060222134537.80196F51BB3>