Don't abuse int variables as pointers in patch-ag. Bumped PKGREVISION in

all sj3 packages.

3 files changed, 94 insertions, 44 deletions

diff --git a/inputmethod/sj3-lib/Makefile b/inputmethod/sj3-lib/Makefile
index 428f6045f1d..20139d6931d 100644
--- a/inputmethod/sj3-lib/Makefile
+++ b/inputmethod/sj3-lib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:46:11 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/09/28 18:22:11 rillig Exp $
 
 DISTNAME=	sj3-2.0.1.20
 PKGNAME=	sj3-lib-2.0.1.20
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	japanese inputmethod
 MASTER_SITES=	ftp://ftp.sony.co.jp/pub/unsupported/src/	\
 		ftp://ftp.cs.titech.ac.jp/pub/japanese/sj3/
diff --git a/inputmethod/sj3-lib/distinfo b/inputmethod/sj3-lib/distinfo
index 728b0b448f4..bfa461e4a84 100644
--- a/inputmethod/sj3-lib/distinfo
+++ b/inputmethod/sj3-lib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2005/09/28 17:32:17 rillig Exp $
+$NetBSD: distinfo,v 1.6 2005/09/28 18:22:11 rillig Exp $
 
 SHA1 (sj3-2.0.1.20.tar.gz) = b1cae59065ebc9caf5e198143ceb9558c932f259
 RMD160 (sj3-2.0.1.20.tar.gz) = b25f2c585485516fddf3b9168e4cb8552cd26f71
@@ -8,7 +8,7 @@ SHA1 (patch-ac) = a2a9c21618e7de1e56d371cb05cf866d549d50a1
 SHA1 (patch-ad) = 6f45996f04f894e28f2dd5d1276c31b3c6a7b12a
 SHA1 (patch-ae) = 3b07eb2ea9d72049a8f322220836a631598ea7dc
 SHA1 (patch-af) = 33ac72303dfa13929d423ecaf5d9b7cb308f8ff5
-SHA1 (patch-ag) = 0c5d2876370e4a3c469eb582512bf363fb50ac14
+SHA1 (patch-ag) = 4df33d342b583bcbc7a81e2da5eb75dd7060215c
 SHA1 (patch-ah) = 77dd83b13facb0c99fc50ebb883591b590a2cab1
 SHA1 (patch-ai) = c29e6770c8679baa7401e20a7a0e2655382bcd7a
 SHA1 (patch-aj) = a8055ef4e06f70b344f5eadf1c2f0042e22781db
diff --git a/inputmethod/sj3-lib/patches/patch-ag b/inputmethod/sj3-lib/patches/patch-ag
index 150dee66094..ecb090f0273 100644
--- a/inputmethod/sj3-lib/patches/patch-ag
+++ b/inputmethod/sj3-lib/patches/patch-ag
@@ -1,13 +1,63 @@
-$NetBSD: patch-ag,v 1.4 2005/09/28 17:32:17 rillig Exp $
+$NetBSD: patch-ag,v 1.5 2005/09/28 18:22:11 rillig Exp $
+
+- Don't abuse an int as a pointer (optarg).
+- Consistently provide lowercase and MixedCase options.
 
 --- server/setup.c.orig	Mon Mar 23 11:48:02 1998
