From 3f3838b673c3bf3be824f253fa1dee247a100185 Mon Sep 17 00:00:00 2001
From: Kevin Lo <kevlo@FreeBSD.org>
Date: Mon, 1 Nov 2010 09:38:47 +0000
Subject: [PATCH] Add iBus configuration

---
 chinese/auto-tw-l10n/Makefile                |  6 ++--
 chinese/auto-tw-l10n/files/patch-doc.xinitrc | 29 +++++++++++++++++---
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/chinese/auto-tw-l10n/Makefile b/chinese/auto-tw-l10n/Makefile
index a1e18d313690..513aa96ceac1 100644
--- a/chinese/auto-tw-l10n/Makefile
+++ b/chinese/auto-tw-l10n/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	auto-tw-l10n
 PORTVERSION=	1.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	chinese
 MASTER_SITES=	LOCAL/chinsan
 DISTNAME=	zh-${PORTNAME}-${PORTVERSION}
@@ -23,7 +23,7 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 SUB_FILES=	pkg-install pkg-message
 SUB_LIST=	PREFIX=${PREFIX} ZONE=${ZONE} SOURCE_DIR=${WRKSRC} \
 		WRKDIR=${WRKDIR} FASTEST_CVSUP=${FASTEST_CVSUP}
-OPTIONS=	KDE "Enable KDE support" Off
+OPTIONS=	KDE3 "Enable KDE support" Off
 
 FASTEST_CVSUP?=	${LOCALBASE}/bin/fastest_cvsup
 ZONE?=		tw
@@ -31,7 +31,7 @@ ZONE?=		tw
 .include <bsd.port.pre.mk>
 
 post-patch:
-.if defined(WITH_KDE)
+.if defined(WITH_KDE3)
 	@${REINPLACE_CMD} -e '5 s/en_US.ISO8859-1/zh_TW.Big5/g' \
 		${WRKSRC}/dot.cshrc
 	@${REINPLACE_CMD} -e '1 s/en_US.ISO8859-1/zh_TW.Big5/g' \
diff --git a/chinese/auto-tw-l10n/files/patch-doc.xinitrc b/chinese/auto-tw-l10n/files/patch-doc.xinitrc
index e767bf9add14..3b3587de2232 100644
--- a/chinese/auto-tw-l10n/files/patch-doc.xinitrc
+++ b/chinese/auto-tw-l10n/files/patch-doc.xinitrc
@@ -1,12 +1,33 @@
---- dot.xinitrc.orig	2010-04-12 10:24:29.000000000 +0800
-+++ dot.xinitrc	2010-04-12 10:26:46.000000000 +0800
-@@ -1,3 +1,5 @@
+--- dot.xinitrc.orig	2007-10-23 18:39:29.000000000 +0800
++++ dot.xinitrc	2010-11-01 17:23:01.000000000 +0800
+@@ -1,14 +1,18 @@
 +# KDE4
 +#export PATH=/usr/local/kde4/bin:$PATH
  
  export TERM=xterm
  
-@@ -34,4 +36,4 @@
+ export XMODIFIERS='@im=xcin'
+ #export XMODIFIERS='@im=SCIM'
+ #export XMODIFIERS='@im=oxim'
++#export XMODIFIERS=@im=ibus
+ 
+ #export GTK_IM_MODULE=xcin
+ export GTK_IM_MODULE=xim
+ #export GTK_IM_MODULE=scim
+ #export GTK_IM_MODULE=oxim
++#export GTK_IM_MODULE=ibus
+ 
+ export QT_IM_MODULE=xim
+ 
+@@ -19,6 +23,7 @@
+ #exec xcin2.5 &
+ #scim -d &
+ #exec oxim &
++#ibus-daemon -d -x &
+ 
+ # turn on numlock (x11/numlockx)
+ numlockx
+@@ -34,4 +39,4 @@
  #exec startkde
  #exec wmaker
  #exec startxfce4