[31224] trunk/dports/x11/kinput2-macim
takanori at macports.org
takanori at macports.org
Sun Nov 18 10:54:05 PST 2007
Revision: 31224
http://trac.macosforge.org/projects/macports/changeset/31224
Author: takanori at macports.org
Date: 2007-11-18 10:54:03 -0800 (Sun, 18 Nov 2007)
Log Message:
-----------
Linted.
Modified Paths:
--------------
trunk/dports/x11/kinput2-macim/Portfile
Added Paths:
-----------
trunk/dports/x11/kinput2-macim/files/patch-kinput2.macim.diff
Removed Paths:
-------------
trunk/dports/x11/kinput2-macim/files/kinput2.macim.patch
Modified: trunk/dports/x11/kinput2-macim/Portfile
===================================================================
--- trunk/dports/x11/kinput2-macim/Portfile 2007-11-18 18:53:22 UTC (rev 31223)
+++ trunk/dports/x11/kinput2-macim/Portfile 2007-11-18 18:54:03 UTC (rev 31224)
@@ -1,11 +1,12 @@
# $Id$
PortSystem 1.0
+
name kinput2-macim
version 3.1.20050629
revision 3
categories x11 japanese
-maintainers takanori at macports.org
+maintainers takanori
description Input server for easy input of Japanese text, using Kotoeri
long_description \
Kinput2 is an input server for X11 applications that want Japanese \
@@ -21,11 +22,12 @@
ftp://ftp.sra.co.jp/pub/x11/kinput2/:kinput2 \
http://homepage1.nifty.com/daemon/MachTen/sonoda/:MachTen \
http://www.sol.dti.ne.jp/~kikuyan/macosx/patches/:macosx
+distname kinput2-v3.1
distfiles kinput2-v3.1.tar.gz:kinput2 \
kinput2.fix4.macim.0.2.patch.gz:MachTen \
Kinput2-MacIM.README.gz:MachTen \
kinput2-v3.1-macim-20050629.patch.gz:macosx
-
+patchfiles patch-kinput2.macim.diff
checksums kinput2-v3.1.tar.gz md5 2de20576f150248d1fdfe66d7cc4e510 \
sha1 48050f70e7c0cc67193ea260f8d7f6e822a02ca3 \
rmd160 c56684769859bbee5f8238cd1af061796ff931e8 \
@@ -41,8 +43,7 @@
depends_lib lib:libX11.6:XFree86
-extract.only kinput2-v3.1.tar.gz
-distname kinput2-v3.1
+extract.only ${distname}${extract.suffix}
post-extract {
system "cd ${worksrcpath} && gzip -cd ${distpath}/kinput2.fix4.macim.0.2.patch.gz | sed -n -e '143,549p' -e '581,\$p' | patch -p1"
system "cd ${worksrcpath} && gzip -cd ${distpath}/kinput2-v3.1-macim-20050629.patch.gz | patch -p0"
@@ -50,7 +51,6 @@
}
patch.pre_args -p1
-patchfiles kinput2.macim.patch
use_xmkmf yes
Deleted: trunk/dports/x11/kinput2-macim/files/kinput2.macim.patch
===================================================================
--- trunk/dports/x11/kinput2-macim/files/kinput2.macim.patch 2007-11-18 18:53:22 UTC (rev 31223)
+++ trunk/dports/x11/kinput2-macim/files/kinput2.macim.patch 2007-11-18 18:54:03 UTC (rev 31224)
@@ -1,217 +0,0 @@
-diff -Naur kinput2-v3.1-macim-20050629.orig/Kinput2.conf kinput2-v3.1-macim-20050629/Kinput2.conf
---- kinput2-v3.1-macim-20050629.orig/Kinput2.conf Thu Jan 22 00:53:19 2004
-+++ kinput2-v3.1-macim-20050629/Kinput2.conf Sat Jun 4 16:28:42 2005
-@@ -79,17 +79,17 @@
- * If you have already installed Canna header files and libraries..
- */
- XCOMM use installed headers/libraries
--XCOMM CANNAINSTDIR = /usr/local/canna
--XCOMM CANNASRC = $(CANNAINSTDIR)/include
--XCOMM CANNALIB = -lcanna16
-+CANNAINSTDIR = $(PREFIX)
-+CANNASRC = $(CANNAINSTDIR)/include
-+CANNALIB = -L$(CANNAINSTDIR)/lib -lcanna16
-
- /*
- * If you have compiled Canna that came with X11R6 (contrib/programs/Canna),
- * but not installed yet..
- */
- XCOMM use headers/libraries in the source tree
--CANNASRC = $(CONTRIBSRC)/programs/Canna32
--CANNALIB = -L$(CANNASRC)/lib/canna16 -lcanna16
-+XCOMM CANNASRC = $(CONTRIBSRC)/programs/Canna32
-+XCOMM CANNALIB = -L$(CANNASRC)/lib/canna16 -lcanna16
-
-
- XCOMM SJ3 configuration
-diff -Naur kinput2-v3.1-macim-20050629.orig/cmd/Imakefile kinput2-v3.1-macim-20050629/cmd/Imakefile
---- kinput2-v3.1-macim-20050629.orig/cmd/Imakefile Thu Jan 22 00:58:31 2004
-+++ kinput2-v3.1-macim-20050629/cmd/Imakefile Sat Jun 4 16:28:42 2005
-@@ -49,5 +49,5 @@
- SRCS = kinput2.c
- OBJS = kinput2.o
-
--ComplexProgramTarget(kinput2)
--InstallAppDefaults(Kinput2)
-+ComplexProgramTargetNoMan(kinput2.macim)
-+InstallAppDefaultsLong(Kinput2,Kinput2_macim)
-diff -Naur kinput2-v3.1-macim-20050629.orig/cmd/Kinput2.ad kinput2-v3.1-macim-20050629/cmd/Kinput2.ad
---- kinput2-v3.1-macim-20050629.orig/cmd/Kinput2.ad Fri May 6 04:35:47 2005
-+++ kinput2-v3.1-macim-20050629/cmd/Kinput2.ad Sat Jun 4 16:28:42 2005
-@@ -5,9 +5,10 @@
- !!
- !! things you shouldn't change
- !!
--Kinput2.mappedWhenManaged: false
--Kinput2.width: 1
--Kinput2.height: 1
-+Kinput2_macim.conversionEngine: macim
-+Kinput2_macim.mappedWhenManaged: false
-+Kinput2_macim.width: 1
-+Kinput2_macim.height: 1
- *converter.accelerators: <Key>: to-inputobj()
- ! AIX seems to need the following superfluous definition.
- *ki2AppDefsLoaded: true
-@@ -96,7 +97,7 @@
- ! XimpProtocol
- *XimpProtocol.ForceDefaultServer: true
- ! X Input Method Protocol
--*IMProtocol.locales: ja_JP.SJIS, ja_JP.EUC, ja_JP, japanese, japan, ja
-+*IMProtocol.locales: ja_JP.UTF-8, ja_JP.eucJP, ja_JP.SJIS, ja_JP, japanese, japan, ja
- ! common to XimpProtocol and IMProtocol
- *defaultFontList: -misc-fixed-medium-r-normal--14-*-*-*-c-*
- *ConversionStartKeys: \
-diff -Naur kinput2-v3.1-macim-20050629.orig/cmd/kinput2.c kinput2-v3.1-macim-20050629/cmd/kinput2.c
---- kinput2-v3.1-macim-20050629.orig/cmd/kinput2.c Tue Mar 23 01:27:35 2004
-+++ kinput2-v3.1-macim-20050629/cmd/kinput2.c Sat Jun 4 16:28:42 2005
-@@ -96,9 +96,9 @@
-
- static String fallback_resources[] = {
- "*ki2AppDefsLoaded: false",
-- "Kinput2.mappedWhenManaged: false",
-- "Kinput2.width: 1",
-- "Kinput2.height: 1",
-+ "Kinput2_macim.mappedWhenManaged: false",
-+ "Kinput2_macim.width: 1",
-+ "Kinput2_macim.height: 1",
- NULL,
- };
-
-@@ -200,7 +200,7 @@
- WidgetClass inputobjclass, displayobjclass;
- Widget inputobj;
-
-- toplevel = XtAppInitialize(&apc, "Kinput2",
-+ toplevel = XtAppInitialize(&apc, "Kinput2_macim",
- options, XtNumber(options),
- &ac, av,
- fallback_resources, (ArgList)NULL, 0);
-diff -Naur kinput2-v3.1-macim-20050629.orig/copyright kinput2-v3.1-macim-20050629/copyright
---- kinput2-v3.1-macim-20050629.orig/copyright Thu Jan 1 00:00:00 1970
-+++ kinput2-v3.1-macim-20050629/copyright Tue May 3 02:14:22 2005
-@@ -0,0 +1,22 @@
-+/*
-+ * kinput2
-+ */
-+
-+/*
-+ * Copyright (C) 1991 by Software Research Associates, Inc.
-+ *
-+ * Permission to use, copy, modify, and distribute this software and its
-+ * documentation for any purpose and without fee is hereby granted, provided
-+ * that the above copyright notice appear in all copies and that both that
-+ * copyright notice and this permission notice appear in supporting
-+ * documentation, and that the name of Software Research Associates not be
-+ * used in advertising or publicity pertaining to distribution of the
-+ * software without specific, written prior permission. Software Research
-+ * Associates makes no representations about the suitability of this software
-+ * for any purpose. It is provided "as is" without express or implied
-+ * warranty.
-+ *
-+ * Author: Makoto Ishisone, Software Research Associates, Inc., Japan
-+ * ishisone at sra.co.jp
-+ */
-+
-diff -Naur kinput2-v3.1-macim-20050629.orig/lib/Canna.c kinput2-v3.1-macim-20050629/lib/Canna.c
---- kinput2-v3.1-macim-20050629.orig/lib/Canna.c Thu Oct 3 09:35:27 2002
-+++ kinput2-v3.1-macim-20050629/lib/Canna.c Tue May 3 02:14:22 2005
-@@ -61,6 +61,10 @@
- #include "CannaP.h"
- #include "DebugPrint.h"
-
-+/* Canna 3.7$B0J9_$O$3$N$h$&$KDj5A$9$k(B */
-+#define CANNA_WCHAR16
-+#define CANNA_NEW_WCHAR_AWARE
-+/* Canna 3.6$B$^$G$N>l9g(B */
- #define _WCHAR_T /* $B$3$NDj5A$O(B jrkanji.h $B$G(B wcKanjiStatus $B$J$I$rDj5A$9$k$?$a(B */
- #define wchar_t wchar
-
-@@ -246,7 +250,7 @@
- kanabuf[0] = '\0';
- nbytes = XKanaLookup(event, kanabuf, 20, &ks, &compose_status);
-
-- buf[0] = (wchar)kanabuf[0]; /* $B$-$?$J$$(B */
-+ buf[0] = (wchar)(unsigned char)kanabuf[0]; /* $B$-$?$J$$(B */
-
- if (ks == XK_space && (event->xkey.state & ShiftMask)) {
- void convend();
-@@ -271,7 +275,7 @@
-
- /* $B$+$J4A;zJQ49$9$k(B */
- len = wcKanjiString((int)obj, (int)buf[0],
-- (wchar_t *)buf, 1024, &kanji_status);
-+ (wchar *)buf, 1024, &kanji_status);
-
- displayPreEdit(obj, len, buf, &kanji_status);
- return (kanji_status.info & KanjiThroughInfo) ? 1 : 0;
-@@ -642,7 +646,9 @@
- CannaObject obj;
- {
- char **warn = 0;
-+#ifndef CANNA_JR_BEEP_FUNC_DECLARED
- extern (*jrBeepFunc)();
-+#endif
-
- if (nCannaContexts == 0) {
- #ifdef KC_SETSERVERNAME
-diff -Naur kinput2-v3.1-macim-20050629.orig/lib/IMProto.c kinput2-v3.1-macim-20050629/lib/IMProto.c
---- kinput2-v3.1-macim-20050629.orig/lib/IMProto.c Thu Oct 3 09:35:28 2002
-+++ kinput2-v3.1-macim-20050629/lib/IMProto.c Tue May 3 02:14:22 2005
-@@ -44,7 +44,7 @@
- #include "im.h"
-
-
--#define SERVER_NAME "kinput2"
-+#define SERVER_NAME "kinput2.macim"
- #define UNIX_SOCKET_DIR "/tmp/.ki2-unix"
-
- /*- resource table -*/
-diff -Naur kinput2-v3.1-macim-20050629.orig/lib/XimpProto.c kinput2-v3.1-macim-20050629/lib/XimpProto.c
---- kinput2-v3.1-macim-20050629.orig/lib/XimpProto.c Thu Oct 3 09:35:28 2002
-+++ kinput2-v3.1-macim-20050629/lib/XimpProto.c Tue May 3 02:14:22 2005
-@@ -45,7 +45,7 @@
-
-
- #define PROTOCOL_VERSION_STR "XIMP.3.5"
--#define SERVER_NAME "kinput2"
-+#define SERVER_NAME "kinput2.macim"
- #define SERVER_VERSION "1"
- #define VENDOR_NAME "SRA"
-
-diff -Naur kinput2-v3.1-macim-20050629.orig/lib/mactext.c kinput2-v3.1-macim-20050629/lib/mactext.c
---- kinput2-v3.1-macim-20050629.orig/lib/mactext.c Wed May 18 18:00:25 2005
-+++ kinput2-v3.1-macim-20050629/lib/mactext.c Sun Mar 12 15:58:51 2006
-@@ -410,10 +410,18 @@
- hiliteRange->fNumOfRanges = 2;
- hiliteRange->fRange[0].fStart = 0;
- hiliteRange->fRange[0].fEnd = length;
-+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
- hiliteRange->fRange[0].fHiliteStyle = kTSMHiliteConvertedText;
-+#else
-+ hiliteRange->fRange[0].fHiliteStyle = kConvertedText;
-+#endif
- hiliteRange->fRange[1].fStart = 0;
- hiliteRange->fRange[1].fEnd = length;
-+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
- hiliteRange->fRange[1].fHiliteStyle = kTSMHiliteCaretPosition;
-+#else
-+ hiliteRange->fRange[1].fHiliteStyle = kCaretPosition;
-+#endif
- } else
- status = memFullErr;
- }
-diff -Naur kinput2-v3.1-macim-20050629.orig/xinitrc.kinput2.macim.sh kinput2-v3.1-macim-20050629/xinitrc.kinput2.macim.sh
---- kinput2-v3.1-macim-20050629.orig/xinitrc.kinput2.macim.sh Thu Jan 1 00:00:00 1970
-+++ kinput2-v3.1-macim-20050629/xinitrc.kinput2.macim.sh Sun Mar 12 15:13:13 2006
-@@ -0,0 +1,11 @@
-+# If you don't want to launch kinput2.macim, put xinitrc_kinput2_macim_enable=NO
-+# in your .xinitrc
-+: ${xinitrc_kinput2_macim_enable=YES}
-+
-+case $xinitrc_kinput2_macim_enable in
-+ [Yy][Ee][Ss])
-+ if test -x "$fink_prefix/bin/kinput2.macim"; then
-+ "$fink_prefix/bin/kinput2.macim" -macim -xim &
-+ fi
-+ ;;
-+esac
Copied: trunk/dports/x11/kinput2-macim/files/patch-kinput2.macim.diff (from rev 30574, trunk/dports/x11/kinput2-macim/files/kinput2.macim.patch)
===================================================================
--- trunk/dports/x11/kinput2-macim/files/patch-kinput2.macim.diff (rev 0)
+++ trunk/dports/x11/kinput2-macim/files/patch-kinput2.macim.diff 2007-11-18 18:54:03 UTC (rev 31224)
@@ -0,0 +1,217 @@
+diff -Naur kinput2-v3.1-macim-20050629.orig/Kinput2.conf kinput2-v3.1-macim-20050629/Kinput2.conf
+--- kinput2-v3.1-macim-20050629.orig/Kinput2.conf Thu Jan 22 00:53:19 2004
++++ kinput2-v3.1-macim-20050629/Kinput2.conf Sat Jun 4 16:28:42 2005
+@@ -79,17 +79,17 @@
+ * If you have already installed Canna header files and libraries..
+ */
+ XCOMM use installed headers/libraries
+-XCOMM CANNAINSTDIR = /usr/local/canna
+-XCOMM CANNASRC = $(CANNAINSTDIR)/include
+-XCOMM CANNALIB = -lcanna16
++CANNAINSTDIR = $(PREFIX)
++CANNASRC = $(CANNAINSTDIR)/include
++CANNALIB = -L$(CANNAINSTDIR)/lib -lcanna16
+
+ /*
+ * If you have compiled Canna that came with X11R6 (contrib/programs/Canna),
+ * but not installed yet..
+ */
+ XCOMM use headers/libraries in the source tree
+-CANNASRC = $(CONTRIBSRC)/programs/Canna32
+-CANNALIB = -L$(CANNASRC)/lib/canna16 -lcanna16
++XCOMM CANNASRC = $(CONTRIBSRC)/programs/Canna32
++XCOMM CANNALIB = -L$(CANNASRC)/lib/canna16 -lcanna16
+
+
+ XCOMM SJ3 configuration
+diff -Naur kinput2-v3.1-macim-20050629.orig/cmd/Imakefile kinput2-v3.1-macim-20050629/cmd/Imakefile
+--- kinput2-v3.1-macim-20050629.orig/cmd/Imakefile Thu Jan 22 00:58:31 2004
++++ kinput2-v3.1-macim-20050629/cmd/Imakefile Sat Jun 4 16:28:42 2005
+@@ -49,5 +49,5 @@
+ SRCS = kinput2.c
+ OBJS = kinput2.o
+
+-ComplexProgramTarget(kinput2)
+-InstallAppDefaults(Kinput2)
++ComplexProgramTargetNoMan(kinput2.macim)
++InstallAppDefaultsLong(Kinput2,Kinput2_macim)
+diff -Naur kinput2-v3.1-macim-20050629.orig/cmd/Kinput2.ad kinput2-v3.1-macim-20050629/cmd/Kinput2.ad
+--- kinput2-v3.1-macim-20050629.orig/cmd/Kinput2.ad Fri May 6 04:35:47 2005
++++ kinput2-v3.1-macim-20050629/cmd/Kinput2.ad Sat Jun 4 16:28:42 2005
+@@ -5,9 +5,10 @@
+ !!
+ !! things you shouldn't change
+ !!
+-Kinput2.mappedWhenManaged: false
+-Kinput2.width: 1
+-Kinput2.height: 1
++Kinput2_macim.conversionEngine: macim
++Kinput2_macim.mappedWhenManaged: false
++Kinput2_macim.width: 1
++Kinput2_macim.height: 1
+ *converter.accelerators: <Key>: to-inputobj()
+ ! AIX seems to need the following superfluous definition.
+ *ki2AppDefsLoaded: true
+@@ -96,7 +97,7 @@
+ ! XimpProtocol
+ *XimpProtocol.ForceDefaultServer: true
+ ! X Input Method Protocol
+-*IMProtocol.locales: ja_JP.SJIS, ja_JP.EUC, ja_JP, japanese, japan, ja
++*IMProtocol.locales: ja_JP.UTF-8, ja_JP.eucJP, ja_JP.SJIS, ja_JP, japanese, japan, ja
+ ! common to XimpProtocol and IMProtocol
+ *defaultFontList: -misc-fixed-medium-r-normal--14-*-*-*-c-*
+ *ConversionStartKeys: \
+diff -Naur kinput2-v3.1-macim-20050629.orig/cmd/kinput2.c kinput2-v3.1-macim-20050629/cmd/kinput2.c
+--- kinput2-v3.1-macim-20050629.orig/cmd/kinput2.c Tue Mar 23 01:27:35 2004
++++ kinput2-v3.1-macim-20050629/cmd/kinput2.c Sat Jun 4 16:28:42 2005
+@@ -96,9 +96,9 @@
+
+ static String fallback_resources[] = {
+ "*ki2AppDefsLoaded: false",
+- "Kinput2.mappedWhenManaged: false",
+- "Kinput2.width: 1",
+- "Kinput2.height: 1",
++ "Kinput2_macim.mappedWhenManaged: false",
++ "Kinput2_macim.width: 1",
++ "Kinput2_macim.height: 1",
+ NULL,
+ };
+
+@@ -200,7 +200,7 @@
+ WidgetClass inputobjclass, displayobjclass;
+ Widget inputobj;
+
+- toplevel = XtAppInitialize(&apc, "Kinput2",
++ toplevel = XtAppInitialize(&apc, "Kinput2_macim",
+ options, XtNumber(options),
+ &ac, av,
+ fallback_resources, (ArgList)NULL, 0);
+diff -Naur kinput2-v3.1-macim-20050629.orig/copyright kinput2-v3.1-macim-20050629/copyright
+--- kinput2-v3.1-macim-20050629.orig/copyright Thu Jan 1 00:00:00 1970
++++ kinput2-v3.1-macim-20050629/copyright Tue May 3 02:14:22 2005
+@@ -0,0 +1,22 @@
++/*
++ * kinput2
++ */
++
++/*
++ * Copyright (C) 1991 by Software Research Associates, Inc.
++ *
++ * Permission to use, copy, modify, and distribute this software and its
++ * documentation for any purpose and without fee is hereby granted, provided
++ * that the above copyright notice appear in all copies and that both that
++ * copyright notice and this permission notice appear in supporting
++ * documentation, and that the name of Software Research Associates not be
++ * used in advertising or publicity pertaining to distribution of the
++ * software without specific, written prior permission. Software Research
++ * Associates makes no representations about the suitability of this software
++ * for any purpose. It is provided "as is" without express or implied
++ * warranty.
++ *
++ * Author: Makoto Ishisone, Software Research Associates, Inc., Japan
++ * ishisone at sra.co.jp
++ */
++
+diff -Naur kinput2-v3.1-macim-20050629.orig/lib/Canna.c kinput2-v3.1-macim-20050629/lib/Canna.c
+--- kinput2-v3.1-macim-20050629.orig/lib/Canna.c Thu Oct 3 09:35:27 2002
++++ kinput2-v3.1-macim-20050629/lib/Canna.c Tue May 3 02:14:22 2005
+@@ -61,6 +61,10 @@
+ #include "CannaP.h"
+ #include "DebugPrint.h"
+
++/* Canna 3.7$B0J9_$O$3$N$h$&$KDj5A$9$k(B */
++#define CANNA_WCHAR16
++#define CANNA_NEW_WCHAR_AWARE
++/* Canna 3.6$B$^$G$N>l9g(B */
+ #define _WCHAR_T /* $B$3$NDj5A$O(B jrkanji.h $B$G(B wcKanjiStatus $B$J$I$rDj5A$9$k$?$a(B */
+ #define wchar_t wchar
+
+@@ -246,7 +250,7 @@
+ kanabuf[0] = '\0';
+ nbytes = XKanaLookup(event, kanabuf, 20, &ks, &compose_status);
+
+- buf[0] = (wchar)kanabuf[0]; /* $B$-$?$J$$(B */
++ buf[0] = (wchar)(unsigned char)kanabuf[0]; /* $B$-$?$J$$(B */
+
+ if (ks == XK_space && (event->xkey.state & ShiftMask)) {
+ void convend();
+@@ -271,7 +275,7 @@
+
+ /* $B$+$J4A;zJQ49$9$k(B */
+ len = wcKanjiString((int)obj, (int)buf[0],
+- (wchar_t *)buf, 1024, &kanji_status);
++ (wchar *)buf, 1024, &kanji_status);
+
+ displayPreEdit(obj, len, buf, &kanji_status);
+ return (kanji_status.info & KanjiThroughInfo) ? 1 : 0;
+@@ -642,7 +646,9 @@
+ CannaObject obj;
+ {
+ char **warn = 0;
++#ifndef CANNA_JR_BEEP_FUNC_DECLARED
+ extern (*jrBeepFunc)();
++#endif
+
+ if (nCannaContexts == 0) {
+ #ifdef KC_SETSERVERNAME
+diff -Naur kinput2-v3.1-macim-20050629.orig/lib/IMProto.c kinput2-v3.1-macim-20050629/lib/IMProto.c
+--- kinput2-v3.1-macim-20050629.orig/lib/IMProto.c Thu Oct 3 09:35:28 2002
++++ kinput2-v3.1-macim-20050629/lib/IMProto.c Tue May 3 02:14:22 2005
+@@ -44,7 +44,7 @@
+ #include "im.h"
+
+
+-#define SERVER_NAME "kinput2"
++#define SERVER_NAME "kinput2.macim"
+ #define UNIX_SOCKET_DIR "/tmp/.ki2-unix"
+
+ /*- resource table -*/
+diff -Naur kinput2-v3.1-macim-20050629.orig/lib/XimpProto.c kinput2-v3.1-macim-20050629/lib/XimpProto.c
+--- kinput2-v3.1-macim-20050629.orig/lib/XimpProto.c Thu Oct 3 09:35:28 2002
++++ kinput2-v3.1-macim-20050629/lib/XimpProto.c Tue May 3 02:14:22 2005
+@@ -45,7 +45,7 @@
+
+
+ #define PROTOCOL_VERSION_STR "XIMP.3.5"
+-#define SERVER_NAME "kinput2"
++#define SERVER_NAME "kinput2.macim"
+ #define SERVER_VERSION "1"
+ #define VENDOR_NAME "SRA"
+
+diff -Naur kinput2-v3.1-macim-20050629.orig/lib/mactext.c kinput2-v3.1-macim-20050629/lib/mactext.c
+--- kinput2-v3.1-macim-20050629.orig/lib/mactext.c Wed May 18 18:00:25 2005
++++ kinput2-v3.1-macim-20050629/lib/mactext.c Sun Mar 12 15:58:51 2006
+@@ -410,10 +410,18 @@
+ hiliteRange->fNumOfRanges = 2;
+ hiliteRange->fRange[0].fStart = 0;
+ hiliteRange->fRange[0].fEnd = length;
++#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
+ hiliteRange->fRange[0].fHiliteStyle = kTSMHiliteConvertedText;
++#else
++ hiliteRange->fRange[0].fHiliteStyle = kConvertedText;
++#endif
+ hiliteRange->fRange[1].fStart = 0;
+ hiliteRange->fRange[1].fEnd = length;
++#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
+ hiliteRange->fRange[1].fHiliteStyle = kTSMHiliteCaretPosition;
++#else
++ hiliteRange->fRange[1].fHiliteStyle = kCaretPosition;
++#endif
+ } else
+ status = memFullErr;
+ }
+diff -Naur kinput2-v3.1-macim-20050629.orig/xinitrc.kinput2.macim.sh kinput2-v3.1-macim-20050629/xinitrc.kinput2.macim.sh
+--- kinput2-v3.1-macim-20050629.orig/xinitrc.kinput2.macim.sh Thu Jan 1 00:00:00 1970
++++ kinput2-v3.1-macim-20050629/xinitrc.kinput2.macim.sh Sun Mar 12 15:13:13 2006
+@@ -0,0 +1,11 @@
++# If you don't want to launch kinput2.macim, put xinitrc_kinput2_macim_enable=NO
++# in your .xinitrc
++: ${xinitrc_kinput2_macim_enable=YES}
++
++case $xinitrc_kinput2_macim_enable in
++ [Yy][Ee][Ss])
++ if test -x "$fink_prefix/bin/kinput2.macim"; then
++ "$fink_prefix/bin/kinput2.macim" -macim -xim &
++ fi
++ ;;
++esac
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071118/b89f76db/attachment-0001.html
More information about the macports-changes
mailing list