diff options
Diffstat (limited to 'lang/tcl83')
-rw-r--r-- | lang/tcl83/distinfo | 6 | ||||
-rw-r--r-- | lang/tcl83/patches/patch-ab | 71 | ||||
-rw-r--r-- | lang/tcl83/patches/patch-af | 44 |
3 files changed, 83 insertions, 38 deletions
diff --git a/lang/tcl83/distinfo b/lang/tcl83/distinfo index 551be34e65b..e2cb8354e6c 100644 --- a/lang/tcl83/distinfo +++ b/lang/tcl83/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.5 2005/11/04 09:56:09 rillig Exp $ +$NetBSD: distinfo,v 1.6 2007/10/27 15:16:52 hubertf 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) = 36e3e635b5f70b658c7151254cf02529611a3120 -SHA1 (patch-ab) = b2fc4fc6a7b651cfbea2bdd5315a5ee24d68ec7b +SHA1 (patch-ab) = 1f717fcab6ddce1023ad889fabc049b4a950912e SHA1 (patch-ac) = b01dc7dbe9b9bd92de4792b74a25b01e33ad4bb9 SHA1 (patch-ae) = a2d8477c6b2f80700876128e14e39afdb4e5504b -SHA1 (patch-af) = 40e5353865399b27b1ece76c9f88931274a9709f +SHA1 (patch-af) = 96f10a1cf1340362ede4eee6327fe44f6b9f9bb3 SHA1 (patch-ag) = a4bc4fe104890a874463df5b2795499f871dd1ba diff --git a/lang/tcl83/patches/patch-ab b/lang/tcl83/patches/patch-ab index 312cae9ee9d..c4e9be830ea 100644 --- a/lang/tcl83/patches/patch-ab +++ b/lang/tcl83/patches/patch-ab @@ -1,8 +1,17 @@ -$NetBSD: patch-ab,v 1.4 2005/11/04 09:56:09 rillig Exp $ +$NetBSD: patch-ab,v 1.5 2007/10/27 15:16:52 hubertf Exp $ ---- unix/configure.orig 2001-10-20 10:24:15.000000000 +1000 -+++ unix/configure -@@ -4776,6 +4776,7 @@ fi +--- unix/configure.orig 2001-10-20 02:24:15.000000000 +0200 ++++ unix/configure 2007-10-27 16:52:15.000000000 +0200 +@@ -4719,7 +4719,7 @@ + # results, and the version is kept in special file). + + if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then +- system=MP-RAS-`awk '{print }' /etc/.relid'` ++ system=MP-RAS-`awk '{print }' /etc/.relid` + fi + if test "`uname -s`" = "AIX" ; then + system=AIX-`uname -v`.`uname -r` +@@ -4776,6 +4776,7 @@ # Step 3: set configuration options based on system name and version. do64bit_ok=no @@ -10,7 +19,7 @@ $NetBSD: patch-ab,v 1.4 2005/11/04 09:56:09 rillig Exp $ EXTRA_CFLAGS="" TCL_EXPORT_FILE_SUFFIX="" UNSHARED_LIB_SUFFIX="" -@@ -5114,6 +5115,9 @@ fi +@@ -5114,6 +5115,9 @@ LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' EXTRA_CFLAGS="" LDFLAGS="" @@ -20,7 +29,7 @@ $NetBSD: patch-ab,v 1.4 2005/11/04 09:56:09 rillig Exp $ ;; IRIX-6.*|IRIX64-6.5*) SHLIB_CFLAGS="" -@@ -5138,6 +5142,9 @@ fi +@@ -5138,6 +5142,9 @@ esac LDFLAGS="-n32" fi @@ -30,7 +39,7 @@ $NetBSD: patch-ab,v 1.4 2005/11/04 09:56:09 rillig Exp $ ;; IRIX64-6.*) SHLIB_CFLAGS="" -@@ -5148,6 +5155,9 @@ fi +@@ -5148,6 +5155,9 @@ DL_LIBS="" LDFLAGS="" LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' @@ -40,7 +49,7 @@ $NetBSD: patch-ab,v 1.4 2005/11/04 09:56:09 rillig Exp $ ;; Linux*) SHLIB_CFLAGS="-fPIC" -@@ -5221,6 +5231,9 @@ fi +@@ -5221,6 +5231,9 @@ EXTRA_CFLAGS="${EXTRA_CFLAGS} -fno-inline" fi @@ -50,7 +59,7 @@ $NetBSD: patch-ab,v 1.4 2005/11/04 09:56:09 rillig Exp $ ;; GNU*) SHLIB_CFLAGS="-fPIC" -@@ -5298,6 +5311,9 @@ fi +@@ -5298,6 +5311,9 @@ LD_SEARCH_FLAGS="" ;; NetBSD-*|FreeBSD-[1-2].*|OpenBSD-*) @@ -60,7 +69,7 @@ $NetBSD: patch-ab,v 1.4 2005/11/04 09:56:09 rillig Exp $ # 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 -@@ -5330,17 +5346,15 @@ if eval "test \"`echo '$ac_cv_header_'$a +@@ -5330,17 +5346,15 @@ # NetBSD/SPARC needs -fPIC, -fpic will not do. SHLIB_CFLAGS="-fPIC" @@ -80,7 +89,7 @@ $NetBSD: patch-ab,v 1.4 2005/11/04 09:56:09 rillig Exp $ #include "confdefs.h" #ifdef __ELF__ -@@ -5351,11 +5365,20 @@ EOF +@@ -5351,11 +5365,20 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "yes" >/dev/null 2>&1; then rm -rf conftest* @@ -103,7 +112,7 @@ $NetBSD: patch-ab,v 1.4 2005/11/04 09:56:09 rillig Exp $ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0' fi -@@ -5383,7 +5406,7 @@ fi +@@ -5383,7 +5406,7 @@ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' TCL_LIB_VERSIONS_OK=nodots ;; @@ -112,7 +121,7 @@ $NetBSD: patch-ab,v 1.4 2005/11/04 09:56:09 rillig Exp $ # FreeBSD 3.* and greater have ELF. SHLIB_CFLAGS="-fPIC" SHLIB_LD="ld -Bshareable -x" -@@ -5401,7 +5424,7 @@ fi +@@ -5401,7 +5424,7 @@ Rhapsody-*|Darwin-*) SHLIB_CFLAGS="-fno-common" SHLIB_LD="cc -dynamiclib \${LDFLAGS}" @@ -121,7 +130,7 @@ $NetBSD: patch-ab,v 1.4 2005/11/04 09:56:09 rillig Exp $ SHLIB_LD_LIBS="${LIBS}" SHLIB_SUFFIX=".dylib" DL_OBJS="tclLoadDyld.o" -@@ -5410,6 +5433,9 @@ fi +@@ -5410,6 +5433,9 @@ LD_SEARCH_FLAGS="" CFLAGS_OPTIMIZE="-O3" EXTRA_CFLAGS="-arch ppc -pipe" @@ -131,7 +140,7 @@ $NetBSD: patch-ab,v 1.4 2005/11/04 09:56:09 rillig Exp $ ;; NEXTSTEP-*) SHLIB_CFLAGS="" -@@ -5569,6 +5595,9 @@ EOF +@@ -5569,6 +5595,9 @@ DL_LIBS="-ldl" LDFLAGS="" LD_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}' @@ -141,7 +150,7 @@ $NetBSD: patch-ab,v 1.4 2005/11/04 09:56:09 rillig Exp $ ;; SunOS-5*) -@@ -5616,6 +5645,9 @@ EOF +@@ -5616,6 +5645,9 @@ else LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}' fi @@ -151,7 +160,7 @@ $NetBSD: patch-ab,v 1.4 2005/11/04 09:56:09 rillig Exp $ ;; ULTRIX-4.*) SHLIB_CFLAGS="-G 0" -@@ -5858,7 +5890,7 @@ fi +@@ -5858,7 +5890,7 @@ ;; IRIX*) ;; @@ -160,7 +169,16 @@ $NetBSD: patch-ab,v 1.4 2005/11/04 09:56:09 rillig Exp $ ;; Rhapsody-*|Darwin-*) ;; -@@ -6103,7 +6135,7 @@ if test "${SHARED_BUILD}" = "1" -a "${SH +@@ -6016,7 +6048,7 @@ + # results, and the version is kept in special file). + + if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then +- system=MP-RAS-`awk '{print }' /etc/.relid'` ++ system=MP-RAS-`awk '{print }' /etc/.relid` + fi + if test "`uname -s`" = "AIX" ; then + system=AIX-`uname -v`.`uname -r` +@@ -6103,7 +6135,7 @@ if test "x$DL_OBJS" = "xtclLoadAout.o"; then MAKE_LIB="\${STLIB_LD} \$@ \${OBJS}" else @@ -169,7 +187,7 @@ $NetBSD: patch-ab,v 1.4 2005/11/04 09:56:09 rillig Exp $ fi else case $system in -@@ -6141,7 +6173,7 @@ if test "$SHARED_BUILD" = "0" -o $TCL_NE +@@ -6141,7 +6173,7 @@ TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}" fi TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}" @@ -178,7 +196,7 @@ $NetBSD: patch-ab,v 1.4 2005/11/04 09:56:09 rillig Exp $ else TCL_BUILD_EXP_FILE="lib.exp" eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}" -@@ -6171,10 +6203,17 @@ VERSION=${TCL_VERSION} +@@ -6171,10 +6203,17 @@ #-------------------------------------------------------------------- if test "$prefix" != "$exec_prefix"; then @@ -198,7 +216,7 @@ $NetBSD: patch-ab,v 1.4 2005/11/04 09:56:09 rillig Exp $ #-------------------------------------------------------------------- # The statements below define various symbols relating to Tcl -@@ -6262,6 +6301,8 @@ TCL_SHARED_BUILD=${SHARED_BUILD} +@@ -6262,6 +6301,8 @@ @@ -207,7 +225,16 @@ $NetBSD: patch-ab,v 1.4 2005/11/04 09:56:09 rillig Exp $ trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure -@@ -6437,12 +6478,12 @@ s%@TCL_DBGX@%$TCL_DBGX%g +@@ -6361,6 +6402,8 @@ + do + case "\$ac_option" in + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ++ : Avoid regenerating within pkgsrc ++ exit 0 + echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" + exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; + -version | --version | --versio | --versi | --vers | --ver | --ve | --v) +@@ -6437,12 +6480,12 @@ s%@CFG_TCL_SHARED_LIB_SUFFIX@%$CFG_TCL_SHARED_LIB_SUFFIX%g s%@CFG_TCL_UNSHARED_LIB_SUFFIX@%$CFG_TCL_UNSHARED_LIB_SUFFIX%g s%@CFG_TCL_EXPORT_FILE_SUFFIX@%$CFG_TCL_EXPORT_FILE_SUFFIX%g diff --git a/lang/tcl83/patches/patch-af b/lang/tcl83/patches/patch-af index d4dbd4b4d5d..80af0eff32b 100644 --- a/lang/tcl83/patches/patch-af +++ b/lang/tcl83/patches/patch-af @@ -1,8 +1,17 @@ -$NetBSD: patch-af,v 1.3 2005/11/04 09:56:09 rillig Exp $ +$NetBSD: patch-af,v 1.4 2007/10/27 15:16:52 hubertf Exp $ ---- unix/tcl.m4.orig Fri Oct 19 19:24:15 2001 -+++ unix/tcl.m4 -@@ -601,6 +601,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ +--- unix/tcl.m4.orig 2001-10-20 02:24:15.000000000 +0200 ++++ unix/tcl.m4 2007-10-27 16:53:32.000000000 +0200 +@@ -584,7 +584,7 @@ + # results, and the version is kept in special file). + + if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then +- system=MP-RAS-`awk '{print $3}' /etc/.relid'` ++ system=MP-RAS-`awk '{print $3}' /etc/.relid` + fi + if test "`uname -s`" = "AIX" ; then + system=AIX-`uname -v`.`uname -r` +@@ -601,6 +601,7 @@ # Step 3: set configuration options based on system name and version. do64bit_ok=no @@ -10,7 +19,7 @@ $NetBSD: patch-af,v 1.3 2005/11/04 09:56:09 rillig Exp $ EXTRA_CFLAGS="" TCL_EXPORT_FILE_SUFFIX="" UNSHARED_LIB_SUFFIX="" -@@ -790,6 +791,9 @@ dnl AC_CHECK_TOOL(AR, ar, :) +@@ -790,6 +791,9 @@ LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' EXTRA_CFLAGS="" LDFLAGS="" @@ -20,7 +29,7 @@ $NetBSD: patch-af,v 1.3 2005/11/04 09:56:09 rillig Exp $ ;; IRIX-6.*|IRIX64-6.5*) SHLIB_CFLAGS="" -@@ -814,6 +818,9 @@ dnl AC_CHECK_TOOL(AR, ar, :) +@@ -814,6 +818,9 @@ esac LDFLAGS="-n32" fi @@ -30,7 +39,7 @@ $NetBSD: patch-af,v 1.3 2005/11/04 09:56:09 rillig Exp $ ;; IRIX64-6.*) SHLIB_CFLAGS="" -@@ -824,6 +831,9 @@ dnl AC_CHECK_TOOL(AR, ar, :) +@@ -824,6 +831,9 @@ DL_LIBS="" LDFLAGS="" LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' @@ -40,7 +49,7 @@ $NetBSD: patch-af,v 1.3 2005/11/04 09:56:09 rillig Exp $ ;; Linux*) SHLIB_CFLAGS="-fPIC" -@@ -865,6 +875,9 @@ dnl AC_CHECK_TOOL(AR, ar, :) +@@ -865,6 +875,9 @@ EXTRA_CFLAGS="${EXTRA_CFLAGS} -fno-inline" fi @@ -50,7 +59,7 @@ $NetBSD: patch-af,v 1.3 2005/11/04 09:56:09 rillig Exp $ ;; GNU*) SHLIB_CFLAGS="-fPIC" -@@ -910,28 +923,36 @@ dnl AC_CHECK_TOOL(AR, ar, :) +@@ -910,28 +923,36 @@ LD_SEARCH_FLAGS="" ;; NetBSD-*|FreeBSD-[[1-2]].*|OpenBSD-*) @@ -92,7 +101,7 @@ $NetBSD: patch-af,v 1.3 2005/11/04 09:56:09 rillig Exp $ ], [ SHLIB_CFLAGS="" SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r" -@@ -949,7 +970,7 @@ dnl AC_CHECK_TOOL(AR, ar, :) +@@ -949,7 +970,7 @@ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' TCL_LIB_VERSIONS_OK=nodots ;; @@ -101,7 +110,7 @@ $NetBSD: patch-af,v 1.3 2005/11/04 09:56:09 rillig Exp $ # FreeBSD 3.* and greater have ELF. SHLIB_CFLAGS="-fPIC" SHLIB_LD="ld -Bshareable -x" -@@ -1129,6 +1150,9 @@ dnl AC_CHECK_TOOL(AR, ar, :) +@@ -1129,6 +1150,9 @@ DL_LIBS="-ldl" LDFLAGS="" LD_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}' @@ -111,7 +120,7 @@ $NetBSD: patch-af,v 1.3 2005/11/04 09:56:09 rillig Exp $ ;; SunOS-5*) -@@ -1173,6 +1197,9 @@ dnl AC_CHECK_TOOL(AR, ar, :) +@@ -1173,6 +1197,9 @@ else LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}' fi @@ -121,7 +130,7 @@ $NetBSD: patch-af,v 1.3 2005/11/04 09:56:09 rillig Exp $ ;; ULTRIX-4.*) SHLIB_CFLAGS="-G 0" -@@ -1328,7 +1355,7 @@ dnl AC_CHECK_TOOL(AR, ar, :) +@@ -1328,7 +1355,7 @@ ;; IRIX*) ;; @@ -130,3 +139,12 @@ $NetBSD: patch-af,v 1.3 2005/11/04 09:56:09 rillig Exp $ ;; Rhapsody-*|Darwin-*) ;; +@@ -1707,7 +1734,7 @@ + # results, and the version is kept in special file). + + if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then +- system=MP-RAS-`awk '{print $3}' /etc/.relid'` ++ system=MP-RAS-`awk '{print $3}' /etc/.relid` + fi + if test "`uname -s`" = "AIX" ; then + system=AIX-`uname -v`.`uname -r` |