Fix errno usage. Add DragonFly support.

13 files changed, 268 insertions, 1 deletions

diff --git a/inputmethod/sj3-lib/distinfo b/inputmethod/sj3-lib/distinfo
index a584088a03c..ac577e6203b 100644
--- a/inputmethod/sj3-lib/distinfo
+++ b/inputmethod/sj3-lib/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.7 2005/09/28 21:42:49 rillig Exp $
+$NetBSD: distinfo,v 1.8 2005/12/02 22:57:32 joerg Exp $
 
 SHA1 (sj3-2.0.1.20.tar.gz) = b1cae59065ebc9caf5e198143ceb9558c932f259
 RMD160 (sj3-2.0.1.20.tar.gz) = b25f2c585485516fddf3b9168e4cb8552cd26f71
 Size (sj3-2.0.1.20.tar.gz) = 584065 bytes
+SHA1 (patch-aa) = b818996516360d1cdbef193eed5eb93fb488ef89
 SHA1 (patch-ab) = a64f78ccb3db3f4349f191abe47c6daebb2bbadd
 SHA1 (patch-ac) = a2a9c21618e7de1e56d371cb05cf866d549d50a1
 SHA1 (patch-ad) = 6f45996f04f894e28f2dd5d1276c31b3c6a7b12a
@@ -15,3 +16,14 @@ SHA1 (patch-aj) = a8055ef4e06f70b344f5eadf1c2f0042e22781db
 SHA1 (patch-ak) = 3aab5f0e57212414e0ec2b5a71dd3583a1379e5c
 SHA1 (patch-al) = 330b4580fccb0cb70541376620916dc32662e378
 SHA1 (patch-am) = dd5f2b962b64969c05e3fc020ceae8bfa6e8e220
