Update gcin to 1.1.6 & use x11/gtk2/modules.mk to deal with gtk2 im module.

1.1.6:
- XIM en_US.UTF-8 support.
- Fix the problem gcin can't be used with gdmxnest.
- If you set disable XIM when compile, gcin -v will not display version.
- The largest font size is 32 in gcin-setup.

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

5 files changed, 29 insertions, 19 deletions

diff --git a/inputmethod/gcin/Makefile b/inputmethod/gcin/Makefile
index 4fbd99efb07..f153ce47b8f 100644
--- a/inputmethod/gcin/Makefile
+++ b/inputmethod/gcin/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2006/02/05 23:09:42 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2006/02/20 18:16:54 rxg Exp $
 #
 
-DISTNAME=		gcin-1.1.5
-PKGREVISION=		2
+DISTNAME=		gcin-1.1.6
 CATEGORIES=		inputmethod
 MASTER_SITES=		http://www.csie.nctu.edu.tw/~cp76/gcin/download/
 EXTRACT_SUFX=		.tar.bz2
@@ -25,9 +24,8 @@ _REPLACE.sh.old=	/bin/bash
 _REPLACE.sh.new=	${SH:Q}
 _REPLACE_FILES.sh=	configure
 _REPLACE_FILES.sh+=	scripts/gcin-user-setup
-_REPLACE_FILES.sh+=	scripts/gcin-utf8-setup
 _REPLACE_FILES.sh+=	scripts/modify-XIM
 _REPLACE_FILES.sh+=	scripts/utf8-edit
 
-.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/gtk2/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/gcin/PLIST b/inputmethod/gcin/PLIST
index 18603a4031a..629d41abffe 100644
--- a/inputmethod/gcin/PLIST
+++ b/inputmethod/gcin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2006/02/01 02:42:13 rxg Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/02/20 18:16:54 rxg Exp $
 bin/gcin
 bin/gcin-setup
 bin/gcin2tab
@@ -21,7 +21,6 @@ share/control-center-2.0/capplets/gcin-setup.desktop
 share/doc/${PKGNAME}/Changelog
 share/doc/${PKGNAME}/README
 share/gcin/script/gcin-user-setup
-share/gcin/script/gcin-utf8-setup
 share/gcin/script/modify-XIM
 share/gcin/script/utf8-edit
 share/gcin/table/ar30.gtab
diff --git a/inputmethod/gcin/distinfo b/inputmethod/gcin/distinfo
index 4623eedf327..9545734180c 100644
--- a/inputmethod/gcin/distinfo
+++ b/inputmethod/gcin/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/01/16 13:01:16 rxg Exp $
+$NetBSD: distinfo,v 1.2 2006/02/20 18:16:54 rxg Exp $
 
-SHA1 (gcin-1.1.5.tar.bz2) = c8a0d306c3865aa139f2450c553d0511c93089be
-RMD160 (gcin-1.1.5.tar.bz2) = e611a9986fd6eab945a5763bccb09744db9af1d5
-Size (gcin-1.1.5.tar.bz2) = 1375846 bytes
+SHA1 (gcin-1.1.6.tar.bz2) = 6f3ed4f000158f5b0b8e91847427a7cd331dbf99
+RMD160 (gcin-1.1.6.tar.bz2) = 5f6d35cad449859e1af90aa5d772e04516d3d69a
+Size (gcin-1.1.6.tar.bz2) = 1391691 bytes
 SHA1 (patch-aa) = ba3cbaad9cd300f5a7dedff7f67e409a7fbcbe28
 SHA1 (patch-ab) = ae3098ed94f821a471161fe0299e0dcc4df0119b
 SHA1 (patch-ac) = 45c8bf6d7fe855f92ed7aa15064d0d58070fa588
