Upgrade to 1.1.7

PR:		ports/93704
Submitted by:	chinsan.tw@gmail.at.com

5 files changed, 27 insertions, 25 deletions

diff --git a/chinese/gcin-devel/Makefile b/chinese/gcin-devel/Makefile
index f11cd90e04fe..fe559bfe6a3b 100644
--- a/chinese/gcin-devel/Makefile
+++ b/chinese/gcin-devel/Makefile
@@ -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/
@@ -23,7 +23,8 @@ USE_BZIP2=	YES
 GNU_CONFIGURE=	YES
 USE_GNOME=	gtk20
 USE_GMAKE=	YES
-USE_REINPLACE=	YES
+
+CONFIGURE_ENV+=	"--new_gtk_im=Y"
 
 MAN1=		gcin.1 gcin2tab.1
 
diff --git a/chinese/gcin-devel/distinfo b/chinese/gcin-devel/distinfo
index a409f39d40cb..62b21cdca4d1 100644
--- a/chinese/gcin-devel/distinfo
+++ b/chinese/gcin-devel/distinfo
@@ -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 --git a/chinese/gcin-devel/files/patch-configure b/chinese/gcin-devel/files/patch-configure
index a43718efd328..62b212276ec3 100644
--- a/chinese/gcin-devel/files/patch-configure
+++ b/chinese/gcin-devel/files/patch-configure
@@ -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 --git a/chinese/gcin-devel/files/patch-script b/chinese/gcin-devel/files/patch-script
index 736197ca08f0..a9f7618064b9 100644
--- a/chinese/gcin-devel/files/patch-script
+++ b/chinese/gcin-devel/files/patch-script
@@ -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 @@ diff -ruN scripts.orig/Makefile scripts/Makefile
  	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 @@ diff -ruN scripts.orig/gcin-user-setup scripts/gcin-user-setup
  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 @@ diff -ruN scripts.orig/utf8-edit scripts/utf8-edit
 -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
diff --git a/chinese/gcin-devel/pkg-plist b/chinese/gcin-devel/pkg-plist
index 0bc8e191990b..a6fef275f92d 100644
--- a/chinese/gcin-devel/pkg-plist
+++ b/chinese/gcin-devel/pkg-plist
@@ -48,8 +48,8 @@ share/gnome/control-center-2.0/capplets/gcin-setup.desktop
 share/icons/gcin.png
 share/icons/gcin/pin-fixed24.png
 share/icons/gcin/pin-float16.png
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%% 
-@dirrmtry share/icons/gcin 
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
+@dirrmtry share/icons/gcin
 @dirrmtry share/icons
 @dirrmtry share/gnome/control-center-2.0/capplets
 @dirrmtry share/gnome/control-center-2.0