[31223] trunk/dports/x11/kinput2
takanori at macports.org
takanori at macports.org
Sun Nov 18 10:53:23 PST 2007
Revision: 31223
http://trac.macosforge.org/projects/macports/changeset/31223
Author: takanori at macports.org
Date: 2007-11-18 10:53:22 -0800 (Sun, 18 Nov 2007)
Log Message:
-----------
Linted.
Modified Paths:
--------------
trunk/dports/x11/kinput2/Portfile
Added Paths:
-----------
trunk/dports/x11/kinput2/files/patch-cmd_Kinput2.ad.diff
trunk/dports/x11/kinput2/files/patch-lib_Canna.c.diff
Removed Paths:
-------------
trunk/dports/x11/kinput2/files/patch-cmd_Kinput2.ad
trunk/dports/x11/kinput2/files/patch-lib_Canna.c
Modified: trunk/dports/x11/kinput2/Portfile
===================================================================
--- trunk/dports/x11/kinput2/Portfile 2007-11-18 18:50:57 UTC (rev 31222)
+++ trunk/dports/x11/kinput2/Portfile 2007-11-18 18:53:22 UTC (rev 31223)
@@ -1,19 +1,22 @@
# $Id$
PortSystem 1.0
+
name kinput2
version 3.1
revision 1
categories x11 japanese
maintainers takanori openmaintainer
description Input server of Japanese text
-long_description ${description}
+long_description \
+ ${description}
platforms darwin
-homepage {}
+homepage
master_sites macports \
ftp://ftp.sra.co.jp/pub/x11/kinput2/
distname ${name}-v${version}
-
+patchfiles patch-cmd_Kinput2.ad.diff \
+ patch-lib_Canna.c.diff
checksums md5 2de20576f150248d1fdfe66d7cc4e510 \
sha1 48050f70e7c0cc67193ea260f8d7f6e822a02ca3 \
rmd160 c56684769859bbee5f8238cd1af061796ff931e8
@@ -25,8 +28,6 @@
default_variants +canna
}
-patchfiles patch-cmd_Kinput2.ad patch-lib_Canna.c
-
post-patch {
move ${worksrcpath}/Kinput2.conf ${worksrcpath}/Kinput2.conf.orig
set fd [open [file join ${worksrcpath} Kinput2.conf] w 0644]
@@ -62,7 +63,7 @@
}
destroot.violate_mtree yes
post-destroot {
- delete ${destroot}/${prefix}/lib/app-defaults
+ delete ${destroot}${prefix}/lib/app-defaults
xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}/doc
xinstall -m 644 -W ${worksrcpath} NEWS README ${destroot}${prefix}/share/doc/${name}
@@ -71,6 +72,8 @@
variant universal {}
-variant canna {
+variant canna description {Use canna as Japanese conversion engine} {
depends_lib-append port:canna
}
+
+livecheck.check none
Deleted: trunk/dports/x11/kinput2/files/patch-cmd_Kinput2.ad
===================================================================
--- trunk/dports/x11/kinput2/files/patch-cmd_Kinput2.ad 2007-11-18 18:50:57 UTC (rev 31222)
+++ trunk/dports/x11/kinput2/files/patch-cmd_Kinput2.ad 2007-11-18 18:53:22 UTC (rev 31223)
@@ -1,18 +0,0 @@
---- cmd/Kinput2.ad.orig 2002-10-03 18:35:26.000000000 +0900
-+++ cmd/Kinput2.ad 2007-10-17 08:00:36.000000000 +0900
-@@ -96,12 +96,13 @@
- ! 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: \
- Shift<Key>space \n\
-- Ctrl<Key>Kanji
-+ Ctrl<Key>Kanji \n\
-+ Mod2<Key>space
- !!
- !! sending back unused keypress events
- !!
Copied: trunk/dports/x11/kinput2/files/patch-cmd_Kinput2.ad.diff (from rev 30574, trunk/dports/x11/kinput2/files/patch-cmd_Kinput2.ad)
===================================================================
--- trunk/dports/x11/kinput2/files/patch-cmd_Kinput2.ad.diff (rev 0)
+++ trunk/dports/x11/kinput2/files/patch-cmd_Kinput2.ad.diff 2007-11-18 18:53:22 UTC (rev 31223)
@@ -0,0 +1,18 @@
+--- cmd/Kinput2.ad.orig 2002-10-03 18:35:26.000000000 +0900
++++ cmd/Kinput2.ad 2007-10-17 08:00:36.000000000 +0900
+@@ -96,12 +96,13 @@
+ ! 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: \
+ Shift<Key>space \n\
+- Ctrl<Key>Kanji
++ Ctrl<Key>Kanji \n\
++ Mod2<Key>space
+ !!
+ !! sending back unused keypress events
+ !!
Deleted: trunk/dports/x11/kinput2/files/patch-lib_Canna.c
===================================================================
--- trunk/dports/x11/kinput2/files/patch-lib_Canna.c 2007-11-18 18:50:57 UTC (rev 31222)
+++ trunk/dports/x11/kinput2/files/patch-lib_Canna.c 2007-11-18 18:53:22 UTC (rev 31223)
@@ -1,42 +0,0 @@
---- lib/Canna.c.orig 2002-10-03 18:35:27.000000000 +0900
-+++ lib/Canna.c 2007-10-17 07:58:25.000000000 +0900
-@@ -61,6 +61,8 @@
- #include "CannaP.h"
- #include "DebugPrint.h"
-
-+#define CANNA_WCHAR16
-+#define CANNA_NEW_WCHAR_AWARE
- #define _WCHAR_T /* この定義は jrkanji.h で wcKanjiStatus などを定義するため */
- #define wchar_t wchar
-
-@@ -246,9 +248,9 @@
- kanabuf[0] = '\0';
- nbytes = XKanaLookup(event, kanabuf, 20, &ks, &compose_status);
-
-- buf[0] = (wchar)kanabuf[0]; /* きたない */
-+ buf[0] = (wchar)(unsigned char)kanabuf[0]; /* きたない */
-
-- if (ks == XK_space && (event->xkey.state & ShiftMask)) {
-+ if (ks == XK_space && ((event->xkey.state & ShiftMask) || (event->xkey.state & Mod2Mask))) {
- void convend();
-
- convend(obj);
-@@ -271,7 +273,7 @@
-
- /* かな漢字変換する */
- 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 +644,9 @@
- CannaObject obj;
- {
- char **warn = 0;
-+#ifndef CANNA_JR_BEEP_FUNC_DECLARED
- extern (*jrBeepFunc)();
-+#endif
-
- if (nCannaContexts == 0) {
- #ifdef KC_SETSERVERNAME
Copied: trunk/dports/x11/kinput2/files/patch-lib_Canna.c.diff (from rev 30574, trunk/dports/x11/kinput2/files/patch-lib_Canna.c)
===================================================================
--- trunk/dports/x11/kinput2/files/patch-lib_Canna.c.diff (rev 0)
+++ trunk/dports/x11/kinput2/files/patch-lib_Canna.c.diff 2007-11-18 18:53:22 UTC (rev 31223)
@@ -0,0 +1,42 @@
+--- lib/Canna.c.orig 2002-10-03 18:35:27.000000000 +0900
++++ lib/Canna.c 2007-10-17 07:58:25.000000000 +0900
+@@ -61,6 +61,8 @@
+ #include "CannaP.h"
+ #include "DebugPrint.h"
+
++#define CANNA_WCHAR16
++#define CANNA_NEW_WCHAR_AWARE
+ #define _WCHAR_T /* この定義は jrkanji.h で wcKanjiStatus などを定義するため */
+ #define wchar_t wchar
+
+@@ -246,9 +248,9 @@
+ kanabuf[0] = '\0';
+ nbytes = XKanaLookup(event, kanabuf, 20, &ks, &compose_status);
+
+- buf[0] = (wchar)kanabuf[0]; /* きたない */
++ buf[0] = (wchar)(unsigned char)kanabuf[0]; /* きたない */
+
+- if (ks == XK_space && (event->xkey.state & ShiftMask)) {
++ if (ks == XK_space && ((event->xkey.state & ShiftMask) || (event->xkey.state & Mod2Mask))) {
+ void convend();
+
+ convend(obj);
+@@ -271,7 +273,7 @@
+
+ /* かな漢字変換する */
+ 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 +644,9 @@
+ CannaObject obj;
+ {
+ char **warn = 0;
++#ifndef CANNA_JR_BEEP_FUNC_DECLARED
+ extern (*jrBeepFunc)();
++#endif
+
+ if (nCannaContexts == 0) {
+ #ifdef KC_SETSERVERNAME
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071118/7ab7c6f6/attachment.html
More information about the macports-changes
mailing list