Update to version 2.03.

PR:		12829
Submitted by:	Yasuhiro Fukuma <yasuf@big.or.jp>

10 files changed, 274 insertions, 20 deletions

diff --git a/japanese/skkinput/Makefile b/japanese/skkinput/Makefile
index 8b21060f0e8c..6dedb63e7736 100644
--- a/japanese/skkinput/Makefile
+++ b/japanese/skkinput/Makefile
@@ -3,29 +3,30 @@
 # Date created:		28 Jan 1998
 # Whom:			Murata Shuuichirou <mrt@mickey.ai.kyutech.ac.jp>
 #
-# $Id: Makefile,v 1.4 1998/04/18 15:50:18 kuriyama Exp $
+# $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>
diff --git a/japanese/skkinput/distinfo b/japanese/skkinput/distinfo
index 796b986f9ae9..5fab6a4c8938 100644
--- a/japanese/skkinput/distinfo
+++ b/japanese/skkinput/distinfo
@@ -1 +1 @@
-MD5 (skkinput-2.00.tar.gz) = 5f10e3ed5a5f8ab40adf2daa6de84931
+MD5 (skkinput-2.03.tar.gz) = 74c08620e8e916a3d56f3bb3e85a5d62
diff --git a/japanese/skkinput/files/patch-ab b/japanese/skkinput/files/patch-ab
new file mode 100644
index 000000000000..2c821d423f75
--- /dev/null
+++ b/japanese/skkinput/files/patch-ab
@@ -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
diff --git a/japanese/skkinput/files/patch-ac b/japanese/skkinput/files/patch-ac
new file mode 100644
index 000000000000..be59901419be
--- /dev/null
+++ b/japanese/skkinput/files/patch-ac
@@ -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 {
diff --git a/japanese/skkinput/pkg-plist b/japanese/skkinput/pkg-plist
index bea505bd6bd9..a5c69227c148 100644
--- a/japanese/skkinput/pkg-plist
+++ b/japanese/skkinput/pkg-plist
@@ -6,5 +6,7 @@ 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
diff --git a/japanese/skkinput3/Makefile b/japanese/skkinput3/Makefile
index 8b21060f0e8c..6dedb63e7736 100644
--- a/japanese/skkinput3/Makefile
+++ b/japanese/skkinput3/Makefile
@@ -3,29 +3,30 @@
 # Date created:		28 Jan 1998
 # Whom:			Murata Shuuichirou <mrt@mickey.ai.kyutech.ac.jp>
 #
-# $Id: Makefile,v 1.4 1998/04/18 15:50:18 kuriyama Exp $
+# $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>
diff --git a/japanese/skkinput3/distinfo b/japanese/skkinput3/distinfo
index 796b986f9ae9..5fab6a4c8938 100644
--- a/japanese/skkinput3/distinfo
+++ b/japanese/skkinput3/distinfo
@@ -1 +1 @@
-MD5 (skkinput-2.00.tar.gz) = 5f10e3ed5a5f8ab40adf2daa6de84931
+MD5 (skkinput-2.03.tar.gz) = 74c08620e8e916a3d56f3bb3e85a5d62
diff --git a/japanese/skkinput3/files/patch-ab b/japanese/skkinput3/files/patch-ab
new file mode 100644
index 000000000000..2c821d423f75
--- /dev/null
+++ b/japanese/skkinput3/files/patch-ab
@@ -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
diff --git a/japanese/skkinput3/files/patch-ac b/japanese/skkinput3/files/patch-ac
new file mode 100644
index 000000000000..be59901419be
--- /dev/null
+++ b/japanese/skkinput3/files/patch-ac
@@ -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 {
diff --git a/japanese/skkinput3/pkg-plist b/japanese/skkinput3/pkg-plist
index bea505bd6bd9..a5c69227c148 100644
--- a/japanese/skkinput3/pkg-plist
+++ b/japanese/skkinput3/pkg-plist
@@ -6,5 +6,7 @@ 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