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.

9 files changed, 121 insertions, 16 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}'
diff --git a/lang/tcl83/distinfo b/lang/tcl83/distinfo
index ceec68aba88..079715cc51e 100644
--- a/lang/tcl83/distinfo
+++ b/lang/tcl83/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 09:03:12 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/09/21 14:49:08 joerg Exp $
 
 SHA1 (tcl8.3.4.tar.gz) = b179f1f51b322b7045cf152b73df4f3d01da82ec
 RMD160 (tcl8.3.4.tar.gz) = 1840927939f9bbc4c48a53f256212f26c164e517
 Size (tcl8.3.4.tar.gz) = 2654756 bytes
 SHA1 (patch-aa) = 2a6069a0ddb7961bb3c120c753bc9f99dce73ff7
-SHA1 (patch-ab) = 3db75db8162cb7e72446dd608fd3fd02ff4aef9c
-SHA1 (patch-ac) = d1e1b6ed334ff424140a678ed098504cc14614e8
+SHA1 (patch-ab) = 06c44a9b8ca32b64c5fbebff5ffafaac57bec20b
+SHA1 (patch-ac) = a67789d9adf404768a32a32037e7cce88b657671
 SHA1 (patch-ae) = 5eee14adec88cf0cac5715fe0cfe7420b9b83774
-SHA1 (patch-af) = 6d2b97ea8ad9de7e22ed6c2c81aa91aeadad3241
+SHA1 (patch-af) = 2a24042c6850a75ae09ca74730933f50e8852a2c
+SHA1 (patch-ag) = 6c4dde9812557efc3c7ff2504828d2f02a861299
diff --git a/lang/tcl83/patches/patch-ab b/lang/tcl83/patches/patch-ab
index 3e115fb4069..4b8416420ce 100644
--- a/lang/tcl83/patches/patch-ab
+++ b/lang/tcl83/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2004/10/10 11:58:29 grant Exp $
+$NetBSD: patch-ab,v 1.3 2005/09/21 14:49:08 joerg Exp $
 
 --- configure.orig	2001-10-20 10:24:15.000000000 +1000
 +++ configure
@@ -103,6 +103,15 @@ $NetBSD: patch-ab,v 1.2 2004/10/10 11:58:29 grant Exp $
  		    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
  		
  fi
+@@ -5383,7 +5406,7 @@ fi
+ 	    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"
 @@ -5401,7 +5424,7 @@ fi
  	Rhapsody-*|Darwin-*)
  	    SHLIB_CFLAGS="-fno-common"
@@ -142,6 +151,15 @@ $NetBSD: patch-ab,v 1.2 2004/10/10 11:58:29 grant Exp $
  	    ;;
  	ULTRIX-4.*)
  	    SHLIB_CFLAGS="-G 0"
+@@ -5858,7 +5890,7 @@ fi
+ 		    ;;
+ 		IRIX*)
+ 		    ;;
+-		NetBSD-*|FreeBSD-*|OpenBSD-*)
++		NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*)
+ 		    ;;
+ 		Rhapsody-*|Darwin-*)
+ 		    ;;
 @@ -6103,7 +6135,7 @@ if test "${SHARED_BUILD}" = "1" -a "${SH
      if test "x$DL_OBJS" = "xtclLoadAout.o"; then
  	MAKE_LIB="\${STLIB_LD} \$@ \${OBJS}"
diff --git a/lang/tcl83/patches/patch-ac b/lang/tcl83/patches/patch-ac
index 762f5d227d7..43c0dfb92f4 100644
--- a/lang/tcl83/patches/patch-ac
+++ b/lang/tcl83/patches/patch-ac
@@ -1,7 +1,16 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/03/08 19:22:27 minskim Exp $
+$NetBSD: patch-ac,v 1.2 2005/09/21 14:49:08 joerg Exp $
 
 --- tclUnixInit.c.orig	Fri Aug 24 19:13:22 2001
 +++ tclUnixInit.c