-+++ server/setup.c	Wed Sep 28 19:23:29 2005
-@@ -219,33 +219,56 @@ StrList	**dst;
++++ server/setup.c	Wed Sep 28 20:06:34 2005
+@@ -139,10 +139,13 @@ u_char	*src, *dst;
+ 
+ 
+ 
+-static	u_char	*get_str(p, dst)
++static	u_char	*get_str(p, pv_dst)
+ u_char	*p;
+-char	**dst;
++void	*pv_dst;
+ {
++	char		**dst;
++
++	dst = pv_dst;
+ 	if (!*dst) {
+ 		*dst = malloc(strlen((char *)p) + 1);
+ 		if (!*dst) RcError("no more memory");
+@@ -151,21 +154,26 @@ char	**dst;
+ 	while (*p++) ;
+ 	return p;
+ }
+-static	u_char	*get_int(p, dst)
++static	u_char	*get_int(p, pv_dst)
+ u_char	*p;
+-int	*dst;
++void	*pv_dst;
+ {
+ 	register char	*fmt;
++	int		*dst;
+ 
++	dst = pv_dst;
+ 	fmt = (*p == '0') ? "%o" : "%d";
+ 	if (sscanf((char *)p, fmt, dst) != 1) RcError("bad integer");
+ 	while (*p++) ;
+ 	return p;
+ }
+-static	u_char	*get_flag(p, dst)
++static	u_char	*get_flag(p, pv_dst)
+ u_char	*p;
+-int	*dst;
++void	*pv_dst;
+ {
++	int		*dst;
++
++	dst = pv_dst;
+ 	if (sscanf((char *)p, "%d", dst) == 1)
+ 		;
+ 	else if (!cmpstr("on", p))
+@@ -219,33 +227,56 @@ StrList	**dst;
  struct	optlist {
  	char	*optname;
  	u_char	*(*optfunc)();
 -	int	optarg;
-+	long int	optarg;
++	void	*optarg;
  } option[] = {
 -	"DebugOut",	get_str,	(int)&debug_file,
 -	"DebugLevel",	get_int,	(int)&debug_level,
@@ -17,35 +67,35 @@ $NetBSD: patch-ag,v 1.4 2005/09/28 17:32:17 rillig Exp $
 + * Because They are lacked in here. See document.
 + * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
 + */
-+	"DebugOut",	get_str,	(long int)&debug_file,
-+	"debugout",	get_str,	(long int)&debug_file,
-+	"DebugLevel",	get_int,	(long int)&debug_level,
-+	"debuglevel",	get_int,	(long int)&debug_level,
-+	"ForkFlag",	get_flag,	(long int)&fork_flag,
-+	"forkflag",	get_flag,	(long int)&fork_flag,
++	"DebugOut",	get_str,	&debug_file,
++	"debugout",	get_str,	&debug_file,
++	"DebugLevel",	get_int,	&debug_level,
++	"debuglevel",	get_int,	&debug_level,
++	"ForkFlag",	get_flag,	&fork_flag,
++	"forkflag",	get_flag,	&fork_flag,
  
 -	"PortName",	get_str,	(int)&port_name,
-+	"PortName",	get_str,	(long int)&port_name,
-+	"portname",	get_str,	(long int)&port_name,
++	"PortName",	get_str,	&port_name,
++	"portname",	get_str,	&port_name,
  #ifdef TLI
 -	"PortNumber",	get_str,	(int)&port_number,
 -        "ProtoName",    get_str,        (int)&proto_name,
-+	"PortNumber",	get_str,	(long int)&port_number,
-+	"portnumber",	get_str,	(long int)&port_number,
-+	"ProtoName",    get_str,        (long int)&proto_name,
-+	"protoname",    get_str,        (long int)&proto_name,
++	"PortNumber",	get_str,	&port_number,
++	"portnumber",	get_str,	&port_number,
++	"ProtoName",    get_str,        &proto_name,
++	"protoname",    get_str,        &proto_name,
  #else
 -	"PortNumber",	get_int,	(int)&port_number,
-+	"PortNumber",	get_int,	(long int)&port_number,
-+	"portnumber",	get_int,	(long int)&port_number,
++	"PortNumber",	get_int,	&port_number,
++	"portnumber",	get_int,	&port_number,
  #endif
 -	"SocketName",	get_str,	(int)&socket_name,
-+	"SocketName",	get_str,	(long int)&socket_name,
-+	"socketname",	get_str,	(long int)&socket_name,
++	"SocketName",	get_str,	&socket_name,
++	"socketname",	get_str,	&socket_name,
  #ifdef	LOCK_FILE
 -	"LockFile",	get_str,	(int)&lock_file;
-+	"LockFile",	get_str,	(long int)&lock_file;
-+	"lockfile",	get_str,	(long int)&lock_file;
++	"LockFile",	get_str,	&lock_file;
++	"lockfile",	get_str,	&lock_file;
  #endif
  
 -	"maxclient",	get_int,	(int)&max_client,
@@ -57,24 +107,24 @@ $NetBSD: patch-ag,v 1.4 2005/09/28 17:32:17 rillig Exp $
 -	"dirmode",	get_int,	(int)&dir_mode,
 -	"filemode",	get_int,	(int)&file_mode,
 -	"allowuser",	get_list,	(int)&allow_user,
-+	"MaxClient",	get_int,	(long int)&max_client,
-+	"maxclient",	get_int,	(long int)&max_client,
-+	"DictDir",	get_str,	(long int)&dict_dir,
-+	"dictdir",	get_str,	(long int)&dict_dir,
-+	"ReadDict",	get_list,	(long int)&read_dict,
-+	"readdict",	get_list,	(long int)&read_dict,
-+	"OpenDict",	get_list,	(long int)&open_dict,
-+	"opendict",	get_list,	(long int)&open_dict,
-+	"ErrorOut",	get_str,	(long int)&error_file,
-+	"errorout",	get_str,	(long int)&error_file,
-+	"LogOut",	get_str,	(long int)&log_file,
-+	"logout",	get_str,	(long int)&log_file,
-+	"DirMode",	get_int,	(long int)&dir_mode,
-+	"dirmode",	get_int,	(long int)&dir_mode,
-+	"FileMode",	get_int,	(long int)&file_mode,
-+	"filemode",	get_int,	(long int)&file_mode,
-+	"AllowUser",	get_list,	(long int)&allow_user,
-+	"allowuser",	get_list,	(long int)&allow_user,
++	"MaxClient",	get_int,	&max_client,
++	"maxclient",	get_int,	&max_client,
++	"DictDir",	get_str,	&dict_dir,
++	"dictdir",	get_str,	&dict_dir,
++	"ReadDict",	get_list,	&read_dict,
++	"readdict",	get_list,	&read_dict,
++	"OpenDict",	get_list,	&open_dict,
++	"opendict",	get_list,	&open_dict,
++	"ErrorOut",	get_str,	&error_file,
++	"errorout",	get_str,	&error_file,
++	"LogOut",	get_str,	&log_file,
++	"logout",	get_str,	&log_file,
++	"DirMode",	get_int,	&dir_mode,
++	"dirmode",	get_int,	&dir_mode,
++	"FileMode",	get_int,	&file_mode,
++	"filemode",	get_int,	&file_mode,
++	"AllowUser",	get_list,	&allow_user,
++	"allowuser",	get_list,	&allow_user,
  	0, 0, 0
  };