+SHA1 (patch-ao) = d260a370cafc1943f6063de8e3f6be444e3d18bc
+SHA1 (patch-ap) = a2c619a2f2fe040ba0a3b570ce34b8f72512c970
+SHA1 (patch-aq) = d24e22974b088c02bfdca75cf97d0e8d7a8d8992
+SHA1 (patch-ar) = 3cdbb095338b2052398bbc5c7cd69cd50cd46d31
+SHA1 (patch-as) = fbe7d015904f38ada14ec9ae5cc8332f725bbeac
+SHA1 (patch-at) = a00e1505af56f7b566232338ef910f899b401ac7
+SHA1 (patch-au) = 57ac169871ef5f38fb4d1fd4387fc4197419b7c6
+SHA1 (patch-av) = 6e2569b3240d09bfd57b2dcde8611e5b9ed9bf14
+SHA1 (patch-aw) = 078fa620e5fe099441dbc6fcba36a0441cc222ca
+SHA1 (patch-ax) = 3ea04cd507909c6dd6b0163230dd03b8c21fbced
+SHA1 (patch-ay) = ec24897bab84adda7873995f708eb70e1a6f03a7
diff --git a/inputmethod/sj3-lib/patches/patch-aa b/inputmethod/sj3-lib/patches/patch-aa
new file mode 100644
index 00000000000..8a1475ef698
--- /dev/null
+++ b/inputmethod/sj3-lib/patches/patch-aa
@@ -0,0 +1,65 @@
+$NetBSD: patch-aa,v 1.5 2005/12/02 22:57:32 joerg Exp $
+
+--- sj3/sj3.c.orig	2005-12-02 22:27:01.000000000 +0000
++++ sj3/sj3.c
+@@ -38,14 +38,12 @@
+ #include "sj_sysvdef.h"
+ #include "wchar16.h"
+ #include <signal.h>
+-#include <sys/errno.h>
+-#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__bsdi__)
+-#if defined(__NetBSD__) || defined(__bsdi__)
++#include <errno.h>
++#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__bsdi__) || defined(__DragonFly__)
+ #define	USE_OLD_TTY
+ #if defined(__NetBSD__)
+ #define LACKOF_SETLOCALE
+ #endif
+-#endif
+ #include <curses.h>
+ #endif
+ 
+@@ -473,7 +471,7 @@ getmaster ()
+  * Because FreeBSD's master pseudo-devices are pty[p-sP-S][0-9a-v].
+  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
+  */
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ 	struct stat	stb;
+ 	int		h, i, j, k1, k2;
+ #else /* !__FreeBSD__ */
+@@ -492,7 +490,7 @@ getmaster ()
+  * Because FreeBSD's master pseudo-devices are pty[p-sP-S][0-9a-v].
+  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
+  */
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ 	for (h = 0; h < 8; h++) {
+ 		line[k1] = "pqrsPQRS"[h];
+ 		line[k2] = '0';
+@@ -852,7 +850,7 @@ shellprocess ()
+ 	SCPYN(Utmp.ut_line, strrchr (slave_name, '/') + 1);
+ 	time (&Utmp.ut_time);
+ 
+-#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__bsdi__)
++#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__bsdi__) || defined(__DragonFly__)
+ 	if (setsid() < 0)
+ 		perror("setsid()");
+ #else
+@@ -937,7 +935,7 @@ getslave ()
+ 		done2 ();
+ 	}
+ #ifndef SYSV_TERMIOS
+-#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__bsdi__)
++#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__bsdi__) || defined(__DragonFly__)
+ 	ioctl(slave, TIOCSCTTY, NULL);
+ #endif
+ 	ioctl (slave, TIOCSETP, (char *)&b);
+@@ -1085,7 +1083,6 @@ suspend ()
+ 	SELECT_FD	ifds;
+ 	int		nc;
+ 	struct timeval	t;
+-	extern int	errno;
+ 
+ 	clear_guide_line ();
+ 
diff --git a/inputmethod/sj3-lib/patches/patch-ao b/inputmethod/sj3-lib/patches/patch-ao
new file mode 100644
index 00000000000..618ac285144
--- /dev/null
+++ b/inputmethod/sj3-lib/patches/patch-ao
@@ -0,0 +1,13 @@
+$NetBSD: patch-ao,v 1.1 2005/12/02 22:57:32 joerg Exp $
+
+--- sj3lib/level1.c.orig	2005-12-02 22:29:21.000000000 +0000
++++ sj3lib/level1.c
+@@ -303,7 +303,7 @@ static	open_unix()
+ 	}
+ 
+ 	len = strlen(sunix.sun_path)+sizeof(sunix.sun_family);
+-#if defined(__NetBSD__) || defined(__FreeBSD__)
++#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
+ 	len += sizeof(sunix.sun_len);
+ #endif
+ 	if (connect(fd, (struct sockaddr *)&sunix, len)
diff --git a/inputmethod/sj3-lib/patches/patch-ap b/inputmethod/sj3-lib/patches/patch-ap
new file mode 100644
index 00000000000..5f18b4aede9
--- /dev/null
+++ b/inputmethod/sj3-lib/patches/patch-ap
@@ -0,0 +1,29 @@
+$NetBSD: patch-ap,v 1.1 2005/12/02 22:57:32 joerg Exp $
+
+--- sj3/sjgetchar.c.orig	2005-12-02 22:29:41.000000000 +0000
++++ sj3/sjgetchar.c
+@@ -48,14 +48,12 @@
+ #include <sys/types.h>
+ #include <sys/fcntl.h>
+ #endif
+-#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__bsdi__)
+-#if defined(__NetBSD__) || defined(__bsdi__)
++#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__bsdi__) || defined(__DragonFly__)
+ #define	USE_OLD_TTY
+-#endif
+ #include <curses.h>
+ #endif
+ 
+-#include <sys/errno.h>
++#include <errno.h>
+ #include <sys/file.h>
+ #include "sj2.h"
+ #include "select.h"
+@@ -72,7 +70,6 @@ static wchar16_t  backup = (wchar16_t) 0
+ 
+ static int    eucmode = 0;
+ extern int	master;
+-extern int	errno;
+ 
+ wchar16_t SJ_getchar()
+ {
diff --git a/inputmethod/sj3-lib/patches/patch-aq b/inputmethod/sj3-lib/patches/patch-aq
new file mode 100644
index 00000000000..4d6533cc8ef
--- /dev/null
+++ b/inputmethod/sj3-lib/patches/patch-aq
@@ -0,0 +1,22 @@
+$NetBSD: patch-aq,v 1.1 2005/12/02 22:57:32 joerg Exp $
+
+--- kanakan/depend.c.orig	2005-12-02 22:30:03.000000000 +0000
++++ kanakan/depend.c
+@@ -318,7 +318,7 @@ char	*passwd;
+ 		serv_errno = SJ3_IncorrectPasswd; goto error1;
+ 	}
+ 
+-#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__bsdi__)
++#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__bsdi__) || defined(__DragonFly__)
+ 	if ((dp = (Uchar *)malloc((long)sbuf.st_size)) == NULL) {
+ #else
+ 	if ((dp = (Uchar *)malloc(sbuf.st_size)) == NULL) {
+@@ -330,7 +330,7 @@ char	*passwd;
+ 	}
+ 	memset(dfp, '\0', sizeof(*dfp));
+ 
+-#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__bsdi__)
++#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__bsdi__) || defined(__DragonFly__)
+ 	if (fgetfile(fp, 0L, (long)sbuf.st_size, dp) == ERROR) goto error3;
+ #else
+ 	if (fgetfile(fp, 0L, sbuf.st_size, dp) == ERROR) goto error3;
diff --git a/inputmethod/sj3-lib/patches/patch-ar b/inputmethod/sj3-lib/patches/patch-ar
new file mode 100644
index 00000000000..ef24ebdcf38
--- /dev/null
+++ b/inputmethod/sj3-lib/patches/patch-ar
@@ -0,0 +1,13 @@
+$NetBSD: patch-ar,v 1.1 2005/12/02 22:57:32 joerg Exp $
+
+--- include/Paths.h.in.orig	2005-12-02 22:30:39.000000000 +0000
++++ include/Paths.h.in
+@@ -43,7 +43,7 @@
+  * This default value is "/dev/null" in document.
+  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/11
+  */
+-#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__)
+ #define	ErrorOutFile		"/dev/console"
+ #else
+ /* #define	ErrorOutFile		"/dev/stderr" */ 	/* for test */
diff --git a/inputmethod/sj3-lib/patches/patch-as b/inputmethod/sj3-lib/patches/patch-as
new file mode 100644
index 00000000000..3574c224876
--- /dev/null
+++ b/inputmethod/sj3-lib/patches/patch-as
@@ -0,0 +1,13 @@
+$NetBSD: patch-as,v 1.1 2005/12/02 22:57:32 joerg Exp $
+
+--- include/Const.h.orig	2005-12-02 22:31:07.000000000 +0000
++++ include/Const.h
+@@ -74,7 +74,7 @@
+  * Change the default Port number of sj3 for FreeBSD.
+  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/20
+  */
+-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+ #define	PortNumber		3086
+ #else /* ! __FreeBSD__ __NetBSD__ __OpenBSD__ */
+ #define	PortNumber		3000
diff --git a/inputmethod/sj3-lib/patches/patch-at b/inputmethod/sj3-lib/patches/patch-at
new file mode 100644
index 00000000000..4e2b566d4e2
--- /dev/null
+++ b/inputmethod/sj3-lib/patches/patch-at
@@ -0,0 +1,13 @@
+$NetBSD: patch-at,v 1.1 2005/12/02 22:57:32 joerg Exp $
+
+--- dict/tool/file.c.orig	2005-12-02 22:31:36.000000000 +0000
++++ dict/tool/file.c
+@@ -124,7 +124,7 @@ char	*filename;
+ {
+ 	struct	stat	buf;
+ 
+-#if defined(__NetBSD__) || defined(__FreeBSD__)
++#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
+ 	if (stat(filename, &buf) == 0) return (long)buf.st_size;
+ #else
+ 	if (stat(filename, &buf) == 0) return buf.st_size;
diff --git a/inputmethod/sj3-lib/patches/patch-au b/inputmethod/sj3-lib/patches/patch-au
new file mode 100644
index 00000000000..7f14c1b8560
--- /dev/null
+++ b/inputmethod/sj3-lib/patches/patch-au
@@ -0,0 +1,12 @@
+$NetBSD: patch-au,v 1.1 2005/12/02 22:57:32 joerg Exp $
+
+--- kanakan/depend.c.orig	2005-12-02 22:33:25.000000000 +0000
++++ kanakan/depend.c
+@@ -50,7 +50,6 @@
+ # define FD_CLR __FD_CLR
+ #endif
+ 
+-extern	int	errno;
+ extern	int	serv_errno;
+ extern	Global	*work_base;
+ char	*malloc();
diff --git a/inputmethod/sj3-lib/patches/patch-av b/inputmethod/sj3-lib/patches/patch-av
new file mode 100644
index 00000000000..7779b26d41f
--- /dev/null
+++ b/inputmethod/sj3-lib/patches/patch-av
@@ -0,0 +1,21 @@
+$NetBSD: patch-av,v 1.1 2005/12/02 22:57:32 joerg Exp $
+
+--- sj3/conv.c.orig	2005-12-02 22:43:26.000000000 +0000
++++ sj3/conv.c
+@@ -35,7 +35,7 @@
+ 
+ 
+ 
+-#include <sys/errno.h>
++#include <errno.h>
+ #include "wchar16.h"
+ #include "select.h"
+ #include "key.h"
+@@ -204,7 +204,6 @@ register int	*count;
+ 	register int	n;
+ 	SELECT_FD	ifds;
+ 	struct timeval	t;
+-	extern int	errno;
+ 	register wchar16_t *s;
+ 	int		value;
+ 
diff --git a/inputmethod/sj3-lib/patches/patch-aw b/inputmethod/sj3-lib/patches/patch-aw
new file mode 100644
index 00000000000..f6b5cc56c6c
--- /dev/null
+++ b/inputmethod/sj3-lib/patches/patch-aw
@@ -0,0 +1,21 @@
+$NetBSD: patch-aw,v 1.1 2005/12/02 22:57:32 joerg Exp $
+
+--- sj3/display.c.orig	2005-12-02 22:43:59.000000000 +0000
++++ sj3/display.c
+@@ -36,7 +36,7 @@
+ 
+ 
+ #include "sj_sysvdef.h"
+-#include <sys/errno.h>
++#include <errno.h>
+ #include "common.h"
+ #include "inkey.h"
+ #include "select.h"
+@@ -201,7 +201,6 @@ master_flush ()
+ 	SELECT_FD	ifds;
+ 	int		nc;
+ 	struct timeval	t;
+-	extern int	errno;
+ 
+ 	do {
+ cont:
diff --git a/inputmethod/sj3-lib/patches/patch-ax b/inputmethod/sj3-lib/patches/patch-ax
new file mode 100644
index 00000000000..abd20e4dbab
--- /dev/null
+++ b/inputmethod/sj3-lib/patches/patch-ax
@@ -0,0 +1,12 @@
+$NetBSD: patch-ax,v 1.1 2005/12/02 22:57:32 joerg Exp $
+
+--- server/comuni.c.orig	2005-12-02 22:44:55.000000000 +0000
++++ server/comuni.c
+@@ -98,7 +98,6 @@ extern  char    *proto_name;
+ extern	int	port_number;
+ #endif
+ extern	int	max_client;
+-extern	int	errno;
+ 
+ static	int	fd_inet = -1;
+ static	int	fd_unix = -1;
diff --git a/inputmethod/sj3-lib/patches/patch-ay b/inputmethod/sj3-lib/patches/patch-ay
new file mode 100644
index 00000000000..ceaa3a59029
--- /dev/null
+++ b/inputmethod/sj3-lib/patches/patch-ay
@@ -0,0 +1,21 @@
+$NetBSD: patch-ay,v 1.1 2005/12/02 22:57:32 joerg Exp $
+
+--- server/execute.c.orig	2005-12-02 22:45:34.000000000 +0000
++++ server/execute.c
+@@ -53,8 +53,6 @@
+ #define SJIS_PROTO 1
+ #define EUC_PROTO 2
+ 
+-extern	int	errno;
+-
+ extern	Global	*work_base;
+ extern	STDY	*stdy_base;
+ extern	int	serv_errno;
+@@ -82,7 +80,6 @@ static	Client	*cur_cli;		
+ static Uchar defaultchar[2] = {(Uchar)0x81, (Uchar)0x40};   
+ static int  defuse=0, defuse2=0;
+ 
+-char	*malloc();
+ DictFile *opendict();
+ int	closedict();
+ StdyFile *openstdy();