diff options
| author | Hiroki Sato <hrs@FreeBSD.org> | 2008-11-02 16:14:55 +0000 |
|---|---|---|
| committer | Hiroki Sato <hrs@FreeBSD.org> | 2008-11-02 16:14:55 +0000 |
| commit | ad57c993a89ed665267176b769d9e6ee06b34813 (patch) | |
| tree | 842e5c3e9f85a5334090e94709573a97fc5d2e7e /japanese/kinput2 | |
| parent | 1e51e1aaf7304662d71a40418b7de89984f9515f (diff) | |
| download | ports-ad57c993a89ed665267176b769d9e6ee06b34813.tar.gz ports-ad57c993a89ed665267176b769d9e6ee06b34813.zip | |
- Disable TCP transport by default (WITH_TCP knob) because unix
domain socket is used in most cases.
- Use "localhost" when TCP transport enabled.
Notes
Notes:
svn path=/head/; revision=222327
Diffstat (limited to 'japanese/kinput2')
| -rw-r--r-- | japanese/kinput2/Makefile | 9 | ||||
| -rw-r--r-- | japanese/kinput2/files/Kinput2.conf.in | 4 | ||||
| -rw-r--r-- | japanese/kinput2/files/patch-lib-IMProto.c | 4 |
3 files changed, 11 insertions, 6 deletions
diff --git a/japanese/kinput2/Makefile b/japanese/kinput2/Makefile index c30324feb25a..a198d83e54e8 100644 --- a/japanese/kinput2/Makefile +++ b/japanese/kinput2/Makefile @@ -7,7 +7,7 @@ PORTNAME= kinput2 PORTVERSION= 3.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= japanese x11 MASTER_SITES= ftp://ftp.sra.co.jp/pub/x11/kinput2/ DISTNAME= ${PORTNAME}-v${PORTVERSION} @@ -24,7 +24,8 @@ OPTIONS= CANNA "Canna support" on \ FREEWNN "FreeWnn support " on \ WNN6 "Wnn6 support" off \ WNN7 "Wnn7 support" off \ - SJ3 "SJ3 support" on + SJ3 "SJ3 support" on \ + TCP "TCP transport support (not needed for most cases)" off LIB_DEPENDS.CANNA= canna16.1:${PORTSDIR}/japanese/canna-lib CONF.CANNA= '\#define UseCanna' \ @@ -66,6 +67,10 @@ PLIST_SUB+= ${I:S/^WITH_//}="@comment " .endif .endfor +.if !defined(WITH_TCP) +CONF+= TRANSPORTDEFS="-DNO_TCP_TRANSPORT" +.endif + pre-configure: apply-slist ${INSTALL_DATA} ${WRKDIR}/Kinput2.conf ${WRKSRC}/Kinput2.conf ${PRINTF} "%s\n" ${CONF} > ${WRKSRC}/Kinput2_im.conf diff --git a/japanese/kinput2/files/Kinput2.conf.in b/japanese/kinput2/files/Kinput2.conf.in index 5090590e0f34..8ee327f812b2 100644 --- a/japanese/kinput2/files/Kinput2.conf.in +++ b/japanese/kinput2/files/Kinput2.conf.in @@ -2,6 +2,6 @@ XCOMM $FreeBSD$ CCDEF_DIR = $(LIBDIR)/ccdef -#include "Kinput2_im.conf" - TRANSPORTDEFS = + +#include "Kinput2_im.conf" diff --git a/japanese/kinput2/files/patch-lib-IMProto.c b/japanese/kinput2/files/patch-lib-IMProto.c index d37e11eba2bb..370b8ae26daf 100644 --- a/japanese/kinput2/files/patch-lib-IMProto.c +++ b/japanese/kinput2/files/patch-lib-IMProto.c @@ -1,11 +1,11 @@ --- lib/IMProto.c.orig 2002-10-03 18:35:28.000000000 +0900 -+++ lib/IMProto.c 2008-11-02 01:12:32.000000000 +0900 ++++ lib/IMProto.c 2008-11-03 01:07:46.000000000 +0900 @@ -259,7 +259,7 @@ #ifdef IM_TCP_TRANSPORT if (ipw->imp.use_tcp_transport) { ipw->imp.tcp_port = 0; /* let the system choose the port number */ - ipw->imp.tcp_sock = IMCreateTCPService(&ipw->imp.tcp_port); -+ ipw->imp.tcp_sock = IMCreateTCPService(&ipw->imp.tcp_port, "127.0.0.1"); ++ ipw->imp.tcp_sock = IMCreateTCPService(&ipw->imp.tcp_port, "localhost"); } if (ipw->imp.tcp_sock >= 0) { TRACE(("call XtAppAddInput for tcp socket(%d)\n", ipw->imp.tcp_sock)); |