Now, newer SKK-JISYO is installed as skk-jisyo and jisyo-tools are skktools.

So let to only install skkserv by this package.
Based on Ryo ONODERA's pkgsrc-wip/skkserv.

Bump PKGREVISION.

10 files changed, 41 insertions, 383 deletions

diff --git a/inputmethod/skkserv/DESCR b/inputmethod/skkserv/DESCR
index 7694fcc0c93..48f1cd49ca8 100644
--- a/inputmethod/skkserv/DESCR
+++ b/inputmethod/skkserv/DESCR
@@ -1,6 +1,4 @@
     skkserv is a dictionary server for SKK (Simple Kana to
 Kanji conversion) programs, including skk.el (Emacs Lisp),
-skkfep (tty-based frontend), and skkinput (X11 frontend).
-
-    This package also contains manipulation tools of
-SKK-format dictionaries.
+skkfep (tty-based frontend), and skkinput (X11 frontend),
+uim-skk, scim-skk.
diff --git a/inputmethod/skkserv/Makefile b/inputmethod/skkserv/Makefile
index 0434779270a..15e6ad8b6c8 100644
--- a/inputmethod/skkserv/Makefile
+++ b/inputmethod/skkserv/Makefile
@@ -1,19 +1,17 @@
-# $NetBSD: Makefile,v 1.21 2010/02/14 22:07:38 dholland Exp $
+# $NetBSD: Makefile,v 1.22 2010/07/17 08:57:18 obache Exp $
 
 DISTNAME=	skk9.6
 PKGNAME=	skkserv-3.9.4
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	japanese inputmethod
 MASTER_SITES=	ftp://skk.kuis.kyoto-u.ac.jp/skk/9.6/
 
-PATCHFILES=	SKK-JISYO.L.diff.gz
-PATCH_SITES=	http://www.ht-net21.ne.jp/%7Enaoki-w/skk/
-PATCH_DIST_ARGS= -d ${WRKSRC}/jisyo --forward --quiet
-
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://skk.kuis.kyoto-u.ac.jp/
 COMMENT=	Dictionary server for Simple Kana-Kanji conversion programs
 
+DEPENDS=	skk-jisyo>=200708:../../inputmethod/skk-jisyo
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=			${WRKDIR}/skk-9.6
@@ -23,6 +21,7 @@ BUILD_DEFS+=	IPV6_READY
 DIST_SUBDIR=	skk
 
 GNU_CONFIGURE=	YES
+BUILD_DIRS=	skkserv
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -39,27 +38,19 @@ SKKSERV_UID?=	32767		# nobody
 SKKSERV_GID?=	32766		# nogroup
 MAKE_ENV+=	SKKUID=${SKKSERV_UID:Q} SKKGID=${SKKSERV_GID:Q}
 
-# tmp for building dictionary.  ~16MB required.  mfs would be much faster.
-TMPDIR?=	${WRKDIR}
-
 RCD_SCRIPTS=	skkserv
 
+SUBST_CLASSES+=		ver-num
+SUBST_STAGE.ver-num=	pre-configure
+SUBST_MESSAGE.ver-num=	Fixing version number and its comments.
+SUBST_FILES.ver-num=	skkserv/skkserv.c
+SUBST_SED.ver-num=	-e 's,"${PKGVERSION_NOREV} ","${PKGVERSION} (binary search) ",g'
+
 INSTALL_MAKE_FLAGS+=	prefix=${DESTDIR}${PREFIX}
 
 INSTALLATION_DIRS=	share/skk
 
-post-build:
-	:
-	: Merging dictionaries....
-	:
-	${WRKSRC}/jisyo-tools/skkdic-expr -d ${TMPDIR}	\
-		${WRKSRC}/jisyo/SKK-JISYO.L + ${WRKSRC}/jisyo/SKK-JISYO.JIS2 | \
-	    ${WRKSRC}/jisyo-tools/skkdic-sort >${WRKDIR}/SKK-JISYO.L
-
 post-install:
-	${INSTALL_DATA} ${WRKDIR}/SKK-JISYO.L ${DESTDIR}${PREFIX}/share/skk/SKK-JISYO.L
 	${INSTALL_DATA} ${WRKSRC}/skkserv/README ${DESTDIR}${PREFIX}/share/skk/README.skkserv
