- Fix problem with GTK_IM_MODULE set to gcin [1]

- Make pkg-message more clear [2]

PR:		ports/108821 [1], ports/108791 [2]
Submitted by:	eliu (author) via chinsan [1], chinsan (maintainer) [2]

4 files changed, 20 insertions, 20 deletions

diff --git a/chinese/gcin-devel/Makefile b/chinese/gcin-devel/Makefile
index 0d738bdd6e2b..1e7890e09d92 100644
--- a/chinese/gcin-devel/Makefile
+++ b/chinese/gcin-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gcin
 PORTVERSION=	1.3.3
+PORTREVISION=	1
 CATEGORIES=	chinese textproc gnome
 MASTER_SITES=	http://cle.linux.org.tw/gcin/download/:main \
 		http://ftp.twaren.net/local-distfiles/gcin/:main \
@@ -62,8 +63,8 @@ pre-patch:
 		${WRKSRC}/scripts/utf8-edit ${WRKSRC}/scripts/gcin-user-setup \
 		${WRKSRC}/scripts/gtab.append_prepare
 	@${REINPLACE_CMD} -e 's,wget,fetch,' ${WRKSRC}/scripts/noseeing-inst
-	@${REINPLACE_CMD} -e 's,gcin-im-client.h,im-client/gcin-im-client.h,' \
-		${WRKSRC}/gtk-im/gtkimcontextgcin.c
+	@${REINPLACE_CMD} -e 's,gcin-im-client.h,im-client/gcin-im-client.h,; \
+		s,if 1,if 0,' ${WRKSRC}/gtk-im/gtkimcontextgcin.c
 	@${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},' \
 		${WRKSRC}/IMdkit/lib/Makefile ${WRKSRC}/Makefile \
 		${WRKSRC}/qt-im/Makefile ${WRKSRC}/scripts/modify-XIM \
diff --git a/chinese/gcin-devel/pkg-message b/chinese/gcin-devel/pkg-message
index 553c1c4cbd07..8989ae6e4a9d 100644
--- a/chinese/gcin-devel/pkg-message
+++ b/chinese/gcin-devel/pkg-message
@@ -1,11 +1,10 @@
---------------------------------------------------------------------
-Remember to set environment varible:
-
-  (csh/tcsh) 				(sh/bash)
-  setenv XMODIFIERS @im=gcin		export XMODIFIERS='@im=gcin'
-
-Finally, to start the GCIN input method daemon, use command:
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+Remember to set these environment varibles (such as your ~/.xinitrc):
+
+  export XMODIFIERS='@im=gcin'
+  export GTK_IM_MODULE=xim
 
+  # Finally, to start the GCIN input method daemon, use command:
   exec gcin &
 
---------------------------------------------------------------------
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
diff --git a/chinese/gcin/Makefile b/chinese/gcin/Makefile
index 0d738bdd6e2b..1e7890e09d92 100644
--- a/chinese/gcin/Makefile
+++ b/chinese/gcin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gcin
 PORTVERSION=	1.3.3
+PORTREVISION=	1
 CATEGORIES=	chinese textproc gnome
 MASTER_SITES=	http://cle.linux.org.tw/gcin/download/:main \
 		http://ftp.twaren.net/local-distfiles/gcin/:main \
@@ -62,8 +63,8 @@ pre-patch:
 		${WRKSRC}/scripts/utf8-edit ${WRKSRC}/scripts/gcin-user-setup \
 		${WRKSRC}/scripts/gtab.append_prepare
 	@${REINPLACE_CMD} -e 's,wget,fetch,' ${WRKSRC}/scripts/noseeing-inst
-	@${REINPLACE_CMD} -e 's,gcin-im-client.h,im-client/gcin-im-client.h,' \
-		${WRKSRC}/gtk-im/gtkimcontextgcin.c
+	@${REINPLACE_CMD} -e 's,gcin-im-client.h,im-client/gcin-im-client.h,; \
+		s,if 1,if 0,' ${WRKSRC}/gtk-im/gtkimcontextgcin.c
 	@${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},' \
 		${WRKSRC}/IMdkit/lib/Makefile ${WRKSRC}/Makefile \
 		${WRKSRC}/qt-im/Makefile ${WRKSRC}/scripts/modify-XIM \
diff --git a/chinese/gcin/pkg-message b/chinese/gcin/pkg-message
index 553c1c4cbd07..8989ae6e4a9d 100644
--- a/chinese/gcin/pkg-message
+++ b/chinese/gcin/pkg-message
@@ -1,11 +1,10 @@
---------------------------------------------------------------------
-Remember to set environment varible:
-
-  (csh/tcsh) 				(sh/bash)
-  setenv XMODIFIERS @im=gcin		export XMODIFIERS='@im=gcin'
-
-Finally, to start the GCIN input method daemon, use command:
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+Remember to set these environment varibles (such as your ~/.xinitrc):
+
+  export XMODIFIERS='@im=gcin'
+  export GTK_IM_MODULE=xim
 
+  # Finally, to start the GCIN input method daemon, use command:
   exec gcin &
 
---------------------------------------------------------------------
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=