summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lang/tcl/distinfo8
-rw-r--r--lang/tcl/patches/patch-ab11
-rw-r--r--lang/tcl/patches/patch-ac20
-rw-r--r--lang/tcl/patches/patch-af11
-rw-r--r--lang/tcl83/distinfo9
-rw-r--r--lang/tcl83/patches/patch-ab20
-rw-r--r--lang/tcl83/patches/patch-ac24
-rw-r--r--lang/tcl83/patches/patch-af20
-rw-r--r--lang/tcl83/patches/patch-ag14
-rw-r--r--x11/tk/distinfo5
-rw-r--r--x11/tk/patches/patch-ab20
-rw-r--r--x11/tk/patches/patch-ae18
-rw-r--r--x11/tk83/distinfo7
-rw-r--r--x11/tk83/patches/patch-ab1036
-rw-r--r--x11/tk83/patches/patch-ac44
-rw-r--r--x11/tk83/patches/patch-ae16
16 files changed, 244 insertions, 1039 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:
diff --git a/x11/tk/distinfo b/x11/tk/distinfo
index 8c6753c9004..f54f9f0d364 100644
--- a/x11/tk/distinfo
+++ b/x11/tk/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.22 2005/07/19 11:12:25 adam Exp $
+$NetBSD: distinfo,v 1.23 2005/09/21 14:49:08 joerg Exp $
SHA1 (tk8.4.11-src.tar.gz) = c05dec9163e6f75787aa2825122d424fc1a1edb6
RMD160 (tk8.4.11-src.tar.gz) = 71b42c0f0ae5067c23d61a2d852a53fb3c546e2f
Size (tk8.4.11-src.tar.gz) = 3236334 bytes
SHA1 (patch-aa) = 5ddd25d23d4749acd251f7e06dde18bdf207da8f
-SHA1 (patch-ab) = 3f085c38c5169a81930571436a8ac1848435205f
+SHA1 (patch-ab) = 3f1cc305a65fb111e6dfe4df1290afb964026c67
SHA1 (patch-ac) = 5dc59a8e26c114a847c511defc7a3d7cc77655e8
SHA1 (patch-ad) = 51ba301ed6786791f0ef9ece73c4496231f1c031
+SHA1 (patch-ae) = 7946f60ee6ff944dfc89e1bc0dbe7be202bc46c7
diff --git a/x11/tk/patches/patch-ab b/x11/tk/patches/patch-ab
index 0ff43af2dba..4bc6c270586 100644
--- a/x11/tk/patches/patch-ab
+++ b/x11/tk/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.19 2005/07/19 11:12:25 adam Exp $
+$NetBSD: patch-ab,v 1.20 2005/09/21 14:49:08 joerg Exp $
--- configure.orig 2005-06-29 16:43:10.000000000 +0000
+++ configure
@@ -51,6 +51,24 @@ $NetBSD: patch-ab,v 1.19 2005/07/19 11:12:25 adam Exp $
fi
rm -f conftest*
+@@ -2699,7 +2709,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"
+@@ -3521,7 +3531,7 @@ fi
+ ;;
+ IRIX*)
+ ;;
+- NetBSD-*|FreeBSD-*|OpenBSD-*)
++ NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*)
+ ;;
+ Darwin-*)
+ ;;
@@ -3539,16 +3549,16 @@ fi
fi
diff --git a/x11/tk/patches/patch-ae b/x11/tk/patches/patch-ae
new file mode 100644
index 00000000000..4845c166273
--- /dev/null
+++ b/x11/tk/patches/patch-ae
@@ -0,0 +1,18 @@
+$NetBSD: patch-ae,v 1.1 2005/09/21 14:49:08 joerg Exp $
+
+--- tkUnixPort.h.orig 2005-07-30 21:02:48.000000000 +0000
++++ tkUnixPort.h
+@@ -119,12 +119,7 @@
+ #endif
+ #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;
++#include <errno.h>
+
+ /*
+ * Define "NBBY" (number of bits per byte) if it's not already defined.
diff --git a/x11/tk83/distinfo b/x11/tk83/distinfo
index 8ffdca90008..0ce9f397979 100644
--- a/x11/tk83/distinfo
+++ b/x11/tk83/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.4 2005/05/10 16:17:06 agc Exp $
+$NetBSD: distinfo,v 1.5 2005/09/21 14:49:08 joerg Exp $
SHA1 (tk8.3.4.tar.gz) = d52bf5cedb73e9b817ba8d6a2b00701f4f82fad2
RMD160 (tk8.3.4.tar.gz) = f154fd9b2eedcff732b9cdabee48bd9af1b3dd26
Size (tk8.3.4.tar.gz) = 2589635 bytes
SHA1 (patch-aa) = 41749b2d76a3bb87d39d472dfa3c2237a623bc89
-SHA1 (patch-ab) = 0a75ddf9d30ba4e4800f8139674f712785ae83af
-SHA1 (patch-ac) = 4b2b967030998dc108457258ee603fa94185cfe5
+SHA1 (patch-ab) = ba97e0908b06e94f662eee6831855272d5ee00e0
+SHA1 (patch-ac) = 4c8775d0da14eb2a6ea1822f668a6d6a9023dc0d
SHA1 (patch-ad) = 1815fc19986674cb2ea03a8d60cd1514ff47fba9
+SHA1 (patch-ae) = 5b025cd75326a491c7c886de2eab81e9d6712c20
diff --git a/x11/tk83/patches/patch-ab b/x11/tk83/patches/patch-ab
index e26a32591f3..14fccbb79c6 100644
--- a/x11/tk83/patches/patch-ab
+++ b/x11/tk83/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2005/03/06 22:41:28 jschauma Exp $
+$NetBSD: patch-ab,v 1.3 2005/09/21 14:49:09 joerg Exp $
---- configure.orig Fri Oct 19 20:24:40 2001
-+++ configure Sun Mar 6 16:52:43 2005
-@@ -1746,6 +1746,7 @@
+--- configure.orig 2001-10-20 02:24:40.000000000 +0200
++++ configure
+@@ -1746,6 +1746,7 @@ fi
do64bit_ok=no
fullSrcDir=`cd $srcdir; pwd`
@@ -10,97 +10,7 @@ $NetBSD: patch-ab,v 1.2 2005/03/06 22:41:28 jschauma Exp $
EXTRA_CFLAGS=""
TCL_EXPORT_FILE_SUFFIX=""
UNSHARED_LIB_SUFFIX=""
-@@ -1765,7 +1766,7 @@
- # Extract the first word of "ar", so it can be a program name with args.
- set dummy ar; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1769: checking for $ac_word" >&5
-+echo "configure:1770: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1870,7 +1871,7 @@
- # known GMT value.
-
- echo $ac_n "checking for gettimeofday in -lbsd""... $ac_c" 1>&6
--echo "configure:1874: checking for gettimeofday in -lbsd" >&5
-+echo "configure:1875: checking for gettimeofday in -lbsd" >&5
- ac_lib_var=`echo bsd'_'gettimeofday | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1878,7 +1879,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lbsd $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1882 "configure"
-+#line 1883 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -1889,7 +1890,7 @@
- gettimeofday()
- ; return 0; }
- EOF
--if { (eval echo configure:1893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -1951,7 +1952,7 @@
- HP-UX-*.11.*)
- SHLIB_SUFFIX=".sl"
- echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
--echo "configure:1955: checking for shl_load in -ldld" >&5
-+echo "configure:1956: checking for shl_load in -ldld" >&5
- ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1959,7 +1960,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-ldld $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1963 "configure"
-+#line 1964 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -1970,7 +1971,7 @@
- shl_load()
- ; return 0; }
- EOF
--if { (eval echo configure:1974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -2013,7 +2014,7 @@
- HP-UX-*.08.*|HP-UX-*.09.*|HP-UX-*.10.*)
- SHLIB_SUFFIX=".sl"
- echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
--echo "configure:2017: checking for shl_load in -ldld" >&5
-+echo "configure:2018: checking for shl_load in -ldld" >&5
- ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2021,7 +2022,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-ldld $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2025 "configure"
-+#line 2026 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -2032,7 +2033,7 @@
- shl_load()
- ; return 0; }
- EOF
--if { (eval echo configure:2036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -2084,8 +2085,11 @@
+@@ -2084,8 +2085,11 @@ fi
LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
EXTRA_CFLAGS=""
LDFLAGS=""
@@ -113,7 +23,7 @@ $NetBSD: patch-ab,v 1.2 2005/03/06 22:41:28 jschauma Exp $
SHLIB_CFLAGS=""
SHLIB_LD="ld -n32 -shared -rdata_shared"
SHLIB_LD_LIBS='${LIBS}'
-@@ -2108,6 +2112,9 @@
+@@ -2108,6 +2112,9 @@ fi
esac
LDFLAGS="-n32"
fi
@@ -123,7 +33,7 @@ $NetBSD: patch-ab,v 1.2 2005/03/06 22:41:28 jschauma Exp $
;;
IRIX64-6.*)
SHLIB_CFLAGS=""
-@@ -2118,6 +2125,22 @@
+@@ -2118,6 +2125,22 @@ fi
DL_LIBS=""
LDFLAGS=""
LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
@@ -146,7 +56,7 @@ $NetBSD: patch-ab,v 1.2 2005/03/06 22:41:28 jschauma Exp $
;;
Linux*)
SHLIB_CFLAGS="-fPIC"
-@@ -2136,20 +2159,23 @@
+@@ -2136,6 +2159,9 @@ fi
DL_LIBS="-ldl"
LDFLAGS="-rdynamic"
LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
@@ -156,66 +66,16 @@ $NetBSD: patch-ab,v 1.2 2005/03/06 22:41:28 jschauma Exp $
else
ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for dld.h""... $ac_c" 1>&6
--echo "configure:2143: checking for dld.h" >&5
-+echo "configure:2144: checking for dld.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 2148 "configure"
-+#line 2149 "configure"
- #include "confdefs.h"
- #include <dld.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2153: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2154: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- rm -rf conftest*
-@@ -2206,17 +2232,17 @@
- else
- ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for dld.h""... $ac_c" 1>&6
--echo "configure:2210: checking for dld.h" >&5
-+echo "configure:2211: checking for dld.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 2215 "configure"
-+#line 2216 "configure"
- #include "confdefs.h"
- #include <dld.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2220: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2221: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- rm -rf conftest*
-@@ -2271,17 +2297,17 @@
+@@ -2267,7 +2293,7 @@ fi
+ LDFLAGS="-Wl,-Bexport"
+ LD_SEARCH_FLAGS=""
+ ;;
+- NetBSD-*|FreeBSD-[1-2].*|OpenBSD-*)
++ NetBSD-*|FreeBSD-[1-2].*|OpenBSD-*|DragonFly-*)
# Not available on all versions: check for include file.
ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
--echo "configure:2275: checking for dlfcn.h" >&5
-+echo "configure:2276: checking for dlfcn.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 2280 "configure"
-+#line 2281 "configure"
- #include "confdefs.h"
- #include <dlfcn.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2285: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2286: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- rm -rf conftest*
-@@ -2300,7 +2326,6 @@
+@@ -2300,7 +2326,6 @@ if eval "test \"`echo '$ac_cv_header_'$a
# NetBSD/SPARC needs -fPIC, -fpic will not do.
SHLIB_CFLAGS="-fPIC"
@@ -223,7 +83,7 @@ $NetBSD: patch-ab,v 1.2 2005/03/06 22:41:28 jschauma Exp $
SHLIB_LD_LIBS=""
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
-@@ -2321,13 +2346,23 @@
+@@ -2321,13 +2346,23 @@ EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "yes" >/dev/null 2>&1; then
rm -rf conftest*
@@ -247,7 +107,7 @@ $NetBSD: patch-ab,v 1.2 2005/03/06 22:41:28 jschauma Exp $
fi
rm -f conftest*
-@@ -2539,6 +2574,9 @@
+@@ -2539,6 +2574,9 @@ EOF
DL_LIBS="-ldl"
LDFLAGS=""
LD_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
@@ -257,7 +117,7 @@ $NetBSD: patch-ab,v 1.2 2005/03/06 22:41:28 jschauma Exp $
;;
SunOS-5*)
-@@ -2586,6 +2624,9 @@
+@@ -2586,6 +2624,9 @@ EOF
else
LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
fi
@@ -267,508 +127,16 @@ $NetBSD: patch-ab,v 1.2 2005/03/06 22:41:28 jschauma Exp $
;;
ULTRIX-4.*)
SHLIB_CFLAGS="-G 0"
-@@ -2611,10 +2652,10 @@
- # that don't grok the -Bexport option. Test that it does.
- hold_ldflags=$LDFLAGS
- echo $ac_n "checking for ld accepts -Bexport flag""... $ac_c" 1>&6
--echo "configure:2615: checking for ld accepts -Bexport flag" >&5
-+echo "configure:2631: checking for ld accepts -Bexport flag" >&5
- LDFLAGS="${LDFLAGS} -Wl,-Bexport"
- cat > conftest.$ac_ext <<EOF
--#line 2618 "configure"
-+#line 2634 "configure"
- #include "confdefs.h"
-
- int main() {
-@@ -2621,7 +2662,7 @@
- int i;
- ; return 0; }
- EOF
--if { (eval echo configure:2625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- found=yes
- else
-@@ -2667,9 +2708,9 @@
-
- if test "x$DL_OBJS" = "xtclLoadAout.o" ; then
- echo $ac_n "checking sys/exec.h""... $ac_c" 1>&6
--echo "configure:2671: checking sys/exec.h" >&5
-+echo "configure:2687: checking sys/exec.h" >&5
- cat > conftest.$ac_ext <<EOF
--#line 2673 "configure"
-+#line 2689 "configure"
- #include "confdefs.h"
- #include <sys/exec.h>
- int main() {
-@@ -2687,7 +2728,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:2691: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:2707: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- tcl_ok=usable
- else
-@@ -2705,9 +2746,9 @@
-
- else
- echo $ac_n "checking a.out.h""... $ac_c" 1>&6
--echo "configure:2709: checking a.out.h" >&5
-+echo "configure:2725: checking a.out.h" >&5
- cat > conftest.$ac_ext <<EOF
--#line 2711 "configure"
-+#line 2727 "configure"
- #include "confdefs.h"
- #include <a.out.h>
- int main() {
-@@ -2725,7 +2766,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:2729: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:2745: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- tcl_ok=usable
- else
-@@ -2743,9 +2784,9 @@
-
- else
- echo $ac_n "checking sys/exec_aout.h""... $ac_c" 1>&6
--echo "configure:2747: checking sys/exec_aout.h" >&5
-+echo "configure:2763: checking sys/exec_aout.h" >&5
- cat > conftest.$ac_ext <<EOF
--#line 2749 "configure"
-+#line 2765 "configure"
- #include "confdefs.h"
- #include <sys/exec_aout.h>
- int main() {
-@@ -2763,7 +2804,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:2767: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:2783: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- tcl_ok=usable
- else
-@@ -2860,7 +2901,7 @@
-
-
- echo $ac_n "checking for build with symbols""... $ac_c" 1>&6
--echo "configure:2864: checking for build with symbols" >&5
-+echo "configure:2880: checking for build with symbols" >&5
- # Check whether --enable-symbols or --disable-symbols was given.
- if test "${enable_symbols+set}" = set; then
- enableval="$enable_symbols"
-@@ -2904,12 +2945,12 @@
- #--------------------------------------------------------------------
-
- echo $ac_n "checking for sin""... $ac_c" 1>&6
--echo "configure:2908: checking for sin" >&5
-+echo "configure:2924: checking for sin" >&5
- if eval "test \"`echo '$''{'ac_cv_func_sin'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 2913 "configure"
-+#line 2929 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char sin(); below. */
-@@ -2932,7 +2973,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:2936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_sin=yes"
- else
-@@ -2953,7 +2994,7 @@
- fi
-
- echo $ac_n "checking for main in -lieee""... $ac_c" 1>&6
--echo "configure:2957: checking for main in -lieee" >&5
-+echo "configure:2973: checking for main in -lieee" >&5
- ac_lib_var=`echo ieee'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2961,7 +3002,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lieee $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2965 "configure"
-+#line 2981 "configure"
- #include "confdefs.h"
-
- int main() {
-@@ -2968,7 +3009,7 @@
- main()
- ; return 0; }
- EOF
--if { (eval echo configure:2972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -2999,7 +3040,7 @@
- libbsd=no
- if test "`uname -s`" = "AIX" ; then
- echo $ac_n "checking for gettimeofday in -lbsd""... $ac_c" 1>&6
--echo "configure:3003: checking for gettimeofday in -lbsd" >&5
-+echo "configure:3019: checking for gettimeofday in -lbsd" >&5
- ac_lib_var=`echo bsd'_'gettimeofday | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3007,7 +3048,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lbsd $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3011 "configure"
-+#line 3027 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -3018,7 +3059,7 @@
- gettimeofday()
- ; return 0; }
- EOF
--if { (eval echo configure:3022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -3049,9 +3090,9 @@
- #--------------------------------------------------------------------
-
- echo $ac_n "checking stdlib.h""... $ac_c" 1>&6
--echo "configure:3053: checking stdlib.h" >&5
-+echo "configure:3069: checking stdlib.h" >&5
- cat > conftest.$ac_ext <<EOF
--#line 3055 "configure"
-+#line 3071 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- EOF
-@@ -3066,7 +3107,7 @@
- rm -f conftest*
-
- cat > conftest.$ac_ext <<EOF
--#line 3070 "configure"
-+#line 3086 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- EOF
-@@ -3080,7 +3121,7 @@
- rm -f conftest*
-
- cat > conftest.$ac_ext <<EOF
--#line 3084 "configure"
-+#line 3100 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- EOF
-@@ -3112,9 +3153,9 @@
- #--------------------------------------------------------------------
-
- echo $ac_n "checking fd_set and sys/select""... $ac_c" 1>&6
--echo "configure:3116: checking fd_set and sys/select" >&5
-+echo "configure:3132: checking fd_set and sys/select" >&5
- cat > conftest.$ac_ext <<EOF
--#line 3118 "configure"
-+#line 3134 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int main() {
-@@ -3121,7 +3162,7 @@
- fd_set readMask, writeMask;
- ; return 0; }
- EOF
--if { (eval echo configure:3125: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:3141: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- tk_ok=yes
- else
-@@ -3133,7 +3174,7 @@
- rm -f conftest*
- if test $tk_ok = no; then
- cat > conftest.$ac_ext <<EOF
--#line 3137 "configure"
-+#line 3153 "configure"
- #include "confdefs.h"
- #include <sys/select.h>
- EOF
-@@ -3165,12 +3206,12 @@
- #--------------------------------------------------------------------
-
- echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
--echo "configure:3169: checking for ANSI C header files" >&5
-+echo "configure:3185: checking for ANSI C header files" >&5
- if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 3174 "configure"
-+#line 3190 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -3178,7 +3219,7 @@
- #include <float.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:3182: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:3198: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- rm -rf conftest*
-@@ -3195,7 +3236,7 @@
- if test $ac_cv_header_stdc = yes; then
- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat > conftest.$ac_ext <<EOF
--#line 3199 "configure"
-+#line 3215 "configure"
- #include "confdefs.h"
- #include <string.h>
- EOF
-@@ -3213,7 +3254,7 @@
- if test $ac_cv_header_stdc = yes; then
- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat > conftest.$ac_ext <<EOF
--#line 3217 "configure"
-+#line 3233 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- EOF
-@@ -3234,7 +3275,7 @@
- :
- else
- cat > conftest.$ac_ext <<EOF
--#line 3238 "configure"
-+#line 3254 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-@@ -3245,7 +3286,7 @@
- exit (0); }
-
- EOF
--if { (eval echo configure:3249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:3265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- :
- else
-@@ -3269,12 +3310,12 @@
- fi
-
- echo $ac_n "checking for mode_t""... $ac_c" 1>&6
--echo "configure:3273: checking for mode_t" >&5
-+echo "configure:3289: checking for mode_t" >&5
- if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 3278 "configure"
-+#line 3294 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
-@@ -3302,12 +3343,12 @@
- fi
-
- echo $ac_n "checking for pid_t""... $ac_c" 1>&6
--echo "configure:3306: checking for pid_t" >&5
-+echo "configure:3322: checking for pid_t" >&5
- if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 3311 "configure"
-+#line 3327 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
-@@ -3335,12 +3376,12 @@
- fi
-
- echo $ac_n "checking for size_t""... $ac_c" 1>&6
--echo "configure:3339: checking for size_t" >&5
-+echo "configure:3355: checking for size_t" >&5
- if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 3344 "configure"
-+#line 3360 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
-@@ -3368,12 +3409,12 @@
- fi
-
- echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
--echo "configure:3372: checking for uid_t in sys/types.h" >&5
-+echo "configure:3388: checking for uid_t in sys/types.h" >&5
- if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 3377 "configure"
-+#line 3393 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- EOF
-@@ -3410,17 +3451,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:3414: checking for $ac_hdr" >&5
-+echo "configure:3430: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 3419 "configure"
-+#line 3435 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:3424: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:3440: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- rm -rf conftest*
-@@ -3447,12 +3488,12 @@
- done
-
- echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
--echo "configure:3451: checking whether time.h and sys/time.h may both be included" >&5
-+echo "configure:3467: checking whether time.h and sys/time.h may both be included" >&5
- if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 3456 "configure"
-+#line 3472 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/time.h>
-@@ -3461,7 +3502,7 @@
- struct tm *tp;
- ; return 0; }
- EOF
--if { (eval echo configure:3465: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:3481: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_header_time=yes
- else
-@@ -3487,9 +3528,9 @@
- #-------------------------------------------
-
- echo $ac_n "checking pw_gecos in struct pwd""... $ac_c" 1>&6
--echo "configure:3491: checking pw_gecos in struct pwd" >&5
-+echo "configure:3507: checking pw_gecos in struct pwd" >&5
- cat > conftest.$ac_ext <<EOF
--#line 3493 "configure"
-+#line 3509 "configure"
- #include "confdefs.h"
- #include <pwd.h>
- int main() {
-@@ -3496,7 +3537,7 @@
- struct passwd pwd; pwd.pw_gecos;
- ; return 0; }
- EOF
--if { (eval echo configure:3500: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:3516: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- tk_ok=yes
- else
-@@ -3529,7 +3570,7 @@
- # Uses ac_ vars as temps to allow command line to override cache and checks.
- # --without-x overrides everything else, but does not touch the cache.
- echo $ac_n "checking for X""... $ac_c" 1>&6
--echo "configure:3533: checking for X" >&5
-+echo "configure:3549: checking for X" >&5
-
- # Check whether --with-x or --without-x was given.
- if test "${with_x+set}" = set; then
-@@ -3591,12 +3632,12 @@
-
- # First, try using that file with no special directory specified.
- cat > conftest.$ac_ext <<EOF
--#line 3595 "configure"
-+#line 3611 "configure"
- #include "confdefs.h"
- #include <$x_direct_test_include>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:3600: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:3616: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- rm -rf conftest*
-@@ -3665,7 +3706,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-l$x_direct_test_library $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3669 "configure"
-+#line 3685 "configure"
- #include "confdefs.h"
-
- int main() {
-@@ -3672,7 +3713,7 @@
- ${x_direct_test_function}()
- ; return 0; }
- EOF
--if { (eval echo configure:3676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- LIBS="$ac_save_LIBS"
- # We can link X programs with no special library path.
-@@ -3762,12 +3803,12 @@
- if test "$no_x" = ""; then
- if test "$x_includes" = ""; then
- cat > conftest.$ac_ext <<EOF
--#line 3766 "configure"
-+#line 3782 "configure"
- #include "confdefs.h"
- #include <X11/XIntrinsic.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:3771: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:3787: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- :
-@@ -3787,15 +3828,15 @@
- fi
- if test "$no_x" = "yes" -o "$not_really_there" = "yes"; then
- echo $ac_n "checking for X11 header files""... $ac_c" 1>&6
--echo "configure:3791: checking for X11 header files" >&5
-+echo "configure:3807: checking for X11 header files" >&5
- XINCLUDES="# no special path needed"
- cat > conftest.$ac_ext <<EOF
--#line 3794 "configure"
-+#line 3810 "configure"
- #include "confdefs.h"
- #include <X11/Intrinsic.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:3799: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:3815: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- :
-@@ -3831,13 +3872,17 @@
-
- if test "$no_x" = yes; then
- echo $ac_n "checking for X11 libraries""... $ac_c" 1>&6
--echo "configure:3835: checking for X11 libraries" >&5
-+echo "configure:3851: checking for X11 libraries" >&5
- XLIBSW=nope
- dirs="/usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/X11R6/lib /usr/X11R5/lib /usr/lib/X11R5 /usr/lib/X11R4 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib"
+@@ -2828,7 +2869,7 @@ fi
+ ;;
+ IRIX*)
+ ;;
+- NetBSD-*|FreeBSD-*|OpenBSD-*)
++ NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*)
+ ;;
+ Rhapsody-*|Darwin-*)
+ ;;
+@@ -3837,7 +3878,11 @@ echo "configure:3835: checking for X11 l
for i in $dirs ; do
if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl; then
echo "$ac_t""$i" 1>&6
@@ -780,7 +148,7 @@ $NetBSD: patch-ab,v 1.2 2005/03/06 22:41:28 jschauma Exp $
x_libraries="$i"
break
fi
-@@ -3846,12 +3891,16 @@
+@@ -3846,12 +3891,16 @@ echo "configure:3835: checking for X11 l
if test "$x_libraries" = ""; then
XLIBSW=-lX11
else
@@ -798,25 +166,7 @@ $NetBSD: patch-ab,v 1.2 2005/03/06 22:41:28 jschauma Exp $
ac_lib_var=`echo Xwindow'_'XCreateWindow | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3859,7 +3908,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lXwindow $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3863 "configure"
-+#line 3887 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -3870,7 +3919,7 @@
- XCreateWindow()
- ; return 0; }
- EOF
--if { (eval echo configure:3874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -3916,6 +3965,10 @@
+@@ -3916,6 +3965,10 @@ if test "x${x_libraries}" != "x"; then
fi
if test "${TCL_LD_SEARCH_FLAGS}" = '-L${LIB_RUNTIME_DIR}'; then
LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -L/g'`
@@ -827,329 +177,7 @@ $NetBSD: patch-ab,v 1.2 2005/03/06 22:41:28 jschauma Exp $
fi
# The statement below is very tricky! It actually *evaluates* the
-@@ -3955,7 +4008,7 @@
- #--------------------------------------------------------------------
-
- echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
--echo "configure:3959: checking for main in -lXbsd" >&5
-+echo "configure:3987: checking for main in -lXbsd" >&5
- ac_lib_var=`echo Xbsd'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3963,7 +4016,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lXbsd $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3967 "configure"
-+#line 3995 "configure"
- #include "confdefs.h"
-
- int main() {
-@@ -3970,7 +4023,7 @@
- main()
- ; return 0; }
- EOF
--if { (eval echo configure:3974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -3993,12 +4046,12 @@
-
- tk_checkBoth=0
- echo $ac_n "checking for connect""... $ac_c" 1>&6
--echo "configure:3997: checking for connect" >&5
-+echo "configure:4025: checking for connect" >&5
- if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 4002 "configure"
-+#line 4030 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char connect(); below. */
-@@ -4021,7 +4074,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:4025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_connect=yes"
- else
-@@ -4043,7 +4096,7 @@
-
- if test "$tk_checkSocket" = 1; then
- echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6
--echo "configure:4047: checking for main in -lsocket" >&5
-+echo "configure:4075: checking for main in -lsocket" >&5
- ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4051,7 +4104,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lsocket $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4055 "configure"
-+#line 4083 "configure"
- #include "confdefs.h"
-
- int main() {
-@@ -4058,7 +4111,7 @@
- main()
- ; return 0; }
- EOF
--if { (eval echo configure:4062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4084,12 +4137,12 @@
- tk_oldLibs=$LIBS
- LIBS="$LIBS -lsocket -lnsl"
- echo $ac_n "checking for accept""... $ac_c" 1>&6
--echo "configure:4088: checking for accept" >&5
-+echo "configure:4116: checking for accept" >&5
- if eval "test \"`echo '$''{'ac_cv_func_accept'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 4093 "configure"
-+#line 4121 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char accept(); below. */
-@@ -4112,7 +4165,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:4116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_accept=yes"
- else
-@@ -4134,12 +4187,12 @@
-
- fi
- echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
--echo "configure:4138: checking for gethostbyname" >&5
-+echo "configure:4166: checking for gethostbyname" >&5
- if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 4143 "configure"
-+#line 4171 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char gethostbyname(); below. */
-@@ -4162,7 +4215,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:4166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_gethostbyname=yes"
- else
-@@ -4180,7 +4233,7 @@
- else
- echo "$ac_t""no" 1>&6
- echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6
--echo "configure:4184: checking for main in -lnsl" >&5
-+echo "configure:4212: checking for main in -lnsl" >&5
- ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4188,7 +4241,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lnsl $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4192 "configure"
-+#line 4220 "configure"
- #include "confdefs.h"
-
- int main() {
-@@ -4195,7 +4248,7 @@
- main()
- ; return 0; }
- EOF
--if { (eval echo configure:4199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4235,13 +4288,13 @@
-
- if test -d /usr/include/mit ; then
- echo $ac_n "checking MIT X libraries""... $ac_c" 1>&6
--echo "configure:4239: checking MIT X libraries" >&5
-+echo "configure:4267: checking MIT X libraries" >&5
- tk_oldCFlags=$CFLAGS
- CFLAGS="$CFLAGS -I/usr/include/mit"
- tk_oldLibs=$LIBS
- LIBS="$LIBS -lX11-mit"
- cat > conftest.$ac_ext <<EOF
--#line 4245 "configure"
-+#line 4273 "configure"
- #include "confdefs.h"
-
- #include <X11/Xlib.h>
-@@ -4252,7 +4305,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:4256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
-
- echo "$ac_t""yes" 1>&6
-@@ -4279,12 +4332,12 @@
-
- MATH_LIBS=""
- echo $ac_n "checking for sin""... $ac_c" 1>&6
--echo "configure:4283: checking for sin" >&5
-+echo "configure:4311: checking for sin" >&5
- if eval "test \"`echo '$''{'ac_cv_func_sin'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 4288 "configure"
-+#line 4316 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char sin(); below. */
-@@ -4307,7 +4360,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:4311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_sin=yes"
- else
-@@ -4328,7 +4381,7 @@
- fi
-
- echo $ac_n "checking for main in -lieee""... $ac_c" 1>&6
--echo "configure:4332: checking for main in -lieee" >&5
-+echo "configure:4360: checking for main in -lieee" >&5
- ac_lib_var=`echo ieee'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4336,7 +4389,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lieee $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4340 "configure"
-+#line 4368 "configure"
- #include "confdefs.h"
-
- int main() {
-@@ -4343,7 +4396,7 @@
- main()
- ; return 0; }
- EOF
--if { (eval echo configure:4347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4370,7 +4423,7 @@
- #--------------------------------------------------------------------
-
- echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6
--echo "configure:4374: checking whether char is unsigned" >&5
-+echo "configure:4402: checking whether char is unsigned" >&5
- if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -4377,7 +4430,7 @@
- if test "$GCC" = yes; then
- # GCC predefines this symbol on systems where it applies.
- cat > conftest.$ac_ext <<EOF
--#line 4381 "configure"
-+#line 4409 "configure"
- #include "confdefs.h"
- #ifdef __CHAR_UNSIGNED__
- yes
-@@ -4399,7 +4452,7 @@
- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
- else
- cat > conftest.$ac_ext <<EOF
--#line 4403 "configure"
-+#line 4431 "configure"
- #include "confdefs.h"
- /* volatile prevents gcc2 from optimizing the test away on sparcs. */
- #if !defined(__STDC__) || __STDC__ != 1
-@@ -4409,7 +4462,7 @@
- volatile char c = 255; exit(c < 0);
- }
- EOF
--if { (eval echo configure:4413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:4441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- ac_cv_c_char_unsigned=yes
- else
-@@ -4442,12 +4495,12 @@
-
-
- echo $ac_n "checking for strtod""... $ac_c" 1>&6
--echo "configure:4446: checking for strtod" >&5
-+echo "configure:4474: checking for strtod" >&5
- if eval "test \"`echo '$''{'ac_cv_func_strtod'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 4451 "configure"
-+#line 4479 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char strtod(); below. */
-@@ -4470,7 +4523,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:4474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_strtod=yes"
- else
-@@ -4492,12 +4545,12 @@
-
- if test "$tcl_strtod" = 1; then
- echo $ac_n "checking for Solaris2.4/Tru64 strtod bugs""... $ac_c" 1>&6
--echo "configure:4496: checking for Solaris2.4/Tru64 strtod bugs" >&5
-+echo "configure:4524: checking for Solaris2.4/Tru64 strtod bugs" >&5
- if test "$cross_compiling" = yes; then
- tcl_ok=0
- else
- cat > conftest.$ac_ext <<EOF
--#line 4501 "configure"
-+#line 4529 "configure"
- #include "confdefs.h"
-
- extern double strtod();
-@@ -4517,7 +4570,7 @@
- exit(0);
- }
- EOF
--if { (eval echo configure:4521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:4549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- tcl_ok=1
- else
-@@ -4549,7 +4602,7 @@
-
-
- echo $ac_n "checking how to build libraries""... $ac_c" 1>&6
--echo "configure:4553: checking how to build libraries" >&5
-+echo "configure:4581: checking how to build libraries" >&5
- # Check whether --enable-shared or --disable-shared was given.
- if test "${enable_shared+set}" = set; then
- enableval="$enable_shared"
-@@ -4588,7 +4641,7 @@
+@@ -4588,7 +4641,7 @@ TCL_STUB_LIB_SPEC='-L$(TCL_BIN_DIR) $(TC
if test "${SHARED_BUILD}" = "1" -a "${SHLIB_SUFFIX}" != ""; then
TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
TK_LIB_FILE=libtk${TK_SHARED_LIB_SUFFIX}
@@ -1158,7 +186,7 @@ $NetBSD: patch-ab,v 1.2 2005/03/06 22:41:28 jschauma Exp $
RANLIB=":"
# TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
-@@ -4611,11 +4664,17 @@
+@@ -4611,11 +4664,17 @@ eval "TK_LIB_FILE=${TK_LIB_FILE}"
if test "$SHARED_BUILD" = 0 -o $TCL_NEEDS_EXP_FILE = 0; then
if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
eval TK_LIB_FLAG="-ltk${VERSION}\${TK_DBGX}"
diff --git a/x11/tk83/patches/patch-ac b/x11/tk83/patches/patch-ac
index 429d0bc304e..bdf3156f943 100644
--- a/x11/tk83/patches/patch-ac
+++ b/x11/tk83/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2005/03/06 22:41:28 jschauma Exp $
+$NetBSD: patch-ac,v 1.3 2005/09/21 14:49:09 joerg Exp $
---- tcl.m4.orig Fri Oct 19 20:24:40 2001
-+++ tcl.m4 Sun Mar 6 16:06:56 2005
-@@ -602,6 +602,7 @@
+--- tcl.m4.orig 2001-10-20 00:24:40.000000000 +0000
++++ tcl.m4
+@@ -602,6 +602,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
do64bit_ok=no
fullSrcDir=`cd $srcdir; pwd`
@@ -10,7 +10,7 @@ $NetBSD: patch-ac,v 1.2 2005/03/06 22:41:28 jschauma Exp $
EXTRA_CFLAGS=""
TCL_EXPORT_FILE_SUFFIX=""
UNSHARED_LIB_SUFFIX=""
-@@ -791,8 +792,11 @@
+@@ -791,8 +792,11 @@ dnl AC_CHECK_TOOL(AR, ar, :)
LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
EXTRA_CFLAGS=""
LDFLAGS=""
@@ -23,7 +23,7 @@ $NetBSD: patch-ac,v 1.2 2005/03/06 22:41:28 jschauma Exp $
SHLIB_CFLAGS=""
SHLIB_LD="ld -n32 -shared -rdata_shared"
SHLIB_LD_LIBS='${LIBS}'
-@@ -815,6 +819,9 @@
+@@ -815,6 +819,9 @@ dnl AC_CHECK_TOOL(AR, ar, :)
esac
LDFLAGS="-n32"
fi
@@ -33,7 +33,7 @@ $NetBSD: patch-ac,v 1.2 2005/03/06 22:41:28 jschauma Exp $
;;
IRIX64-6.*)
SHLIB_CFLAGS=""
-@@ -825,6 +832,15 @@
+@@ -825,6 +832,15 @@ dnl AC_CHECK_TOOL(AR, ar, :)
DL_LIBS=""
LDFLAGS=""
LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
@@ -49,7 +49,7 @@ $NetBSD: patch-ac,v 1.2 2005/03/06 22:41:28 jschauma Exp $
;;
Linux*)
SHLIB_CFLAGS="-fPIC"
-@@ -915,7 +931,6 @@
+@@ -915,7 +931,6 @@ dnl AC_CHECK_TOOL(AR, ar, :)
AC_CHECK_HEADER(dlfcn.h, [
# NetBSD/SPARC needs -fPIC, -fpic will not do.
SHLIB_CFLAGS="-fPIC"
@@ -57,7 +57,7 @@ $NetBSD: patch-ac,v 1.2 2005/03/06 22:41:28 jschauma Exp $
SHLIB_LD_LIBS=""
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
-@@ -927,11 +942,19 @@
+@@ -927,11 +942,19 @@ dnl AC_CHECK_TOOL(AR, ar, :)
#ifdef __ELF__
yes
#endif
@@ -79,7 +79,16 @@ $NetBSD: patch-ac,v 1.2 2005/03/06 22:41:28 jschauma Exp $
)
], [
SHLIB_CFLAGS=""
-@@ -1130,6 +1153,9 @@
+@@ -950,7 +973,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"
+@@ -1130,6 +1153,9 @@ dnl AC_CHECK_TOOL(AR, ar, :)
DL_LIBS="-ldl"
LDFLAGS=""
LD_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
@@ -89,7 +98,7 @@ $NetBSD: patch-ac,v 1.2 2005/03/06 22:41:28 jschauma Exp $
;;
SunOS-5*)
-@@ -1174,6 +1200,9 @@
+@@ -1174,6 +1200,9 @@ dnl AC_CHECK_TOOL(AR, ar, :)
else
LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
fi
@@ -99,7 +108,16 @@ $NetBSD: patch-ac,v 1.2 2005/03/06 22:41:28 jschauma Exp $
;;
ULTRIX-4.*)
SHLIB_CFLAGS="-G 0"
-@@ -1652,7 +1681,11 @@
+@@ -1329,7 +1358,7 @@ dnl AC_CHECK_TOOL(AR, ar, :)
+ ;;
+ IRIX*)
+ ;;
+- NetBSD-*|FreeBSD-*|OpenBSD-*)
++ NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*)
+ ;;
+ Rhapsody-*|Darwin-*)
+ ;;
+@@ -1652,7 +1681,11 @@ AC_DEFUN(SC_PATH_X, [
for i in $dirs ; do
if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl; then
AC_MSG_RESULT($i)
@@ -111,7 +129,7 @@ $NetBSD: patch-ac,v 1.2 2005/03/06 22:41:28 jschauma Exp $
x_libraries="$i"
break
fi
-@@ -1661,7 +1694,11 @@
+@@ -1661,7 +1694,11 @@ AC_DEFUN(SC_PATH_X, [
if test "$x_libraries" = ""; then
XLIBSW=-lX11
else
diff --git a/x11/tk83/patches/patch-ae b/x11/tk83/patches/patch-ae
new file mode 100644
index 00000000000..3734ceacf72
--- /dev/null
+++ b/x11/tk83/patches/patch-ae
@@ -0,0 +1,16 @@
+$NetBSD: patch-ae,v 1.1 2005/09/21 14:49:09 joerg Exp $
+
+--- tkUnixPort.h.orig 2001-10-13 01:25:10.000000000 +0000
++++ tkUnixPort.h
+@@ -123,8 +123,10 @@
+ * Not all systems declare the errno variable in errno.h. so this
+ * file does it explicitly.
+ */
+-
++#include <errno.h>
++#ifndef errno
+ extern int errno;
++#endif
+
+ /*
+ * Define "NBBY" (number of bits per byte) if it's not already defined.
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-24 08:04:25 +0000