From 92da883c166474811f2674517bf50c7c90a01fba Mon Sep 17 00:00:00 2001 From: joerg Date: Wed, 21 Sep 2005 14:49:08 +0000 Subject: 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. --- x11/tk83/distinfo | 7 +- x11/tk83/patches/patch-ab | 1036 ++------------------------------------------- x11/tk83/patches/patch-ac | 44 +- x11/tk83/patches/patch-ae | 16 + 4 files changed, 83 insertions(+), 1020 deletions(-) create mode 100644 x11/tk83/patches/patch-ae (limited to 'x11/tk83') 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 <&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 <&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 <&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 - 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 - 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 - 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 <&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 < - 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 < - 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 < - 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 <&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 <&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 <&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 -@@ -3066,7 +3107,7 @@ - rm -f conftest* - - cat > conftest.$ac_ext < - EOF -@@ -3080,7 +3121,7 @@ - rm -f conftest* - - cat > conftest.$ac_ext < - 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 < - 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 -@@ -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 < - #include -@@ -3178,7 +3219,7 @@ - #include - 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 -@@ -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 -@@ -3234,7 +3275,7 @@ - : - else - cat > conftest.$ac_ext < - #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 < - #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 < - #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 < - #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 -@@ -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 - 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 < - #include -@@ -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 < - 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 - 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 <&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 - 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 - 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 <&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 <&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 <&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 <&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 <&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 <&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 <&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 < -@@ -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 <&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 <&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 <&2; exit 1; } - else - cat > conftest.$ac_ext <&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 <&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 <&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 ++#ifndef errno + extern int errno; ++#endif + + /* + * Define "NBBY" (number of bits per byte) if it's not already defined. -- cgit v1.2.3