Ensure that errno really comes from errno.h and only define it as

extern, if it's not a macro. Teach configure about DragonFly.

OKed by maintainer.

4 files changed, 43 insertions, 7 deletions

diff --git a/lang/tcl/distinfo b/lang/tcl/distinfo
index 068d97ea430..f9a3fdae541 100644
--- a/lang/tcl/distinfo
+++ b/lang/tcl/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.34 2005/08/31 14:46:59 seb Exp $
+$NetBSD: distinfo,v 1.35 2005/09/21 14:49:08 joerg Exp $
 
 SHA1 (tcl8.4.11-src.tar.gz) = 4580adcbdcb7d09fd9a8ae8fbe61c592a56bfa9e
 RMD160 (tcl8.4.11-src.tar.gz) = 933dda739859af170c31cef855409f861ed597cb
 Size (tcl8.4.11-src.tar.gz) = 3474428 bytes
 SHA1 (patch-aa) = c41a554996965c9ceaf639ce54841c8861ac8ba2
-SHA1 (patch-ab) = 7107fca2f0269ce90ea076c6be6dd45ccda3bc0b
-SHA1 (patch-ac) = bc746ec3c8fc50c56d4827540d6a8b2fffda78ad
+SHA1 (patch-ab) = 4a20ef86bda2faf1f427273dbde601fcb176a34e
+SHA1 (patch-ac) = 39634cde6f535f3592e40105d6060c05cfab0a68
 SHA1 (patch-ad) = 54947660216280726ee9ec213995063fa428f560
 SHA1 (patch-ae) = d5b7c01873c9d092bcdea5ea37b407bbd865f22d
-SHA1 (patch-af) = 427a6baa9494f1eeb9148584436af3a8162fbbf5
+SHA1 (patch-af) = 6e599f54b2f2045cdee608aaa958cd95941cb67f
 SHA1 (patch-ag) = 0a11bfc878d43b15f6444923fac18b4876b62398
 SHA1 (patch-ah) = 0aaa349fcf9ce736e1f7d3dad377ee355f549ecb
 SHA1 (patch-ai) = ef8939597e759a95ca869f93e251df76d9c660f9
diff --git a/lang/tcl/patches/patch-ab b/lang/tcl/patches/patch-ab
index cbede9f61f1..3badda3b891 100644
--- a/lang/tcl/patches/patch-ab
+++ b/lang/tcl/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.30 2005/07/19 11:11:58 adam Exp $
+$NetBSD: patch-ab,v 1.31 2005/09/21 14:49:08 joerg Exp $
 
 --- configure.orig	2005-06-29 16:40:33.000000000 +0000
 +++ configure
@@ -86,6 +86,15 @@ $NetBSD: patch-ab,v 1.30 2005/07/19 11:11:58 adam Exp $
  		    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
  		
  fi
+@@ -2980,7 +3006,7 @@ rm -f conftest*
+ 	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
+ 	    TCL_LIB_VERSIONS_OK=nodots
+ 	    ;;
+-	FreeBSD-*)
++	FreeBSD-*|DragonFly-*)
+ 	    # FreeBSD 3.* and greater have ELF.
+ 	    SHLIB_CFLAGS="-fPIC"
+ 	    SHLIB_LD="ld -Bshareable -x"
 @@ -3820,16 +3846,16 @@ fi
      fi
  
diff --git a/lang/tcl/patches/patch-ac b/lang/tcl/patches/patch-ac
index 2b4dce10fb0..1b6a98be59f 100644
--- a/lang/tcl/patches/patch-ac
+++ b/lang/tcl/patches/patch-ac
@@ -1,7 +1,16 @@
-$NetBSD: patch-ac,v 1.6 2005/07/19 11:11:58 adam Exp $
+$NetBSD: patch-ac,v 1.7 2005/09/21 14:49:08 joerg Exp $
 
 --- tclUnixInit.c.orig	2005-05-24 04:20:12.000000000 +0000
 +++ tclUnixInit.c
+@@ -19,7 +19,7 @@
+ #ifdef HAVE_LANGINFO
+ #include <langinfo.h>
+ #endif
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ #   include <floatingpoint.h>
+ #endif
+ #if defined(__bsdi__)
 @@ -28,6 +28,11 @@
  #	include <dlfcn.h>
  #   endif
@@ -14,6 +23,15 @@ $NetBSD: patch-ac,v 1.6 2005/07/19 11:11:58 adam Exp $
  
  /*
   * The Init script (common to Windows and Unix platforms) is
+@@ -203,7 +208,7 @@ TclpInitPlatform()
+     (void) signal(SIGPIPE, SIG_IGN);
+ #endif /* SIGPIPE */
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+     fpsetround(FP_RN);
+     fpsetmask(0L);
+ #endif
 @@ -740,6 +745,11 @@ TclpSetVariables(interp)
      int unameOK;
      CONST char *user;
diff --git a/lang/tcl/patches/patch-af b/lang/tcl/patches/patch-af
index 3332a14c301..7b0fff1a393 100644
--- a/lang/tcl/patches/patch-af
+++ b/lang/tcl/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.16 2005/07/19 11:11:58 adam Exp $
+$NetBSD: patch-af,v 1.17 2005/09/21 14:49:08 joerg Exp $
 
 --- tcl.m4.orig	2005-06-29 16:40:33.000000000 +0000
 +++ tcl.m4
@@ -113,6 +113,15 @@ $NetBSD: patch-af,v 1.16 2005/07/19 11:11:58 adam Exp $
  	    ], [
  		SHLIB_CFLAGS=""
  		SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r"
+@@ -1335,7 +1371,7 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
+ 	    TCL_LIB_VERSIONS_OK=nodots
+ 	    ;;
+-	FreeBSD-*)
++	FreeBSD-*|DragonFly-*)
+ 	    # FreeBSD 3.* and greater have ELF.
+ 	    SHLIB_CFLAGS="-fPIC"
+ 	    SHLIB_LD="ld -Bshareable -x"
 @@ -1668,6 +1704,9 @@ dnl AC_CHECK_TOOL(AR, ar)
  		CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
  		LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'