Fix errno. Fix stdio abuse for DragonFly.

5 files changed, 77 insertions, 1 deletions

diff --git a/lang/STk/distinfo b/lang/STk/distinfo
index ca4e9905464..b3c60af1d2f 100644
--- a/lang/STk/distinfo
+++ b/lang/STk/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 09:03:05 agc Exp $
+$NetBSD: distinfo,v 1.6 2006/01/11 17:43:34 joerg Exp $
 
 SHA1 (STk-4.0.1.tar.gz) = 50dc98c2b64db1c9cca54411cb406feb4cb57600
 RMD160 (STk-4.0.1.tar.gz) = 58ad3c66f77a6ab33db5d4ca9f2510d50b6b6f0d
@@ -12,3 +12,7 @@ SHA1 (patch-af) = 2625837a9d784071b2bfed71e2798891c6c47b71
 SHA1 (patch-ag) = dde1a30f1b0f0d781d8d2389af6bc2393dd40729
 SHA1 (patch-ah) = 353ac24f2a097e360067a292828ef2f469e137c8
 SHA1 (patch-ai) = f83af050a51c95f2de6d0cd109388e822727a724
+SHA1 (patch-aj) = 17158d45f3a57a822a5eb13ad7f8c2e631329e41
+SHA1 (patch-ak) = 7548a9912788c1a951ef9d14f0b21bebf0899b66
+SHA1 (patch-al) = c5a8f2f3d2a70ef5c4ca23c1574b5b25f2c0dacb
+SHA1 (patch-am) = cb59da47c5e7fd1f07c456fa1a1258217c798ed5
diff --git a/lang/STk/patches/patch-aj b/lang/STk/patches/patch-aj
new file mode 100644
index 00000000000..3f1a193aacb
--- /dev/null
+++ b/lang/STk/patches/patch-aj
@@ -0,0 +1,19 @@
+$NetBSD: patch-aj,v 1.1 2006/01/11 17:43:34 joerg Exp $
+
+--- Tcl/tclUnixPort.h.orig	2006-01-11 17:08:11.000000000 +0000
++++ Tcl/tclUnixPort.h
+@@ -176,14 +176,6 @@
+ #define	TCL_PLATFORM_TRANSLATION	TCL_TRANSLATE_LF
+ 
+ /*
+- * Not all systems declare the errno variable in errno.h. so this
+- * file does it explicitly.  The list of system error messages also
+- * isn't generally declared in a header file anywhere.
+- */
+-
+-extern int errno;
+-
+-/*
+  * The type of the status returned by wait varies from UNIX system
+  * to UNIX system.  The macro below defines it:
+  */
diff --git a/lang/STk/patches/patch-ak b/lang/STk/patches/patch-ak
new file mode 100644
index 00000000000..a3f4cb242e9
--- /dev/null
+++ b/lang/STk/patches/patch-ak
@@ -0,0 +1,18 @@
+$NetBSD: patch-ak,v 1.1 2006/01/11 17:43:34 joerg Exp $
+
+--- Tk/unix/tkUnixPort.h.orig	2006-01-11 17:12:28.000000000 +0000
++++ Tk/unix/tkUnixPort.h
+@@ -120,13 +120,6 @@
+ #define MASK_SIZE howmany(FD_SETSIZE, NFDBITS)
+ 
+ /*
+- * Not all systems declare the errno variable in errno.h. so this
+- * file does it explicitly.
+- */
+-
+-extern int errno;
+-
+-/*
+  * Define "NBBY" (number of bits per byte) if it's not already defined.
+  */
+ 
diff --git a/lang/STk/patches/patch-al b/lang/STk/patches/patch-al
new file mode 100644
index 00000000000..a4936381275
--- /dev/null
+++ b/lang/STk/patches/patch-al
@@ -0,0 +1,14 @@
+$NetBSD: patch-al,v 1.1 2006/01/11 17:43:34 joerg Exp $
+
+--- Src/io.c.orig	2006-01-11 17:16:11.000000000 +0000
++++ Src/io.c
+@@ -67,6 +67,9 @@
+ #    define READ_DATA_PENDING(fp) (max(0,(fp)->_egptr - (fp)->_gptr))
+ #  endif
+ #endif
++#if !defined(READ_DATA_PENDING) && defined(__DragonFly__)
++#  define READ_DATA_PENDING(fp) (max(0,((struct __FILE_public *)(fp))->_r))
++#endif
+ #if (!defined (READ_DATA_PENDING)) && defined __SLBF
+ #  define READ_DATA_PENDING(fp) (max(0,fp->_r))
+ #endif
diff --git a/lang/STk/patches/patch-am b/lang/STk/patches/patch-am
new file mode 100644
index 00000000000..f3572846a17
--- /dev/null
+++ b/lang/STk/patches/patch-am
@@ -0,0 +1,21 @@
+$NetBSD: patch-am,v 1.1 2006/01/11 17:43:34 joerg Exp $
+
+--- Extensions/posix.c.orig	2006-01-11 17:19:54.000000000 +0000
++++ Extensions/posix.c
+@@ -23,7 +23,7 @@
+  * <shiro@sqush.squareusa.com>
+  */
+  
+-
++#include <errno.h>
+ #include <stk.h>
+ #include <sys/types.h>
+ #include <sys/utsname.h>
+@@ -35,7 +35,6 @@
+  * Error management
+  *
+  ******************************************************************************/
+-extern int errno;
+ 
+ static SCM get_errno(char *s)
+ {