+@@ -13,7 +13,7 @@
+ #include "tclInt.h"
+ #include "tclPort.h"
+ #include <locale.h>
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ #   include <floatingpoint.h>
+ #endif
+ #if defined(__bsdi__)
 @@ -22,6 +22,11 @@
  #	include <dlfcn.h>
  #   endif
@@ -14,7 +23,16 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/03/08 19:22:27 minskim Exp $
  
  /*
   * The Init script (common to Windows and Unix platforms) is
-@@ -550,6 +555,11 @@
+@@ -132,7 +137,7 @@ TclpInitPlatform()
+     (void) signal(SIGPIPE, SIG_IGN);
+ #endif /* SIGPIPE */
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+     fpsetround(FP_RN);
+     fpsetmask(0L);
+ #endif
+@@ -550,6 +555,11 @@ TclpSetVariables(interp)
      int unameOK;
      char *user;
      Tcl_DString ds;
@@ -26,7 +44,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/03/08 19:22:27 minskim Exp $
  
      Tcl_SetVar(interp, "tclDefaultLibrary", defaultLibraryDir, TCL_GLOBAL_ONLY);
      Tcl_SetVar(interp, "tcl_pkgPath", pkgPath, TCL_GLOBAL_ONLY);
-@@ -585,8 +595,16 @@
+@@ -585,8 +595,16 @@ TclpSetVariables(interp)
  	    Tcl_SetVar2(interp, "tcl_platform", "osVersion", name.release,
  		    TCL_GLOBAL_ONLY|TCL_APPEND_VALUE);
  	}
diff --git a/lang/tcl83/patches/patch-af b/lang/tcl83/patches/patch-af
index ad716028e6b..48bb7466e4f 100644
--- a/lang/tcl83/patches/patch-af
+++ b/lang/tcl83/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1.1.1 2004/03/08 19:22:27 minskim Exp $
+$NetBSD: patch-af,v 1.2 2005/09/21 14:49:08 joerg Exp $
 
 --- tcl.m4.orig	Fri Oct 19 19:24:15 2001
 +++ tcl.m4
@@ -92,6 +92,15 @@ $NetBSD: patch-af,v 1.1.1.1 2004/03/08 19:22:27 minskim Exp $
  	    ], [
  		SHLIB_CFLAGS=""
  		SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r"
+@@ -949,7 +970,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"
 @@ -1129,6 +1150,9 @@ dnl AC_CHECK_TOOL(AR, ar, :)
  	    DL_LIBS="-ldl"
  	    LDFLAGS=""
@@ -112,3 +121,12 @@ $NetBSD: patch-af,v 1.1.1.1 2004/03/08 19:22:27 minskim Exp $
  	    ;;
  	ULTRIX-4.*)
  	    SHLIB_CFLAGS="-G 0"
+@@ -1328,7 +1355,7 @@ dnl AC_CHECK_TOOL(AR, ar, :)
+ 		    ;;
+ 		IRIX*)
+ 		    ;;
+-		NetBSD-*|FreeBSD-*|OpenBSD-*)
++		NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*)
+ 		    ;;
+ 		Rhapsody-*|Darwin-*)
+ 		    ;;
diff --git a/lang/tcl83/patches/patch-ag b/lang/tcl83/patches/patch-ag
new file mode 100644
index 00000000000..840f268b3ba
--- /dev/null
+++ b/lang/tcl83/patches/patch-ag
@@ -0,0 +1,14 @@
+$NetBSD: patch-ag,v 1.1 2005/09/21 14:49:08 joerg Exp $
+
+--- tclUnixPort.h.orig	2005-07-30 20:55:41.000000000 +0000
++++ tclUnixPort.h
+@@ -417,7 +417,9 @@ EXTERN int		gettimeofday _ANSI_ARGS_((st
+  * isn't generally declared in a header file anywhere.
+  */
+ 
++#ifndef errno
+ extern int errno;
++#endif
+ 
+ /*
+  * Variables provided by the C library: