DragonFly is a BSD, even though it doesn't end in it.

Depend on errno.h for errno.

4 files changed, 34 insertions, 10 deletions

diff --git a/shells/scsh/distinfo b/shells/scsh/distinfo
index 8048688aed3..20fdd9a5ac8 100644
--- a/shells/scsh/distinfo
+++ b/shells/scsh/distinfo
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.9 2005/02/24 13:14:41 agc Exp $
+$NetBSD: distinfo,v 1.10 2005/11/10 22:48:07 joerg Exp $
 
 SHA1 (scsh-0.6.6.tar.gz) = 5d38ec103e1cb885e634bb3475e8912ac892067b
 RMD160 (scsh-0.6.6.tar.gz) = f81f7bb60d97035c61912092c2b16eebe953b999
 Size (scsh-0.6.6.tar.gz) = 4332223 bytes
 SHA1 (patch-aa) = e4456d514815c1a8db0e2c655f37272421ef0007
 SHA1 (patch-ab) = 5a8ba9cfe463c791f8478366933c335683e38c3b
-SHA1 (patch-ac) = e4270b345de59978440e6accec9bcd80c83f6f6e
-SHA1 (patch-ad) = c67946758a5424ff6c1fb91693c8aa01158eb6e4
+SHA1 (patch-ac) = 05371f266d8993e6bba0e34502fe31006fd07567
+SHA1 (patch-ad) = dd94b8bd8b5879bcad4629ff5b4f0d1baee9cfe0
 SHA1 (patch-ae) = 3838934816cf23f1975d15f3dfd3ce8fae10ee40
 SHA1 (patch-af) = faddb025c3bada2d321b693217104dc986a8a90f
+SHA1 (patch-ag) = efd04134ee52795c1538a31ad6052da8fd8946ae
diff --git a/shells/scsh/patches/patch-ac b/shells/scsh/patches/patch-ac
index 67d9fd6bf53..eabafbb1ce6 100644
--- a/shells/scsh/patches/patch-ac
+++ b/shells/scsh/patches/patch-ac
@@ -1,11 +1,13 @@
-$NetBSD: patch-ac,v 1.5 2004/04/21 12:08:10 dillo Exp $
+$NetBSD: patch-ac,v 1.6 2005/11/10 22:48:07 joerg Exp $
 
---- configure.orig	Thu Mar 11 16:53:58 2004
+--- configure.orig	2004-03-11 15:53:58.000000000 +0000
 +++ configure
-@@ -3129,6 +3129,7 @@ echo "${ECHO_T}$scsh_cv_elf" >&6
+@@ -3128,7 +3128,8 @@ echo "${ECHO_T}$scsh_cv_elf" >&6
+   ;;
  
    ## NetBSD and FreeBSD ( and maybe 386BSD also)
-   *-*-*bsd*|*-*-darwin* )
+-  *-*-*bsd*|*-*-darwin* )
++  *-*-*bsd*|*-*-darwin*|*-*-dragonfly* )
 +  LDFLAGS="-Wl,--export-dynamic"
    dir=bsd
  
diff --git a/shells/scsh/patches/patch-ad b/shells/scsh/patches/patch-ad
index 14d5519d9e5..df639c093b5 100644
--- a/shells/scsh/patches/patch-ad
+++ b/shells/scsh/patches/patch-ad
@@ -1,8 +1,16 @@
-$NetBSD: patch-ad,v 1.5 2005/01/24 21:24:48 tv Exp $
+$NetBSD: patch-ad,v 1.6 2005/11/10 22:48:07 joerg Exp $
 
---- scsh/syscalls1.c.orig	2005-01-24 16:23:12.000000000 -0500
+--- scsh/syscalls1.c.orig	2004-03-11 15:54:06.000000000 +0000
 +++ scsh/syscalls1.c
-@@ -671,7 +671,9 @@ s48_value scsh_fsync(s48_value sch_fdes)
+@@ -42,7 +42,6 @@
+ /* Make sure our exports match up w/the implementation: */
+ #include "syscalls1.h"
+ 
+-extern int errno;
+ extern char **environ;
+ 
+ /* Sux because it's dependent on 32-bitness. */
+@@ -671,7 +670,9 @@ s48_value scsh_fsync(s48_value sch_fdes)
  
  s48_value scsh_sync()
  {
diff --git a/shells/scsh/patches/patch-ag b/shells/scsh/patches/patch-ag
new file mode 100644
index 00000000000..cb92e69c6dc
--- /dev/null
+++ b/shells/scsh/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.5 2005/11/10 22:48:07 joerg Exp $
+
+--- scsh/fdports1.c.orig	2005-11-10 22:27:01.000000000 +0000
++++ scsh/fdports1.c
+@@ -29,8 +29,6 @@
+ /* Make sure our exports match up w/the implementation: */
+ #include "fdports1.h"
+ 
+-extern int errno;
+-
+ static char const *fdes_modestr(int fd)
+ {
+     int flags = fcntl(fd,F_GETFL);