Fix build error on amd64 (maybe ia64, too).

Submitted by:	Hiroo Ono <hiroo+freebsd@oikumene.gcd.org>
Tested on the box from:	AMD Developper Program (FreeBSD/amd64)

30 files changed, 18 insertions, 801 deletions

diff --git a/japanese/sj3-lib/Makefile b/japanese/sj3-lib/Makefile
index 6f79250fa5a5..f8b03cf1c35d 100644
--- a/japanese/sj3-lib/Makefile
+++ b/japanese/sj3-lib/Makefile
@@ -7,11 +7,14 @@
 
 PORTNAME=	sj3
 PORTVERSION=	2.0.1.20
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.sony.co.jp/pub/unsupported/src/ \
 		ftp://ftp.cs.titech.ac.jp/pub/japanese/sj3/
 
+PATCH_SITES=	http://oikumene.que.ne.jp/misc/
+PATCHFILES=	${PORTNAME}-patches-20040704.bz2
+
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Japanese input method
 
@@ -28,10 +31,6 @@ STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/sj3.sh
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "ia64" || ${ARCH} == "amd64"
-BROKEN=		"Coredump during build on amd64 and ia64"
-.endif
-
 do-configure:
 	( cd $(WRKSRC) ; xmkmf ; make Makefiles )
 
diff --git a/japanese/sj3-lib/distinfo b/japanese/sj3-lib/distinfo
index 39b5aabd5d85..c9a95cc317c4 100644
--- a/japanese/sj3-lib/distinfo
+++ b/japanese/sj3-lib/distinfo
@@ -1,2 +1,4 @@
 MD5 (sj3-2.0.1.20.tar.gz) = 36cc23702e2295e4552271b9d481c863
 SIZE (sj3-2.0.1.20.tar.gz) = 584065
+MD5 (sj3-patches-20040704.bz2) = 2cff2995f279845a4bbe083ce1d5243e
+SIZE (sj3-patches-20040704.bz2) = 41310
diff --git a/japanese/sj3-lib/files/patch-aa b/japanese/sj3-lib/files/patch-aa
index b4670f0add7f..584eee7aef56 100644
--- a/japanese/sj3-lib/files/patch-aa
+++ b/japanese/sj3-lib/files/patch-aa
@@ -359,143 +359,3 @@ diff -arcN ../sj3-2.0.1.13.org/doc/man/sj3serv.1 ./doc/man/sj3serv.1
   かな漢字変換サーバ デフォルト辞書ディレクトリ
   .TP
       sj3main.dic
-*** server/setup.c.orig	Mon Mar 23 05:48:02 1998
---- server/setup.c	Fri Feb  2 19:53:37 2001
-***************
-*** 217,251 ****
-  
-  
-  struct	optlist {
-! 	char	*optname;
-  	u_char	*(*optfunc)();
-! 	int	optarg;
-  } option[] = {
-! 	"DebugOut",	get_str,	(int)&debug_file,
-! 	"DebugLevel",	get_int,	(int)&debug_level,
-! 	"ForkFlag",	get_flag,	(int)&fork_flag,
-  
-! 	"PortName",	get_str,	(int)&port_name,
-  #ifdef TLI
-! 	"PortNumber",	get_str,	(int)&port_number,
-!         "ProtoName",    get_str,        (int)&proto_name,
-  #else
-! 	"PortNumber",	get_int,	(int)&port_number,
-  #endif
-! 	"SocketName",	get_str,	(int)&socket_name,
-  #ifdef	LOCK_FILE
-! 	"LockFile",	get_str,	(int)&lock_file;
-  #endif
-  
-! 	"maxclient",	get_int,	(int)&max_client,
-! 	"dictdir",	get_str,	(int)&dict_dir,
-! 	"readdict",	get_list,	(int)&read_dict,
-! 	"opendict",	get_list,	(int)&open_dict,
-! 	"errorout",	get_str,	(int)&error_file,
-! 	"logout",	get_str,	(int)&log_file,
-! 	"dirmode",	get_int,	(int)&dir_mode,
-! 	"filemode",	get_int,	(int)&file_mode,
-! 	"allowuser",	get_list,	(int)&allow_user,
-  	0, 0, 0
-  };
-  
---- 217,274 ----
-  
-  
-  struct	optlist {
-! 	const char	*optname;
-  	u_char	*(*optfunc)();
-! 	void	*optarg;
-  } option[] = {
-! /*
-!  * Add option flag.
-!  * Because They are lacked in here. See document.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! 	"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,	&port_name,
-! 	"portname",	get_str,	&port_name,
-  #ifdef TLI
-! 	"PortNumber",	get_str,	&port_number,
-! 	"portnumber",	get_str,	&port_number,
-! 	"ProtoName",    get_str,        &proto_name,
-! 	"protoname",    get_str,        &proto_name,
-  #else
-! 	"PortNumber",	get_int,	&port_number,
-! 	"portnumber",	get_int,	&port_number,
-  #endif
-! 	"SocketName",	get_str,	&socket_name,
-! 	"socketname",	get_str,	&socket_name,
-  #ifdef	LOCK_FILE
-! 	"LockFile",	get_str,	&lock_file;
-! 	"lockfile",	get_str,	&lock_file;
-  #endif
-  
-! 	"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
-  };
-  
-***************
-*** 424,441 ****
-  	int	c;
-  	int	errflg = 0;
-  	char	*p;
-  
-  	extern	char	*optarg, *strrchr();
-  	extern	int	optind;
-  
-  	p = (p = strrchr(argv[0], '/')) ? p + 1 : argv[0];
-! 	strcpy(program_name,	p);
-! 	strcpy(runcmd_file,	RunCmdFile);
-  
-  	while ((c = getopt(argc, argv, "f:")) != EOF) {
-  		switch (c) {
-  		case 'f':
-! 			strcpy(runcmd_file, optarg);
-  			break;
-  
-  		case '?':
---- 447,467 ----
-  	int	c;
-  	int	errflg = 0;
-  	char	*p;
-+ 	size_t	ret;
-  
-  	extern	char	*optarg, *strrchr();
-  	extern	int	optind;
-  
-  	p = (p = strrchr(argv[0], '/')) ? p + 1 : argv[0];
-! 	strlcpy(program_name,	p, sizeof(program_name));
-! 	strlcpy(runcmd_file,	RunCmdFile, sizeof(runcmd_file));
-  
-  	while ((c = getopt(argc, argv, "f:")) != EOF) {
-  		switch (c) {
-  		case 'f':
-! 			ret = strlcpy(runcmd_file, optarg, sizeof(runcmd_file));
-! 			if (ret > sizeof(runcmd_file))
-! 				errflg++;
-  			break;
-  
-  		case '?':
diff --git a/japanese/sj3-lib/files/patch-ac b/japanese/sj3-lib/files/patch-ac
deleted file mode 100644
index 148a043fdad8..000000000000
--- a/japanese/sj3-lib/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- dict/dict/Imakefile.~1~	Thu Jan 23 20:20:51 1997
-+++ dict/dict/Imakefile	Tue Aug 18 10:51:14 1998
-@@ -48,7 +48,7 @@
- 
- XCOMM INSTFLAGS	= -o $(SJ3OWNER) -g $(SJ3GROUP) -m 444
- 
--all:		$(OBJS)
-+all::		$(OBJS)
- 
- $(OBJS):	$(SRCS)
- 		$(TOOL_DIR)/$(TOOL_NAME) $(SRCS) $(OBJS) > $(OUTPUT)
diff --git a/japanese/sj3-lib/files/patch-ad b/japanese/sj3-lib/files/patch-ad
deleted file mode 100644
index 8c714daa84fe..000000000000
--- a/japanese/sj3-lib/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- sj3.tmpl.~1~	Thu Jan 23 20:20:58 1997
-+++ sj3.tmpl	Tue Aug 18 11:07:42 1998
-@@ -48,7 +48,7 @@
- #if defined(FreeBSDArchitecture)
- 
- CODE_LIBS	= -lxpg4
--SJ3OWNER	= root
-+SJ3OWNER	= bin
- SJ3GROUP	= bin
- 
- #else
diff --git a/japanese/sj3-lib/files/patch-ae b/japanese/sj3-lib/files/patch-ae
deleted file mode 100644
index 939c71115c9b..000000000000
--- a/japanese/sj3-lib/files/patch-ae
+++ /dev/null
@@ -1,26 +0,0 @@
---- include/Paths.h.in.orig	Thu Jan 23 20:20:57 1997
-+++ include/Paths.h.in	Tue Aug 18 11:29:00 1998
-@@ -33,7 +33,22 @@
-  * $SonyDate: 1997/01/23 11:20:55 $
-  */
- 
--#define ErrorOutFile            "/dev/console"
-+/*
-+ * Change ErrotOutFile variable.
-+ * Because suppress a error when sj3serv start up, change to "/dev/stderr".
-+ * This error is "Cannot Open "/dev/console".". 
-+ * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-+ *
-+ * Change ErrotOutFile variable.
-+ * This default value is "/dev/null" in document.
-+ * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/11
-+ */
-+#if !defined(__FreeBSD__)
-+#define	ErrorOutFile		"/dev/console"
-+#else
-+/* #define	ErrorOutFile		"/dev/stderr" */ 	/* for test */
-+#define	ErrorOutFile		"/dev/null"
-+#endif
- 
- #define SocketName              "/tmp/sj3sock"
- #define LockFile                "/tmp/SJ3SERV.EXIST"
diff --git a/japanese/sj3-lib/files/patch-af b/japanese/sj3-lib/files/patch-af
deleted file mode 100644
index 13b49cf298b3..000000000000
--- a/japanese/sj3-lib/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/man/Imakefile.~1~	Thu Jan 23 20:20:52 1997
-+++ doc/man/Imakefile	Tue Aug 18 12:15:20 1998
-@@ -40,7 +40,7 @@
-  */
- 
- #ifndef JapaneseManLocale
--#define JapaneseManLocale	ja_JP.EUC
-+#define JapaneseManLocale	ja
- #endif
- JMANLOCALE = JapaneseManLocale
- 
diff --git a/japanese/sj3-lib/files/patch-ah b/japanese/sj3-lib/files/patch-ah
deleted file mode 100644
index 3919516c0498..000000000000
--- a/japanese/sj3-lib/files/patch-ah
+++ /dev/null
@@ -1,12 +0,0 @@
---- sj3/sjgetchar.c.orig	Sun Feb  6 18:59:26 2000
-+++ sj3/sjgetchar.c	Sun Feb  6 19:00:02 2000
-@@ -52,6 +52,9 @@
- #if defined(__NetBSD__) || defined(__bsdi__)
- #define	USE_OLD_TTY
- #endif
-+#if defined(__FreeBSD__)
-+#include <sys/ioctl_compat.h>
-+#endif
- #include <curses.h>
- #endif
- 
diff --git a/japanese/sj3-lib/files/patch-ai b/japanese/sj3-lib/files/patch-ai
deleted file mode 100644
index b2ed64a2b9c6..000000000000
--- a/japanese/sj3-lib/files/patch-ai
+++ /dev/null
@@ -1,22 +0,0 @@
---- server/execute.c.orig	Mon Apr 13 07:20:22 1998
-+++ server/execute.c	Fri Feb  2 19:47:07 2001
-@@ -105,7 +105,7 @@
- 	i = strlen(dict_dir) + 1 + strlen(path) + 1;
- 	if (i > sizeof(tmp)) return ERROR;
- 
--	strcpy(tmp, path);
-+	strlcpy(tmp, path, sizeof(tmp));
- 	index = strtok(tmp, "/");
- 	do {
- 		if (!strcmp(index, "..")) return ERROR;
-@@ -118,9 +118,7 @@
- 			return ERROR;
- 		}
- 	}
--	strcpy(tmp, dict_dir);
--	strcat(tmp, "/");
--	strcat(tmp, path);
-+	snprintf(tmp, sizeof(tmp), "%s/%s", dict_dir, path);
- 	strcpy(path, tmp);
- 	return 0;
- }
diff --git a/japanese/sj3-lib/files/patch-sj3.c b/japanese/sj3-lib/files/patch-sj3.c
deleted file mode 100644
index 7d404c64e61b..000000000000
--- a/japanese/sj3-lib/files/patch-sj3.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- sj3/sj3.c.orig	Wed Jan 14 00:52:48 1998
-+++ sj3/sj3.c	Fri Oct 25 10:51:35 2002
-@@ -46,6 +46,9 @@
- #define LACKOF_SETLOCALE
- #endif
- #endif
-+#if defined(__FreeBSD__)
-+#include <sys/ioctl_compat.h>
-+#endif
- #include <curses.h>
- #endif
- 
-@@ -1058,14 +1061,13 @@
-            return;
-         if (info.si_code == CLD_STOPPED)
- #else
--	union wait	status;
--	int		pid;
-+	int		pid, status;
- 
- /*
-  * Remove warning.
-  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-  */
--	pid = wait3 ((int *)&status, (WNOHANG|WUNTRACED), 0);
-+	pid = wait3 (&status, (WNOHANG|WUNTRACED), 0);
- 	if (WIFSTOPPED (status))
- #endif
- 		suspend();
diff --git a/japanese/sj3-server/Makefile b/japanese/sj3-server/Makefile
index 6f79250fa5a5..f8b03cf1c35d 100644
--- a/japanese/sj3-server/Makefile
+++ b/japanese/sj3-server/Makefile
@@ -7,11 +7,14 @@
 
 PORTNAME=	sj3
 PORTVERSION=	2.0.1.20
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.sony.co.jp/pub/unsupported/src/ \
 		ftp://ftp.cs.titech.ac.jp/pub/japanese/sj3/
 
+PATCH_SITES=	http://oikumene.que.ne.jp/misc/
+PATCHFILES=	${PORTNAME}-patches-20040704.bz2
+
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Japanese input method
 
@@ -28,10 +31,6 @@ STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/sj3.sh
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "ia64" || ${ARCH} == "amd64"
-BROKEN=		"Coredump during build on amd64 and ia64"
-.endif
-
 do-configure:
 	( cd $(WRKSRC) ; xmkmf ; make Makefiles )
 
diff --git a/japanese/sj3-server/distinfo b/japanese/sj3-server/distinfo
index 39b5aabd5d85..c9a95cc317c4 100644
--- a/japanese/sj3-server/distinfo
+++ b/japanese/sj3-server/distinfo
@@ -1,2 +1,4 @@
 MD5 (sj3-2.0.1.20.tar.gz) = 36cc23702e2295e4552271b9d481c863
 SIZE (sj3-2.0.1.20.tar.gz) = 584065
+MD5 (sj3-patches-20040704.bz2) = 2cff2995f279845a4bbe083ce1d5243e
+SIZE (sj3-patches-20040704.bz2) = 41310
diff --git a/japanese/sj3-server/files/patch-aa b/japanese/sj3-server/files/patch-aa
index b4670f0add7f..584eee7aef56 100644
--- a/japanese/sj3-server/files/patch-aa
+++ b/japanese/sj3-server/files/patch-aa
@@ -359,143 +359,3 @@ diff -arcN ../sj3-2.0.1.13.org/doc/man/sj3serv.1 ./doc/man/sj3serv.1
   かな漢字変換サーバ デフォルト辞書ディレクトリ
   .TP
       sj3main.dic
