Date: Tue, 27 Jul 1999 11:45:27 +0900 From: yasuf@big.or.jp To: FreeBSD-gnats-submit@freebsd.org Subject: ports/12829: Update: japanese/skkinput Message-ID: <19990727114527Q.yasuf@big.or.jp>
next in thread | raw e-mail | index | archive | help
>Number: 12829
>Category: ports
>Synopsis: Update: japanese/skkinput
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Jul 26 19:50:01 PDT 1999
>Closed-Date:
>Last-Modified:
>Originator: Yasuhiro Fukuma
>Release: FreeBSD 4.0-CURRENT i386
>Organization:
>Environment:
>Description:
This patch contains:
- Updates for ja-skkinput-2.03.
- Maintainer change.
- Solution of unfetchable error.
- Solution of problems with Netscape Communicator.
New files: patches/{patch-ab,patch-ac}
>How-To-Repeat:
>Fix:
Index: skkinput/Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/skkinput/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile 1998/06/06 03:45:10 1.5
+++ Makefile 1999/07/23 06:51:40
@@ -6,26 +6,27 @@
# $Id: Makefile,v 1.5 1998/06/06 03:45:10 itojun Exp $
#
-DISTNAME= skkinput-2.00
-PKGNAME= ja-skkinput-2.00
+DISTNAME= skkinput-2.03
+PKGNAME= ja-skkinput-2.03
CATEGORIES= japanese x11
-MASTER_SITES= http://www.yajima.kuis.kyoto-u.ac.jp/staffs/sakamoto/skkinput/
+MASTER_SITES= http://member.nifty.ne.jp/Tatari_SAKAMOTO/
-MAINTAINER= mrt@mickey.ai.kyutech.ac.jp
+MAINTAINER= yasuf@big.or.jp
-RUN_DEPENDS= ${LOCALBASE}/libexec/skkserv:${PORTSDIR}/japanese/skk \
- jman:${PORTSDIR}/japanese/man
+RUN_DEPENDS= ${LOCALBASE}/sbin/skkserv:${PORTSDIR}/japanese/skkserv
USE_IMAKE= yes
MANLANG= ja
MAN1= skkinput.1
MANCOMPRESSED= yes
+DOCS= *.jis skkinput.doc myeval/skkinputlisp.doc dot.skkinput
+
post-install:
.if !defined(NOPORTDOCS)
- @${MKDIR} ${X11BASE}/share/doc/skkinput
+ @${MKDIR} ${PREFIX}/share/doc/skkinput
@( cd ${WRKSRC} ; \
- ${INSTALL_DATA} *.jis skkinput.doc ${X11BASE}/share/doc/skkinput/ )
+ ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/skkinput )
.endif
.include <bsd.port.mk>
Index: skkinput/files/md5
===================================================================
RCS file: /home/ncvs/ports/japanese/skkinput/files/md5,v
retrieving revision 1.2
diff -u -r1.2 md5
--- md5 1998/04/18 15:50:19 1.2
+++ md5 1999/07/23 06:14:12
@@ -1 +1 @@
-MD5 (skkinput-2.00.tar.gz) = 5f10e3ed5a5f8ab40adf2daa6de84931
+MD5 (skkinput-2.03.tar.gz) = 74c08620e8e916a3d56f3bb3e85a5d62
Index: skkinput/patches/patch-ab
===================================================================
RCS file: patch-ab
diff -N patch-ab
--- /dev/null Fri Jul 23 16:04:19 1999
+++ patch-ab Thu Mar 25 15:10:39 1999
@@ -0,0 +1,111 @@
+--- imattr.c.orig Tue Mar 3 20:58:22 1998
++++ imattr.c Fri Mar 19 14:24:12 1999
+@@ -127,6 +127,11 @@
+ static int getFontSet( IMIC *, unsigned int, int, int, char *, int ) ;
+ static int getLineSpace( IMIC *, unsigned int, int, int, char *, int ) ;
+ static int getCursor( IMIC *, unsigned int, int, int, char *, int ) ;
++
++#ifndef ORIGINAL
++static int setFilterEvents( IMIC *, char *, int, int, int, int );
++static int getFilterEvents( IMIC *, unsigned int, int, int, char *, int );
++#endif
+
+ static ICAttribute icAttributes[] = {
+ { XNInputStyle, TYPE_CARD32, OP_C|OP_G,
+@@ -135,6 +140,8 @@
+ setClientWindow, getClientWindow },
+ { XNFocusWindow, TYPE_WINDOW, OP_C|OP_S|OP_G,
+ setFocusWindow, getFocusWindow },
++ { XNFilterEvents, TYPE_CARD32, OP_C|OP_S|OP_G,
++ setFilterEvents, getFilterEvents },
+ { XNPreeditAttributes, TYPE_NESTED_LIST, OP_C|OP_S|OP_G,
+ setPreeditAttributes, getPreeditAttributes },
+ { XNStatusAttributes, TYPE_NESTED_LIST, OP_C|OP_S|OP_G,
+@@ -495,6 +502,26 @@
+ return 0 ;
+ }
+
++#ifndef ORIGINAL
++/* ARGSUSED */
++static int
++setFilterEvents
++( IMIC *icp, char *value, int len, int order, int nest, int op )
++{
++ unsigned long filter_events;
++
++ CHECK_ICATTR_SIZE(4, IMBadSomething);
++
++ filter_events = (unsigned long)getC32(value, order);
++
++ if (!(icp->common_attr.set_mask & ATTR_MASK_FILTER_EVENTS) ||
++ filter_events != icp->common_attr.filter_events) {
++ icp->common_attr.change_mask |= ATTR_MASK_FILTER_EVENTS;
++ }
++ return 0;
++}
++#endif
++
+ /* ARGSUSED */
+ static int setPreeditAttributes
+ ( IMIC *icp, char *value, int len, int order, int nest, int op )
+@@ -1061,6 +1088,35 @@
+ }
+ }
+
++#ifndef ORIGINAL
++/* ARGSUSED */
++static int
++getFilterEvents
++( IMIC *icp, unsigned int id, int nest, int offset,
++ char *data, int len )
++{
++ IMConnection *conn = icp->im->connection;
++
++ if (!(icp->common_attr.set_mask & ATTR_MASK_FILTER_EVENTS)) {
++ /* fill default value */
++ fillCommonDefault(icp, (unsigned long)ATTR_MASK_FILTER_EVENTS);
++ }
++
++ if (icp->common_attr.set_mask & ATTR_MASK_FILTER_EVENTS) {
++ IMPutC16(conn, id); /* attribute ID */
++ IMPutC16(conn, 4); /* value length */
++ IMPutC32(conn, icp->common_attr.filter_events);
++ }
++ else {
++ /* no default is available */
++ IMCancelRequest(conn, offset);
++ IMSendError(conn, IMBadSomething, icp->im->id, icp->id,
++ "filter events not specified yet");
++ return -1;
++ }
++}
++#endif
++
+ /* ARGSUSED */
+ static int getArea
+ ( IMIC *icp, unsigned int id, int nest,
+@@ -1383,6 +1439,12 @@
+ icp->focus_profile = icp->client_profile ;
+ }
+ }
++#ifndef ORIGINAL
++ if (mask & ATTR_MASK_FILTER_EVENTS) {
++ ap->filter_events = NoEventMask;
++ ap->set_mask |= ATTR_MASK_FILTER_EVENTS;
++ }
++#endif
+ }
+
+ static int getNaturalLineSpace( IMIC *icp )
+@@ -1520,6 +1582,11 @@
+ SENDERROR( IMBadFocusWindow, "invalid focus window ID" ) ;
+ }
+ }
++#ifndef ORIGINAL
++ if (mask & ATTR_MASK_FILTER_EVENTS) {
++ SENDERROR(IMBadSomething, "filter events not support");
++ }
++#endif
+
+ return ret ;
+ #undef SENDERROR
Index: skkinput/patches/patch-ac
===================================================================
RCS file: patch-ac
diff -N patch-ac
--- /dev/null Fri Jul 23 16:04:19 1999
+++ patch-ac Thu Mar 25 15:10:39 1999
@@ -0,0 +1,13 @@
+--- im.h.orig Tue Mar 3 21:08:33 1998
++++ im.h Fri Mar 19 14:10:22 1999
+@@ -148,6 +148,10 @@
+ XIMStyle input_style ;
+ Window client ; /* client window */
+ Window focus ; /* focus window */
++#ifndef ORIGINAL
++#define ATTR_MASK_FILTER_EVENTS (1<<3)
++ unsigned long filter_events; /* Event mask that IM need */
++#endif
+ } IMCommonAttributes;
+
+ typedef struct {
Index: skkinput/pkg/PLIST
===================================================================
RCS file: /home/ncvs/ports/japanese/skkinput/pkg/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- PLIST 1998/09/05 00:27:52 1.3
+++ PLIST 1999/07/23 06:43:26
@@ -6,5 +6,7 @@
share/doc/skkinput/PROGRAM.jis
share/doc/skkinput/README.jis
share/doc/skkinput/TODO.jis
+share/doc/skkinput/dot.skkinput
share/doc/skkinput/skkinput.doc
+share/doc/skkinput/skkinputlisp.doc
@dirrm share/doc/skkinput
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19990727114527Q.yasuf>