-SHA1 (patch-ad) = 524d38ae0b6c21f1e934920027051adad0626b1e
-SHA1 (patch-ae) = 0c77825091b8895cf535fa26cf3380aafdcd3c4b
+SHA1 (patch-ad) = 66529156d2af3c696a87f6fef05bb02166188bd4
+SHA1 (patch-ae) = 26cfd5fdba8c57177468bd1ae407f75ed866c04a
 SHA1 (patch-af) = e66965a840e67afe007c4ddaa55cba572cf49e6f
 SHA1 (patch-ag) = d3e16fd690f132bd687ceda2d13041e447147f6e
diff --git a/inputmethod/gcin/patches/patch-ad b/inputmethod/gcin/patches/patch-ad
index a274e71e6f5..02b61660988 100644
--- a/inputmethod/gcin/patches/patch-ad
+++ b/inputmethod/gcin/patches/patch-ad
@@ -1,10 +1,15 @@
-$NetBSD: patch-ad,v 1.1.1.1 2006/01/16 13:01:16 rxg Exp $
+$NetBSD: patch-ad,v 1.2 2006/02/20 18:16:54 rxg Exp $
 
 --- im-client/Makefile.orig	2005-05-09 12:23:22.000000000 +0800
 +++ im-client/Makefile
-@@ -6,23 +6,18 @@ CFLAGS= $(WALL) $(OPTFLAGS) -I. -I.. -I.
-         -DCLIENT_LIB=1 -DGCIN_BIN_DIR=\"$(GCIN_BIN_DIR)\" \
-         -DDEBUG="0$(GCIN_DEBUG)" -DGCIN_TABLE_DIR=\"$(GCIN_TABLE_DIR)\" \
+@@ -3,26 +3,21 @@ include ../config.mak
+ .SUFFIXES:      .c .o .E
+ WALL=-Wall
+ CFLAGS= $(WALL) $(OPTFLAGS) -I. -I.. -I../IMdkit/include $(GTKINC) \
+-        -DCLIENT_LIB=1 -DGCIN_BIN_DIR=\"$(GCIN_BIN_DIR)\" \
+-        -DDEBUG="0$(GCIN_DEBUG)" -DGCIN_TABLE_DIR=\"$(GCIN_TABLE_DIR)\" \
++        -DGCIN_BIN_DIR=\"$(GCIN_BIN_DIR)\" \
++        -DGCIN_TABLE_DIR=\"$(GCIN_TABLE_DIR)\" \
          -DFREEBSD=$(FREEBSD)
 -OBJS = gcin-im-client.o im-addr.o gcin-conf.o util.o gcin-crypt.o
 +OBJS = gcin-im-client.o ../im-srv/im-addr.o ../gcin-conf.o ../util.o gcin-crypt.o
diff --git a/inputmethod/gcin/patches/patch-ae b/inputmethod/gcin/patches/patch-ae
index a16059abde4..98864b9c65a 100644
--- a/inputmethod/gcin/patches/patch-ae
+++ b/inputmethod/gcin/patches/patch-ae
@@ -1,8 +1,16 @@
-$NetBSD: patch-ae,v 1.1.1.1 2006/01/16 13:01:16 rxg Exp $
+$NetBSD: patch-ae,v 1.2 2006/02/20 18:16:54 rxg Exp $
 
 --- gtk-im/Makefile.orig	2005-09-14 00:29:56.000000000 +0800
 +++ gtk-im/Makefile
-@@ -13,23 +13,18 @@ CFLAGS += -DNEW_GTK_IM=1
+@@ -6,30 +6,25 @@ IMMODULES=$(libdir)/$(GTK2IM)
+ IMMODULES_LOCAL=/usr/lib/$(GTK2IM)
+ 
+ .SUFFIXES:	.c .o .E
+-CFLAGS = $(OPTFLAGS) $(GTKINC) -I../im-client -I.. -I../IMdkit/include -DCLIENT_LIB=1
++CFLAGS = $(OPTFLAGS) $(GTKINC) -I../im-client -I.. -I../IMdkit/include
+ 
+ ifeq ($(NEW_GTK_IM),Y)
+ CFLAGS += -DNEW_GTK_IM=1
  endif
  
  .c.o: