Fix crashing LP64 build by including necessary standard headers.

Remove NOT_FOR_PLATFORM again. Bump PKGREVISION (to 5) as a precaution.

4 files changed, 37 insertions, 19 deletions

diff --git a/inputmethod/skkserv/distinfo b/inputmethod/skkserv/distinfo
index fcb88f3dc08..a704854b3cb 100644
--- a/inputmethod/skkserv/distinfo
+++ b/inputmethod/skkserv/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 21:00:35 agc Exp $
+$NetBSD: distinfo,v 1.4 2010/02/14 22:07:38 dholland Exp $
 
 SHA1 (skk/skk9.6.tar.gz) = f462b4586dff6e36bfe331a526e054c3f6c3aad9
 RMD160 (skk/skk9.6.tar.gz) = af182063e92f993cd2d9a69d7f89109ef0631526
@@ -12,8 +12,8 @@ SHA1 (patch-ac) = 3a1818c3bb453b69eb23154ed0daa6909275774b
 SHA1 (patch-ad) = 27abe12b627e8e5c5de0a78fab3a5f4551f3c0f7
 SHA1 (patch-ae) = 356b3bab93365bb769a340b99979161f07f60de4
 SHA1 (patch-af) = 0ee1792a36a220096048801346c466c9e3ec2736
-SHA1 (patch-ag) = f60d3e410cfc1c438827fa498e5fa4bc4dc3ec46
-SHA1 (patch-ah) = 414fc705a685f0276ae3a66d2f2546e1e7767495
-SHA1 (patch-ai) = 89fa76a42e445a3cb331e9f49e00b42d1a2ec91f
+SHA1 (patch-ag) = 9d972fe066228d77214693bdfdcc14a827db79d2
+SHA1 (patch-ah) = c5c75fa2b74e7878b3a489be458f5000889d316d
+SHA1 (patch-ai) = 38f6169507d12c500298cba555a57b77cafa19c4
 SHA1 (patch-bsearch) = d753fe29c2d0301a9e7bbf8c2d1f624447761cad
 SHA1 (patch-jisyo) = 0711c55fb8df69648bd182de68ea6a69d42ac9af
diff --git a/inputmethod/skkserv/patches/patch-ag b/inputmethod/skkserv/patches/patch-ag
index f31b2ab24bb..c9e8796a68d 100644
--- a/inputmethod/skkserv/patches/patch-ag
+++ b/inputmethod/skkserv/patches/patch-ag
@@ -1,8 +1,17 @@
-$NetBSD: patch-ag,v 1.1.1.1 2002/05/31 12:59:58 seb Exp $
+$NetBSD: patch-ag,v 1.2 2010/02/14 22:07:38 dholland Exp $
 
---- jisyo-tools/skkdic-expr.c.orig	Tue Dec 17 14:51:28 1996
-+++ jisyo-tools/skkdic-expr.c	Mon Nov  6 01:34:22 2000
-@@ -78,59 +78,86 @@
+--- 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)
  	}
  }
  
@@ -111,7 +120,7 @@ $NetBSD: patch-ag,v 1.1.1.1 2002/05/31 12:59:58 seb Exp $
  	    == NULL){
  	    perror(okuri_tail_name);
  	    exit(1);
-@@ -698,7 +725,7 @@
+@@ -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)
@@ -120,7 +129,7 @@ $NetBSD: patch-ag,v 1.1.1.1 2002/05/31 12:59:58 seb Exp $
  	putc(' ', output);
  	fseek(dbcontent, getpos(content.dptr), 0);
  	db_gets(kanji, BLEN, dbcontent);
-@@ -716,7 +743,7 @@
+@@ -716,7 +745,7 @@ static void type_out(output)
  	    if (entry.dptr != NULL) continue;
  
  	    for(i = 0; i < key.dsize; ++ i)
@@ -129,7 +138,7 @@ $NetBSD: patch-ag,v 1.1.1.1 2002/05/31 12:59:58 seb Exp $
  	    putc(' ', output);
  	    putc('/', output);
  	    okuri_type_out(&key, output);
-@@ -775,9 +802,8 @@
+@@ -775,9 +804,8 @@ int main(argc, argv)
  	exit(1);
      }
  
diff --git a/inputmethod/skkserv/patches/patch-ah b/inputmethod/skkserv/patches/patch-ah
index 3bb6012ea68..b18895872dc 100644
--- a/inputmethod/skkserv/patches/patch-ah
+++ b/inputmethod/skkserv/patches/patch-ah
@@ -1,12 +1,13 @@
-$NetBSD: patch-ah,v 1.1.1.1 2002/05/31 12:59:58 seb Exp $
+$NetBSD: patch-ah,v 1.2 2010/02/14 22:07:38 dholland Exp $
 
---- jisyo-tools/skkdic-sort.c-orig	Tue Dec 17 06:51:28 1996
-+++ jisyo-tools/skkdic-sort.c	Sun Nov 18 13:01:23 2001
-@@ -22,7 +22,7 @@
+--- 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-ai b/inputmethod/skkserv/patches/patch-ai
index 0af9736fb04..3f97f7407b0 100644
--- a/inputmethod/skkserv/patches/patch-ai
+++ b/inputmethod/skkserv/patches/patch-ai
@@ -1,8 +1,16 @@
-$NetBSD: patch-ai,v 1.1 2005/02/22 10:48:36 hira Exp $
+$NetBSD: patch-ai,v 1.2 2010/02/14 22:07:38 dholland Exp $
 
---- skkserv/skkserv.h.orig	2005-02-22 19:14:10.000000000 +0900
-+++ skkserv/skkserv.h	2005-02-22 19:14:46.000000000 +0900
-@@ -43,6 +43,7 @@
+--- skkserv/skkserv.h.orig	1997-01-20 19:16:36.000000000 +0000
++++ skkserv/skkserv.h
+@@ -37,12 +37,15 @@
+ /* Necessary for SunOS 3.x and maybe other old systems */
+ 
+ #include	<stdio.h>
++#include	<stdlib.h>
++#include	<string.h>
+ 
+ #include	<sys/types.h>
+ #ifdef HAVE_SYS_IOCTL_H
  #include	<sys/ioctl.h>
  #endif
  #include	<sys/socket.h>