[29942] trunk/dports/x11
source_changes at macosforge.org
source_changes at macosforge.org
Mon Oct 15 12:41:21 PDT 2007
Revision: 29942
http://trac.macosforge.org/projects/macports/changeset/29942
Author: takanori at macports.org
Date: 2007-10-15 12:41:20 -0700 (Mon, 15 Oct 2007)
Log Message:
-----------
New port: kinput2
Added Paths:
-----------
trunk/dports/x11/kinput2/
trunk/dports/x11/kinput2/Portfile
trunk/dports/x11/kinput2/files/
trunk/dports/x11/kinput2/files/patch-cmd_Kinput2.ad
trunk/dports/x11/kinput2/files/patch-lib_Canna.c
Added: trunk/dports/x11/kinput2/Portfile
===================================================================
--- trunk/dports/x11/kinput2/Portfile (rev 0)
+++ trunk/dports/x11/kinput2/Portfile 2007-10-15 19:41:20 UTC (rev 29942)
@@ -0,0 +1,73 @@
+# $Id$
+
+PortSystem 1.0
+name kinput2
+version 3.1
+categories x11 japanese
+maintainers takanori openmaintainer
+description Input server of Japanese text
+long_description ${description}
+platforms darwin
+homepage {}
+master_sites ftp://ftp.sra.co.jp/pub/x11/kinput2/
+distname ${name}-v${version}
+
+checksums md5 2de20576f150248d1fdfe66d7cc4e510 \
+ sha1 48050f70e7c0cc67193ea260f8d7f6e822a02ca3 \
+ rmd160 c56684769859bbee5f8238cd1af061796ff931e8
+
+if {[variant_isset wnn]} {
+} elseif {[variant_isset canna]} {
+} elseif {[variant_isset sj3]} {
+} else {
+ 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]
+ puts ${fd} "CCDEF_DIR = \$(LIBDIR)/ccdef"
+ if {[variant_isset canna]} {
+ puts ${fd} "#define UseCanna"
+ puts ${fd} "CANNAINSTDIR = ${prefix}"
+ puts ${fd} "CANNASRC = \$(CANNAINSTDIR)/include"
+ puts ${fd} "CANNALIB = -lcanna16 -L\$(CANNAINSTDIR)/lib"
+ }
+ puts ${fd} "TRANSPORTDEFS ="
+ close ${fd}
+}
+
+use_xmkmf yes
+
+pre-build {
+ system "cd ${worksrcpath} && make Makefiles PREFIX=${prefix}"
+ system "cd ${worksrcpath} && make depend PREFIX=${prefix}"
+
+ build.target {}
+ if {[variant_isset universal]} {
+ build.post_args PREFIX=${prefix} CDEBUGFLAGS=\"${configure.cflags} ${configure.universal_cflags}\"
+ } else {
+ build.post_args PREFIX=${prefix} CDEBUGFLAGS=\"${configure.cflags}\"
+ }
+}
+
+pre-destroot {
+ destroot.target install install.man
+ destroot.post_args-append "PREFIX=${prefix} BINDIR=${prefix}/bin LIBDIR=${prefix}/lib CONFDIR=${prefix}/etc MANSOURCEPATH=${prefix}/share/man/man DOCDIR=${prefix}/share/doc/${name} XAPPLOADDIR=${x11prefix}/lib/X11/app-defaults"
+ #notice: app-defaults/Kinput2 is installed outside of /opt tree.
+}
+post-destroot {
+ 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}
+ eval xinstall -m 644 [glob ${worksrcpath}/doc/*] ${destroot}${prefix}/share/doc/${name}/doc
+}
+
+variant universal {}
+
+variant canna {
+ depends_lib-append port:canna
+}
Property changes on: trunk/dports/x11/kinput2/Portfile
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: trunk/dports/x11/kinput2/files/patch-cmd_Kinput2.ad
===================================================================
--- trunk/dports/x11/kinput2/files/patch-cmd_Kinput2.ad (rev 0)
+++ trunk/dports/x11/kinput2/files/patch-cmd_Kinput2.ad 2007-10-15 19:41:20 UTC (rev 29942)
@@ -0,0 +1,11 @@
+--- cmd/Kinput2.ad.orig 2002-10-03 18:35:26.000000000 +0900
++++ cmd/Kinput2.ad 2007-10-13 01:56:44.000000000 +0900
+@@ -96,7 +96,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: \
Added: trunk/dports/x11/kinput2/files/patch-lib_Canna.c
===================================================================
--- trunk/dports/x11/kinput2/files/patch-lib_Canna.c (rev 0)
+++ trunk/dports/x11/kinput2/files/patch-lib_Canna.c 2007-10-15 19:41:20 UTC (rev 29942)
@@ -0,0 +1,39 @@
+--- lib/Canna.c.orig 2002-10-03 18:35:27.000000000 +0900
++++ lib/Canna.c 2007-10-13 02:04:29.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,7 +248,7 @@
+ 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)) {
+ void convend();
+@@ -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/20071015/900334c3/attachment.html
More information about the macports-changes
mailing list