-*** server/setup.c.orig	Mon Mar 23 05:48:02 1998
---- server/setup.c	Fri Feb  2 19:53:37 2001
-***************
-*** 217,251 ****
-  
-  
-  struct	optlist {
-! 	char	*optname;
-  	u_char	*(*optfunc)();
-! 	int	optarg;
-  } option[] = {
-! 	"DebugOut",	get_str,	(int)&debug_file,
-! 	"DebugLevel",	get_int,	(int)&debug_level,
-! 	"ForkFlag",	get_flag,	(int)&fork_flag,
-  
-! 	"PortName",	get_str,	(int)&port_name,
-  #ifdef TLI
-! 	"PortNumber",	get_str,	(int)&port_number,
-!         "ProtoName",    get_str,        (int)&proto_name,
-  #else
-! 	"PortNumber",	get_int,	(int)&port_number,
-  #endif
-! 	"SocketName",	get_str,	(int)&socket_name,
-  #ifdef	LOCK_FILE
-! 	"LockFile",	get_str,	(int)&lock_file;
-  #endif
-  
-! 	"maxclient",	get_int,	(int)&max_client,
-! 	"dictdir",	get_str,	(int)&dict_dir,
-! 	"readdict",	get_list,	(int)&read_dict,
-! 	"opendict",	get_list,	(int)&open_dict,
-! 	"errorout",	get_str,	(int)&error_file,
-! 	"logout",	get_str,	(int)&log_file,
-! 	"dirmode",	get_int,	(int)&dir_mode,
-! 	"filemode",	get_int,	(int)&file_mode,
-! 	"allowuser",	get_list,	(int)&allow_user,
-  	0, 0, 0
-  };
-  
---- 217,274 ----
-  
-  
-  struct	optlist {
-! 	const char	*optname;
-  	u_char	*(*optfunc)();
-! 	void	*optarg;
-  } option[] = {
-! /*
-!  * Add option flag.
-!  * Because They are lacked in here. See document.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! 	"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,	&port_name,
-! 	"portname",	get_str,	&port_name,
-  #ifdef TLI
-! 	"PortNumber",	get_str,	&port_number,
-! 	"portnumber",	get_str,	&port_number,
-! 	"ProtoName",    get_str,        &proto_name,
-! 	"protoname",    get_str,        &proto_name,
-  #else
-! 	"PortNumber",	get_int,	&port_number,
-! 	"portnumber",	get_int,	&port_number,
-  #endif
-! 	"SocketName",	get_str,	&socket_name,
-! 	"socketname",	get_str,	&socket_name,
-  #ifdef	LOCK_FILE
-! 	"LockFile",	get_str,	&lock_file;
-! 	"lockfile",	get_str,	&lock_file;
-  #endif
-  
-! 	"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
-  };
-  
-***************
-*** 424,441 ****
-  	int	c;
-  	int	errflg = 0;
-  	char	*p;
-  
-  	extern	char	*optarg, *strrchr();
-  	extern	int	optind;
-  
-  	p = (p = strrchr(argv[0], '/')) ? p + 1 : argv[0];
-! 	strcpy(program_name,	p);
-! 	strcpy(runcmd_file,	RunCmdFile);
-  
-  	while ((c = getopt(argc, argv, "f:")) != EOF) {
-  		switch (c) {
-  		case 'f':
-! 			strcpy(runcmd_file, optarg);
-  			break;
-  
-  		case '?':
---- 447,467 ----
-  	int	c;
-  	int	errflg = 0;
-  	char	*p;
-+ 	size_t	ret;
-  
-  	extern	char	*optarg, *strrchr();
-  	extern	int	optind;
-  
-  	p = (p = strrchr(argv[0], '/')) ? p + 1 : argv[0];
-! 	strlcpy(program_name,	p, sizeof(program_name));
-! 	strlcpy(runcmd_file,	RunCmdFile, sizeof(runcmd_file));
-  
-  	while ((c = getopt(argc, argv, "f:")) != EOF) {
-  		switch (c) {
-  		case 'f':
-! 			ret = strlcpy(runcmd_file, optarg, sizeof(runcmd_file));
-! 			if (ret > sizeof(runcmd_file))
-! 				errflg++;
-  			break;
-  
-  		case '?':
diff --git a/japanese/sj3-server/files/patch-ac b/japanese/sj3-server/files/patch-ac
deleted file mode 100644
index 148a043fdad8..000000000000
--- a/japanese/sj3-server/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- dict/dict/Imakefile.~1~	Thu Jan 23 20:20:51 1997
-+++ dict/dict/Imakefile	Tue Aug 18 10:51:14 1998
-@@ -48,7 +48,7 @@
- 
- XCOMM INSTFLAGS	= -o $(SJ3OWNER) -g $(SJ3GROUP) -m 444
- 
--all:		$(OBJS)
-+all::		$(OBJS)
- 
- $(OBJS):	$(SRCS)
- 		$(TOOL_DIR)/$(TOOL_NAME) $(SRCS) $(OBJS) > $(OUTPUT)
diff --git a/japanese/sj3-server/files/patch-ad b/japanese/sj3-server/files/patch-ad
deleted file mode 100644
index 8c714daa84fe..000000000000
--- a/japanese/sj3-server/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- sj3.tmpl.~1~	Thu Jan 23 20:20:58 1997
-+++ sj3.tmpl	Tue Aug 18 11:07:42 1998
-@@ -48,7 +48,7 @@
- #if defined(FreeBSDArchitecture)
- 
- CODE_LIBS	= -lxpg4
--SJ3OWNER	= root
-+SJ3OWNER	= bin
- SJ3GROUP	= bin
- 
- #else
diff --git a/japanese/sj3-server/files/patch-ae b/japanese/sj3-server/files/patch-ae
deleted file mode 100644
index 939c71115c9b..000000000000
--- a/japanese/sj3-server/files/patch-ae
+++ /dev/null
@@ -1,26 +0,0 @@
---- include/Paths.h.in.orig	Thu Jan 23 20:20:57 1997
-+++ include/Paths.h.in	Tue Aug 18 11:29:00 1998
-@@ -33,7 +33,22 @@
-  * $SonyDate: 1997/01/23 11:20:55 $
-  */
- 
--#define ErrorOutFile            "/dev/console"
-+/*
-+ * Change ErrotOutFile variable.
-+ * Because suppress a error when sj3serv start up, change to "/dev/stderr".
-+ * This error is "Cannot Open "/dev/console".". 
-+ * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-+ *
-+ * Change ErrotOutFile variable.
-+ * This default value is "/dev/null" in document.
-+ * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/11
-+ */
-+#if !defined(__FreeBSD__)
-+#define	ErrorOutFile		"/dev/console"
-+#else
-+/* #define	ErrorOutFile		"/dev/stderr" */ 	/* for test */
-+#define	ErrorOutFile		"/dev/null"
-+#endif
- 
- #define SocketName              "/tmp/sj3sock"
- #define LockFile                "/tmp/SJ3SERV.EXIST"
diff --git a/japanese/sj3-server/files/patch-af b/japanese/sj3-server/files/patch-af
deleted file mode 100644
index 13b49cf298b3..000000000000
--- a/japanese/sj3-server/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/man/Imakefile.~1~	Thu Jan 23 20:20:52 1997
-+++ doc/man/Imakefile	Tue Aug 18 12:15:20 1998
-@@ -40,7 +40,7 @@
-  */
- 
- #ifndef JapaneseManLocale
--#define JapaneseManLocale	ja_JP.EUC
-+#define JapaneseManLocale	ja
- #endif
- JMANLOCALE = JapaneseManLocale
- 
diff --git a/japanese/sj3-server/files/patch-ah b/japanese/sj3-server/files/patch-ah
deleted file mode 100644
index 3919516c0498..000000000000
--- a/japanese/sj3-server/files/patch-ah
+++ /dev/null
@@ -1,12 +0,0 @@
---- sj3/sjgetchar.c.orig	Sun Feb  6 18:59:26 2000
-+++ sj3/sjgetchar.c	Sun Feb  6 19:00:02 2000
-@@ -52,6 +52,9 @@
- #if defined(__NetBSD__) || defined(__bsdi__)
- #define	USE_OLD_TTY
- #endif
-+#if defined(__FreeBSD__)
-+#include <sys/ioctl_compat.h>
-+#endif
- #include <curses.h>
- #endif
- 
diff --git a/japanese/sj3-server/files/patch-ai b/japanese/sj3-server/files/patch-ai
deleted file mode 100644
index b2ed64a2b9c6..000000000000
--- a/japanese/sj3-server/files/patch-ai
+++ /dev/null
@@ -1,22 +0,0 @@
---- server/execute.c.orig	Mon Apr 13 07:20:22 1998
-+++ server/execute.c	Fri Feb  2 19:47:07 2001
-@@ -105,7 +105,7 @@
- 	i = strlen(dict_dir) + 1 + strlen(path) + 1;
- 	if (i > sizeof(tmp)) return ERROR;
- 
--	strcpy(tmp, path);
-+	strlcpy(tmp, path, sizeof(tmp));
- 	index = strtok(tmp, "/");
- 	do {
- 		if (!strcmp(index, "..")) return ERROR;
-@@ -118,9 +118,7 @@
- 			return ERROR;
- 		}
- 	}
--	strcpy(tmp, dict_dir);
--	strcat(tmp, "/");
--	strcat(tmp, path);
-+	snprintf(tmp, sizeof(tmp), "%s/%s", dict_dir, path);
- 	strcpy(path, tmp);
- 	return 0;
- }
diff --git a/japanese/sj3-server/files/patch-sj3.c b/japanese/sj3-server/files/patch-sj3.c
deleted file mode 100644
index 7d404c64e61b..000000000000
--- a/japanese/sj3-server/files/patch-sj3.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- sj3/sj3.c.orig	Wed Jan 14 00:52:48 1998
-+++ sj3/sj3.c	Fri Oct 25 10:51:35 2002
-@@ -46,6 +46,9 @@
- #define LACKOF_SETLOCALE
- #endif
- #endif
-+#if defined(__FreeBSD__)
-+#include <sys/ioctl_compat.h>
-+#endif
- #include <curses.h>
- #endif
- 
-@@ -1058,14 +1061,13 @@
-            return;
-         if (info.si_code == CLD_STOPPED)
- #else
--	union wait	status;
--	int		pid;
-+	int		pid, status;
- 
- /*
-  * Remove warning.
-  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-  */
--	pid = wait3 ((int *)&status, (WNOHANG|WUNTRACED), 0);
-+	pid = wait3 (&status, (WNOHANG|WUNTRACED), 0);
- 	if (WIFSTOPPED (status))
- #endif
- 		suspend();
diff --git a/japanese/sj3/Makefile b/japanese/sj3/Makefile
index 6f79250fa5a5..f8b03cf1c35d 100644
--- a/japanese/sj3/Makefile
+++ b/japanese/sj3/Makefile
@@ -7,11 +7,14 @@
 
 PORTNAME=	sj3
 PORTVERSION=	2.0.1.20
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.sony.co.jp/pub/unsupported/src/ \
 		ftp://ftp.cs.titech.ac.jp/pub/japanese/sj3/
 
+PATCH_SITES=	http://oikumene.que.ne.jp/misc/
+PATCHFILES=	${PORTNAME}-patches-20040704.bz2
+
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Japanese input method
 
@@ -28,10 +31,6 @@ STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/sj3.sh
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "ia64" || ${ARCH} == "amd64"
-BROKEN=		"Coredump during build on amd64 and ia64"
-.endif
-
 do-configure:
 	( cd $(WRKSRC) ; xmkmf ; make Makefiles )
 
diff --git a/japanese/sj3/distinfo b/japanese/sj3/distinfo
index 39b5aabd5d85..c9a95cc317c4 100644
--- a/japanese/sj3/distinfo
+++ b/japanese/sj3/distinfo
@@ -1,2 +1,4 @@
 MD5 (sj3-2.0.1.20.tar.gz) = 36cc23702e2295e4552271b9d481c863
 SIZE (sj3-2.0.1.20.tar.gz) = 584065
+MD5 (sj3-patches-20040704.bz2) = 2cff2995f279845a4bbe083ce1d5243e
+SIZE (sj3-patches-20040704.bz2) = 41310
diff --git a/japanese/sj3/files/patch-aa b/japanese/sj3/files/patch-aa
index b4670f0add7f..584eee7aef56 100644
--- a/japanese/sj3/files/patch-aa
+++ b/japanese/sj3/files/patch-aa
@@ -359,143 +359,3 @@ diff -arcN ../sj3-2.0.1.13.org/doc/man/sj3serv.1 ./doc/man/sj3serv.1
   かな漢字変換サーバ デフォルト辞書ディレクトリ
   .TP
       sj3main.dic
