pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Changes 8.4.12:
details: https://anonhg.NetBSD.org/pkgsrc/rev/3e6e72c29a11
branches: trunk
changeset: 506465:3e6e72c29a11
user: adam <adam%pkgsrc.org@localhost>
date: Mon Jan 16 14:47:35 2006 +0000
description:
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:
lang/tcl/Makefile | 22 +++++++++++-----------
lang/tcl/Makefile.version | 4 ++--
lang/tcl/distinfo | 29 ++++++++++++++---------------
lang/tcl/patches/patch-aa | 16 ++++++++--------
lang/tcl/patches/patch-ab | 32 ++++++++++++++++----------------
lang/tcl/patches/patch-ac | 12 ++++++------
lang/tcl/patches/patch-ad | 6 +++---
lang/tcl/patches/patch-ae | 20 ++++++++++----------
lang/tcl/patches/patch-af | 28 ++++++++++++++--------------
lang/tcl/patches/patch-ag | 6 +++---
lang/tcl/patches/patch-ah | 8 ++++----
lang/tcl/patches/patch-ai | 6 +++---
lang/tcl/patches/patch-aj | 6 +++---
lang/tcl/patches/patch-ak | 31 -------------------------------
x11/tk/Makefile | 3 +--
x11/tk/Makefile.version | 4 ++--
x11/tk/distinfo | 16 ++++++++--------
x11/tk/patches/patch-aa | 38 +++++++++++++++++++-------------------
x11/tk/patches/patch-ab | 24 ++++++++++++------------
x11/tk/patches/patch-ac | 22 +++++++++++-----------
x11/tk/patches/patch-ad | 8 ++++----
21 files changed, 154 insertions(+), 187 deletions(-)
diffs (truncated from 911 to 300 lines):
diff -r e2acb7c3c7ae -r 3e6e72c29a11 lang/tcl/Makefile
--- a/lang/tcl/Makefile Mon Jan 16 14:37:16 2006 +0000
+++ b/lang/tcl/Makefile Mon Jan 16 14:47:35 2006 +0000
@@ -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 @@
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_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 -r e2acb7c3c7ae -r 3e6e72c29a11 lang/tcl/Makefile.version
--- a/lang/tcl/Makefile.version Mon Jan 16 14:37:16 2006 +0000
+++ b/lang/tcl/Makefile.version Mon Jan 16 14:47:35 2006 +0000
@@ -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 -r e2acb7c3c7ae -r 3e6e72c29a11 lang/tcl/distinfo
--- a/lang/tcl/distinfo Mon Jan 16 14:37:16 2006 +0000
+++ b/lang/tcl/distinfo Mon Jan 16 14:47:35 2006 +0000
@@ -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 -r e2acb7c3c7ae -r 3e6e72c29a11 lang/tcl/patches/patch-aa
--- a/lang/tcl/patches/patch-aa Mon Jan 16 14:37:16 2006 +0000
+++ b/lang/tcl/patches/patch-aa Mon Jan 16 14:47:35 2006 +0000
@@ -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 @@
-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 @@
$(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 -r e2acb7c3c7ae -r 3e6e72c29a11 lang/tcl/patches/patch-ab
--- a/lang/tcl/patches/patch-ab Mon Jan 16 14:37:16 2006 +0000
+++ b/lang/tcl/patches/patch-ab Mon Jan 16 14:47:35 2006 +0000
@@ -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 @@
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 @@
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 @@
# 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 @@
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 @@
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 @@
# 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 @@
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 @@
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 @@
+ 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 -r e2acb7c3c7ae -r 3e6e72c29a11 lang/tcl/patches/patch-ac
--- a/lang/tcl/patches/patch-ac Mon Jan 16 14:37:16 2006 +0000
+++ b/lang/tcl/patches/patch-ac Mon Jan 16 14:47:35 2006 +0000
@@ -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 @@
/*
* 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 @@
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 @@
#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 -r e2acb7c3c7ae -r 3e6e72c29a11 lang/tcl/patches/patch-ad
--- a/lang/tcl/patches/patch-ad Mon Jan 16 14:37:16 2006 +0000
+++ b/lang/tcl/patches/patch-ad Mon Jan 16 14:47:35 2006 +0000
@@ -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 -r e2acb7c3c7ae -r 3e6e72c29a11 lang/tcl/patches/patch-ae
Home |
Main Index |
Thread Index |
Old Index