DragonFly and errno fixes.

4 files changed, 37 insertions, 12 deletions

diff --git a/x11/hanterm/distinfo b/x11/hanterm/distinfo
index 817b38fd65d..c08ff4a90c4 100644
--- a/x11/hanterm/distinfo
+++ b/x11/hanterm/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.8 2005/02/23 17:36:12 wiz Exp $
+$NetBSD: distinfo,v 1.9 2005/12/04 01:10:33 joerg Exp $
 
 SHA1 (hanterm-3.1.6.tar.gz) = df2ff9ca8ddcee41baeaa8544a9983a1534e8b30
 RMD160 (hanterm-3.1.6.tar.gz) = 9d9c6c1d2eca9ad338140f1d8c418ed5e0e9548b
 Size (hanterm-3.1.6.tar.gz) = 323736 bytes
-SHA1 (patch-aa) = 809fe405147b1acf9bc612ef529bebfa2368439f
+SHA1 (patch-aa) = fc4be22d26913c4235e132a0282f910c2e5d616f
 SHA1 (patch-ab) = 8b861979eeffc3e9763f4a2162c0e007c61f1a6c
 SHA1 (patch-ac) = 4c6b6efc12f2e1fba6eb577c65c94d701574353b
-SHA1 (patch-ad) = e6bf91a30c1b318c2f60ac8590e4842d9e8bab12
-SHA1 (patch-ae) = 39d01a39808d144823885c8b674d333362825da7
+SHA1 (patch-ad) = 50d6c38ab197e02a15b73bc7cfea476d22eaf961
+SHA1 (patch-ae) = 677db306b1f0d340d130194155a25458c3fd69c5
 SHA1 (patch-af) = 7306a141331bbbe1e4ee4e46549834be2ae2cfa1
 SHA1 (patch-ag) = 50a7a71b7075ac57735189f43fd7e770ec9de81d
diff --git a/x11/hanterm/patches/patch-aa b/x11/hanterm/patches/patch-aa
index 101ad26e345..5325ecdb0c4 100644
--- a/x11/hanterm/patches/patch-aa
+++ b/x11/hanterm/patches/patch-aa
@@ -1,7 +1,16 @@
-$NetBSD: patch-aa,v 1.4 2003/10/20 08:17:17 junyoung Exp $
+$NetBSD: patch-aa,v 1.5 2005/12/04 01:10:33 joerg Exp $
 
---- misc.c.orig	2003-10-05 16:23:49.000000000 -0500
+--- misc.c.orig	2002-01-09 00:41:11.000000000 +0000
 +++ misc.c
+@@ -35,7 +35,7 @@
+ #include <pwd.h>
+ #include <errno.h>
+ 
+-#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DARWIN__)
++#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DARWIN__) || defined(__DragonFly__)
+ #include <sys/param.h>
+ #endif
+ 
 @@ -913,7 +913,6 @@ char *SysErrorMsg (n)
      extern char *sys_errlist[];
  #endif
diff --git a/x11/hanterm/patches/patch-ad b/x11/hanterm/patches/patch-ad
index cac4c72c10a..1d1b0328c32 100644
--- a/x11/hanterm/patches/patch-ad
+++ b/x11/hanterm/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.1 2001/05/03 18:37:49 fredb Exp $
+$NetBSD: patch-ad,v 1.2 2005/12/04 01:10:33 joerg Exp $
 
---- data.h.orig	Wed Feb 24 05:04:50 1999
+--- data.h.orig	1999-02-24 11:04:50.000000000 +0000
 +++ data.h
 @@ -24,6 +24,8 @@
   * SOFTWARE.
@@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.1 2001/05/03 18:37:49 fredb Exp $
  extern XPoint VTbox[];
  extern XPoint hVTbox[];
  extern Char *bptr;
-@@ -34,7 +36,7 @@
+@@ -34,7 +36,7 @@ extern char *ptydev;
  extern char *ttydev;
  extern char *xterm_name;
  extern Char buffer[];
@@ -20,3 +20,11 @@ $NetBSD: patch-ad,v 1.1 2001/05/03 18:37:49 fredb Exp $
  extern fd_set Select_mask;
  #else
  extern int Select_mask;
+@@ -45,7 +47,6 @@ extern int bcnt;
+ #ifdef DEBUG
+ extern int debug;
+ #endif	/* DEBUG */
+-extern int errno;
+ extern int max_plus1;
+ extern int pty_mask;
+ extern int switchfb[];
diff --git a/x11/hanterm/patches/patch-ae b/x11/hanterm/patches/patch-ae
index 129ef720b7a..ed7110e97f0 100644
--- a/x11/hanterm/patches/patch-ae
+++ b/x11/hanterm/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1 2001/05/03 18:37:49 fredb Exp $
+$NetBSD: patch-ae,v 1.2 2005/12/04 01:10:33 joerg Exp $
 
---- main.c.orig	Tue Nov 28 04:44:05 2000
+--- main.c.orig	2002-01-09 00:41:11.000000000 +0000
 +++ main.c
-@@ -1508,7 +1508,8 @@
+@@ -1527,7 +1527,8 @@ char **argv;
  	if (ioctl (pty, FIONBIO, (char *)&mode) == -1) SysError (ERROR_FIONBIO);
  #endif	/* USE_SYSV_TERMIO */
  	
@@ -12,3 +12,11 @@ $NetBSD: patch-ae,v 1.1 2001/05/03 18:37:49 fredb Exp $
  	pty_mask = pty;
  	X_mask = Xsocket;
  	FD_ZERO(&Select_mask);
+@@ -3332,7 +3333,6 @@ static SIGNAL_T reapchild (n)
+ consolepr(fmt,x0,x1,x2,x3,x4,x5,x6,x7,x8,x9)
+ char *fmt;
+ {
+-	extern int errno;
+ 	extern char *SysErrorMsg();
+ 	int oerrno;
+ 	int f;