-	${INSTALL_DATA} ${WRKSRC}/jisyo-tools/README.1st ${DESTDIR}${PREFIX}/share/skk/README.1st.jisyo-tools
-	${INSTALL_DATA} ${WRKSRC}/jisyo-tools/README ${DESTDIR}${PREFIX}/share/skk/README.jisyo-tools
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/skkserv/PLIST b/inputmethod/skkserv/PLIST
index 7812cc707cd..00a1c3e4363 100644
--- a/inputmethod/skkserv/PLIST
+++ b/inputmethod/skkserv/PLIST
@@ -1,10 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:01:32 joerg Exp $
-bin/skkdic-expr
-bin/skkdic-sort
-bin/skkdic-count
+@comment $NetBSD: PLIST,v 1.5 2010/07/17 08:57:18 obache Exp $
 libexec/skkserv
 share/examples/rc.d/skkserv
-share/skk/SKK-JISYO.L
 share/skk/README.skkserv
-share/skk/README.1st.jisyo-tools
-share/skk/README.jisyo-tools
diff --git a/inputmethod/skkserv/distinfo b/inputmethod/skkserv/distinfo
index a704854b3cb..83ea75db5ca 100644
--- a/inputmethod/skkserv/distinfo
+++ b/inputmethod/skkserv/distinfo
@@ -1,19 +1,12 @@
-$NetBSD: distinfo,v 1.4 2010/02/14 22:07:38 dholland Exp $
+$NetBSD: distinfo,v 1.5 2010/07/17 08:57:18 obache Exp $
 
 SHA1 (skk/skk9.6.tar.gz) = f462b4586dff6e36bfe331a526e054c3f6c3aad9
 RMD160 (skk/skk9.6.tar.gz) = af182063e92f993cd2d9a69d7f89109ef0631526
 Size (skk/skk9.6.tar.gz) = 2407653 bytes
-SHA1 (skk/SKK-JISYO.L.diff.gz) = aecf9a7aa8607b9e9a4a3c7e74268ffb09c775ad
-RMD160 (skk/SKK-JISYO.L.diff.gz) = 74f6ca601b314e9c0f20cc7dce80dc084e1efba4
-Size (skk/SKK-JISYO.L.diff.gz) = 15533 bytes
-SHA1 (patch-aa) = d9ee708fe5dcf36258256bdb4ba4c8d7e16905da
 SHA1 (patch-ab) = 5103484679c5d82a8d79460cc24e8857fc89460a
 SHA1 (patch-ac) = 3a1818c3bb453b69eb23154ed0daa6909275774b
 SHA1 (patch-ad) = 27abe12b627e8e5c5de0a78fab3a5f4551f3c0f7
 SHA1 (patch-ae) = 356b3bab93365bb769a340b99979161f07f60de4
-SHA1 (patch-af) = 0ee1792a36a220096048801346c466c9e3ec2736
-SHA1 (patch-ag) = 9d972fe066228d77214693bdfdcc14a827db79d2
-SHA1 (patch-ah) = c5c75fa2b74e7878b3a489be458f5000889d316d
+SHA1 (patch-af) = 010ee51ad8b8e078fc14e7297fbcdf7259245014
 SHA1 (patch-ai) = 38f6169507d12c500298cba555a57b77cafa19c4
-SHA1 (patch-bsearch) = d753fe29c2d0301a9e7bbf8c2d1f624447761cad
-SHA1 (patch-jisyo) = 0711c55fb8df69648bd182de68ea6a69d42ac9af
+SHA1 (patch-bsearch) = 32a0ab43b6695e19748abed250dd0e1ad632260b
diff --git a/inputmethod/skkserv/patches/patch-aa b/inputmethod/skkserv/patches/patch-aa
deleted file mode 100644
index 07c5161730c..00000000000
--- a/inputmethod/skkserv/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/05/31 12:59:58 seb Exp $
-
---- Makefile.in.orig	Mon Feb  3 18:21:39 1997
-+++ Makefile.in	Tue Dec 21 20:03:09 1999
-@@ -33,7 +33,7 @@
- JISYO = @JISYO@
- JISYODIR = $(datadir)/skk
- 
--SUBDIRS = lisp skkserv jisyo-tools doc etc
-+SUBDIRS = skkserv jisyo-tools
- 
- MDEFINES = CC='$(CC)' CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' \
- 	EMACS='$(EMACS)' JISYO='$(JISYO)' JISYODIR='$(JISYODIR)' \
-@@ -50,7 +50,6 @@
- 	  echo making $@ in $$subdir; \
- 	  (cd $$subdir && $(MAKE) $(MDEFINES) $@) || exit 1; \
- 	done
--	$(INSTALL_DATA) jisyo/$(JISYO) $(JISYODIR)/$(JISYO)
- 
- clean:
- 	cd lisp; $(MAKE) clean
diff --git a/inputmethod/skkserv/patches/patch-af b/inputmethod/skkserv/patches/patch-af
index 2699f3f9c83..3be1d57e631 100644
--- a/inputmethod/skkserv/patches/patch-af
+++ b/inputmethod/skkserv/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1.1.1 2002/05/31 12:59:58 seb Exp $
+$NetBSD: patch-af,v 1.2 2010/07/17 08:57:18 obache Exp $
 
