aboutsummaryrefslogtreecommitdiff
path: root/japanese/kinput2
diff options
context:
space:
mode:
authorHiroki Sato <hrs@FreeBSD.org>2008-12-28 04:51:40 +0000
committerHiroki Sato <hrs@FreeBSD.org>2008-12-28 04:51:40 +0000
commit15d82c528c5b84afb49d61ff59af8eed229d4cc1 (patch)
tree8059848162cbdbc2a509b50ea484b52e8044a104 /japanese/kinput2
parente5463667af1a4f9e799c7bfa4ef020341ad643fa (diff)
downloadports-15d82c528c5b84afb49d61ff59af8eed229d4cc1.tar.gz
ports-15d82c528c5b84afb49d61ff59af8eed229d4cc1.zip
Prioritize $JSERVER over "CcWnn.Jserver" in the resource file for
server name lookup for consistency. Bump PORTREVISION.
Notes
Notes: svn path=/head/; revision=224870
Diffstat (limited to 'japanese/kinput2')
-rw-r--r--japanese/kinput2/Makefile2
-rw-r--r--japanese/kinput2/files/patch-lib-CcWnn.c22
2 files changed, 23 insertions, 1 deletions
diff --git a/japanese/kinput2/Makefile b/japanese/kinput2/Makefile
index aa7992f3f3b3..64cd6db0b376 100644
--- a/japanese/kinput2/Makefile
+++ b/japanese/kinput2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kinput2
PORTVERSION= 3.1
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= japanese x11
MASTER_SITES= ftp://ftp.sra.co.jp/pub/x11/kinput2/
DISTNAME= ${PORTNAME}-v${PORTVERSION}
diff --git a/japanese/kinput2/files/patch-lib-CcWnn.c b/japanese/kinput2/files/patch-lib-CcWnn.c
new file mode 100644
index 000000000000..e1a27e3d9f00
--- /dev/null
+++ b/japanese/kinput2/files/patch-lib-CcWnn.c
@@ -0,0 +1,22 @@
+--- lib/CcWnn.c.orig 2002-10-03 18:35:27.000000000 +0900
++++ lib/CcWnn.c 2008-12-28 13:32:01.000000000 +0900
+@@ -18,6 +18,8 @@
+ * Author: Makoto Ishisone, Software Research Associates, Inc., Japan
+ */
+
++#include <stdlib.h>
++
+ #include <X11/IntrinsicP.h>
+ #include <X11/StringDefs.h>
+ #include <X11/Xmu/Atoms.h>
+@@ -854,6 +856,10 @@
+ * で、覚えておく。
+ */
+ current_obj = obj;
++ /* Use JSERVER if defined instead of any other configurations */
++ if (getenv("JSERVER") != NULL) {
++ obj->ccWnn.jservername = getenv("JSERVER");
++ }
+ obj->ccWnn.wnnbuf = jcOpen2(obj->ccWnn.jservername,
+ obj->ccWnn.wnnenvname,
+ obj->ccWnn.wnnoverrideenv,