Date: Sat, 21 Sep 2002 00:59:57 +0900 (JST) From: KOMATSU Shinichiro <koma2@jiro.c.u-tokyo.ac.jp> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/43114: Update japanese/skkinput to 2.05 Message-ID: <20020920155958.4D9E072501@jiro.c.u-tokyo.ac.jp>
next in thread | raw e-mail | index | archive | help
>Number: 43114 >Category: ports >Synopsis: Update japanese/skkinput to 2.05 >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: Fri Sep 20 09:00:12 PDT 2002 >Closed-Date: >Last-Modified: >Originator: KOMATSU Shinichiro >Release: FreeBSD 4.6.2-RELEASE i386 >Organization: >Environment: FreeBSD 4.6.2-RELEASE i386 >Description: - Upgrade to 2.05 and change MATER_SITES to sourceforge.jp. - Change MAINTAINER to me, because original maintainer has not replied for about a month. - If either japanese/dbskkd-cdb or japanese/rskkserv was installed, depends on one of them instead of japanese/skkserv. - patch-a[a-c] seem to be unneeded, so delete them. - Add English man page. - Add %%PORTDOCS%% to pkg-plist. - Add WWW to pkg-descr. >How-To-Repeat: >Fix: diff --exclude=*.log* --exclude=CVS -urN skkinput.old/Makefile skkinput/Makefile --- skkinput.old/Makefile Wed Apr 12 23:37:45 2000 +++ skkinput/Makefile Wed Sep 11 19:11:53 2002 @@ -6,26 +6,40 @@ # PORTNAME= skkinput -PORTVERSION= 2.03 +PORTVERSION= 2.05 CATEGORIES= japanese x11 -MASTER_SITES= http://member.nifty.ne.jp/Tatari_SAKAMOTO/ +MASTER_SITES= http://downloads.sourceforge.jp/skkinput2/864/ -MAINTAINER= yasuf@big.or.jp +MAINTAINER= koma2@jiro.c.u-tokyo.ac.jp +USE_IMAKE= yes + +.include <bsd.port.pre.mk> + +# sanity check +.if defined(WITH_DBSKKD) && defined(WITH_RSKKSERV) +.error Cannot define both WITH_DBSKKD and WITH_RSKKSERV simultaneously. +.endif + +.if defined(WITH_DBSKKD) || exists(${LOCALBASE}/libexec/dbskkd-cdb) && !defined(WITH_RSKKSERV) +RUN_DEPENDS= ${LOCALBASE}/libexec/dbskkd-cdb:${PORTSDIR}/japanese/dbskkd-cdb +.elif defined(WITH_RSKKSERV) || exists(${LOCALBASE}/libexec/rskkserv) && !defined(WITH_DBSKKD) +RUN_DEPENDS= ${LOCALBASE}/libexec/rskkserv:${PORTSDIR}/japanese/rskkserv +.else RUN_DEPENDS= ${LOCALBASE}/sbin/skkserv:${PORTSDIR}/japanese/skkserv +.endif -USE_IMAKE= yes -MANLANG= ja +MANLANG= "" ja MAN1= skkinput.1 MANCOMPRESSED= yes -DOCS= *.jis skkinput.doc myeval/skkinputlisp.doc dot.skkinput +DOCS= *.jis ChangeLog skkinput.doc \ + myeval/skkinputlisp.doc dot.skkinput -post-install: .if !defined(NOPORTDOCS) - @${MKDIR} ${PREFIX}/share/doc/skkinput - @( cd ${WRKSRC} ; \ - ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/skkinput ) +post-install: + @${MKDIR} ${DOCSDIR} + @( cd ${WRKSRC} ; ${INSTALL_DATA} ${DOCS} ${DOCSDIR}) .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --exclude=*.log* --exclude=CVS -urN skkinput.old/distinfo skkinput/distinfo --- skkinput.old/distinfo Sun Aug 1 13:11:13 1999 +++ skkinput/distinfo Wed Aug 14 17:13:29 2002 @@ -1 +1 @@ -MD5 (skkinput-2.03.tar.gz) = 74c08620e8e916a3d56f3bb3e85a5d62 +MD5 (skkinput-2.05.tar.gz) = a3f521a4391d31ce685a7d5d9f21391f diff --exclude=*.log* --exclude=CVS -urN skkinput.old/files/patch-aa skkinput/files/patch-aa --- skkinput.old/files/patch-aa Sat Jun 6 12:45:14 1998 +++ skkinput/files/patch-aa Thu Jan 1 09:00:00 1970 @@ -1,10 +0,0 @@ ---- Imakefile.org Wed Jan 28 19:19:42 1998 -+++ Imakefile Wed Jan 28 19:19:55 1998 -@@ -1,5 +1,7 @@ - XCOMM $ Imakefile for skkinput,v 0.10 96/10/16 12:45 $ - -+MANDIR = ${PREFIX}/man/ja/man1 -+ - /* SKK Server Address */ - #define SkkServer localhost - diff --exclude=*.log* --exclude=CVS -urN skkinput.old/files/patch-ab skkinput/files/patch-ab --- skkinput.old/files/patch-ab Sun Aug 1 13:11:14 1999 +++ skkinput/files/patch-ab Thu Jan 1 09:00:00 1970 @@ -1,111 +0,0 @@ ---- 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 diff --exclude=*.log* --exclude=CVS -urN skkinput.old/files/patch-ac skkinput/files/patch-ac --- skkinput.old/files/patch-ac Sun Aug 1 13:11:14 1999 +++ skkinput/files/patch-ac Thu Jan 1 09:00:00 1970 @@ -1,13 +0,0 @@ ---- 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 { diff --exclude=*.log* --exclude=CVS -urN skkinput.old/pkg-descr skkinput/pkg-descr --- skkinput.old/pkg-descr Fri Mar 13 01:05:01 1998 +++ skkinput/pkg-descr Fri Aug 16 11:09:02 2002 @@ -8,3 +8,5 @@ The port was done by Murata Shuuichirou <mrt@mickey.ai.kyutech.ac.jp>. It requires skk server. + +WWW: http://skkinput2.sourceforge.jp/ diff --exclude=*.log* --exclude=CVS -urN skkinput.old/pkg-plist skkinput/pkg-plist --- skkinput.old/pkg-plist Sun Aug 1 13:11:16 1999 +++ skkinput/pkg-plist Wed Sep 11 19:12:01 2002 @@ -1,12 +1,13 @@ bin/skkinput lib/X11/app-defaults/Skkinput -share/doc/skkinput/BUGS.jis -share/doc/skkinput/CHANGES.jis -share/doc/skkinput/FAQ.jis -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 +%%PORTDOCS%%share/doc/skkinput/BUGS.jis +%%PORTDOCS%%share/doc/skkinput/CHANGES.jis +%%PORTDOCS%%share/doc/skkinput/ChangeLog +%%PORTDOCS%%share/doc/skkinput/FAQ.jis +%%PORTDOCS%%share/doc/skkinput/PROGRAM.jis +%%PORTDOCS%%share/doc/skkinput/README.jis +%%PORTDOCS%%share/doc/skkinput/TODO.jis +%%PORTDOCS%%share/doc/skkinput/dot.skkinput +%%PORTDOCS%%share/doc/skkinput/skkinput.doc +%%PORTDOCS%%share/doc/skkinput/skkinputlisp.doc +%%PORTDOCS%%@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?20020920155958.4D9E072501>