-*** server/setup.c.orig	Mon Mar 23 05:48:02 1998
---- server/setup.c	Fri Feb  2 19:53:37 2001
-***************
-*** 217,251 ****
-  
-  
-  struct	optlist {
-! 	char	*optname;
-  	u_char	*(*optfunc)();
-! 	int	optarg;
-  } option[] = {
-! 	"DebugOut",	get_str,	(int)&debug_file,
-! 	"DebugLevel",	get_int,	(int)&debug_level,
-! 	"ForkFlag",	get_flag,	(int)&fork_flag,
-  
-! 	"PortName",	get_str,	(int)&port_name,
-  #ifdef TLI
-! 	"PortNumber",	get_str,	(int)&port_number,
-!         "ProtoName",    get_str,        (int)&proto_name,
-  #else
-! 	"PortNumber",	get_int,	(int)&port_number,
-  #endif
-! 	"SocketName",	get_str,	(int)&socket_name,
-  #ifdef	LOCK_FILE
-! 	"LockFile",	get_str,	(int)&lock_file;
-  #endif
-  
-! 	"maxclient",	get_int,	(int)&max_client,
-! 	"dictdir",	get_str,	(int)&dict_dir,
-! 	"readdict",	get_list,	(int)&read_dict,
-! 	"opendict",	get_list,	(int)&open_dict,
-! 	"errorout",	get_str,	(int)&error_file,
-! 	"logout",	get_str,	(int)&log_file,
-! 	"dirmode",	get_int,	(int)&dir_mode,
-! 	"filemode",	get_int,	(int)&file_mode,
-! 	"allowuser",	get_list,	(int)&allow_user,
-  	0, 0, 0
-  };
-  
---- 217,274 ----
-  
-  
-  struct	optlist {
-! 	const char	*optname;
-  	u_char	*(*optfunc)();
-! 	void	*optarg;
-  } option[] = {
-! /*
-!  * Add option flag.
-!  * Because They are lacked in here. See document.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! 	"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,	&port_name,
-! 	"portname",	get_str,	&port_name,
-  #ifdef TLI
-! 	"PortNumber",	get_str,	&port_number,
-! 	"portnumber",	get_str,	&port_number,
-! 	"ProtoName",    get_str,        &proto_name,
-! 	"protoname",    get_str,        &proto_name,
-  #else
-! 	"PortNumber",	get_int,	&port_number,
-! 	"portnumber",	get_int,	&port_number,
-  #endif
-! 	"SocketName",	get_str,	&socket_name,
-! 	"socketname",	get_str,	&socket_name,
-  #ifdef	LOCK_FILE
-! 	"LockFile",	get_str,	&lock_file;
-! 	"lockfile",	get_str,	&lock_file;
-  #endif
-  
-! 	"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
-  };
-  
-***************
-*** 424,441 ****
-  	int	c;
-  	int	errflg = 0;
-  	char	*p;
-  
-  	extern	char	*optarg, *strrchr();
-  	extern	int	optind;
-  
-  	p = (p = strrchr(argv[0], '/')) ? p + 1 : argv[0];
-! 	strcpy(program_name,	p);
-! 	strcpy(runcmd_file,	RunCmdFile);
-  
-  	while ((c = getopt(argc, argv, "f:")) != EOF) {
-  		switch (c) {
-  		case 'f':
-! 			strcpy(runcmd_file, optarg);
-  			break;
-  
-  		case '?':
---- 447,467 ----
-  	int	c;
-  	int	errflg = 0;
-  	char	*p;
-+ 	size_t	ret;
-  
-  	extern	char	*optarg, *strrchr();
-  	extern	int	optind;
-  
-  	p = (p = strrchr(argv[0], '/')) ? p + 1 : argv[0];
-! 	strlcpy(program_name,	p, sizeof(program_name));
-! 	strlcpy(runcmd_file,	RunCmdFile, sizeof(runcmd_file));
-  
-  	while ((c = getopt(argc, argv, "f:")) != EOF) {
-  		switch (c) {
-  		case 'f':
-! 			ret = strlcpy(runcmd_file, optarg, sizeof(runcmd_file));
-! 			if (ret > sizeof(runcmd_file))
-! 				errflg++;
-  			break;
-  
-  		case '?':
diff --git a/japanese/sj3/files/patch-ac b/japanese/sj3/files/patch-ac
deleted file mode 100644
index 148a043fdad8..000000000000
--- a/japanese/sj3/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- dict/dict/Imakefile.~1~	Thu Jan 23 20:20:51 1997
-+++ dict/dict/Imakefile	Tue Aug 18 10:51:14 1998
-@@ -48,7 +48,7 @@
- 
- XCOMM INSTFLAGS	= -o $(SJ3OWNER) -g $(SJ3GROUP) -m 444
- 
--all:		$(OBJS)
-+all::		$(OBJS)
- 
- $(OBJS):	$(SRCS)
- 		$(TOOL_DIR)/$(TOOL_NAME) $(SRCS) $(OBJS) > $(OUTPUT)
diff --git a/japanese/sj3/files/patch-ad b/japanese/sj3/files/patch-ad
deleted file mode 100644
index 8c714daa84fe..000000000000
--- a/japanese/sj3/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- sj3.tmpl.~1~	Thu Jan 23 20:20:58 1997
-+++ sj3.tmpl	Tue Aug 18 11:07:42 1998
-@@ -48,7 +48,7 @@
- #if defined(FreeBSDArchitecture)
- 
- CODE_LIBS	= -lxpg4
--SJ3OWNER	= root
-+SJ3OWNER	= bin
- SJ3GROUP	= bin
- 
- #else
diff --git a/japanese/sj3/files/patch-ae b/japanese/sj3/files/patch-ae
deleted file mode 100644
index 939c71115c9b..000000000000
--- a/japanese/sj3/files/patch-ae
+++ /dev/null
@@ -1,26 +0,0 @@
---- include/Paths.h.in.orig	Thu Jan 23 20:20:57 1997
-+++ include/Paths.h.in	Tue Aug 18 11:29:00 1998
-@@ -33,7 +33,22 @@
-  * $SonyDate: 1997/01/23 11:20:55 $
-  */
- 
--#define ErrorOutFile            "/dev/console"
-+/*
-+ * Change ErrotOutFile variable.
-+ * Because suppress a error when sj3serv start up, change to "/dev/stderr".
-+ * This error is "Cannot Open "/dev/console".". 
-+ * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-+ *
-+ * Change ErrotOutFile variable.
-+ * This default value is "/dev/null" in document.
-+ * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/11
-+ */
-+#if !defined(__FreeBSD__)
-+#define	ErrorOutFile		"/dev/console"
-+#else
-+/* #define	ErrorOutFile		"/dev/stderr" */ 	/* for test */
-+#define	ErrorOutFile		"/dev/null"
-+#endif
- 
- #define SocketName              "/tmp/sj3sock"
- #define LockFile                "/tmp/SJ3SERV.EXIST"
diff --git a/japanese/sj3/files/patch-af b/japanese/sj3/files/patch-af
deleted file mode 100644
index 13b49cf298b3..000000000000
--- a/japanese/sj3/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/man/Imakefile.~1~	Thu Jan 23 20:20:52 1997
-+++ doc/man/Imakefile	Tue Aug 18 12:15:20 1998
-@@ -40,7 +40,7 @@
-  */
- 
- #ifndef JapaneseManLocale
--#define JapaneseManLocale	ja_JP.EUC
-+#define JapaneseManLocale	ja
- #endif
- JMANLOCALE = JapaneseManLocale
- 
diff --git a/japanese/sj3/files/patch-ah b/japanese/sj3/files/patch-ah
deleted file mode 100644
index 3919516c0498..000000000000
--- a/japanese/sj3/files/patch-ah
+++ /dev/null
@@ -1,12 +0,0 @@
---- sj3/sjgetchar.c.orig	Sun Feb  6 18:59:26 2000
-+++ sj3/sjgetchar.c	Sun Feb  6 19:00:02 2000
-@@ -52,6 +52,9 @@
- #if defined(__NetBSD__) || defined(__bsdi__)
- #define	USE_OLD_TTY
- #endif
-+#if defined(__FreeBSD__)
-+#include <sys/ioctl_compat.h>
-+#endif
- #include <curses.h>
- #endif
- 
diff --git a/japanese/sj3/files/patch-ai b/japanese/sj3/files/patch-ai
deleted file mode 100644
index b2ed64a2b9c6..000000000000
--- a/japanese/sj3/files/patch-ai
+++ /dev/null
@@ -1,22 +0,0 @@
---- server/execute.c.orig	Mon Apr 13 07:20:22 1998
-+++ server/execute.c	Fri Feb  2 19:47:07 2001
-@@ -105,7 +105,7 @@
- 	i = strlen(dict_dir) + 1 + strlen(path) + 1;
- 	if (i > sizeof(tmp)) return ERROR;
- 
--	strcpy(tmp, path);
-+	strlcpy(tmp, path, sizeof(tmp));
- 	index = strtok(tmp, "/");
- 	do {
- 		if (!strcmp(index, "..")) return ERROR;
-@@ -118,9 +118,7 @@
- 			return ERROR;
- 		}
- 	}
--	strcpy(tmp, dict_dir);
--	strcat(tmp, "/");
--	strcat(tmp, path);
-+	snprintf(tmp, sizeof(tmp), "%s/%s", dict_dir, path);
- 	strcpy(path, tmp);
- 	return 0;
- }
diff --git a/japanese/sj3/files/patch-sj3.c b/japanese/sj3/files/patch-sj3.c
deleted file mode 100644
index 7d404c64e61b..000000000000
--- a/japanese/sj3/files/patch-sj3.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- sj3/sj3.c.orig	Wed Jan 14 00:52:48 1998
-+++ sj3/sj3.c	Fri Oct 25 10:51:35 2002
-@@ -46,6 +46,9 @@
- #define LACKOF_SETLOCALE
- #endif
- #endif
-+#if defined(__FreeBSD__)
-+#include <sys/ioctl_compat.h>
-+#endif
- #include <curses.h>
- #endif
- 
-@@ -1058,14 +1061,13 @@
-            return;
-         if (info.si_code == CLD_STOPPED)
- #else
--	union wait	status;
--	int		pid;
-+	int		pid, status;
- 
- /*
-  * Remove warning.
-  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-  */
--	pid = wait3 ((int *)&status, (WNOHANG|WUNTRACED), 0);
-+	pid = wait3 (&status, (WNOHANG|WUNTRACED), 0);
- 	if (WIFSTOPPED (status))
- #endif
- 		suspend();