summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authoradam <adam>2006-01-16 14:47:35 +0000
committeradam <adam>2006-01-16 14:47:35 +0000
commitae8fcf90e78d2189e1b6bfcbd06160eb18b5de9e (patch)
tree1c264294a90a0a335a86bf980e82276d16a9ae91 /lang
parent5bacfe321f1c92063102a5b47af5e7fe1690ba3c (diff)
downloadpkgsrc-ae8fcf90e78d2189e1b6bfcbd06160eb18b5de9e.tar.gz
Changes 8.4.12:
* Repeated [namespace import] of same command now permitted. * ${prefix}/share added to ::tcl_pkgPath on some systems. * [exec]'s >> redirection has improved append behavior. * [info globals] returned only existing variables. * Recognize some Solaris variations of the cp1251 encoding. * Addressed [file mkdir] race condition. * Support opening >2GB files on RHEL 3. * Corrections to $argv formatting when [encoding system] is multibyte. * http 2.5.2: Update URL encoding rules to RFC 3986. * Fixed issue in recursive file delete with NFS lock files. * Stopped crash after use of Tcl_TraceCommand(). * Win NT/XP: support unicode console. * Improved support for Tclkit to set [encoding system]. * Added Korean timezone abbreviations. * Windows: exit codes can now exceed -128..127 range. * [load] support on LynxOS. * Packages with incorrect index scripts now cause a warning to be logged. *** POTENTIAL INCOMPATIBILITY *** * [lsearch -regexp] now accepts backrefs in the RE. * [selection get] made compatible with OpenOffice.org. * Dialog support for widget names containing spaces. * Improved Tk window manager event interaction on OS X Aqua.
Diffstat (limited to 'lang')
-rw-r--r--lang/tcl/Makefile22
-rw-r--r--lang/tcl/Makefile.version4
-rw-r--r--lang/tcl/distinfo29
-rw-r--r--lang/tcl/patches/patch-aa16
-rw-r--r--lang/tcl/patches/patch-ab32
-rw-r--r--lang/tcl/patches/patch-ac12
-rw-r--r--lang/tcl/patches/patch-ad6
-rw-r--r--lang/tcl/patches/patch-ae20
-rw-r--r--lang/tcl/patches/patch-af28
-rw-r--r--lang/tcl/patches/patch-ag6
-rw-r--r--lang/tcl/patches/patch-ah8
-rw-r--r--lang/tcl/patches/patch-ai6
-rw-r--r--lang/tcl/patches/patch-aj6
-rw-r--r--lang/tcl/patches/patch-ak31
14 files changed, 97 insertions, 129 deletions
diff --git a/lang/tcl/Makefile b/lang/tcl/Makefile
index b2ae7b92a69..1d06bab2122 100644
--- a/lang/tcl/Makefile
+++ b/lang/tcl/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.56 2005/12/05 20:50:28 rillig Exp $
+# $NetBSD: Makefile,v 1.57 2006/01/16 14:47:35 adam Exp $
DISTNAME= tcl${TCL_VERSION}-src
PKGNAME= tcl-${TCL_VERSION}
-PKGREVISION= 1
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/}
@@ -16,10 +15,12 @@ CONFLICTS+= tclman80-[0-9]*
PKG_INSTALLATION_TYPES= overwrite pkgviews
-WRKSRC= ${WRKDIR}/${DISTNAME:C/-src//}/unix
+WRKSRC= ${WRKDIR}/tcl${TCL_VERSION}
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
+CONFIGURE_DIRS= unix
+BUILD_DIRS= ${CONFIGURE_DIRS}
MAKE_ENV+= TOUCH=${TOUCH:Q}
INSTALL_TARGET= install
@@ -51,23 +52,22 @@ CONFIGURE_ENV+= TCL_PACKAGE_PATH="${VIEWBASE}/lib/tcl"
CONFIGURE_ARGS+= --enable-64bit
.endif
-post-build:
- ${SED} \
- -e "s|${WRKSRC}|${PREFIX}/lib|" \
- -e "s|${WRKDIR}/${DISTNAME:C/-src//}|${PREFIX}/include/tcl|" \
- ${WRKSRC}/tclConfig.sh > ${WRKSRC}/tclConfig.sh.tmp && \
- ${MV} ${WRKSRC}/tclConfig.sh.tmp ${WRKSRC}/tclConfig.sh
+SUBST_CLASSES+= tcl-config
+SUBST_STAGE.tcl-config= post-build
+SUBST_FILES.tcl-config= unix/tclConfig.sh
+SUBST_SED.tcl-config+= -e "s|${WRKSRC}/unix|${PREFIX}/lib|"
+SUBST_SED.tcl-config+= -e "s|${WRKSRC}|${PREFIX}/include/tcl|"
post-install:
cd ${PREFIX}/bin && ${LN} -s tclsh8.4 tclsh
${INSTALL_DATA_DIR} ${PREFIX}/include/tcl
${INSTALL_DATA_DIR} ${PREFIX}/include/tcl/unix
${INSTALL_DATA_DIR} ${PREFIX}/include/tcl/generic
- ${INSTALL_DATA} ${WRKSRC}/tclUnixPort.h ${PREFIX}/include/tcl/unix
+ ${INSTALL_DATA} ${WRKSRC}/unix/tclUnixPort.h ${PREFIX}/include/tcl/unix
.for f in regex.h tcl.h tclCompile.h tclDecls.h tclIO.h \
tclInitScript.h tclInt.h tclIntDecls.h tclIntPlatDecls.h\
tclMath.h tclPlatDecls.h tclPort.h tclRegexp.h
- ${INSTALL_DATA} ${WRKSRC}/../generic/${f} ${PREFIX}/include/tcl/generic
+ ${INSTALL_DATA} ${WRKSRC}/generic/${f} ${PREFIX}/include/tcl/generic
.endfor
${INSTALL_LIB_DIR} ${PREFIX}/lib/tcl
diff --git a/lang/tcl/Makefile.version b/lang/tcl/Makefile.version
index 90e7e3efa24..9ad9cf8ca06 100644
--- a/lang/tcl/Makefile.version
+++ b/lang/tcl/Makefile.version
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.version,v 1.2 2005/07/19 11:11:58 adam Exp $
+# $NetBSD: Makefile.version,v 1.3 2006/01/16 14:47:35 adam Exp $
-TCL_VERSION=8.4.11
+TCL_VERSION=8.4.12
diff --git a/lang/tcl/distinfo b/lang/tcl/distinfo
index f9a3fdae541..1f1cbbb4680 100644
--- a/lang/tcl/distinfo
+++ b/lang/tcl/distinfo
@@ -1,16 +1,15 @@
-$NetBSD: distinfo,v 1.35 2005/09/21 14:49:08 joerg Exp $
+$NetBSD: distinfo,v 1.36 2006/01/16 14:47:35 adam 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) = 4a20ef86bda2faf1f427273dbde601fcb176a34e
-SHA1 (patch-ac) = 39634cde6f535f3592e40105d6060c05cfab0a68
-SHA1 (patch-ad) = 54947660216280726ee9ec213995063fa428f560
-SHA1 (patch-ae) = d5b7c01873c9d092bcdea5ea37b407bbd865f22d
-SHA1 (patch-af) = 6e599f54b2f2045cdee608aaa958cd95941cb67f
-SHA1 (patch-ag) = 0a11bfc878d43b15f6444923fac18b4876b62398
-SHA1 (patch-ah) = 0aaa349fcf9ce736e1f7d3dad377ee355f549ecb
-SHA1 (patch-ai) = ef8939597e759a95ca869f93e251df76d9c660f9
-SHA1 (patch-aj) = 3e6844bce3e9c15100dd53ef4c8fb715ffebf1c9
-SHA1 (patch-ak) = 6d4ef7d1aa6709257add6f4cbc6b837f08004c55
+SHA1 (tcl8.4.12-src.tar.gz) = 8f9808da2df0aeb2319ab10a4fc49295789fc43d
+RMD160 (tcl8.4.12-src.tar.gz) = 5a667face8be2cebced5238c481e96499a93237b
+Size (tcl8.4.12-src.tar.gz) = 3500222 bytes
+SHA1 (patch-aa) = ab9ac8cabb91735d9203dcb107ef86a46127bf06
+SHA1 (patch-ab) = d1ace8aa33f7483ef1a544f001725c5007e0cb2a
+SHA1 (patch-ac) = 2040e904292a22a4142f35bf8d8f01f1c96a2195
+SHA1 (patch-ad) = 05a945172651513e178c6f49672bb18d8c4ad3e7
+SHA1 (patch-ae) = 68af5d4b11b66a0db41578956575559421833a26
+SHA1 (patch-af) = c929027fee5a1845ee18ffa618780a11622ba8da
+SHA1 (patch-ag) = fe371866b438063515bad6d145287455c4636824
+SHA1 (patch-ah) = 51abadf5fb5aed1d4bf0a162ed5f392bc9c3bc22
+SHA1 (patch-ai) = b0f7818adedd53a123c6ab809bbec28924b3f07b
+SHA1 (patch-aj) = 74d5d7f0d47f39241068c98a316104da94f1cdb9
diff --git a/lang/tcl/patches/patch-aa b/lang/tcl/patches/patch-aa
index 35411b685f0..a08c707c661 100644
--- a/lang/tcl/patches/patch-aa
+++ b/lang/tcl/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.15 2005/07/19 11:11:58 adam Exp $
+$NetBSD: patch-aa,v 1.16 2006/01/16 14:47:35 adam Exp $
---- Makefile.in.orig 2005-06-29 16:40:32.000000000 +0000
-+++ Makefile.in
+--- unix/Makefile.in.orig 2005-12-06 17:03:33.000000000 +0100
++++ unix/Makefile.in
@@ -184,8 +184,8 @@ SHELL = /bin/sh
INSTALL_STRIP_PROGRAM = -s
INSTALL_STRIP_LIBRARY = -S -S
@@ -64,9 +64,9 @@ $NetBSD: patch-aa,v 1.15 2005/07/19 11:11:58 adam Exp $
-tclsh: ${TCLSH_OBJS} ${TCL_LIB_FILE}
-- ${CC} ${LDFLAGS} ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
+- ${CC} ${CFLAGS} ${LDFLAGS} ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
+tclsh: ${TCLSH_OBJS} ${TCL_LA_FILE}
-+ ${LD} ${LDFLAGS} ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
++ ${LD} ${CFLAGS} ${LDFLAGS} ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
${CC_SEARCH_FLAGS} -o tclsh
# Resetting the LIB_RUNTIME_DIR below is required so that
@@ -79,12 +79,12 @@ $NetBSD: patch-aa,v 1.15 2005/07/19 11:11:58 adam Exp $
$(MAKE) tcltest-real LIB_RUNTIME_DIR=`pwd`
tcltest-real:
-- ${CC} ${LDFLAGS} ${TCLTEST_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
-+ ${LD} ${LDFLAGS} ${TCLTEST_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
+- ${CC} ${CFLAGS} ${LDFLAGS} ${TCLTEST_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
++ ${LD} ${CFLAGS} ${LDFLAGS} ${TCLTEST_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
${CC_SEARCH_FLAGS} -o tcltest
# Note, in the target below TCL_LIBRARY needs to be set or else
-@@ -1085,7 +1087,7 @@ tclMacOSXNotify.o: $(MAC_OSX_DIR)/tclMac
+@@ -1089,7 +1091,7 @@ tclMacOSXNotify.o: $(MAC_OSX_DIR)/tclMac
xttest: ${XTTEST_OBJS} ${GENERIC_OBJS} ${UNIX_OBJS} ${COMPAT_OBJS} \
@DL_OBJS@ ${BUILD_DLTEST}
diff --git a/lang/tcl/patches/patch-ab b/lang/tcl/patches/patch-ab
index 3badda3b891..a84b2f0e1ab 100644
--- a/lang/tcl/patches/patch-ab
+++ b/lang/tcl/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.31 2005/09/21 14:49:08 joerg Exp $
+$NetBSD: patch-ab,v 1.32 2006/01/16 14:47:35 adam Exp $
---- configure.orig 2005-06-29 16:40:33.000000000 +0000
-+++ configure
-@@ -2191,12 +2191,13 @@ fi
+--- unix/configure.orig 2005-12-06 17:03:33.000000000 +0100
++++ unix/configure
+@@ -2542,12 +2542,13 @@ fi
# Step 3: set configuration options based on system name and version.
do64bit_ok=no
@@ -17,7 +17,7 @@ $NetBSD: patch-ab,v 1.31 2005/09/21 14:49:08 joerg Exp $
CFLAGS_DEBUG=-g
CFLAGS_OPTIMIZE=-O
if test "$GCC" = "yes" ; then
-@@ -2606,6 +2607,21 @@ fi
+@@ -2962,6 +2963,21 @@ fi
LD_LIBRARY_PATH_VAR="SHLIB_PATH"
fi
;;
@@ -39,7 +39,7 @@ $NetBSD: patch-ab,v 1.31 2005/09/21 14:49:08 joerg Exp $
IRIX-4.*)
SHLIB_CFLAGS="-G 0"
SHLIB_SUFFIX=".a"
-@@ -2834,6 +2850,9 @@ fi
+@@ -3202,6 +3218,9 @@ fi
LD_SEARCH_FLAGS=""
;;
NetBSD-*|FreeBSD-[1-2].*)
@@ -49,7 +49,7 @@ $NetBSD: patch-ab,v 1.31 2005/09/21 14:49:08 joerg 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
-@@ -2866,13 +2885,11 @@ if eval "test \"`echo '$ac_cv_header_'$a
+@@ -3234,13 +3253,11 @@ if eval "test \"`echo '$ac_cv_header_'$a
# NetBSD/SPARC needs -fPIC, -fpic will not do.
SHLIB_CFLAGS="-fPIC"
@@ -61,9 +61,9 @@ $NetBSD: patch-ab,v 1.31 2005/09/21 14:49:08 joerg Exp $
CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
- LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
echo $ac_n "checking for ELF""... $ac_c" 1>&6
- echo "configure:2878: checking for ELF" >&5
+ echo "configure:3246: checking for ELF" >&5
cat > conftest.$ac_ext <<EOF
-@@ -2887,11 +2904,20 @@ EOF
+@@ -3255,11 +3272,20 @@ EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "yes" >/dev/null 2>&1; then
rm -rf conftest*
@@ -86,7 +86,7 @@ $NetBSD: patch-ab,v 1.31 2005/09/21 14:49:08 joerg Exp $
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
fi
-@@ -2980,7 +3006,7 @@ rm -f conftest*
+@@ -3348,7 +3374,7 @@ rm -f conftest*
UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
TCL_LIB_VERSIONS_OK=nodots
;;
@@ -95,7 +95,7 @@ $NetBSD: patch-ab,v 1.31 2005/09/21 14:49:08 joerg Exp $
# FreeBSD 3.* and greater have ELF.
SHLIB_CFLAGS="-fPIC"
SHLIB_LD="ld -Bshareable -x"
-@@ -3820,16 +3846,16 @@ fi
+@@ -4301,16 +4327,16 @@ fi
fi
if test "$SHARED_LIB_SUFFIX" = "" ; then
@@ -116,7 +116,7 @@ $NetBSD: patch-ab,v 1.31 2005/09/21 14:49:08 joerg Exp $
else
LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
-@@ -7756,7 +7782,7 @@ else
+@@ -7785,7 +7811,7 @@ else
TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}"
fi
TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}"
@@ -125,7 +125,7 @@ $NetBSD: patch-ab,v 1.31 2005/09/21 14:49:08 joerg Exp $
else
TCL_BUILD_EXP_FILE="lib.exp"
eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}"
-@@ -7787,13 +7813,21 @@ VERSION=${TCL_VERSION}
+@@ -7816,13 +7842,21 @@ VERSION=${TCL_VERSION}
#--------------------------------------------------------------------
if test "$FRAMEWORK_BUILD" = "1" ; then
@@ -147,6 +147,6 @@ $NetBSD: patch-ab,v 1.31 2005/09/21 14:49:08 joerg Exp $
+ fi
+done
+
- #--------------------------------------------------------------------
- # The statements below define various symbols relating to Tcl
- # stub support.
+ # If a system share directory like /usr/local/share already exists, then add
+ # it to the package search path.
+
diff --git a/lang/tcl/patches/patch-ac b/lang/tcl/patches/patch-ac
index 1b6a98be59f..4797dfc2ae9 100644
--- a/lang/tcl/patches/patch-ac
+++ b/lang/tcl/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.7 2005/09/21 14:49:08 joerg Exp $
+$NetBSD: patch-ac,v 1.8 2006/01/16 14:47:35 adam Exp $
---- tclUnixInit.c.orig 2005-05-24 04:20:12.000000000 +0000
-+++ tclUnixInit.c
+--- unix/tclUnixInit.c.orig 2005-11-03 17:16:29.000000000 +0100
++++ unix/tclUnixInit.c
@@ -19,7 +19,7 @@
#ifdef HAVE_LANGINFO
#include <langinfo.h>
@@ -23,7 +23,7 @@ $NetBSD: patch-ac,v 1.7 2005/09/21 14:49:08 joerg Exp $
/*
* The Init script (common to Windows and Unix platforms) is
-@@ -203,7 +208,7 @@ TclpInitPlatform()
+@@ -204,7 +209,7 @@ TclpInitPlatform()
(void) signal(SIGPIPE, SIG_IGN);
#endif /* SIGPIPE */
@@ -32,7 +32,7 @@ $NetBSD: patch-ac,v 1.7 2005/09/21 14:49:08 joerg Exp $
fpsetround(FP_RN);
fpsetmask(0L);
#endif
-@@ -740,6 +745,11 @@ TclpSetVariables(interp)
+@@ -742,6 +747,11 @@ TclpSetVariables(interp)
int unameOK;
CONST char *user;
Tcl_DString ds;
@@ -44,7 +44,7 @@ $NetBSD: patch-ac,v 1.7 2005/09/21 14:49:08 joerg Exp $
#ifdef HAVE_COREFOUNDATION
char tclLibPath[MAXPATHLEN + 1];
-@@ -842,8 +852,16 @@ TclpSetVariables(interp)
+@@ -844,8 +854,16 @@ TclpSetVariables(interp)
Tcl_SetVar2(interp, "tcl_platform", "osVersion", name.release,
TCL_GLOBAL_ONLY|TCL_APPEND_VALUE);
}
diff --git a/lang/tcl/patches/patch-ad b/lang/tcl/patches/patch-ad
index d5bc49cb61e..208099832f7 100644
--- a/lang/tcl/patches/patch-ad
+++ b/lang/tcl/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.3 2005/08/02 22:37:18 seb Exp $
+$NetBSD: patch-ad,v 1.4 2006/01/16 14:47:35 adam Exp $
---- dltest/Makefile.in.orig 2004-09-23 20:04:07.000000000 +0000
-+++ dltest/Makefile.in
+--- unix/dltest/Makefile.in.orig 2004-09-23 20:04:07.000000000 +0000
++++ unix/dltest/Makefile.in
@@ -5,11 +5,11 @@
TCL_DBGX = @TCL_DBGX@
diff --git a/lang/tcl/patches/patch-ae b/lang/tcl/patches/patch-ae
index 793bc72e068..5e6f715807b 100644
--- a/lang/tcl/patches/patch-ae
+++ b/lang/tcl/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.7 2005/07/19 11:11:58 adam Exp $
+$NetBSD: patch-ae,v 1.8 2006/01/16 14:47:35 adam Exp $
---- configure.in.orig 2005-06-29 16:40:33.000000000 +0000
-+++ configure.in
-@@ -520,7 +520,7 @@ else
+--- unix/configure.in.orig 2005-12-06 17:03:33.000000000 +0100
++++ unix/configure.in
+@@ -539,7 +539,7 @@ else
TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}"
fi
TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}"
@@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.7 2005/07/19 11:11:58 adam Exp $
else
TCL_BUILD_EXP_FILE="lib.exp"
eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}"
-@@ -551,13 +551,21 @@ VERSION=${TCL_VERSION}
+@@ -570,13 +570,21 @@ VERSION=${TCL_VERSION}
#--------------------------------------------------------------------
if test "$FRAMEWORK_BUILD" = "1" ; then
@@ -19,10 +19,10 @@ $NetBSD: patch-ae,v 1.7 2005/07/19 11:11:58 adam Exp $
+ TCL_PACKAGE_PATH_ADD="~/Library/Tcl /Library/Tcl /Network/Library/Tcl /System/Library/Tcl ~/Library/Frameworks /Library/Frameworks /Network/Library/Frameworks /System/Library/Frameworks"
elif test "$prefix" != "$exec_prefix"; then
- TCL_PACKAGE_PATH="${libdir} ${prefix}/lib"
-+ TCL_PACKAGE_PATH="${libdir}/tcl ${prefix}/lib"
++ TCL_PACKAGE_PATH_ADD="${libdir}/tcl ${prefix}/lib"
else
- TCL_PACKAGE_PATH="${prefix}/lib"
-+ TCL_PACKAGE_PATH="${prefix}/lib/tcl"
++ TCL_PACKAGE_PATH_ADD="${prefix}/lib/tcl"
fi
+for dir in ${TCL_PACKAGE_PATH_ADD}; do
@@ -33,6 +33,6 @@ $NetBSD: patch-ae,v 1.7 2005/07/19 11:11:58 adam Exp $
+ fi
+done
+
- #--------------------------------------------------------------------
- # The statements below define various symbols relating to Tcl
- # stub support.
+ # If a system share directory like /usr/local/share already exists, then add
+ # it to the package search path.
+
diff --git a/lang/tcl/patches/patch-af b/lang/tcl/patches/patch-af
index 7b0fff1a393..c9b7441add0 100644
--- a/lang/tcl/patches/patch-af
+++ b/lang/tcl/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.17 2005/09/21 14:49:08 joerg Exp $
+$NetBSD: patch-af,v 1.18 2006/01/16 14:47:35 adam Exp $
---- tcl.m4.orig 2005-06-29 16:40:33.000000000 +0000
-+++ tcl.m4
-@@ -866,6 +866,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
+--- unix/tcl.m4.orig 2005-12-06 17:03:34.000000000 +0100
++++ unix/tcl.m4
+@@ -900,6 +900,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
# Step 3: set configuration options based on system name and version.
do64bit_ok=no
@@ -10,7 +10,7 @@ $NetBSD: patch-af,v 1.17 2005/09/21 14:49:08 joerg Exp $
LDFLAGS_ORIG="$LDFLAGS"
TCL_EXPORT_FILE_SUFFIX=""
UNSHARED_LIB_SUFFIX=""
-@@ -1087,6 +1088,21 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1126,6 +1127,21 @@ dnl AC_CHECK_TOOL(AR, ar)
LD_LIBRARY_PATH_VAR="SHLIB_PATH"
fi
;;
@@ -32,7 +32,7 @@ $NetBSD: patch-af,v 1.17 2005/09/21 14:49:08 joerg Exp $
IRIX-4.*)
SHLIB_CFLAGS="-G 0"
SHLIB_SUFFIX=".a"
-@@ -1108,6 +1124,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1147,6 +1163,9 @@ dnl AC_CHECK_TOOL(AR, ar)
DL_LIBS=""
CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
@@ -42,7 +42,7 @@ $NetBSD: patch-af,v 1.17 2005/09/21 14:49:08 joerg Exp $
;;
IRIX-6.*)
SHLIB_CFLAGS=""
-@@ -1133,6 +1152,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1172,6 +1191,9 @@ dnl AC_CHECK_TOOL(AR, ar)
esac
LDFLAGS="$LDFLAGS -n32"
fi
@@ -52,7 +52,7 @@ $NetBSD: patch-af,v 1.17 2005/09/21 14:49:08 joerg Exp $
;;
IRIX64-6.*)
SHLIB_CFLAGS=""
-@@ -1156,6 +1178,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1195,6 +1217,9 @@ dnl AC_CHECK_TOOL(AR, ar)
LDFLAGS="$LDFLAGS -64"
fi
fi
@@ -62,7 +62,7 @@ $NetBSD: patch-af,v 1.17 2005/09/21 14:49:08 joerg Exp $
;;
Linux*)
SHLIB_CFLAGS="-fPIC"
-@@ -1201,6 +1226,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1240,6 +1265,9 @@ dnl AC_CHECK_TOOL(AR, ar)
# XIM peeking works under XFree86.
AC_DEFINE(PEEK_XCLOSEIM)
@@ -72,7 +72,7 @@ $NetBSD: patch-af,v 1.17 2005/09/21 14:49:08 joerg Exp $
;;
GNU*)
SHLIB_CFLAGS="-fPIC"
-@@ -1248,28 +1276,36 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1299,28 +1327,36 @@ dnl AC_CHECK_TOOL(AR, ar)
LD_SEARCH_FLAGS=""
;;
NetBSD-*|FreeBSD-[[1-2]].*)
@@ -113,7 +113,7 @@ $NetBSD: patch-af,v 1.17 2005/09/21 14:49:08 joerg Exp $
], [
SHLIB_CFLAGS=""
SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r"
-@@ -1335,7 +1371,7 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1386,7 +1422,7 @@ dnl AC_CHECK_TOOL(AR, ar)
UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
TCL_LIB_VERSIONS_OK=nodots
;;
@@ -122,7 +122,7 @@ $NetBSD: patch-af,v 1.17 2005/09/21 14:49:08 joerg Exp $
# FreeBSD 3.* and greater have ELF.
SHLIB_CFLAGS="-fPIC"
SHLIB_LD="ld -Bshareable -x"
-@@ -1668,6 +1704,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1736,6 +1772,9 @@ dnl AC_CHECK_TOOL(AR, ar)
CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
fi
@@ -132,7 +132,7 @@ $NetBSD: patch-af,v 1.17 2005/09/21 14:49:08 joerg Exp $
;;
ULTRIX-4.*)
SHLIB_CFLAGS="-G 0"
-@@ -1847,8 +1886,8 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1915,8 +1954,8 @@ dnl AC_CHECK_TOOL(AR, ar)
if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then
LIB_SUFFIX=${SHARED_LIB_SUFFIX}
@@ -143,7 +143,7 @@ $NetBSD: patch-af,v 1.17 2005/09/21 14:49:08 joerg Exp $
else
LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
-@@ -1878,10 +1917,10 @@ dnl esac
+@@ -1946,10 +1985,10 @@ dnl esac
# Stub lib does not depend on shared/static configuration
if test "$RANLIB" = "" ; then
diff --git a/lang/tcl/patches/patch-ag b/lang/tcl/patches/patch-ag
index 380a0e84c37..1be4e94a8cd 100644
--- a/lang/tcl/patches/patch-ag
+++ b/lang/tcl/patches/patch-ag
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.3 2004/10/04 02:15:52 minskim Exp $
+$NetBSD: patch-ag,v 1.4 2006/01/16 14:47:35 adam Exp $
---- tclConfig.sh.in.orig 2004-03-02 00:58:59.000000000 +0100
-+++ tclConfig.sh.in
+--- unix/tclConfig.sh.in.orig 2004-03-02 00:58:59.000000000 +0100
++++ unix/tclConfig.sh.in
@@ -13,2 +13,4 @@
+if [ -z "${_TCL_NOTHREAD}" ]; then
diff --git a/lang/tcl/patches/patch-ah b/lang/tcl/patches/patch-ah
index a3c19d60d04..f296bff820f 100644
--- a/lang/tcl/patches/patch-ah
+++ b/lang/tcl/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.1 2004/05/13 12:57:42 he Exp $
+$NetBSD: patch-ah,v 1.2 2006/01/16 14:47:35 adam Exp $
---- tclUnixFCmd.c.orig 2003-10-03 19:45:37.000000000 +0200
-+++ tclUnixFCmd.c
-@@ -561,6 +561,14 @@ TclpDeleteFile(path)
+--- unix/tclUnixFCmd.c.orig 2005-12-05 16:10:33.000000000 +0100
++++ unix/tclUnixFCmd.c
+@@ -583,6 +583,14 @@ TclpDeleteFile(path)
*---------------------------------------------------------------------------
*/
diff --git a/lang/tcl/patches/patch-ai b/lang/tcl/patches/patch-ai
index 3686e4deefa..dbc3e76e081 100644
--- a/lang/tcl/patches/patch-ai
+++ b/lang/tcl/patches/patch-ai
@@ -1,7 +1,7 @@
-$NetBSD: patch-ai,v 1.1 2005/08/02 22:37:18 seb Exp $
+$NetBSD: patch-ai,v 1.2 2006/01/16 14:47:35 adam Exp $
---- ../tests/load.test.orig 2004-09-14 17:02:56.000000000 +0000
-+++ ../tests/load.test
+--- tests/load.test.orig 2004-09-14 17:02:56.000000000 +0000
++++ tests/load.test
@@ -28,7 +28,7 @@ if {$tcl_platform(platform) == "macintos
# Tests require the existence of one of the DLLs in the dltest directory.
diff --git a/lang/tcl/patches/patch-aj b/lang/tcl/patches/patch-aj
index f250662124a..9b28a5ec815 100644
--- a/lang/tcl/patches/patch-aj
+++ b/lang/tcl/patches/patch-aj
@@ -1,7 +1,7 @@
-$NetBSD: patch-aj,v 1.1 2005/08/02 22:37:18 seb Exp $
+$NetBSD: patch-aj,v 1.2 2006/01/16 14:47:35 adam Exp $
---- ../tests/pkgMkIndex.test.orig 2003-07-24 08:23:39.000000000 +0000
-+++ ../tests/pkgMkIndex.test
+--- tests/pkgMkIndex.test.orig 2003-07-24 08:23:39.000000000 +0000
++++ tests/pkgMkIndex.test
@@ -559,7 +559,7 @@ removeFile [file join pkg circ2.tcl]
removeFile [file join pkg circ3.tcl]
diff --git a/lang/tcl/patches/patch-ak b/lang/tcl/patches/patch-ak
deleted file mode 100644
index 92d16060142..00000000000
--- a/lang/tcl/patches/patch-ak
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2005/08/31 14:46:59 seb Exp $
-
---- tclUnixNotfy.c.orig 2005-06-07 10:26:58.000000000 +0000
-+++ tclUnixNotfy.c
-@@ -275,7 +275,7 @@ Tcl_FinalizeNotifier(clientData)
- */
-
- if (notifierCount == 0) {
-- int result, dummy;
-+ int result;
- if (triggerPipe < 0) {
- panic("Tcl_FinalizeNotifier: notifier pipe not initialized");
- }
-@@ -288,13 +288,14 @@ Tcl_FinalizeNotifier(clientData)
- * not just close the pipe and check for EOF in the notifier
- * thread because if a background child process was created with
- * exec, select() would not register the EOF on the pipe until the
-- * child processes had terminated. [Bug: 4139]
-+ * child processes had terminated. [Bug: 4139][Bug: 1222872]
- */
- write(triggerPipe, "q", 1);
- close(triggerPipe);
--
-+ while(triggerPipe >= 0) {
- Tcl_ConditionWait(&notifierCV, &notifierMutex, NULL);
-- result = Tcl_JoinThread(notifierThread, &dummy);
-+ }
-+ result = Tcl_JoinThread(notifierThread, NULL);
- if (result) {
- Tcl_Panic("Tcl_FinalizeNotifier: unable to join notifier thread");
- }
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-24 09:20:36 +0000