Updated gcin to 1.1.7.

1.1.7:
- Fix the bug that it can use LC_CTYPE to set locale only.
- Add x86_64 support?

See
http://ccbsd9.csie.nctu.edu.tw/~cp76/gcin/download/Changelog
for more detail.

3 files changed, 28 insertions, 11 deletions

diff --git a/inputmethod/gcin/patches/patch-ab b/inputmethod/gcin/patches/patch-ab
index 2c841e4922f..4a84cd96405 100644
--- a/inputmethod/gcin/patches/patch-ab
+++ b/inputmethod/gcin/patches/patch-ab
@@ -1,7 +1,16 @@
-$NetBSD: patch-ab,v 1.1.1.1 2006/01/16 13:01:16 rxg Exp $
+$NetBSD: patch-ab,v 1.2 2006/02/22 14:55:54 rxg Exp $
 
---- Makefile.orig	2005-10-16 10:19:45.000000000 +0800
+--- Makefile.orig	2006-02-16 17:36:08.000000000 +0800
 +++ Makefile
+@@ -23,7 +23,7 @@ OBJS_gcin2tab=gcin2tab.o gtab-util.o uti
+ OBJS_gcin_steup=gcin-setup.o gcin-conf.o util.o gcin-send.o gcin-settings.o \
+ 	gcin-setup-list.o gcin-switch.o locale.o gcin-setup-pho.o about.o
+ WALL=-Wall
+-CFLAGS= $(WALL) $(OPTFLAGS) $(GTKINC) -I./IMdkit/include -DDEBUG="0$(GCIN_DEBUG)" \
++CFLAGS= $(WALL) $(GTKINC) -I./IMdkit/include \
+         -DGCIN_TABLE_DIR=\"$(GCIN_TABLE_DIR)\"  -DDOC_DIR=\"$(DOC_DIR)\" \
+         -DGCIN_ICON_DIR=\"$(GCIN_ICON_DIR)\" -DGCIN_VERSION=\"$(GCIN_VERSION)\" \
+         -DGCIN_SCRIPT_DIR=\"$(GCIN_SCRIPT_DIR)\" -DGCIN_BIN_DIR=\"$(GCIN_BIN_DIR)\" \
 @@ -36,8 +36,8 @@ endif
  
  im-srv = im-srv/im-srv.a
diff --git a/inputmethod/gcin/patches/patch-ad b/inputmethod/gcin/patches/patch-ad
index 02b61660988..cc91be4be2a 100644
--- a/inputmethod/gcin/patches/patch-ad
+++ b/inputmethod/gcin/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2006/02/20 18:16:54 rxg Exp $
+$NetBSD: patch-ad,v 1.3 2006/02/22 14:55:54 rxg Exp $
 
---- im-client/Makefile.orig	2005-05-09 12:23:22.000000000 +0800
+--- im-client/Makefile.orig	2006-02-16 18:23:34.000000000 +0800
 +++ im-client/Makefile
-@@ -3,26 +3,21 @@ include ../config.mak
+@@ -3,34 +3,23 @@ include ../config.mak
  .SUFFIXES:      .c .o .E
  WALL=-Wall
  CFLAGS= $(WALL) $(OPTFLAGS) -I. -I.. -I../IMdkit/include $(GTKINC) \
@@ -12,6 +12,9 @@ $NetBSD: patch-ad,v 1.2 2006/02/20 18:16:54 rxg Exp $
 +        -DGCIN_TABLE_DIR=\"$(GCIN_TABLE_DIR)\" \
          -DFREEBSD=$(FREEBSD)
 -OBJS = gcin-im-client.o im-addr.o gcin-conf.o util.o gcin-crypt.o
+-
+-.c.E:
+-	$(CC) $(CFLAGS) -E -o $@ $<
 +OBJS = gcin-im-client.o ../im-srv/im-addr.o ../gcin-conf.o ../util.o gcin-crypt.o
  
  .c.o:
@@ -24,13 +27,18 @@ $NetBSD: patch-ad,v 1.2 2006/02/20 18:16:54 rxg Exp $
 +	$(LIBTOOL) --mode=link $(CC) $(OBJS:.o=.lo) -o $@ -rpath $(libdir) -version-info 1:1
  	$(MAKE) -C ../gtk-im
  
+ LOCALLIB=/usr/local/$(LIB)
+ 
  install:
  	install -d $(libdir)
--	install -m 755 libgcin-im-client.so $(libdir)
 -	if [ $(prefix) = /usr/local ]; then \
--	  grep /usr/local/lib /etc/ld.so.conf > /dev/null 2>&1 || \
--	  echo /usr/local/lib >> /etc/ld.so.conf; \
+-	  ! [ -d $(LOCALLIB) ] && mkdir $(LOCALLIB) ; \
+-	  install -m 755 libgcin-im-client.so $(LOCALLIB); \
+-	  grep $(LOCALLIB) /etc/ld.so.conf > /dev/null 2>&1 || \
+-	  echo $(LOCALLIB) >> /etc/ld.so.conf; \
 -	  PATH=/sbin:/usr/sbin:$(PATH); ldconfig; \
+-	else \
+-	  install -m 755 libgcin-im-client.so $(libdir); \
 -	fi; \
 +	$(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) libgcin-im-client.la $(libdir)
  	install -d $(includedir); \
diff --git a/inputmethod/gcin/patches/patch-ae b/inputmethod/gcin/patches/patch-ae
index 98864b9c65a..f1a03e06d7d 100644
--- a/inputmethod/gcin/patches/patch-ae
+++ b/inputmethod/gcin/patches/patch-ae
@@ -1,9 +1,9 @@
-$NetBSD: patch-ae,v 1.2 2006/02/20 18:16:54 rxg Exp $
+$NetBSD: patch-ae,v 1.3 2006/02/22 14:55:54 rxg Exp $
 
---- gtk-im/Makefile.orig	2005-09-14 00:29:56.000000000 +0800
+--- gtk-im/Makefile.orig	2006-02-22 21:11:46.000000000 +0800
 +++ gtk-im/Makefile
 @@ -6,30 +6,25 @@ IMMODULES=$(libdir)/$(GTK2IM)
- IMMODULES_LOCAL=/usr/lib/$(GTK2IM)
+ IMMODULES_LOCAL=/usr/$(LIB)/$(GTK2IM)
  
  .SUFFIXES:	.c .o .E
 -CFLAGS = $(OPTFLAGS) $(GTKINC) -I../im-client -I.. -I../IMdkit/include -DCLIENT_LIB=1