---- skkserv/skkserv.c.orig	Tue Jan 21 04:16:36 1997
-+++ skkserv/skkserv.c	Mon Nov  6 00:12:57 2000
-@@ -100,14 +100,16 @@
+--- skkserv/skkserv.c.orig	1997-01-20 19:16:36.000000000 +0000
++++ skkserv/skkserv.c
+@@ -100,8 +100,10 @@
  #define SERVER_NOT_FOUND "4"
  #define SERVER_FULL	"9"
  
@@ -14,14 +14,7 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 12:59:58 seb Exp $
  
  /*
   *	Global Variables
-  */
- 
--char	pgmver[] = "3.9.4 ";	/* version number */
-+char	pgmver[] = "3.9.4nb1 ";	/* version number */
- 
- char	*pgmnm;		/* program name */
- char	*jname;		/* name of shared dictionary */
-@@ -121,6 +123,9 @@
+@@ -121,6 +123,9 @@ int	format;		/* 0 (old-style) / non-0 (n
  int	jtab1[KANAMOJI]; /* index-table by 1st letter (1st part)*/
  int	jtab2[KANAMOJI]; /* index-table by 1st letter (2nd part)*/
  int	initsock;	/* socket for waiting requests */
@@ -31,7 +24,7 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 12:59:58 seb Exp $
  int	clientsock[MAXCLNT];	/* socket for each client */
  int	nclients;	/* max index for active clients */
  
-@@ -130,8 +135,18 @@
+@@ -130,8 +135,18 @@ char *argv[];
    int	parg;
    int	setjisho = 0;
    int	ctlterm;	/* fildes for control terminal */
@@ -51,7 +44,7 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 12:59:58 seb Exp $
    pgmnm = argv[0];
    debug = 0;
    errout = stderr;
-@@ -200,7 +215,10 @@
+@@ -200,7 +215,10 @@ char *argv[];
      fclose(stderr);
  
      /* detach child process from control terminal */
@@ -63,7 +56,7 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 12:59:58 seb Exp $
      if ((ctlterm = open("/dev/tty", 2)) >= 0) { 
        ioctl(ctlterm, TIOCNOTTY, 0);
        close(ctlterm);
-@@ -215,6 +233,7 @@
+@@ -215,6 +233,7 @@ char *argv[];
      signal(SIGHUP, SIG_IGN);
      if (fork() != 0) exit(0);
  #endif
@@ -71,7 +64,7 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 12:59:58 seb Exp $
    } else { /* debug mode */
      fprintf(errout, "SKK-JISYO is %s\n", jname);
      fflush(errout);
-@@ -222,7 +241,7 @@
+@@ -222,7 +241,7 @@ char *argv[];
      if (errout != stderr) fclose(stderr);
    }
  
@@ -80,7 +73,7 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 12:59:58 seb Exp $
    /* 1993/6/5 by kam, re-read dictionary by "INT" signal */
  
    nclients = 0;
-@@ -244,8 +263,11 @@
+@@ -244,8 +263,11 @@ showusage()
  mksock()
  {
    struct sockaddr_in	sin;
@@ -93,7 +86,7 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 12:59:58 seb Exp $
    
    bzero((char*)&sin, sizeof(sin));
    sin.sin_family = AF_INET;
-@@ -262,16 +284,54 @@
+@@ -262,16 +284,54 @@ mksock()
    sin.sin_port = htons(portnum); 
  
    if ((initsock = socket(PF_INET, SOCK_STREAM, 0)) < 0)
@@ -154,7 +147,7 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 12:59:58 seb Exp $
      fflush(errout);
    }
  }
-@@ -303,8 +363,19 @@
+@@ -303,8 +363,19 @@ mkjtab()
      mkoldjtab(buf);
  }
  
@@ -175,7 +168,7 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 12:59:58 seb Exp $
  {
    if (fclose(jisho) < 0) {
      fprintf(stderr, 
-@@ -455,15 +526,22 @@
+@@ -455,15 +526,22 @@ mknewjtab()
  main_loop()
  {
    fd_set 		readfds, writefds, exceptfds;
@@ -200,7 +193,7 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 12:59:58 seb Exp $
      if (select(MAXDTAB, &readfds, &writefds, &exceptfds, NULL) < 0) {
        if (errno == EINTR) /* if signal happens */
  	continue;
-@@ -474,16 +552,32 @@
+@@ -474,16 +552,32 @@ main_loop()
        fflush(errout);
      }
  
@@ -235,7 +228,7 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 12:59:58 seb Exp $
  
      /*	naiive scheduling */
      for (i = 0; i < nclients; i ++)
-@@ -511,16 +605,20 @@
+@@ -511,16 +605,20 @@ main_loop()
   *	get bit pattern of read file descriptor
   */
  
@@ -262,7 +255,7 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 12:59:58 seb Exp $
  }
  
  /*
-@@ -724,6 +822,9 @@
+@@ -724,6 +822,9 @@ set_hname()
      exit(1);
    }
    hentry = gethostbyname(hname);
@@ -272,7 +265,7 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 12:59:58 seb Exp $
  #ifdef NO_ADDR_LIST
    strcat(hname, ":");
    strcat(hname, hentry->h_addr);
-@@ -736,6 +837,7 @@
+@@ -736,6 +837,7 @@ set_hname()
      strcat(hname, inet_ntoa(*(struct in_addr *)*p++));
    }
  #endif
diff --git a/inputmethod/skkserv/patches/patch-ag b/inputmethod/skkserv/patches/patch-ag
deleted file mode 100644
index c9e8796a68d..00000000000
--- a/inputmethod/skkserv/patches/patch-ag
+++ /dev/null
@@ -1,151 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2010/02/14 22:07:38 dholland Exp $
-
---- jisyo-tools/skkdic-expr.c.orig	1996-12-17 05:51:28.000000000 +0000
-+++ jisyo-tools/skkdic-expr.c
-@@ -22,6 +22,8 @@ the Free Software Foundation, 675 Mass A
-  */
- 
- #include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
- #include <ndbm.h>
- #include <errno.h>
- #include <signal.h>
-@@ -78,59 +80,86 @@ static void db_remove_file(fname)
- 	}
- }
- 
-+#if !defined(dbm_pagfno) || defined(DBM_SUFFIX)
-+#define NEW_DB
-+#endif
-+
- /* 作業用データベースファイルを削除
-    file_name には content が格納される */
- static void db_remove_files()
- {
--    char pag_name[256];
--    char dir_name[256];
-+    char db_name[256];
- 
-     db_remove_file(file_name);
--    sprintf(pag_name, "%s.pag", file_name);
--    db_remove_file(pag_name);
--    sprintf(dir_name, "%s.dir", file_name);
--    db_remove_file(dir_name);
-+#ifdef NEW_DB
-+    sprintf(db_name, "%s.db", file_name);
-+    db_remove_file(db_name);
-+#else
-+    sprintf(db_name, "%s.pag", file_name);
-+    db_remove_file(db_name);
-+    sprintf(db_name, "%s.dir", file_name);
-+    db_remove_file(db_name);
-+#endif
- 
-     if (okurigana_flag) {
- 	db_remove_file(okuri_head_name);
--	sprintf(pag_name, "%s.pag", okuri_head_name);
--	db_remove_file(pag_name);
--	sprintf(dir_name, "%s.dir", okuri_head_name);
--	db_remove_file(dir_name);
-+#ifdef NEW_DB
-+	sprintf(db_name, "%s.db", okuri_head_name);
-+	db_remove_file(db_name);
-+#else
-+	sprintf(db_name, "%s.pag", okuri_head_name);
-+	db_remove_file(db_name);
-+	sprintf(db_name, "%s.dir", okuri_head_name);
-+	db_remove_file(db_name);
-+#endif
- 
- 	db_remove_file(okuri_tail_name);
--	sprintf(pag_name, "%s.pag", okuri_tail_name);
--	db_remove_file(pag_name);
--	sprintf(dir_name, "%s.dir", okuri_tail_name);
--	db_remove_file(dir_name);
-+#ifdef NEW_DB
-+	sprintf(db_name, "%s.db", okuri_tail_name);
-+	db_remove_file(db_name);
-+#else
-+	sprintf(db_name, "%s.pag", okuri_tail_name);
-+	db_remove_file(db_name);
-+	sprintf(db_name, "%s.dir", okuri_tail_name);
-+	db_remove_file(db_name);
-+#endif
-     }
- }
- 
-+#ifndef O_EXCL
-+#define O_EXCL	0
-+#endif
-+
- /* データベースファイルを作成 */
--static void db_make_files()
-+static void db_make_files(tmpdir)
-+	char *tmpdir;
- {
--    sprintf(file_name, "/tmp/skkjisyo.%d", getpid());
-+    int pid = getpid();
-+    int fd;
-+
-+    sprintf(file_name, "%s/skkjisyo.%d", tmpdir, pid);
-     if (okurigana_flag) {
--	sprintf(okuri_head_name, "/tmp/skkhead.%d", getpid());
--	sprintf(okuri_tail_name, "/tmp/skktail.%d", getpid());
-+	sprintf(okuri_head_name, "%s/skkhead.%d", tmpdir, pid);
-+	sprintf(okuri_tail_name, "%s/skktail.%d", tmpdir, pid);
-     }
-     
-     db_remove_files();
--    if ((db = dbm_open(file_name, O_RDWR|O_CREAT, 0600)) == NULL){
-+    if ((db = dbm_open(file_name, O_RDWR|O_CREAT|O_EXCL, 0600)) == NULL){
- 	perror(file_name);
- 	exit(1);
-     }
--    if ((dbcontent = fopen(file_name, "w+")) == NULL){
-+    if ((fd = open(file_name, O_RDWR|O_CREAT|O_EXCL, 0600)) < 0 ||
-+	(dbcontent = fdopen(fd, "w+")) == NULL){
- 	perror(file_name);
- 	exit(1);
-     }
-     if (okurigana_flag) {
--	if ((okuriheaddb = dbm_open(okuri_head_name, O_RDWR|O_CREAT, 0600)) 
-+	if ((okuriheaddb = dbm_open(okuri_head_name, O_RDWR|O_CREAT|O_EXCL, 0600)) 
- 	    == NULL){
- 	    perror(okuri_head_name);
- 	    exit(1);
- 	}
--	if ((okuritaildb = dbm_open(okuri_tail_name, O_RDWR|O_CREAT, 0600)) 
-+	if ((okuritaildb = dbm_open(okuri_tail_name, O_RDWR|O_CREAT|O_EXCL, 0600)) 
- 	    == NULL){
- 	    perror(okuri_tail_name);
- 	    exit(1);
-@@ -698,7 +727,7 @@ static void type_out(output)
-     for (key = dbm_firstkey(db); key.dptr !=  NULL;  key = dbm_nextkey(db)) {
- 	content = dbm_fetch(db, key);
- 	for(i = 0; i < key.dsize; ++ i)
--	    putc((key.dptr)[i], output);
-+	    putc(((char *) key.dptr)[i], output);
- 	putc(' ', output);
- 	fseek(dbcontent, getpos(content.dptr), 0);
- 	db_gets(kanji, BLEN, dbcontent);
-@@ -716,7 +745,7 @@ static void type_out(output)
- 	    if (entry.dptr != NULL) continue;
- 
- 	    for(i = 0; i < key.dsize; ++ i)
--		putc((key.dptr)[i], output);
-+		putc(((char *) key.dptr)[i], output);
- 	    putc(' ', output);
- 	    putc('/', output);
- 	    okuri_type_out(&key, output);
-@@ -775,9 +804,8 @@ int main(argc, argv)
- 	exit(1);
-     }
- 
--    sprintf(file_name, "%s/skkjisyo.%d", tmpdir, getpid());
-     set_signal_handler();
--    db_make_files();
-+    db_make_files(tmpdir);
-     
-     negate = 0;
-     for (; i < argc; ++ i) {
diff --git a/inputmethod/skkserv/patches/patch-ah b/inputmethod/skkserv/patches/patch-ah
deleted file mode 100644
index b18895872dc..00000000000
--- a/inputmethod/skkserv/patches/patch-ah
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2010/02/14 22:07:38 dholland Exp $
-
---- jisyo-tools/skkdic-sort.c.orig	1996-12-17 05:51:28.000000000 +0000
-+++ jisyo-tools/skkdic-sort.c
-@@ -22,7 +22,8 @@ the Free Software Foundation, 675 Mass A
-  */
- 
- #include <stdio.h>
--#ifndef NO_MALLOC_H
-+#include <stdlib.h>
-+#ifdef HAVE_MALLOC_H
- #include <malloc.h>
- #endif
- 
diff --git a/inputmethod/skkserv/patches/patch-bsearch b/inputmethod/skkserv/patches/patch-bsearch
index 5cc1c2a22b7..a01d719f1ed 100644
--- a/inputmethod/skkserv/patches/patch-bsearch
+++ b/inputmethod/skkserv/patches/patch-bsearch
@@ -1,21 +1,8 @@
-$NetBSD: patch-bsearch,v 1.1.1.1 2002/05/31 12:59:59 seb Exp $
+$NetBSD: patch-bsearch,v 1.2 2010/07/17 08:57:18 obache Exp $
 
-Binary search patch.
-Originally from skk-users mailing list
-(Masahiro Doteguchi, Mailinglist-Id: 1779).
-
---- skkserv/skkserv.c.patch1	Mon Nov  6 00:12:57 2000
-+++ skkserv/skkserv.c	Mon Nov  6 00:15:00 2000
-@@ -109,7 +109,7 @@
-  *	Global Variables
-  */
- 
--char	pgmver[] = "3.9.4nb1 ";	/* version number */
-+char	pgmver[] = "3.9.4nb1 (binary search) ";	/* version number */
- 
- char	*pgmnm;		/* program name */
- char	*jname;		/* name of shared dictionary */
-@@ -622,7 +622,7 @@
+--- skkserv/skkserv.c.orig	2010-07-16 09:36:31.000000000 +0000
++++ skkserv/skkserv.c
+@@ -622,7 +622,7 @@ fd_set	*rfds;
  }
  
  /*
@@ -24,7 +11,7 @@ Originally from skk-users mailing list
   */
  
  search(commsock)
-@@ -635,6 +635,7 @@
+@@ -635,6 +635,7 @@ int	commsock;
    int		n; 	 	 /* number of characters from client */
    int		sttpnt; 	 /* start point of searching */
    int		endpnt; 	 /* end point of searching */
@@ -32,7 +19,7 @@ Originally from skk-users mailing list
    int		errcod = 0; 	 /* error flag */
    int		sstyle;		 /* search style */
  
-@@ -743,18 +744,36 @@
+@@ -743,18 +744,36 @@ int	commsock;
        endpnt = jtab1[KANA_END - code + 1];
      }
    }
@@ -75,7 +62,7 @@ Originally from skk-users mailing list
        if ((errcod = write(commsock, SERVER_FOUND, 1)) >= 0)
  	while ((c = fgetc(jisho)) != EOF) {
  	  *pbuf = c;
-@@ -770,18 +789,35 @@
+@@ -770,18 +789,35 @@ int	commsock;
        }
        return(0);
      }
diff --git a/inputmethod/skkserv/patches/patch-jisyo b/inputmethod/skkserv/patches/patch-jisyo
deleted file mode 100644
index d00792dab62..00000000000
--- a/inputmethod/skkserv/patches/patch-jisyo
+++ /dev/null
@@ -1,112 +0,0 @@
-$NetBSD: patch-jisyo,v 1.1.1.1 2002/05/31 12:59:59 seb Exp $
-
-Dictionary (SKK-JISYO.L) corrigenda.
-Partially from skk-dic mailing list.
-
---- jisyo/SKK-JISYO.L.fix1	Mon Dec 20 16:28:52 1999
-+++ jisyo/SKK-JISYO.L	Mon Dec 27 23:53:47 1999
-@@ -3530,7 +3530,7 @@
- しりあe /知り合/
- しらべr /調べ/
- しらじらs /白々/
--しらs /報/知ら/知らせ/
-+しらs /報/知ら/
- しらm /白/
- しらk /白/
- しらb /調/
-@@ -4216,9 +4216,9 @@
- ぐi /食/
- くんよm /訓読/
- くんづk /君付/
--くわわt /加/
-+くわわt /加わ/
- くわだt /企/
--くわw /加わ/
-+くわw /加/
- くわs /詳/加/
- くわk /区分/
- くわe /加/咥/銜/加え/
-@@ -30746,7 +30746,7 @@
- がいかんび /外観美/
- がいき /外気/
- がいきおん /外気温/
--がいきょう /概況/外匡/
-+がいきょう /概況/外筐/
- がいきょく /外局/
- がいきれいぼう /外気冷房/
- がいきん /外勤/
-@@ -34044,7 +34044,7 @@
- きゅうきゅうたい /救急隊/
- きゅうきゅうばこ /救急箱/
- きゅうきゅうばんそうこう /救急絆創膏/
--きゅうきょ /急拠/急遽/急きょ/
-+きゅうきょ /急遽/急きょ/
- きゅうきょう /窮境/
- きゅうきょうさんけんしょこく /旧共産圏諸国/
- きゅうきょうしょくいん /旧教職員/
-@@ -35040,9 +35040,9 @@
- きょうぞんきょうえい /共存共栄/
- きょうぞんほう /共存法/
- きょうぞんほうほう /共存方法/
--きょうたい /匡体/筐体/狂態/矯態/嬌態/筺体/
-+きょうたい /筐体/狂態/嬌態/
- きょうたいいき /狭帯域/
--きょうたいじっそうぎじゅつ /匡体実装技術/
-+きょうたいじっそうぎじゅつ /筐体実装技術/
- きょうたく /供託/教卓/
- きょうたくきん /供託金/
- きょうたくしょ /供託所/
-@@ -36904,7 +36904,7 @@
- ぎじんほう /擬人法/
- ぎせい /犠牲/擬声/擬制/
- ぎせいご /擬声語/
--ぎせいしゃ /儀牲者/犠牲者/
-+ぎせいしゃ /犠牲者/
- ぎせき /議席/
- ぎせきすう /議席数/
- ぎせきはいぶん /議席配分/
-@@ -42867,7 +42867,7 @@
- こうぎせきぶん /広義積分/
- こうぎたいしょう /抗議対象/
- こうぎちゅう /講義中/
--こうぎとう /講義搭/講義棟/
-+こうぎとう /講義棟/
- こうぎないよう /講義内容/
- こうぎぶん /抗議文/
- こうぎめい /講義名/
-@@ -84011,7 +84011,7 @@
- とうじゅうろう /藤十郎/
- とうじゆうめい /当時有名/
- とうじょ /唐書/
--とうじょう /登場/搭乗/東條/東条/棟上/東上/塔乗/頭状/東城/筒状/
-+とうじょう /登場/搭乗/東條/東条/棟上/東上/頭状/東城/筒状/
- とうじょういぜん /登場以前/
- とうじょういらい /登場以来/
- とうじょういん /搭乗員/
-@@ -84025,7 +84025,7 @@
- とうじょうご /登場後/
- とうじょうしゃ /搭乗者/
- とうじょうしゃほけん /搭乗者保険/
--とうじょうじ /塔乗時/登場時/
-+とうじょうじ /搭乗時/登場時/
- とうじょうじっせき /搭乗実績/
- とうじょうじんぶつ /登場人物/
- とうじょうじんぶつたち /登場人物達/
-@@ -84038,7 +84038,7 @@
- とうじょうとうじ /登場当時/
- とうじょうばめん /登場場面/
- とうじょうばんぐみ /登場番組/
--とうじょうび /塔乗日/搭乗日/
-+とうじょうび /搭乗日/
- とうじょうびん /搭乗便/
- とうじょうまえ /登場前/搭乗前/
- とうじょうよてい /登場予定/搭乗予定/
-@@ -93140,7 +93140,7 @@
- はげたか /禿鷹/
- はげやま /禿山/
- はげん /波源/
--はこ /箱/函/運/葉子/□/匡/凾/筥/箪/匣/
-+はこ /箱/函/運/葉子/□/筐/凾/筥/箪/匣/
- はこいり /箱入り/箱入/
- はこう /破口/跛行/波高/
- はこうぶんぷ /波高分布/