diff options
| author | marino <marino@pkgsrc.org> | 2012-08-21 21:31:47 +0000 |
|---|---|---|
| committer | marino <marino@pkgsrc.org> | 2012-08-21 21:31:47 +0000 |
| commit | e533c71d65d6450acc067d7c6b5f48b252f6f937 (patch) | |
| tree | e28ae4506d7abff5d82fe11121387e9c23cb2441 /lang | |
| parent | 4d7405ce7516571a6f16f27be969186fc3276ec2 (diff) | |
| download | pkgsrc-e533c71d65d6450acc067d7c6b5f48b252f6f937.tar.gz | |
lang/tcl: Upgrade from version 8.4.18 to 8.5.12
Highlights of Tcl 8.5
* Features: 8.5 has over 90 TIPs included to provide a wide variety of
new features.
* Bignums: Tcl now supports arbitrary-precision integers, which improves
math operations on large integers.
* Safer interps: Tcl's powerful safe interpreter mechanism now has
improved control of time and command limits in slave interpreters.
* clock command: More robust implementation of command for specifying
time, with significant l10n and i18n improvements.
* dict command: New data structure that allows access to data by value
rather than a variable name, which is substantially faster.
* Additional improvements: Faster list search, new and improved
mathematics procedures, anonymous procedures, new ways to package Tcl
extensions, Tcl-level custom channel types, file and line location
information for each command, and more.
There is of course much, much more.
See [8.5 Changes](http://wiki.tcl.tk/10630) on the wiki for a complete
list of new features.
Diffstat (limited to 'lang')
27 files changed, 908 insertions, 946 deletions
diff --git a/lang/tcl/DESCR b/lang/tcl/DESCR index b22bfecedd3..521fe4d2e65 100644 --- a/lang/tcl/DESCR +++ b/lang/tcl/DESCR @@ -1,8 +1,15 @@ -This package contains Tcl, John Osterhout's Tool Command Language, an -exceedingly simple language great for general scripting and for -embedding in other programs. +Tcl (Tool Command Language) is a very powerful but easy to learn dynamic +programming language, suitable for a very wide range of uses, including +web and desktop applications, networking, administration, testing and +many more. Open source and business-friendly, Tcl is a mature yet +evolving language that is truly cross platform, easily deployed and +highly extensible. -The best way to get started with Tcl is to read ``Tcl and the Tk -Toolkit'' by John K. Ousterhout, Addison-Wesley, ISBN 0-201-63337-X -or ``Practical Programming in Tcl and Tk'' by Brent B. Welch, -Prentice Hall PTR, ISBN 0-13-616830-X. +Tcl/Tk resources: + Newsgroup: comp.lang.tcl + Wiki: http://wiki.tcl.tk + Books: + * Practical Programming in Tcl and Tk, 4th Edition + ISBN: 0-13-038560-3 + * Tcl and the Tk Toolkit, 2nd Edition + ISBN: 978-0-321-33633-0 diff --git a/lang/tcl/Makefile b/lang/tcl/Makefile index 5123674854f..dd2a017e6d4 100644 --- a/lang/tcl/Makefile +++ b/lang/tcl/Makefile @@ -1,57 +1,34 @@ -# $NetBSD: Makefile,v 1.66 2011/08/16 10:18:58 cheusov Exp $ +# $NetBSD: Makefile,v 1.67 2012/08/21 21:31:47 marino Exp $ DISTNAME= tcl${TCL_VERSION}-src PKGNAME= tcl-${TCL_VERSION} -PKGREVISION= 1 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.tcl.tk/ -COMMENT= Ousterhout's Tool Command Language, a scripting language +COMMENT= Tool Command Language, a dynamic language +LICENSE= 2-clause-bsd .include "../../lang/tcl/Makefile.version" -CONFLICTS+= tclman80-[0-9]* - PKG_DESTDIR_SUPPORT= user-destdir -PKG_INSTALLATION_TYPES= overwrite pkgviews WRKSRC= ${WRKDIR}/tcl${TCL_VERSION} -USE_LIBTOOL= yes GNU_CONFIGURE= yes CONFIGURE_DIRS= unix BUILD_DIRS= ${CONFIGURE_DIRS} -MAKE_ENV+= TOUCH=${TOUCH:Q} - -PRIVILEGED_STAGES+= clean +CONFIGURE_ARGS+= --prefix=${PREFIX:Q} INSTALL_TARGET= install # The test target gives better results when not run as root. TEST_TARGET= test -TEST_ENV+= TZ=+0 - -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "NetBSD" -. if empty(OS_VERSION:M1.[56]*) -CONFIGURE_ARGS+= --enable-threads -. else -CONFIGURE_ARGS+= --disable-threads -. endif -.endif - -# Add ${VIEWBASE}/lib/tcl to the list of locations for Tcl packages. -CONFIGURE_ENV+= TCL_PACKAGE_PATH="${VIEWBASE}/lib/tcl" -.if ${OPSYS} == "NetBSD" -. if empty(OS_VERSION:M1.[56]*) -. include "../../mk/pthread.buildlink3.mk" -. endif -.endif +.include "options.mk" +# This is needed for SGI and maybe sun (according to tcl developers) .if defined(ABI) && ${ABI} == "64" CONFIGURE_ARGS+= --enable-64bit .endif @@ -62,20 +39,7 @@ 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|" -INSTALLATION_DIRS+= include/tcl -INSTALLATION_DIRS+= include/tcl/unix -INSTALLATION_DIRS+= include/tcl/generic -INSTALLATION_DIRS+= lib/tcl - -post-install: - cd ${DESTDIR:Q}${PREFIX:Q}/bin && ln -s tclsh8.4 tclsh - ${INSTALL_DATA} ${WRKSRC}/unix/tclUnixPort.h \ - ${DESTDIR:Q}${PREFIX:Q}/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} \ - ${DESTDIR:Q}${PREFIX:Q}/include/tcl/generic -.endfor +PLIST_SUBST+= SONUM=${TCL_SONUM} +PLIST_SUBST+= BASEVER=${TCL_BASEVER} .include "../../mk/bsd.pkg.mk" diff --git a/lang/tcl/Makefile.version b/lang/tcl/Makefile.version index 6e812cd73a9..87937ee3697 100644 --- a/lang/tcl/Makefile.version +++ b/lang/tcl/Makefile.version @@ -1,3 +1,5 @@ -# $NetBSD: Makefile.version,v 1.8 2008/04/07 15:16:40 bjs Exp $ +# $NetBSD: Makefile.version,v 1.9 2012/08/21 21:31:47 marino Exp $ -TCL_VERSION=8.4.18 +TCL_SONUM= 85 +TCL_BASEVER= 8.5 +TCL_VERSION= 8.5.12 diff --git a/lang/tcl/PLIST b/lang/tcl/PLIST index ba468b7d11e..01cafedf24c 100644 --- a/lang/tcl/PLIST +++ b/lang/tcl/PLIST @@ -1,124 +1,262 @@ -@comment $NetBSD: PLIST,v 1.12 2009/06/14 20:34:15 joerg Exp $ +@comment $NetBSD: PLIST,v 1.13 2012/08/21 21:31:47 marino Exp $ bin/tclsh -bin/tclsh8.4 +bin/tclsh${BASEVER} include/tcl.h +include/tcl/generic/regcustom.h +include/tcl/generic/regerrs.h include/tcl/generic/regex.h +include/tcl/generic/regguts.h include/tcl/generic/tcl.h include/tcl/generic/tclCompile.h include/tcl/generic/tclDecls.h +include/tcl/generic/tclFileSystem.h include/tcl/generic/tclIO.h -include/tcl/generic/tclInitScript.h include/tcl/generic/tclInt.h include/tcl/generic/tclIntDecls.h include/tcl/generic/tclIntPlatDecls.h -include/tcl/generic/tclMath.h include/tcl/generic/tclPlatDecls.h include/tcl/generic/tclPort.h include/tcl/generic/tclRegexp.h +include/tcl/generic/tclTomMath.h +include/tcl/generic/tclTomMathDecls.h +include/tcl/generic/tclTomMathInt.h +include/tcl/generic/tommath.h include/tcl/unix/tclUnixPort.h +include/tcl/unix/tclUnixThrd.h include/tclDecls.h include/tclPlatDecls.h -lib/libtcl84.la -lib/libtclstub84.a -lib/tcl8.4/auto.tcl -lib/tcl8.4/encoding/ascii.enc -lib/tcl8.4/encoding/big5.enc -lib/tcl8.4/encoding/cp1250.enc -lib/tcl8.4/encoding/cp1251.enc -lib/tcl8.4/encoding/cp1252.enc -lib/tcl8.4/encoding/cp1253.enc -lib/tcl8.4/encoding/cp1254.enc -lib/tcl8.4/encoding/cp1255.enc -lib/tcl8.4/encoding/cp1256.enc -lib/tcl8.4/encoding/cp1257.enc -lib/tcl8.4/encoding/cp1258.enc -lib/tcl8.4/encoding/cp437.enc -lib/tcl8.4/encoding/cp737.enc -lib/tcl8.4/encoding/cp775.enc -lib/tcl8.4/encoding/cp850.enc -lib/tcl8.4/encoding/cp852.enc -lib/tcl8.4/encoding/cp855.enc -lib/tcl8.4/encoding/cp857.enc -lib/tcl8.4/encoding/cp860.enc -lib/tcl8.4/encoding/cp861.enc -lib/tcl8.4/encoding/cp862.enc -lib/tcl8.4/encoding/cp863.enc -lib/tcl8.4/encoding/cp864.enc -lib/tcl8.4/encoding/cp865.enc -lib/tcl8.4/encoding/cp866.enc -lib/tcl8.4/encoding/cp869.enc -lib/tcl8.4/encoding/cp874.enc -lib/tcl8.4/encoding/cp932.enc -lib/tcl8.4/encoding/cp936.enc -lib/tcl8.4/encoding/cp949.enc -lib/tcl8.4/encoding/cp950.enc -lib/tcl8.4/encoding/dingbats.enc -lib/tcl8.4/encoding/ebcdic.enc -lib/tcl8.4/encoding/euc-cn.enc -lib/tcl8.4/encoding/euc-jp.enc -lib/tcl8.4/encoding/euc-kr.enc -lib/tcl8.4/encoding/gb12345.enc -lib/tcl8.4/encoding/gb1988.enc -lib/tcl8.4/encoding/gb2312-raw.enc -lib/tcl8.4/encoding/gb2312.enc -lib/tcl8.4/encoding/iso2022-jp.enc -lib/tcl8.4/encoding/iso2022-kr.enc -lib/tcl8.4/encoding/iso2022.enc -lib/tcl8.4/encoding/iso8859-1.enc -lib/tcl8.4/encoding/iso8859-10.enc -lib/tcl8.4/encoding/iso8859-13.enc -lib/tcl8.4/encoding/iso8859-14.enc -lib/tcl8.4/encoding/iso8859-15.enc -lib/tcl8.4/encoding/iso8859-16.enc -lib/tcl8.4/encoding/iso8859-2.enc -lib/tcl8.4/encoding/iso8859-3.enc -lib/tcl8.4/encoding/iso8859-4.enc -lib/tcl8.4/encoding/iso8859-5.enc -lib/tcl8.4/encoding/iso8859-6.enc -lib/tcl8.4/encoding/iso8859-7.enc -lib/tcl8.4/encoding/iso8859-8.enc -lib/tcl8.4/encoding/iso8859-9.enc -lib/tcl8.4/encoding/jis0201.enc -lib/tcl8.4/encoding/jis0208.enc -lib/tcl8.4/encoding/jis0212.enc -lib/tcl8.4/encoding/koi8-r.enc -lib/tcl8.4/encoding/koi8-u.enc -lib/tcl8.4/encoding/ksc5601.enc -lib/tcl8.4/encoding/macCentEuro.enc -lib/tcl8.4/encoding/macCroatian.enc -lib/tcl8.4/encoding/macCyrillic.enc -lib/tcl8.4/encoding/macDingbats.enc -lib/tcl8.4/encoding/macGreek.enc -lib/tcl8.4/encoding/macIceland.enc -lib/tcl8.4/encoding/macJapan.enc -lib/tcl8.4/encoding/macRoman.enc -lib/tcl8.4/encoding/macRomania.enc -lib/tcl8.4/encoding/macThai.enc -lib/tcl8.4/encoding/macTurkish.enc -lib/tcl8.4/encoding/macUkraine.enc -lib/tcl8.4/encoding/shiftjis.enc -lib/tcl8.4/encoding/symbol.enc -lib/tcl8.4/encoding/tis-620.enc -lib/tcl8.4/history.tcl -lib/tcl8.4/http1.0/http.tcl -lib/tcl8.4/http1.0/pkgIndex.tcl -lib/tcl8.4/http2.5/http.tcl -lib/tcl8.4/http2.5/pkgIndex.tcl -lib/tcl8.4/init.tcl -lib/tcl8.4/ldAix -lib/tcl8.4/ldAout.tcl -lib/tcl8.4/msgcat1.3/msgcat.tcl -lib/tcl8.4/msgcat1.3/pkgIndex.tcl -lib/tcl8.4/opt0.4/optparse.tcl -lib/tcl8.4/opt0.4/pkgIndex.tcl -lib/tcl8.4/package.tcl -lib/tcl8.4/parray.tcl -lib/tcl8.4/safe.tcl -lib/tcl8.4/tclAppInit.c -lib/tcl8.4/tclIndex -lib/tcl8.4/tcltest2.2/pkgIndex.tcl -lib/tcl8.4/tcltest2.2/tcltest.tcl -lib/tcl8.4/word.tcl +lib/libtcl${SONUM}.a +lib/libtcl${SONUM}.so +lib/libtcl${SONUM}.so.1.0 +lib/libtclstub${SONUM}.a +lib/tcl${BASEVER}/auto.tcl +lib/tcl${BASEVER}/clock.tcl +lib/tcl${BASEVER}/encoding/ascii.enc +lib/tcl${BASEVER}/encoding/big5.enc +lib/tcl${BASEVER}/encoding/cp1250.enc +lib/tcl${BASEVER}/encoding/cp1251.enc +lib/tcl${BASEVER}/encoding/cp1252.enc +lib/tcl${BASEVER}/encoding/cp1253.enc +lib/tcl${BASEVER}/encoding/cp1254.enc +lib/tcl${BASEVER}/encoding/cp1255.enc +lib/tcl${BASEVER}/encoding/cp1256.enc +lib/tcl${BASEVER}/encoding/cp1257.enc +lib/tcl${BASEVER}/encoding/cp1258.enc +lib/tcl${BASEVER}/encoding/cp437.enc +lib/tcl${BASEVER}/encoding/cp737.enc +lib/tcl${BASEVER}/encoding/cp775.enc +lib/tcl${BASEVER}/encoding/cp850.enc +lib/tcl${BASEVER}/encoding/cp852.enc +lib/tcl${BASEVER}/encoding/cp855.enc +lib/tcl${BASEVER}/encoding/cp857.enc +lib/tcl${BASEVER}/encoding/cp860.enc +lib/tcl${BASEVER}/encoding/cp861.enc +lib/tcl${BASEVER}/encoding/cp862.enc +lib/tcl${BASEVER}/encoding/cp863.enc +lib/tcl${BASEVER}/encoding/cp864.enc +lib/tcl${BASEVER}/encoding/cp865.enc +lib/tcl${BASEVER}/encoding/cp866.enc +lib/tcl${BASEVER}/encoding/cp869.enc +lib/tcl${BASEVER}/encoding/cp874.enc +lib/tcl${BASEVER}/encoding/cp932.enc +lib/tcl${BASEVER}/encoding/cp936.enc +lib/tcl${BASEVER}/encoding/cp949.enc +lib/tcl${BASEVER}/encoding/cp950.enc +lib/tcl${BASEVER}/encoding/dingbats.enc +lib/tcl${BASEVER}/encoding/ebcdic.enc +lib/tcl${BASEVER}/encoding/euc-cn.enc +lib/tcl${BASEVER}/encoding/euc-jp.enc +lib/tcl${BASEVER}/encoding/euc-kr.enc +lib/tcl${BASEVER}/encoding/gb12345.enc +lib/tcl${BASEVER}/encoding/gb1988.enc +lib/tcl${BASEVER}/encoding/gb2312-raw.enc +lib/tcl${BASEVER}/encoding/gb2312.enc +lib/tcl${BASEVER}/encoding/iso2022-jp.enc +lib/tcl${BASEVER}/encoding/iso2022-kr.enc +lib/tcl${BASEVER}/encoding/iso2022.enc +lib/tcl${BASEVER}/encoding/iso8859-1.enc +lib/tcl${BASEVER}/encoding/iso8859-10.enc +lib/tcl${BASEVER}/encoding/iso8859-13.enc +lib/tcl${BASEVER}/encoding/iso8859-14.enc +lib/tcl${BASEVER}/encoding/iso8859-15.enc +lib/tcl${BASEVER}/encoding/iso8859-16.enc +lib/tcl${BASEVER}/encoding/iso8859-2.enc +lib/tcl${BASEVER}/encoding/iso8859-3.enc +lib/tcl${BASEVER}/encoding/iso8859-4.enc +lib/tcl${BASEVER}/encoding/iso8859-5.enc +lib/tcl${BASEVER}/encoding/iso8859-6.enc +lib/tcl${BASEVER}/encoding/iso8859-7.enc +lib/tcl${BASEVER}/encoding/iso8859-8.enc +lib/tcl${BASEVER}/encoding/iso8859-9.enc +lib/tcl${BASEVER}/encoding/jis0201.enc +lib/tcl${BASEVER}/encoding/jis0208.enc +lib/tcl${BASEVER}/encoding/jis0212.enc +lib/tcl${BASEVER}/encoding/koi8-r.enc +lib/tcl${BASEVER}/encoding/koi8-u.enc +lib/tcl${BASEVER}/encoding/ksc5601.enc +lib/tcl${BASEVER}/encoding/macCentEuro.enc +lib/tcl${BASEVER}/encoding/macCroatian.enc +lib/tcl${BASEVER}/encoding/macCyrillic.enc +lib/tcl${BASEVER}/encoding/macDingbats.enc +lib/tcl${BASEVER}/encoding/macGreek.enc +lib/tcl${BASEVER}/encoding/macIceland.enc +lib/tcl${BASEVER}/encoding/macJapan.enc +lib/tcl${BASEVER}/encoding/macRoman.enc +lib/tcl${BASEVER}/encoding/macRomania.enc +lib/tcl${BASEVER}/encoding/macThai.enc +lib/tcl${BASEVER}/encoding/macTurkish.enc +lib/tcl${BASEVER}/encoding/macUkraine.enc +lib/tcl${BASEVER}/encoding/shiftjis.enc +lib/tcl${BASEVER}/encoding/symbol.enc +lib/tcl${BASEVER}/encoding/tis-620.enc +lib/tcl${BASEVER}/history.tcl +lib/tcl${BASEVER}/http1.0/http.tcl +lib/tcl${BASEVER}/http1.0/pkgIndex.tcl +lib/tcl${BASEVER}/init.tcl +lib/tcl${BASEVER}/msgcat1.4/msgcat.tcl +lib/tcl${BASEVER}/msgcat1.4/pkgIndex.tcl +lib/tcl${BASEVER}/msgs/af.msg +lib/tcl${BASEVER}/msgs/af_za.msg +lib/tcl${BASEVER}/msgs/ar.msg +lib/tcl${BASEVER}/msgs/ar_in.msg +lib/tcl${BASEVER}/msgs/ar_jo.msg +lib/tcl${BASEVER}/msgs/ar_lb.msg +lib/tcl${BASEVER}/msgs/ar_sy.msg +lib/tcl${BASEVER}/msgs/be.msg +lib/tcl${BASEVER}/msgs/bg.msg +lib/tcl${BASEVER}/msgs/bn.msg +lib/tcl${BASEVER}/msgs/bn_in.msg +lib/tcl${BASEVER}/msgs/ca.msg +lib/tcl${BASEVER}/msgs/cs.msg +lib/tcl${BASEVER}/msgs/da.msg +lib/tcl${BASEVER}/msgs/de.msg +lib/tcl${BASEVER}/msgs/de_at.msg +lib/tcl${BASEVER}/msgs/de_be.msg +lib/tcl${BASEVER}/msgs/el.msg +lib/tcl${BASEVER}/msgs/en_au.msg +lib/tcl${BASEVER}/msgs/en_be.msg +lib/tcl${BASEVER}/msgs/en_bw.msg +lib/tcl${BASEVER}/msgs/en_ca.msg +lib/tcl${BASEVER}/msgs/en_gb.msg +lib/tcl${BASEVER}/msgs/en_hk.msg +lib/tcl${BASEVER}/msgs/en_ie.msg +lib/tcl${BASEVER}/msgs/en_in.msg +lib/tcl${BASEVER}/msgs/en_nz.msg +lib/tcl${BASEVER}/msgs/en_ph.msg +lib/tcl${BASEVER}/msgs/en_sg.msg +lib/tcl${BASEVER}/msgs/en_za.msg +lib/tcl${BASEVER}/msgs/en_zw.msg +lib/tcl${BASEVER}/msgs/eo.msg +lib/tcl${BASEVER}/msgs/es.msg +lib/tcl${BASEVER}/msgs/es_ar.msg +lib/tcl${BASEVER}/msgs/es_bo.msg +lib/tcl${BASEVER}/msgs/es_cl.msg +lib/tcl${BASEVER}/msgs/es_co.msg +lib/tcl${BASEVER}/msgs/es_cr.msg +lib/tcl${BASEVER}/msgs/es_do.msg +lib/tcl${BASEVER}/msgs/es_ec.msg +lib/tcl${BASEVER}/msgs/es_gt.msg +lib/tcl${BASEVER}/msgs/es_hn.msg +lib/tcl${BASEVER}/msgs/es_mx.msg +lib/tcl${BASEVER}/msgs/es_ni.msg +lib/tcl${BASEVER}/msgs/es_pa.msg +lib/tcl${BASEVER}/msgs/es_pe.msg +lib/tcl${BASEVER}/msgs/es_pr.msg +lib/tcl${BASEVER}/msgs/es_py.msg +lib/tcl${BASEVER}/msgs/es_sv.msg +lib/tcl${BASEVER}/msgs/es_uy.msg +lib/tcl${BASEVER}/msgs/es_ve.msg +lib/tcl${BASEVER}/msgs/et.msg +lib/tcl${BASEVER}/msgs/eu.msg +lib/tcl${BASEVER}/msgs/eu_es.msg +lib/tcl${BASEVER}/msgs/fa.msg +lib/tcl${BASEVER}/msgs/fa_in.msg +lib/tcl${BASEVER}/msgs/fa_ir.msg +lib/tcl${BASEVER}/msgs/fi.msg +lib/tcl${BASEVER}/msgs/fo.msg +lib/tcl${BASEVER}/msgs/fo_fo.msg +lib/tcl${BASEVER}/msgs/fr.msg +lib/tcl${BASEVER}/msgs/fr_be.msg +lib/tcl${BASEVER}/msgs/fr_ca.msg +lib/tcl${BASEVER}/msgs/fr_ch.msg +lib/tcl${BASEVER}/msgs/ga.msg +lib/tcl${BASEVER}/msgs/ga_ie.msg +lib/tcl${BASEVER}/msgs/gl.msg +lib/tcl${BASEVER}/msgs/gl_es.msg +lib/tcl${BASEVER}/msgs/gv.msg +lib/tcl${BASEVER}/msgs/gv_gb.msg +lib/tcl${BASEVER}/msgs/he.msg +lib/tcl${BASEVER}/msgs/hi.msg +lib/tcl${BASEVER}/msgs/hi_in.msg +lib/tcl${BASEVER}/msgs/hr.msg +lib/tcl${BASEVER}/msgs/hu.msg +lib/tcl${BASEVER}/msgs/id.msg +lib/tcl${BASEVER}/msgs/id_id.msg +lib/tcl${BASEVER}/msgs/is.msg +lib/tcl${BASEVER}/msgs/it.msg +lib/tcl${BASEVER}/msgs/it_ch.msg +lib/tcl${BASEVER}/msgs/ja.msg +lib/tcl${BASEVER}/msgs/kl.msg +lib/tcl${BASEVER}/msgs/kl_gl.msg +lib/tcl${BASEVER}/msgs/ko.msg +lib/tcl${BASEVER}/msgs/ko_kr.msg +lib/tcl${BASEVER}/msgs/kok.msg +lib/tcl${BASEVER}/msgs/kok_in.msg +lib/tcl${BASEVER}/msgs/kw.msg +lib/tcl${BASEVER}/msgs/kw_gb.msg +lib/tcl${BASEVER}/msgs/lt.msg +lib/tcl${BASEVER}/msgs/lv.msg +lib/tcl${BASEVER}/msgs/mk.msg +lib/tcl${BASEVER}/msgs/mr.msg +lib/tcl${BASEVER}/msgs/mr_in.msg +lib/tcl${BASEVER}/msgs/ms.msg +lib/tcl${BASEVER}/msgs/ms_my.msg +lib/tcl${BASEVER}/msgs/mt.msg +lib/tcl${BASEVER}/msgs/nb.msg +lib/tcl${BASEVER}/msgs/nl.msg +lib/tcl${BASEVER}/msgs/nl_be.msg +lib/tcl${BASEVER}/msgs/nn.msg +lib/tcl${BASEVER}/msgs/pl.msg +lib/tcl${BASEVER}/msgs/pt.msg +lib/tcl${BASEVER}/msgs/pt_br.msg +lib/tcl${BASEVER}/msgs/ro.msg +lib/tcl${BASEVER}/msgs/ru.msg +lib/tcl${BASEVER}/msgs/ru_ua.msg +lib/tcl${BASEVER}/msgs/sh.msg +lib/tcl${BASEVER}/msgs/sk.msg +lib/tcl${BASEVER}/msgs/sl.msg +lib/tcl${BASEVER}/msgs/sq.msg +lib/tcl${BASEVER}/msgs/sr.msg +lib/tcl${BASEVER}/msgs/sv.msg +lib/tcl${BASEVER}/msgs/sw.msg +lib/tcl${BASEVER}/msgs/ta.msg +lib/tcl${BASEVER}/msgs/ta_in.msg +lib/tcl${BASEVER}/msgs/te.msg +lib/tcl${BASEVER}/msgs/te_in.msg +lib/tcl${BASEVER}/msgs/th.msg +lib/tcl${BASEVER}/msgs/tr.msg +lib/tcl${BASEVER}/msgs/uk.msg +lib/tcl${BASEVER}/msgs/vi.msg +lib/tcl${BASEVER}/msgs/zh.msg +lib/tcl${BASEVER}/msgs/zh_cn.msg +lib/tcl${BASEVER}/msgs/zh_hk.msg +lib/tcl${BASEVER}/msgs/zh_sg.msg +lib/tcl${BASEVER}/msgs/zh_tw.msg +lib/tcl${BASEVER}/opt0.4/optparse.tcl +lib/tcl${BASEVER}/opt0.4/pkgIndex.tcl +lib/tcl${BASEVER}/package.tcl +lib/tcl${BASEVER}/parray.tcl +lib/tcl${BASEVER}/platform1.0/pkgIndex.tcl +lib/tcl${BASEVER}/platform1.0/platform.tcl +lib/tcl${BASEVER}/safe.tcl +lib/tcl${BASEVER}/shell1.1/pkgIndex.tcl +lib/tcl${BASEVER}/shell1.1/shell.tcl +lib/tcl${BASEVER}/tclAppInit.c +lib/tcl${BASEVER}/tclIndex +lib/tcl${BASEVER}/tcltest2.3/tcltest.tcl +lib/tcl${BASEVER}/tcltest2.3/pkgIndex.tcl +lib/tcl${BASEVER}/tm.tcl +lib/tcl${BASEVER}/word.tcl lib/tclConfig.sh man/man1/tclsh.1 man/man3/TCL_MEM_DEBUG.3 @@ -132,7 +270,12 @@ man/man3/Tcl_AllowExceptions.3 man/man3/Tcl_AppInit.3 man/man3/Tcl_AppendAllObjTypes.3 man/man3/Tcl_AppendElement.3 +man/man3/Tcl_AppendExportList.3 +man/man3/Tcl_AppendFormatToObj.3 +man/man3/Tcl_AppendLimitedToObj.3 +man/man3/Tcl_AppendObjToErrorInfo.3 man/man3/Tcl_AppendObjToObj.3 +man/man3/Tcl_AppendPrintfToObj.3 man/man3/Tcl_AppendResult.3 man/man3/Tcl_AppendResultVA.3 man/man3/Tcl_AppendStringsToObj.3 @@ -166,6 +309,7 @@ man/man3/Tcl_ChannelOutputProc.3 man/man3/Tcl_ChannelSeekProc.3 man/man3/Tcl_ChannelSetOptionProc.3 man/man3/Tcl_ChannelThreadActionProc.3 +man/man3/Tcl_ChannelTruncateProc.3 man/man3/Tcl_ChannelVersion.3 man/man3/Tcl_ChannelWatchProc.3 man/man3/Tcl_ChannelWideSeekProc.3 @@ -189,12 +333,14 @@ man/man3/Tcl_CreateChannelHandler.3 man/man3/Tcl_CreateCloseHandler.3 man/man3/Tcl_CreateCommand.3 man/man3/Tcl_CreateEncoding.3 +man/man3/Tcl_CreateEnsemble.3 man/man3/Tcl_CreateEventSource.3 man/man3/Tcl_CreateExitHandler.3 man/man3/Tcl_CreateFileHandler.3 man/man3/Tcl_CreateHashEntry.3 man/man3/Tcl_CreateInterp.3 man/man3/Tcl_CreateMathFunc.3 +man/man3/Tcl_CreateNamespace.3 man/man3/Tcl_CreateObjCommand.3 man/man3/Tcl_CreateObjTrace.3 man/man3/Tcl_CreateSlave.3 @@ -228,11 +374,22 @@ man/man3/Tcl_DeleteFileHandler.3 man/man3/Tcl_DeleteHashEntry.3 man/man3/Tcl_DeleteHashTable.3 man/man3/Tcl_DeleteInterp.3 +man/man3/Tcl_DeleteNamespace.3 man/man3/Tcl_DeleteThreadExitHandler.3 man/man3/Tcl_DeleteTimerHandler.3 man/man3/Tcl_DeleteTrace.3 man/man3/Tcl_DetachChannel.3 man/man3/Tcl_DetachPids.3 +man/man3/Tcl_DictObjDone.3 +man/man3/Tcl_DictObjFirst.3 +man/man3/Tcl_DictObjGet.3 +man/man3/Tcl_DictObjNext.3 +man/man3/Tcl_DictObjPut.3 +man/man3/Tcl_DictObjPutKeyList.3 +man/man3/Tcl_DictObjRemove.3 +man/man3/Tcl_DictObjRemoveKeyList.3 +man/man3/Tcl_DictObjSize.3 +man/man3/Tcl_DiscardInterpState.3 man/man3/Tcl_DiscardResult.3 man/man3/Tcl_DoOneEvent.3 man/man3/Tcl_DoWhenIdle.3 @@ -252,6 +409,7 @@ man/man3/Tcl_EvalTokensStandard.3 man/man3/Tcl_EventuallyFree.3 man/man3/Tcl_Exit.3 man/man3/Tcl_ExitThread.3 +man/man3/Tcl_Export.3 man/man3/Tcl_ExposeCommand.3 man/man3/Tcl_ExprBoolean.3 man/man3/Tcl_ExprBooleanObj.3 @@ -273,6 +431,7 @@ man/man3/Tcl_FSData.3 man/man3/Tcl_FSDeleteFile.3 man/man3/Tcl_FSEqualPaths.3 man/man3/Tcl_FSEvalFile.3 +man/man3/Tcl_FSEvalFileEx.3 man/man3/Tcl_FSFileAttrStrings.3 man/man3/Tcl_FSFileAttrsGet.3 man/man3/Tcl_FSFileAttrsSet.3 @@ -306,10 +465,15 @@ man/man3/Tcl_FSUtime.3 man/man3/Tcl_Finalize.3 man/man3/Tcl_FinalizeNotifier.3 man/man3/Tcl_FinalizeThread.3 +man/man3/Tcl_FindCommand.3 +man/man3/Tcl_FindEnsemble.3 man/man3/Tcl_FindExecutable.3 man/man3/Tcl_FindHashEntry.3 +man/man3/Tcl_FindNamespace.3 man/man3/Tcl_FirstHashEntry.3 man/man3/Tcl_Flush.3 +man/man3/Tcl_ForgetImport.3 +man/man3/Tcl_Format.3 man/man3/Tcl_Free.3 man/man3/Tcl_FreeEncoding.3 man/man3/Tcl_FreeParse.3 @@ -317,11 +481,14 @@ man/man3/Tcl_FreeResult.3 man/man3/Tcl_GetAlias.3 man/man3/Tcl_GetAliasObj.3 man/man3/Tcl_GetAssocData.3 +man/man3/Tcl_GetBignumFromObj.3 man/man3/Tcl_GetBoolean.3 man/man3/Tcl_GetBooleanFromObj.3 man/man3/Tcl_GetByteArrayFromObj.3 man/man3/Tcl_GetChannel.3 man/man3/Tcl_GetChannelBufferSize.3 +man/man3/Tcl_GetChannelError.3 +man/man3/Tcl_GetChannelErrorInterp.3 man/man3/Tcl_GetChannelHandle.3 man/man3/Tcl_GetChannelInstanceData.3 man/man3/Tcl_GetChannelMode.3 @@ -337,15 +504,25 @@ man/man3/Tcl_GetCommandFullName.3 man/man3/Tcl_GetCommandInfo.3 man/man3/Tcl_GetCommandInfoFromToken.3 man/man3/Tcl_GetCommandName.3 +man/man3/Tcl_GetCurrentNamespace.3 man/man3/Tcl_GetCurrentThread.3 man/man3/Tcl_GetCwd.3 man/man3/Tcl_GetDefaultEncodingDir.3 man/man3/Tcl_GetDouble.3 man/man3/Tcl_GetDoubleFromObj.3 man/man3/Tcl_GetEncoding.3 +man/man3/Tcl_GetEncodingFromObj.3 man/man3/Tcl_GetEncodingName.3 +man/man3/Tcl_GetEncodingNameFromEnvironment.3 man/man3/Tcl_GetEncodingNames.3 +man/man3/Tcl_GetEncodingSearchPath.3 +man/man3/Tcl_GetEnsembleFlags.3 +man/man3/Tcl_GetEnsembleMappingDict.3 +man/man3/Tcl_GetEnsembleNamespace.3 +man/man3/Tcl_GetEnsembleSubcommandList.3 +man/man3/Tcl_GetEnsembleUnknownHandler.3 man/man3/Tcl_GetErrno.3 +man/man3/Tcl_GetGlobalNamespace.3 man/man3/Tcl_GetHashKey.3 man/man3/Tcl_GetHashValue.3 man/man3/Tcl_GetHostName.3 @@ -358,13 +535,14 @@ man/man3/Tcl_GetLongFromObj.3 man/man3/Tcl_GetMaster.3 man/man3/Tcl_GetMathFuncInfo.3 man/man3/Tcl_GetNameOfExecutable.3 -man/man3/Tcl_GetOSTypeFromObj.3 +man/man3/Tcl_GetNamespaceUnknownHandler.3 man/man3/Tcl_GetObjResult.3 man/man3/Tcl_GetObjType.3 man/man3/Tcl_GetOpenFile.3 man/man3/Tcl_GetPathType.3 man/man3/Tcl_GetRange.3 man/man3/Tcl_GetRegExpFromObj.3 +man/man3/Tcl_GetReturnOptions.3 man/man3/Tcl_GetServiceMode.3 man/man3/Tcl_GetSlave.3 man/man3/Tcl_GetStackedChannel.3 @@ -389,6 +567,7 @@ man/man3/Tcl_GlobalEval.3 man/man3/Tcl_GlobalEvalObj.3 man/man3/Tcl_HashStats.3 man/man3/Tcl_HideCommand.3 +man/man3/Tcl_Import.3 man/man3/Tcl_IncrRefCount.3 man/man3/Tcl_Init.3 man/man3/Tcl_InitCustomHashTable.3 @@ -405,11 +584,27 @@ man/man3/Tcl_InvalidateStringRep.3 man/man3/Tcl_IsChannelExisting.3 man/man3/Tcl_IsChannelRegistered.3 man/man3/Tcl_IsChannelShared.3 +man/man3/Tcl_IsEnsemble.3 man/man3/Tcl_IsSafe.3 man/man3/Tcl_IsShared.3 man/man3/Tcl_IsStandardChannel.3 man/man3/Tcl_JoinPath.3 man/man3/Tcl_JoinThread.3 +man/man3/Tcl_LimitAddHandler.3 +man/man3/Tcl_LimitCheck.3 +man/man3/Tcl_LimitExceeded.3 +man/man3/Tcl_LimitGetCommands.3 +man/man3/Tcl_LimitGetGranularity.3 +man/man3/Tcl_LimitGetTime.3 +man/man3/Tcl_LimitReady.3 +man/man3/Tcl_LimitRemoveHandler.3 +man/man3/Tcl_LimitSetCommands.3 +man/man3/Tcl_LimitSetGranularity.3 +man/man3/Tcl_LimitSetTime.3 +man/man3/Tcl_LimitTypeEnabled.3 +man/man3/Tcl_LimitTypeExceeded.3 +man/man3/Tcl_LimitTypeReset.3 +man/man3/Tcl_LimitTypeSet.3 man/man3/Tcl_LinkVar.3 man/man3/Tcl_ListMathFuncs.3 man/man3/Tcl_ListObjAppendElement.3 @@ -419,10 +614,6 @@ man/man3/Tcl_ListObjIndex.3 man/man3/Tcl_ListObjLength.3 man/man3/Tcl_ListObjReplace.3 man/man3/Tcl_LogCommandInfo.3 -man/man3/Tcl_MacConvertTextResource.3 -man/man3/Tcl_MacEvalResource.3 -man/man3/Tcl_MacFindResource.3 -man/man3/Tcl_MacSetEventProc.3 man/man3/Tcl_Main.3 man/man3/Tcl_MakeFileChannel.3 man/man3/Tcl_MakeSafe.3 @@ -431,13 +622,14 @@ man/man3/Tcl_Merge.3 man/man3/Tcl_MutexFinalize.3 man/man3/Tcl_MutexLock.3 man/man3/Tcl_MutexUnlock.3 +man/man3/Tcl_NewBignumObj.3 man/man3/Tcl_NewBooleanObj.3 man/man3/Tcl_NewByteArrayObj.3 +man/man3/Tcl_NewDictObj.3 man/man3/Tcl_NewDoubleObj.3 man/man3/Tcl_NewIntObj.3 man/man3/Tcl_NewListObj.3 man/man3/Tcl_NewLongObj.3 -man/man3/Tcl_NewOSTypeObj.3 man/man3/Tcl_NewObj.3 man/man3/Tcl_NewStringObj.3 man/man3/Tcl_NewUnicodeObj.3 @@ -446,6 +638,7 @@ man/man3/Tcl_NextHashEntry.3 man/man3/Tcl_NotifyChannel.3 man/man3/Tcl_NumUtfChars.3 man/man3/Tcl_ObjGetVar2.3 +man/man3/Tcl_ObjPrintf.3 man/man3/Tcl_ObjSetVar2.3 man/man3/Tcl_OpenCommandChannel.3 man/man3/Tcl_OpenFileChannel.3 @@ -466,10 +659,12 @@ man/man3/Tcl_PkgProvide.3 man/man3/Tcl_PkgProvideEx.3 man/man3/Tcl_PkgRequire.3 man/man3/Tcl_PkgRequireEx.3 +man/man3/Tcl_PkgRequireProc.3 man/man3/Tcl_PosixError.3 man/man3/Tcl_Preserve.3 man/man3/Tcl_PrintDouble.3 man/man3/Tcl_PutEnv.3 +man/man3/Tcl_QueryTimeProc.3 man/man3/Tcl_QueueEvent.3 man/man3/Tcl_Read.3 man/man3/Tcl_ReadChars.3 @@ -486,10 +681,13 @@ man/man3/Tcl_RegExpMatch.3 man/man3/Tcl_RegExpMatchObj.3 man/man3/Tcl_RegExpRange.3 man/man3/Tcl_RegisterChannel.3 +man/man3/Tcl_RegisterConfig.3 man/man3/Tcl_RegisterObjType.3 man/man3/Tcl_Release.3 man/man3/Tcl_ResetResult.3 +man/man3/Tcl_RestoreInterpState.3 man/man3/Tcl_RestoreResult.3 +man/man3/Tcl_SaveInterpState.3 man/man3/Tcl_SaveResult.3 man/man3/Tcl_ScanCountedElement.3 man/man3/Tcl_ScanElement.3 @@ -497,35 +695,46 @@ man/man3/Tcl_Seek.3 man/man3/Tcl_ServiceAll.3 man/man3/Tcl_ServiceEvent.3 man/man3/Tcl_SetAssocData.3 +man/man3/Tcl_SetBignumObj.3 man/man3/Tcl_SetBooleanObj.3 man/man3/Tcl_SetByteArrayLength.3 man/man3/Tcl_SetByteArrayObj.3 man/man3/Tcl_SetChannelBufferSize.3 +man/man3/Tcl_SetChannelError.3 +man/man3/Tcl_SetChannelErrorInterp.3 man/man3/Tcl_SetChannelOption.3 man/man3/Tcl_SetCommandInfo.3 man/man3/Tcl_SetCommandInfoFromToken.3 man/man3/Tcl_SetDefaultEncodingDir.3 man/man3/Tcl_SetDoubleObj.3 +man/man3/Tcl_SetEncodingSearchPath.3 +man/man3/Tcl_SetEnsembleFlags.3 +man/man3/Tcl_SetEnsembleMappingDict.3 +man/man3/Tcl_SetEnsembleSubcommandList.3 +man/man3/Tcl_SetEnsembleUnknownHandler.3 man/man3/Tcl_SetErrno.3 man/man3/Tcl_SetErrorCode.3 man/man3/Tcl_SetErrorCodeVA.3 +man/man3/Tcl_SetExitProc.3 man/man3/Tcl_SetHashValue.3 man/man3/Tcl_SetIntObj.3 man/man3/Tcl_SetListObj.3 man/man3/Tcl_SetLongObj.3 man/man3/Tcl_SetMainLoop.3 man/man3/Tcl_SetMaxBlockTime.3 -man/man3/Tcl_SetOSTypeObj.3 +man/man3/Tcl_SetNamespaceUnknownHandler.3 man/man3/Tcl_SetObjErrorCode.3 man/man3/Tcl_SetObjLength.3 man/man3/Tcl_SetObjResult.3 man/man3/Tcl_SetPanicProc.3 man/man3/Tcl_SetRecursionLimit.3 man/man3/Tcl_SetResult.3 +man/man3/Tcl_SetReturnOptions.3 man/man3/Tcl_SetServiceMode.3 man/man3/Tcl_SetStdChannel.3 man/man3/Tcl_SetStringObj.3 man/man3/Tcl_SetSystemEncoding.3 +man/man3/Tcl_SetTimeProc.3 man/man3/Tcl_SetTimer.3 man/man3/Tcl_SetUnicodeObj.3 man/man3/Tcl_SetVar.3 @@ -546,6 +755,7 @@ man/man3/Tcl_StaticPackage.3 man/man3/Tcl_StringCaseMatch.3 man/man3/Tcl_StringMatch.3 man/man3/Tcl_SubstObj.3 +man/man3/Tcl_TakeBignumFromObj.3 man/man3/Tcl_Tell.3 man/man3/Tcl_ThreadAlert.3 man/man3/Tcl_ThreadQueueEvent.3 @@ -553,6 +763,7 @@ man/man3/Tcl_TraceCommand.3 man/man3/Tcl_TraceVar.3 man/man3/Tcl_TraceVar2.3 man/man3/Tcl_TranslateFileName.3 +man/man3/Tcl_TruncateChannel.3 man/man3/Tcl_Ungets.3 man/man3/Tcl_UniChar.3 man/man3/Tcl_UniCharAtIndex.3 @@ -620,12 +831,11 @@ man/man3/attemptckrealloc.3 man/man3/ckalloc.3 man/man3/ckfree.3 man/man3/ckrealloc.3 -man/man3/panic.3 -man/man3/panicVA.3 man/mann/SafeBase.n man/mann/Tcl.n man/mann/after.n man/mann/append.n +man/mann/apply.n man/mann/array.n man/mann/auto_execok.n man/mann/auto_import.n @@ -640,11 +850,13 @@ man/mann/break.n man/mann/case.n man/mann/catch.n man/mann/cd.n +man/mann/chan.n man/mann/clock.n man/mann/close.n man/mann/concat.n man/mann/continue.n man/mann/dde.n +man/mann/dict.n man/mann/encoding.n man/mann/eof.n man/mann/error.n @@ -673,16 +885,21 @@ man/mann/info.n man/mann/interp.n man/mann/join.n man/mann/lappend.n +man/mann/lassign.n man/mann/lindex.n man/mann/linsert.n man/mann/list.n man/mann/llength.n man/mann/load.n man/mann/lrange.n +man/mann/lrepeat.n man/mann/lreplace.n +man/mann/lreverse.n man/mann/lsearch.n man/mann/lset.n man/mann/lsort.n +man/mann/mathfunc.n +man/mann/mathop.n man/mann/memory.n man/mann/msgcat.n man/mann/namespace.n @@ -692,16 +909,18 @@ man/mann/parray.n man/mann/pid.n man/mann/pkg::create.n man/mann/pkg_mkIndex.n +man/mann/platform.n +man/mann/platform::shell.n man/mann/proc.n man/mann/puts.n man/mann/pwd.n man/mann/re_syntax.n man/mann/read.n +man/mann/refchan.n man/mann/regexp.n man/mann/registry.n man/mann/regsub.n man/mann/rename.n -man/mann/resource.n man/mann/return.n man/mann/scan.n man/mann/seek.n @@ -722,8 +941,10 @@ man/mann/tcltest.n man/mann/tclvars.n man/mann/tell.n man/mann/time.n +man/mann/tm.n man/mann/trace.n man/mann/unknown.n +man/mann/unload.n man/mann/unset.n man/mann/update.n man/mann/uplevel.n @@ -731,4 +952,3 @@ man/mann/upvar.n man/mann/variable.n man/mann/vwait.n man/mann/while.n -@pkgdir lib/tcl diff --git a/lang/tcl/buildlink3.mk b/lang/tcl/buildlink3.mk index 994063ebccc..c6bb9f8986e 100644 --- a/lang/tcl/buildlink3.mk +++ b/lang/tcl/buildlink3.mk @@ -1,21 +1,21 @@ -# $NetBSD: buildlink3.mk,v 1.23 2012/03/21 15:33:29 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.24 2012/08/21 21:31:47 marino Exp $ BUILDLINK_TREE+= tcl .if !defined(TCL_BUILDLINK3_MK) TCL_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.tcl+= tcl>=8.4.6nb1 -BUILDLINK_ABI_DEPENDS.tcl+= tcl>=8.4.7nb1 +BUILDLINK_API_DEPENDS.tcl+= tcl>=8.5.7 +BUILDLINK_ABI_DEPENDS.tcl+= tcl>=8.5.7 BUILDLINK_PKGSRCDIR.tcl?= ../../lang/tcl BUILDLINK_FILES.tcl+= bin/tclsh* # -# Make "-ltcl" and "-ltcl8.4" resolve into "-ltcl84", so that we don't +# Make "-ltcl" and "-ltcl8.5" resolve into "-ltcl85", so that we don't # need to patch so many Makefiles. # -BUILDLINK_TRANSFORM+= l:tcl:tcl84 -BUILDLINK_TRANSFORM+= l:tcl8.4:tcl84 +BUILDLINK_TRANSFORM+= l:tcl:tcl85 +BUILDLINK_TRANSFORM+= l:tcl8.5:tcl85 TCLCONFIG_SH?= ${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh diff --git a/lang/tcl/distinfo b/lang/tcl/distinfo index 520c21b4492..c3b0ae724bc 100644 --- a/lang/tcl/distinfo +++ b/lang/tcl/distinfo @@ -1,17 +1,16 @@ -$NetBSD: distinfo,v 1.46 2012/03/31 01:27:26 ryoon Exp $ +$NetBSD: distinfo,v 1.47 2012/08/21 21:31:47 marino Exp $ -SHA1 (tcl8.4.18-src.tar.gz) = 83b04c3ad092c22507869dec3a5c7ba821f109b0 -RMD160 (tcl8.4.18-src.tar.gz) = 735a9cc0575585de70cbd3cb2ff5c97d46c1dfbd -Size (tcl8.4.18-src.tar.gz) = 3653369 bytes -SHA1 (patch-aa) = 8db3024597007f861c64e4c933bed3012c27832f -SHA1 (patch-ab) = 1b4ae1af652922577ba3d87e983f602bda995179 -SHA1 (patch-ac) = 3139a65c6647d806fc69765bc62aa715b49f4d41 -SHA1 (patch-ad) = 277cf39e47affa2c2913e47a7d4e87468c5e21bb -SHA1 (patch-ae) = 7694081556a6b004db47ae54775bea0f659b8805 -SHA1 (patch-af) = b295549971753ae3ae3516a06d59e0d4ccdfa616 -SHA1 (patch-ag) = fe371866b438063515bad6d145287455c4636824 -SHA1 (patch-ah) = b6a68a26ed018f424e9e41bcf6f8da1517bd599a -SHA1 (patch-ai) = b0f7818adedd53a123c6ab809bbec28924b3f07b -SHA1 (patch-aj) = 74d5d7f0d47f39241068c98a316104da94f1cdb9 -SHA1 (patch-generic_tclCmdMZ.c) = 7779f4e1e8696774821c59d51e2afa32fad821d8 -SHA1 (patch-generic_tclPosixStr.c) = 8b1d4408eb2ca28557ed1a03bbe5e348353a9d0b +SHA1 (tcl8.5.12-src.tar.gz) = 0ea293d27b1368cb5865e552ece348d02ff55adc +RMD160 (tcl8.5.12-src.tar.gz) = ada42e22f7b12413c88d9ec7dbd3789926f362d2 +Size (tcl8.5.12-src.tar.gz) = 4501505 bytes +SHA1 (patch-generic_tclInt.h) = 13289d8fcf5021898b06a9608bc05fc968a1ba5c +SHA1 (patch-generic_tclPort.h) = cd44f24c79048a70e2c4929aa1499ee336602ba5 +SHA1 (patch-generic_tclPosixStr.c) = 8c252a4f3d8898fb48544d15123d6a8ddc3172f0 +SHA1 (patch-tests_load.test) = 438695ab76e01646e49aadc01c44344a5495eabb +SHA1 (patch-tests_pkgMkIndex.test) = 70d1042c1f4743052c5fa191fa7c4732a08e28a2 +SHA1 (patch-unix_Makefile.in) = 2b949d4290b3539916654381e5fdea6f26d0765e +SHA1 (patch-unix_configure) = 801527d0d19a478476d2f8d506e8c18252d44777 +SHA1 (patch-unix_tclConfig.sh.in) = 5a32d8e97240d14f3a03e205637fe3bf8307d868 +SHA1 (patch-unix_tclUnixFCmd.c) = a56a12b8a0068e914d10336076347ca2b0ba9ac7 +SHA1 (patch-unix_tclUnixInit.c) = cceb75bc67a3b67620889cd92e5978ec8290af09 +SHA1 (patch-unix_tclUnixPort.h) = 2965dd6ef6560e0a6385c6cb286754f63c98c827 diff --git a/lang/tcl/hacks.mk b/lang/tcl/hacks.mk deleted file mode 100644 index d818263d071..00000000000 --- a/lang/tcl/hacks.mk +++ /dev/null @@ -1,14 +0,0 @@ -# $NetBSD: hacks.mk,v 1.1 2004/11/16 22:44:51 jlam Exp $ - -### [Wed Jul 25 19:42:58 UTC 2001 : jlam] -### Force no optimization (-O0) on NetBSD-1.5.x/m68k machines as there -### appears to be an optimization bug that causes the build to fail -### (pkg/13395). The problem appeared in the original PR on an Amiga -### running NetBSD 1.5.1 and also on a mac68k running NetBSD 1.5.1. -### This workaround was tested on the mac68k system (kindly provided -### by Jon Lindgren). -### -.if !empty(MACHINE_PLATFORM:MNetBSD-1.5*-m68k) -PKG_HACKS+= netbsd-1-5-m68k-codegen -BUILDLINK_TRANSFORM+= rm:-O[0-9]* -.endif diff --git a/lang/tcl/options.mk b/lang/tcl/options.mk new file mode 100644 index 00000000000..5c332907d93 --- /dev/null +++ b/lang/tcl/options.mk @@ -0,0 +1,18 @@ +# $NetBSD: options.mk,v 1.1 2012/08/21 21:31:47 marino Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.tcl +PKG_SUPPORTED_OPTIONS= threads debug +PKG_SUGGESTED_OPTIONS= threads + +.include "../../mk/bsd.prefs.mk" +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Mdebug) +CONFIGURE_ARGS+= --enable-symbols=mem +.endif + +.if !empty(PKG_OPTIONS:Mthreads) +CONFIGURE_ARGS+= --enable-threads=on +.else +CONFIGURE_ARGS+= --enable-threads=off +.endif diff --git a/lang/tcl/patches/patch-aa b/lang/tcl/patches/patch-aa deleted file mode 100644 index 561f3bb850d..00000000000 --- a/lang/tcl/patches/patch-aa +++ /dev/null @@ -1,95 +0,0 @@ -$NetBSD: patch-aa,v 1.19 2011/08/16 10:18:58 cheusov Exp $ - ---- unix/Makefile.in.orig 2008-02-06 15:38:26.000000000 +0000 -+++ unix/Makefile.in -@@ -185,8 +185,8 @@ SHELL = /bin/sh - INSTALL_STRIP_PROGRAM = -s - INSTALL_STRIP_LIBRARY = -S -S - --INSTALL = @srcdir@/install-sh -c --INSTALL_PROGRAM = ${INSTALL} -+INSTALL := ${LIBTOOL} --mode=install @srcdir@/install-sh -c -+INSTALL_PROGRAM = ${INSTALL} -s - INSTALL_LIBRARY = ${INSTALL} - INSTALL_DATA = ${INSTALL} -m 644 - -@@ -204,7 +204,7 @@ TCL_EXE = tclsh - # these definitions by hand. - - STLIB_LD = @STLIB_LD@ --SHLIB_LD = @SHLIB_LD@ -+SHLIB_LD = ${LIBTOOL} --tag CC --mode=link @CC@ -rpath ${PREFIX}/lib - SHLIB_CFLAGS = @SHLIB_CFLAGS@ - SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ - TCL_SHLIB_LD_EXTRAS = @TCL_SHLIB_LD_EXTRAS@ -@@ -229,6 +229,7 @@ BUILD_DLTEST = @BUILD_DLTEST@ - #BUILD_DLTEST = - - TCL_LIB_FILE = @TCL_LIB_FILE@ -+TCL_LA_FILE = ${TCL_LIB_FILE:@SHLIB_SUFFIX@=.la} - #TCL_LIB_FILE = libtcl.a - - # Generic lib name used in rules that apply to tcl and tk -@@ -267,8 +268,9 @@ DLTEST_DIR = @TCL_SRC_DIR@/unix/dltest - # Must be absolute to so the corresponding tcltest's tcl_library is absolute. - TCL_BUILDTIME_LIBRARY = @TCL_SRC_DIR@/library - --CC = @CC@ - #CC = purify -best-effort @CC@ -DPURIFY -+CC = ${LIBTOOL} --tag CC --mode=compile @CC@ -+LD = ${LIBTOOL} --tag CC --mode=link @CC@ - - # Flags to be passed to installManPage to control whether the manpages - # should be compressed and linked with softlinks -@@ -469,7 +471,7 @@ SRCS = $(GENERIC_SRCS) $(UNIX_SRCS) $(NO - - all: binaries libraries doc - --binaries: ${LIB_FILE} $(STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) tclsh -+binaries: ${TCL_LA_FILE} $(STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) tclsh - - libraries: - -@@ -477,7 +479,7 @@ doc: - - # The following target is configured by autoconf to generate either - # a shared library or non-shared library for Tcl. --${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} -+${TCL_LA_FILE}: ${OBJS} ${STUB_LIB_FILE} - rm -f $@ - @MAKE_LIB@ - -@@ -497,8 +499,8 @@ tclLibObjs: - objs: ${OBJS} - - --tclsh: ${TCLSH_OBJS} ${TCL_LIB_FILE} -- ${CC} ${CFLAGS} ${LDFLAGS} ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} @EXTRA_TCLSH_LIBS@ \ -+tclsh: ${TCLSH_OBJS} ${TCL_LA_FILE} -+ ${LD} ${CFLAGS} ${LDFLAGS} ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} @EXTRA_TCLSH_LIBS@ \ - ${CC_SEARCH_FLAGS} -o tclsh - - # Resetting the LIB_RUNTIME_DIR below is required so that -@@ -506,11 +508,11 @@ tclsh: ${TCLSH_OBJS} ${TCL_LIB_FILE} - # burned into its ld search path. This keeps tcltest from - # picking up an already installed version of the Tcl library. - --tcltest: ${TCLTEST_OBJS} ${TCL_LIB_FILE} ${BUILD_DLTEST} -+tcltest: ${TCLTEST_OBJS} ${TCL_LA_FILE} ${BUILD_DLTEST} - $(MAKE) tcltest-real LIB_RUNTIME_DIR=`pwd` - - tcltest-real: -- ${CC} ${CFLAGS} ${LDFLAGS} ${TCLTEST_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} @EXTRA_TCLSH_LIBS@ \ -+ ${LD} ${CFLAGS} ${LDFLAGS} ${TCLTEST_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} @EXTRA_TCLSH_LIBS@ \ - ${CC_SEARCH_FLAGS} -o tcltest - - # Note, in the target below TCL_LIBRARY needs to be set or else -@@ -1118,7 +1120,7 @@ $(DTRACE_OBJ): $(DTRACE_SRC) $(TCL_OBJS) - - xttest: ${XTTEST_OBJS} ${GENERIC_OBJS} ${UNIX_OBJS} ${COMPAT_OBJS} \ - @DL_OBJS@ ${BUILD_DLTEST} -- ${CC} ${XTTEST_OBJS} ${GENERIC_OBJS} ${UNIX_OBJS} ${COMPAT_OBJS} \ -+ ${LD} ${XTTEST_OBJS} ${GENERIC_OBJS} ${UNIX_OBJS} ${COMPAT_OBJS} \ - @DL_OBJS@ @TCL_BUILD_LIB_SPEC@ ${LIBS} \ - ${CC_SEARCH_FLAGS} -L/usr/openwin/lib -lXt -o xttest - diff --git a/lang/tcl/patches/patch-ab b/lang/tcl/patches/patch-ab deleted file mode 100644 index 3956a3c5f21..00000000000 --- a/lang/tcl/patches/patch-ab +++ /dev/null @@ -1,261 +0,0 @@ -$NetBSD: patch-ab,v 1.40 2012/03/31 01:27:27 ryoon Exp $ - ---- unix/configure.orig 2008-02-06 15:38:26.000000000 +0000 -+++ unix/configure -@@ -2567,6 +2567,7 @@ fi - # Step 3: set configuration options based on system name and version. - - do64bit_ok=no -+ TCL_LIB_SPEC_RPATH="" - LDFLAGS_ORIG="$LDFLAGS" - TCL_EXPORT_FILE_SUFFIX="" - UNSHARED_LIB_SUFFIX="" -@@ -2991,6 +2992,21 @@ fi - LD_LIBRARY_PATH_VAR="SHLIB_PATH" - fi - ;; -+ Interix-3.*) -+ SHLIB_CFLAGS="" -+ SHLIB_LD='${TCL_CC} -shared' -+ SHLIB_LD_LIBS="" -+ SHLIB_SUFFIX=".so" -+ DL_OBJS="tclLoadDl.o" -+ DL_LIBS="-ldl" -+ LDFLAGS="$LDFLAGS -Wl,-E" -+ CC_SEARCH_FLAGS='-Wl,-R${LIB_RUNTIME_DIR}' -+ LD_SEARCH_FLAGS='-Wl,-R${LIB_RUNTIME_DIR}' -+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so', -+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' -+ TCL_LIB_SPEC_RPATH="-Wl,-R${exec_prefix}/lib" -+ TCL_LIB_VERSIONS_OK=nodots -+ ;; - IRIX-4.*) - SHLIB_CFLAGS="-G 0" - SHLIB_SUFFIX=".a" -@@ -3012,6 +3028,9 @@ fi - DL_LIBS="" - CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' - LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' -+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' -+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' -+ TCL_LIB_VERSIONS_OK=nodots - ;; - IRIX-6.*) - SHLIB_CFLAGS="" -@@ -3037,6 +3056,9 @@ fi - esac - LDFLAGS="$LDFLAGS -n32" - fi -+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' -+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' -+ TCL_LIB_VERSIONS_OK=nodots - ;; - IRIX64-6.*) - SHLIB_CFLAGS="" -@@ -3060,6 +3082,9 @@ fi - LDFLAGS="$LDFLAGS -64" - fi - fi -+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' -+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' -+ TCL_LIB_VERSIONS_OK=nodots - ;; - Linux*) - SHLIB_CFLAGS="-fPIC" -@@ -3176,6 +3201,9 @@ echo "$ac_t""$tcl_cv_cc_m64" 1>&6 - EOF - - -+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' -+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' -+ TCL_LIB_VERSIONS_OK=nodots - ;; - GNU*) - SHLIB_CFLAGS="-fPIC" -@@ -3267,6 +3295,9 @@ fi - LD_SEARCH_FLAGS="" - ;; - NetBSD-*|FreeBSD-[1-2].*) -+ if test "X${COMPILER_OPTIMIZATION_BUG}" = "XYES"; then -+ CFLAGS_OPTIMIZE=-O0 -+ fi - # 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 -@@ -3299,15 +3330,13 @@ if eval "test \"`echo '$ac_cv_header_'$a - - # NetBSD/SPARC needs -fPIC, -fpic will not do. - SHLIB_CFLAGS="-fPIC" -- SHLIB_LD="ld -Bshareable -x" - SHLIB_LD_LIBS='${LIBS}' - SHLIB_SUFFIX=".so" - DL_OBJS="tclLoadDl.o" - DL_LIBS="" - 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:3311: checking for ELF" >&5 -+echo "configure:3340: checking for ELF" >&5 - if eval "test \"`echo '$''{'tcl_cv_ld_elf'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3334,6 +3363,8 @@ rm -f conftest* - fi - - echo "$ac_t""$tcl_cv_ld_elf" 1>&6 -+ SHLIB_LD='${TCL_CC} -shared -Wl,-x' -+ LD_SEARCH_FLAGS='-Wl,-R${LIB_RUNTIME_DIR}' - if test $tcl_cv_ld_elf = yes; then - SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' - else -@@ -3361,7 +3392,7 @@ fi - UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' - TCL_LIB_VERSIONS_OK=nodots - ;; -- OpenBSD-*) -+ OpenBSD-*|MirBSD-*) - case `arch -s` in - m88k|vax) - SHLIB_CFLAGS="" -@@ -3431,7 +3462,7 @@ echo "$ac_t""$tcl_cv_ld_elf" 1>&6 - 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" -@@ -3449,12 +3480,18 @@ echo "$ac_t""$tcl_cv_ld_elf" 1>&6 - LDFLAGS="$LDFLAGS -pthread" - fi - case $system in -- FreeBSD-3.*) -- # FreeBSD-3 doesn't handle version numbers with dots. -+ FreeBSD-*) -+ # "nodots" required to confirm to pkgsrc lang/tcl PLIST - UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' - SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' - TCL_LIB_VERSIONS_OK=nodots - ;; -+ DragonFly-*) -+ # "nodots" required to confirm to pkgsrc lang/tcl PLIST -+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' -+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' -+ TCL_LIB_VERSIONS_OK=nodots -+ ;; - esac - ;; - Darwin-*) -@@ -4003,6 +4040,9 @@ EOF - CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}' - LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}' - fi -+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' -+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' -+ TCL_LIB_VERSIONS_OK=nodots - ;; - ULTRIX-4.*) - SHLIB_CFLAGS="-G 0" -@@ -4273,7 +4313,7 @@ fi - ;; - IRIX*) - ;; -- NetBSD-*|FreeBSD-*|OpenBSD-*) -+ NetBSD-*|FreeBSD-*|OpenBSD-*|MirBSD-*) - ;; - Darwin-*) - ;; -@@ -4299,8 +4339,8 @@ fi - - if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then - LIB_SUFFIX=${SHARED_LIB_SUFFIX} -- MAKE_LIB='${SHLIB_LD} -o $@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}' -- INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) $(LIB_INSTALL_DIR)/$(LIB_FILE)' -+ MAKE_LIB='${SHLIB_LD} -o ${@:C/\.so.*/.la/} ${OBJS:.o=.lo} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS} -version-info 1:0' -+ INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE:C/\.so.*/.la/) $(LIB_INSTALL_DIR)/$(LIB_FILE)' - else - LIB_SUFFIX=${UNSHARED_LIB_SUFFIX} - -@@ -9247,7 +9287,7 @@ else - TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}" - fi - TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}" -- TCL_LIB_SPEC="-L${libdir} ${TCL_LIB_FLAG}" -+ TCL_LIB_SPEC="${TCL_LIB_SPEC_RPATH} -L${libdir} ${TCL_LIB_FLAG}" - else - TCL_BUILD_EXP_FILE="lib.exp" - eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}" -@@ -9278,14 +9318,24 @@ VERSION=${TCL_VERSION} - #-------------------------------------------------------------------- - - if test "$FRAMEWORK_BUILD" = "1" ; then -- test -z "$TCL_PACKAGE_PATH" && \ -- TCL_PACKAGE_PATH="~/Library/Tcl /Library/Tcl /Network/Library/Tcl /System/Library/Tcl ~/Library/Frameworks /Library/Frameworks /Network/Library/Frameworks /System/Library/Frameworks" -+ test -z "$TCL_PACKAGE_PATH_ADD" && \ -+ 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}" -+ TCL_PACKAGE_PATH_ADD="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}" - else -- TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}" -+ TCL_PACKAGE_PATH_ADD="${prefix}/lib ${TCL_PACKAGE_PATH}" - fi - -+for dir in ${TCL_PACKAGE_PATH_ADD}; do -+ if test -z "${TCL_PACKAGE_PATH}"; then -+ TCL_PACKAGE_PATH="$dir" -+ else -+ TCL_PACKAGE_PATH="${TCL_PACKAGE_PATH} $dir" -+ fi -+done -+ -+ -+ - #-------------------------------------------------------------------- - # The statements below define various symbols relating to Tcl - # stub support. -@@ -9442,34 +9492,15 @@ trap 'rm -f $CONFIG_STATUS conftest*; ex - # Transform confdefs.h into DEFS. - # Protect against shell expansion while executing Makefile rules. - # Protect against Makefile macro expansion. --# --# If the first sed substitution is executed (which looks for macros that --# take arguments), then we branch to the quote section. Otherwise, --# look for a macro that doesn't take arguments. --cat >confdef2opt.sed <<\_ACEOF --t clear --: clear --s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g --t quote --s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g --t quote --d --: quote --s,[ `~#$^&*(){}\\|;'"<>?],\\&,g --s,\[,\\&,g --s,\],\\&,g --s,\$,$$,g --p --_ACEOF --# We use echo to avoid assuming a particular line-breaking character. --# The extra dot is to prevent the shell from consuming trailing --# line-breaks from the sub-command output. A line-break within --# single-quotes doesn't work because, if this script is created in a --# platform that uses two characters for line-breaks (e.g., DOS), tr --# would break. --ac_LF_and_DOT=`echo; echo .` --DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` --rm -f confdef2opt.sed -+cat > conftest.defs <<\EOF -+s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g -+s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g -+s%\[%\\&%g -+s%\]%\\&%g -+s%\$%$$%g -+EOF -+DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` -+rm -f conftest.defs - - - # Without the "./", some shells look in PATH for config.status. diff --git a/lang/tcl/patches/patch-ad b/lang/tcl/patches/patch-ad deleted file mode 100644 index 9a1eea56d36..00000000000 --- a/lang/tcl/patches/patch-ad +++ /dev/null @@ -1,52 +0,0 @@ -$NetBSD: patch-ad,v 1.5 2011/08/16 10:18:58 cheusov Exp $ - ---- 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@ --CC = @CC@ -+CC = ${LIBTOOL} --tag CC --mode=compile @CC@ - LIBS = @TCL_BUILD_STUB_LIB_SPEC@ @DL_LIBS@ @LIBS@ @MATH_LIBS@ - AC_FLAGS = @DEFS@ - SHLIB_CFLAGS = @SHLIB_CFLAGS@ --SHLIB_LD = @SHLIB_LD@ -+SHLIB_LD = ${LIBTOOL} --tag CC --mode=link cc -module -pipe -rpath ${PREFIX}/lib - SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ --SHLIB_SUFFIX = @SHLIB_SUFFIX@ -+SHLIB_SUFFIX = .la - SRC_DIR = @srcdir@ - TCL_VERSION= @TCL_VERSION@ -@@ -27,25 +27,26 @@ all: pkga${SHLIB_SUFFIX} pkgb${SHLIB_SUF - pkga${SHLIB_SUFFIX}: $(SRC_DIR)/pkga.c - $(CC) -c $(CC_SWITCHES) $(SRC_DIR)/pkga.c -- ${SHLIB_LD} -o pkga${SHLIB_SUFFIX} pkga.o ${SHLIB_LD_LIBS} -+ ${SHLIB_LD} -o pkga${SHLIB_SUFFIX} pkga.lo ${SHLIB_LD_LIBS} - - pkgb${SHLIB_SUFFIX}: $(SRC_DIR)/pkgb.c - $(CC) -c $(CC_SWITCHES) $(SRC_DIR)/pkgb.c -- ${SHLIB_LD} -o pkgb${SHLIB_SUFFIX} pkgb.o ${SHLIB_LD_LIBS} -+ ${SHLIB_LD} -o pkgb${SHLIB_SUFFIX} pkgb.lo ${SHLIB_LD_LIBS} - - pkgc${SHLIB_SUFFIX}: $(SRC_DIR)/pkgc.c - $(CC) -c $(CC_SWITCHES) $(SRC_DIR)/pkgc.c -- ${SHLIB_LD} -o pkgc${SHLIB_SUFFIX} pkgc.o ${SHLIB_LD_LIBS} -+ ${SHLIB_LD} -o pkgc${SHLIB_SUFFIX} pkgc.lo ${SHLIB_LD_LIBS} - - pkgd${SHLIB_SUFFIX}: $(SRC_DIR)/pkgd.c - $(CC) -c $(CC_SWITCHES) $(SRC_DIR)/pkgd.c -- ${SHLIB_LD} -o pkgd${SHLIB_SUFFIX} pkgd.o ${SHLIB_LD_LIBS} -+ ${SHLIB_LD} -o pkgd${SHLIB_SUFFIX} pkgd.lo ${SHLIB_LD_LIBS} - - pkge${SHLIB_SUFFIX}: $(SRC_DIR)/pkge.c - $(CC) -c $(CC_SWITCHES) $(SRC_DIR)/pkge.c -- ${SHLIB_LD} -o pkge${SHLIB_SUFFIX} pkge.o ${SHLIB_LD_LIBS} -+ ${SHLIB_LD} -o pkge${SHLIB_SUFFIX} pkge.lo ${SHLIB_LD_LIBS} - - clean: -- rm -f *.o config.cache config.log config.status -+ rm -f *.o *.lo config.cache config.log config.status - rm -f lib.exp ../dltest.marker -+ rm -rf .libs - @if test "$(SHLIB_SUFFIX)" != ""; then \ - echo "rm -f *${SHLIB_SUFFIX}" ; \ diff --git a/lang/tcl/patches/patch-ae b/lang/tcl/patches/patch-ae deleted file mode 100644 index 7f10d290592..00000000000 --- a/lang/tcl/patches/patch-ae +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-ae,v 1.11 2007/10/13 11:41:44 adam Exp $ - ---- unix/configure.in.orig 2007-10-13 10:37:13.000000000 +0200 -+++ unix/configure.in -@@ -636,7 +636,7 @@ else - TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}" - fi - TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}" -- TCL_LIB_SPEC="-L${libdir} ${TCL_LIB_FLAG}" -+ TCL_LIB_SPEC="${TCL_LIB_SPEC_RPATH} -L${libdir} ${TCL_LIB_FLAG}" - else - TCL_BUILD_EXP_FILE="lib.exp" - eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}" -@@ -667,14 +667,24 @@ VERSION=${TCL_VERSION} - #-------------------------------------------------------------------- - - if test "$FRAMEWORK_BUILD" = "1" ; then -- test -z "$TCL_PACKAGE_PATH" && \ -- TCL_PACKAGE_PATH="~/Library/Tcl /Library/Tcl /Network/Library/Tcl /System/Library/Tcl ~/Library/Frameworks /Library/Frameworks /Network/Library/Frameworks /System/Library/Frameworks" -+ test -z "$TCL_PACKAGE_PATH_ADD" && \ -+ 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}" -+ TCL_PACKAGE_PATH_ADD="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}" - else -- TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}" -+ TCL_PACKAGE_PATH_ADD="${prefix}/lib ${TCL_PACKAGE_PATH}" - fi - -+for dir in ${TCL_PACKAGE_PATH_ADD}; do -+ if test -z "${TCL_PACKAGE_PATH}"; then -+ TCL_PACKAGE_PATH="$dir" -+ else -+ TCL_PACKAGE_PATH="${TCL_PACKAGE_PATH} $dir" -+ fi -+done -+ -+ -+ - #-------------------------------------------------------------------- - # The statements below define various symbols relating to Tcl - # stub support. diff --git a/lang/tcl/patches/patch-af b/lang/tcl/patches/patch-af deleted file mode 100644 index 3f7179dbb8a..00000000000 --- a/lang/tcl/patches/patch-af +++ /dev/null @@ -1,164 +0,0 @@ -$NetBSD: patch-af,v 1.25 2011/11/14 01:31:18 marino Exp $ - ---- unix/tcl.m4.orig 2008-02-06 15:38:26.000000000 +0000 -+++ unix/tcl.m4 -@@ -1033,6 +1033,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ - # Step 3: set configuration options based on system name and version. - - do64bit_ok=no -+ TCL_LIB_SPEC_RPATH="" - LDFLAGS_ORIG="$LDFLAGS" - TCL_EXPORT_FILE_SUFFIX="" - UNSHARED_LIB_SUFFIX="" -@@ -1263,6 +1264,21 @@ dnl AC_CHECK_TOOL(AR, ar) - LD_LIBRARY_PATH_VAR="SHLIB_PATH" - fi - ;; -+ Interix-3.*) -+ SHLIB_CFLAGS="" -+ SHLIB_LD='${TCL_CC} -shared' -+ SHLIB_LD_LIBS="" -+ SHLIB_SUFFIX=".so" -+ DL_OBJS="tclLoadDl.o" -+ DL_LIBS="-ldl" -+ LDFLAGS="$LDFLAGS -Wl,-E" -+ CC_SEARCH_FLAGS='-Wl,-R${LIB_RUNTIME_DIR}' -+ LD_SEARCH_FLAGS='-Wl,-R${LIB_RUNTIME_DIR}' -+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so', -+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' -+ TCL_LIB_SPEC_RPATH="-Wl,-R${exec_prefix}/lib" -+ TCL_LIB_VERSIONS_OK=nodots -+ ;; - IRIX-4.*) - SHLIB_CFLAGS="-G 0" - SHLIB_SUFFIX=".a" -@@ -1284,6 +1300,9 @@ dnl AC_CHECK_TOOL(AR, ar) - DL_LIBS="" - CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' - LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' -+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' -+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' -+ TCL_LIB_VERSIONS_OK=nodots - ;; - IRIX-6.*) - SHLIB_CFLAGS="" -@@ -1309,6 +1328,9 @@ dnl AC_CHECK_TOOL(AR, ar) - esac - LDFLAGS="$LDFLAGS -n32" - fi -+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' -+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' -+ TCL_LIB_VERSIONS_OK=nodots - ;; - IRIX64-6.*) - SHLIB_CFLAGS="" -@@ -1332,6 +1354,9 @@ dnl AC_CHECK_TOOL(AR, ar) - LDFLAGS="$LDFLAGS -64" - fi - fi -+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' -+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' -+ TCL_LIB_VERSIONS_OK=nodots - ;; - Linux*) - SHLIB_CFLAGS="-fPIC" -@@ -1388,6 +1413,9 @@ dnl AC_CHECK_TOOL(AR, ar) - # XIM peeking works under XFree86. - AC_DEFINE(PEEK_XCLOSEIM) - -+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' -+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' -+ TCL_LIB_VERSIONS_OK=nodots - ;; - GNU*) - SHLIB_CFLAGS="-fPIC" -@@ -1447,23 +1475,26 @@ dnl AC_CHECK_TOOL(AR, ar) - LD_SEARCH_FLAGS="" - ;; - NetBSD-*|FreeBSD-[[1-2]].*) -+ if test "X${COMPILER_OPTIMIZATION_BUG}" = "XYES"; then -+ CFLAGS_OPTIMIZE=-O0 -+ fi - # Not available on all versions: check for include file. - AC_CHECK_HEADER(dlfcn.h, [ - # NetBSD/SPARC needs -fPIC, -fpic will not do. - SHLIB_CFLAGS="-fPIC" -- SHLIB_LD="ld -Bshareable -x" - SHLIB_LD_LIBS='${LIBS}' - SHLIB_SUFFIX=".so" - DL_OBJS="tclLoadDl.o" - DL_LIBS="" - CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' -- LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' - AC_CACHE_CHECK([for ELF], tcl_cv_ld_elf, [ - AC_EGREP_CPP(yes, [ - #ifdef __ELF__ - yes - #endif - ], tcl_cv_ld_elf=yes, tcl_cv_ld_elf=no)]) -+ SHLIB_LD='${TCL_CC} -shared -Wl,-x' -+ LD_SEARCH_FLAGS='-Wl,-R${LIB_RUNTIME_DIR}' - if test $tcl_cv_ld_elf = yes; then - SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' - else -@@ -1486,7 +1517,7 @@ dnl AC_CHECK_TOOL(AR, ar) - UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' - TCL_LIB_VERSIONS_OK=nodots - ;; -- OpenBSD-*) -+ OpenBSD-*|MirBSD-*) - case `arch -s` in - m88k|vax) - SHLIB_CFLAGS="" -@@ -1534,7 +1565,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" -@@ -1558,6 +1589,12 @@ dnl AC_CHECK_TOOL(AR, ar) - SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' - TCL_LIB_VERSIONS_OK=nodots - ;; -+ DragonFly-*) -+ # "nodots" required to confirm to pkgsrc lang/tcl PLIST -+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' -+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' -+ TCL_LIB_VERSIONS_OK=nodots -+ ;; - esac - ;; - Darwin-*) -@@ -1933,6 +1970,9 @@ dnl AC_CHECK_TOOL(AR, ar) - CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}' - LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}' - fi -+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' -+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' -+ TCL_LIB_VERSIONS_OK=nodots - ;; - ULTRIX-4.*) - SHLIB_CFLAGS="-G 0" -@@ -2091,7 +2131,7 @@ dnl # preprocessing tests use only CPPFL - ;; - IRIX*) - ;; -- NetBSD-*|FreeBSD-*|OpenBSD-*) -+ NetBSD-*|FreeBSD-*|OpenBSD-*|MirBSD-*) - ;; - Darwin-*) - ;; -@@ -2117,8 +2157,8 @@ dnl # preprocessing tests use only CPPFL - - if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then - LIB_SUFFIX=${SHARED_LIB_SUFFIX} -- MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}' -- INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) $(LIB_INSTALL_DIR)/$(LIB_FILE)' -+ MAKE_LIB='${SHLIB_LD} -o ${@:C/\.so.*/.la/} ${OBJS:.o=.lo} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS} -version-info 1:0' -+ INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE:C/\.so.*/.la/) $(LIB_INSTALL_DIR)/$(LIB_FILE)' - else - LIB_SUFFIX=${UNSHARED_LIB_SUFFIX} - diff --git a/lang/tcl/patches/patch-ag b/lang/tcl/patches/patch-ag deleted file mode 100644 index 1be4e94a8cd..00000000000 --- a/lang/tcl/patches/patch-ag +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ag,v 1.4 2006/01/16 14:47:35 adam Exp $ - ---- 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 -+ - # Tcl's version number. -@@ -180 +182,7 @@ TCL_STUB_LIB_PATH='@TCL_STUB_LIB_PATH@' - TCL_THREADS=@TCL_THREADS@ -+ -+else -+ -+. @prefix@/lib/tclConfig-nothread.sh -+ -+fi diff --git a/lang/tcl/patches/patch-aj b/lang/tcl/patches/patch-aj deleted file mode 100644 index 9b28a5ec815..00000000000 --- a/lang/tcl/patches/patch-aj +++ /dev/null @@ -1,31 +0,0 @@ -$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 -@@ -559,7 +559,7 @@ removeFile [file join pkg circ2.tcl] - removeFile [file join pkg circ3.tcl] - - # Some tests require the existence of one of the DLLs in the dltest directory --set x [file join [file dirname [info nameofexecutable]] dltest \ -+set x [file join [file dirname [info nameofexecutable]] .. dltest .libs \ - pkga[info sharedlibextension]] - set dll "[file tail $x]Required" - ::tcltest::testConstraint $dll [file exists $x] -@@ -572,7 +572,7 @@ proc pkga_neq { x } { - return [expr {! [pkgq_eq $x]}] - } - } [file join pkg pkga.tcl] --file copy -force $x $fullPkgPath -+eval file copy -force [glob "$x*"] $fullPkgPath - } - testConstraint exec [llength [info commands ::exec]] - -@@ -598,7 +598,7 @@ test pkgMkIndex-10.2 {package in DLL hid - } {0 {}} - - if {[testConstraint $dll]} { --file delete -force [file join $fullPkgPath [file tail $x]] -+eval file delete -force [glob [file join $fullPkgPath [file tail "$x*"] ] ] - removeFile [file join pkg pkga.tcl] - } - diff --git a/lang/tcl/patches/patch-generic_tclCmdMZ.c b/lang/tcl/patches/patch-generic_tclCmdMZ.c deleted file mode 100644 index 46f2e48347f..00000000000 --- a/lang/tcl/patches/patch-generic_tclCmdMZ.c +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-generic_tclCmdMZ.c,v 1.1 2011/08/16 10:18:58 cheusov Exp $ - -PR 45244 ---- generic/tclCmdMZ.c.orig 2007-06-27 17:29:22.000000000 +0000 -+++ generic/tclCmdMZ.c -@@ -3340,7 +3340,7 @@ TclTraceExecutionObjCmd(interp, optionIn - flags |= (TCL_TRACE_ENTER_EXEC | - TCL_TRACE_LEAVE_EXEC); - } -- strcpy(tcmdPtr->command, command); -+ memcpy(tcmdPtr->command, command, length + 1); - name = Tcl_GetString(objv[3]); - if (Tcl_TraceCommand(interp, name, flags, TraceCommandProc, - (ClientData) tcmdPtr) != TCL_OK) { -@@ -3572,7 +3572,7 @@ TclTraceCommandObjCmd(interp, optionInde - tcmdPtr->length = length; - tcmdPtr->refCount = 1; - flags |= TCL_TRACE_DELETE; -- strcpy(tcmdPtr->command, command); -+ memcpy(tcmdPtr->command, command, length + 1); - name = Tcl_GetString(objv[3]); - if (Tcl_TraceCommand(interp, name, flags, TraceCommandProc, - (ClientData) tcmdPtr) != TCL_OK) { -@@ -3791,7 +3791,7 @@ TclTraceVariableObjCmd(interp, optionInd - } - tvarPtr->length = length; - flags |= TCL_TRACE_UNSETS | TCL_TRACE_RESULT_OBJECT; -- strcpy(tvarPtr->command, command); -+ memcpy(tvarPtr->command, command, length + 1); - name = Tcl_GetString(objv[3]); - flagMask = TCL_GLOBAL_ONLY | TCL_NAMESPACE_ONLY; - varPtr = TclLookupVar(interp, name, NULL, diff --git a/lang/tcl/patches/patch-generic_tclInt.h b/lang/tcl/patches/patch-generic_tclInt.h new file mode 100644 index 00000000000..728e5fec410 --- /dev/null +++ b/lang/tcl/patches/patch-generic_tclInt.h @@ -0,0 +1,27 @@ +$NetBSD: patch-generic_tclInt.h,v 1.1 2012/08/21 21:31:47 marino Exp $ + +--- generic/tclInt.h.orig 2012-07-16 11:57:05.000000000 +0000 ++++ generic/tclInt.h +@@ -38,21 +38,9 @@ + #include <stdio.h> + + #include <ctype.h> +-#ifdef NO_STDLIB_H +-# include "../compat/stdlib.h" +-#else +-# include <stdlib.h> +-#endif +-#ifdef NO_STRING_H +-#include "../compat/string.h" +-#else ++#include <stdlib.h> + #include <string.h> +-#endif +-#ifdef STDC_HEADERS + #include <stddef.h> +-#else +-typedef int ptrdiff_t; +-#endif + + /* + * Ensure WORDS_BIGENDIAN is defined correctly: diff --git a/lang/tcl/patches/patch-generic_tclPort.h b/lang/tcl/patches/patch-generic_tclPort.h new file mode 100644 index 00000000000..2a8d3b6ac72 --- /dev/null +++ b/lang/tcl/patches/patch-generic_tclPort.h @@ -0,0 +1,13 @@ +$NetBSD: patch-generic_tclPort.h,v 1.1 2012/08/21 21:31:47 marino Exp $ + +--- generic/tclPort.h.orig 2012-07-16 11:57:05.000000000 +0000 ++++ generic/tclPort.h +@@ -22,7 +22,7 @@ + #endif + #include "tcl.h" + #if !defined(_WIN32) +-# include "tclUnixPort.h" ++# include "../unix/tclUnixPort.h" + #endif + + #if !defined(LLONG_MIN) diff --git a/lang/tcl/patches/patch-generic_tclPosixStr.c b/lang/tcl/patches/patch-generic_tclPosixStr.c index 836389bb111..81785ed0737 100644 --- a/lang/tcl/patches/patch-generic_tclPosixStr.c +++ b/lang/tcl/patches/patch-generic_tclPosixStr.c @@ -1,22 +1,24 @@ -$NetBSD: patch-generic_tclPosixStr.c,v 1.1 2011/11/01 20:08:12 bsiegert Exp $ +$NetBSD: patch-generic_tclPosixStr.c,v 1.2 2012/08/21 21:31:47 marino Exp $ ---- generic/tclPosixStr.c.orig Mon May 27 10:13:59 2002 +Carried over from TCL 8.4 + +--- generic/tclPosixStr.c.orig 2012-07-16 11:57:05.000000000 +0000 +++ generic/tclPosixStr.c -@@ -339,7 +339,7 @@ Tcl_ErrnoId() +@@ -335,7 +335,7 @@ Tcl_ErrnoId(void) #if defined(EOPNOTSUPP) && (!defined(ENOTSUP) || (ENOTSUP != EOPNOTSUPP)) - case EOPNOTSUPP: return "EOPNOTSUPP"; + case EOPNOTSUPP: return "EOPNOTSUPP"; #endif --#if defined(EOVERFLOW) && ( !defined(EFBIG) || (EOVERFLOW != EFBIG) ) && ( !defined(EINVAL) || (EOVERFLOW != EINVAL) ) -+#if defined(EOVERFLOW) && ( !defined(EFBIG) || (EOVERFLOW != EFBIG) ) && ( !defined(EINVAL) || (EOVERFLOW != EINVAL) ) && ( !defined(ERANGE) || (EOVERFLOW != ERANGE) ) - case EOVERFLOW: return "EOVERFLOW"; +-#if defined(EOVERFLOW) && (!defined(EFBIG) || (EOVERFLOW != EFBIG)) && (!defined(EINVAL) || (EOVERFLOW != EINVAL)) ++#if defined(EOVERFLOW) && (!defined(EFBIG) || (EOVERFLOW != EFBIG)) && (!defined(EINVAL) || (EOVERFLOW != EINVAL)) && (!defined(ERANGE) || (EOVERFLOW != ERANGE)) + case EOVERFLOW: return "EOVERFLOW"; #endif #ifdef EPERM -@@ -789,7 +789,7 @@ Tcl_ErrnoMsg(err) +@@ -783,7 +783,7 @@ Tcl_ErrnoMsg( #if defined(EOPNOTSUPP) && (!defined(ENOTSUP) || (ENOTSUP != EOPNOTSUPP)) - case EOPNOTSUPP: return "operation not supported on socket"; + case EOPNOTSUPP: return "operation not supported on socket"; #endif --#if defined(EOVERFLOW) && ( !defined(EFBIG) || (EOVERFLOW != EFBIG) ) && ( !defined(EINVAL) || (EOVERFLOW != EINVAL) ) -+#if defined(EOVERFLOW) && ( !defined(EFBIG) || (EOVERFLOW != EFBIG) ) && ( !defined(EINVAL) || (EOVERFLOW != EINVAL) ) && ( !defined(ERANGE) || (EOVERFLOW != ERANGE) ) - case EOVERFLOW: return "file too big"; +-#if defined(EOVERFLOW) && (!defined(EFBIG) || (EOVERFLOW != EFBIG)) && (!defined(EINVAL) || (EOVERFLOW != EINVAL)) ++#if defined(EOVERFLOW) && (!defined(EFBIG) || (EOVERFLOW != EFBIG)) && (!defined(EINVAL) || (EOVERFLOW != EINVAL)) && (!defined(ERANGE) || (EOVERFLOW != ERANGE)) + case EOVERFLOW: return "file too big"; #endif #ifdef EPERM diff --git a/lang/tcl/patches/patch-ai b/lang/tcl/patches/patch-tests_load.test index dbc3e76e081..64924538673 100644 --- a/lang/tcl/patches/patch-ai +++ b/lang/tcl/patches/patch-tests_load.test @@ -1,13 +1,15 @@ -$NetBSD: patch-ai,v 1.2 2006/01/16 14:47:35 adam Exp $ +$NetBSD: patch-tests_load.test,v 1.1 2012/08/21 21:31:47 marino Exp $ ---- tests/load.test.orig 2004-09-14 17:02:56.000000000 +0000 +Carried over from TCL 8.4 + +--- tests/load.test.orig 2012-07-16 11:57:06.000000000 +0000 +++ tests/load.test -@@ -28,7 +28,7 @@ if {$tcl_platform(platform) == "macintos - +@@ -21,7 +21,7 @@ if {![info exists ext]} { + set ext [info sharedlibextension] + } # Tests require the existence of one of the DLLs in the dltest directory. - set ext [info sharedlibextension] -set testDir [file join [file dirname [info nameofexecutable]] dltest] +set testDir [file join [file dirname [info nameofexecutable]] .. dltest .libs ] set x [file join $testDir pkga$ext] set dll "[file tail $x]Required" - ::tcltest::testConstraint $dll [file readable $x] + testConstraint $dll [file readable $x] diff --git a/lang/tcl/patches/patch-tests_pkgMkIndex.test b/lang/tcl/patches/patch-tests_pkgMkIndex.test new file mode 100644 index 00000000000..57348163019 --- /dev/null +++ b/lang/tcl/patches/patch-tests_pkgMkIndex.test @@ -0,0 +1,33 @@ +$NetBSD: patch-tests_pkgMkIndex.test,v 1.1 2012/08/21 21:31:47 marino Exp $ + +Carried over from TCL 8.4 + +--- tests/pkgMkIndex.test.orig 2012-07-16 11:57:06.000000000 +0000 ++++ tests/pkgMkIndex.test +@@ -557,7 +557,7 @@ removeFile [file join pkg circ2.tcl] + removeFile [file join pkg circ3.tcl] + + # Some tests require the existence of one of the DLLs in the dltest directory +-set x [file join [file dirname [info nameofexecutable]] dltest \ ++set x [file join [file dirname [info nameofexecutable]] .. dltest .libs \ + pkga[info sharedlibextension]] + set dll "[file tail $x]Required" + testConstraint $dll [file exists $x] +@@ -570,7 +570,7 @@ proc pkga_neq { x } { + return [expr {! [pkgq_eq $x]}] + } + } [file join pkg pkga.tcl] +- file copy -force $x $fullPkgPath ++ eval file copy -force [glob "$x*"] $fullPkgPath + } + testConstraint exec [llength [info commands ::exec]] + +@@ -596,7 +596,7 @@ test pkgMkIndex-10.2 {package in DLL hid + } {0 {}} + + if {[testConstraint $dll]} { +- file delete -force [file join $fullPkgPath [file tail $x]] ++ eval file delete -force [global [file join $fullPkgPath [file tail "$x*"] ] ] + removeFile [file join pkg pkga.tcl] + } + diff --git a/lang/tcl/patches/patch-unix_Makefile.in b/lang/tcl/patches/patch-unix_Makefile.in new file mode 100644 index 00000000000..8d8cb71f969 --- /dev/null +++ b/lang/tcl/patches/patch-unix_Makefile.in @@ -0,0 +1,147 @@ +$NetBSD: patch-unix_Makefile.in,v 1.1 2012/08/21 21:31:47 marino Exp $ + +--- unix/Makefile.in.orig 2012-07-25 16:45:05.000000000 +0000 ++++ unix/Makefile.in +@@ -8,6 +8,7 @@ VERSION = @TCL_VERSION@ + MAJOR_VERSION = @TCL_MAJOR_VERSION@ + MINOR_VERSION = @TCL_MINOR_VERSION@ + PATCH_LEVEL = @TCL_PATCH_LEVEL@ ++SHLIB_VERSION = .@SHLIB_VERSION@ + + #-------------------------------------------------------------------------- + # Things you can change to personalize the Makefile for your own site (you can +@@ -54,6 +55,8 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TC + + # Directory in which to install the include file tcl.h: + INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) ++UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/tcl/unix ++GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/tcl/generic + + # Path to the private tcl header dir: + PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@ +@@ -100,7 +103,7 @@ CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@ + #CFLAGS = $(CFLAGS_DEBUG) + #CFLAGS = $(CFLAGS_OPTIMIZE) + #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) +-CFLAGS = @CFLAGS_DEFAULT@ @CFLAGS@ ++CFLAGS += @CFLAGS_DEFAULT@ @CFLAGS@ + + # Flags to pass to the linker + LDFLAGS_DEBUG = @LDFLAGS_DEBUG@ +@@ -193,6 +196,7 @@ BUILD_DLTEST = @BUILD_DLTEST@ + #BUILD_DLTEST = + + TCL_LIB_FILE = @TCL_LIB_FILE@ ++TCL_LIB_A_FILE = ${TCL_LIB_FILE:@SHLIB_SUFFIX@=.a} + #TCL_LIB_FILE = libtcl.a + + # Generic lib name used in rules that apply to tcl and tk +@@ -541,7 +545,7 @@ SRCS = $(GENERIC_SRCS) $(TOMMATH_SRCS) $ + + all: binaries libraries doc + +-binaries: ${LIB_FILE} $(STUB_LIB_FILE) ${TCL_EXE} ++binaries: ${LIB_FILE} $(STUB_LIB_FILE) ${TCL_EXE} ${TCL_LIB_A_FILE} + + libraries: + +@@ -557,6 +561,11 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} + rm -f $@ + @MAKE_STUB_LIB@ + ++${TCL_LIB_A_FILE}: ${OBJS} ++ rm -rf $@ ++ ar cr $@ ${OBJS} ++ $(RANLIB) $@ ++ + # Make target which outputs the list of the .o contained in the Tcl lib useful + # to build a single big shared library containing Tcl and other extensions. + # Used for the Tcl Plugin. -- dl +@@ -722,9 +731,13 @@ install-binaries: binaries + fi + @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" + @@INSTALL_LIB@ +- @chmod 555 "$(DLL_INSTALL_DIR)"/$(LIB_FILE) ++ @chmod 555 "$(DLL_INSTALL_DIR)"/$(LIB_FILE)$(SHLIB_VERSION) ++ @cd "$(DLL_INSTALL_DIR)" && ln -sf $(LIB_FILE)$(SHLIB_VERSION) $(LIB_FILE) ++ @echo "Installing ${TCL_LIB_A_FILE} to $(DLL_INSTALL_DIR)/" ++ @$(INSTALL_DATA) ${TCL_LIB_A_FILE} $(DLL_INSTALL_DIR)/${TCL_LIB_A_FILE} + @echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)@EXEEXT@" + @$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)"/tclsh$(VERSION)@EXEEXT@ ++ @cd "$(BIN_INSTALL_DIR)" && ln -sf tclsh$(VERSION)@EXEEXT@ tclsh + @echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/" + @$(INSTALL_DATA) tclConfig.sh "$(CONFIG_INSTALL_DIR)"/tclConfig.sh + @if test "$(STUB_LIB_FILE)" != "" ; then \ +@@ -734,7 +747,8 @@ install-binaries: binaries + @EXTRA_INSTALL_BINARIES@ + + install-libraries: libraries $(INSTALL_TZDATA) install-msgs +- @for i in "$(INCLUDE_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)"; \ ++ @for i in "$(INCLUDE_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)" \ ++ "$(GENERIC_INCLUDE_INSTALL_DIR)" "$(UNIX_INCLUDE_INSTALL_DIR)"; \ + do \ + if [ ! -d "$$i" ] ; then \ + echo "Making directory $$i"; \ +@@ -743,7 +757,7 @@ install-libraries: libraries $(INSTALL_T + else true; \ + fi; \ + done; +- @for i in opt0.4 http1.0 encoding ../tcl8 ../tcl8/8.4 ../tcl8/8.4/platform ../tcl8/8.5; \ ++ @for i in opt0.4 http1.0 encoding; \ + do \ + if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \ + echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \ +@@ -756,12 +770,17 @@ install-libraries: libraries $(INSTALL_T + chmod +x $(SRC_DIR)/../unix/install-sh; \ + fi + @echo "Installing header files"; +- @for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \ +- $(GENERIC_DIR)/tclPlatDecls.h \ +- $(GENERIC_DIR)/tclTomMath.h \ +- $(GENERIC_DIR)/tclTomMathDecls.h ; \ ++ @for i in $(GENERIC_DIR)/*.h ; \ ++ do \ ++ $(INSTALL_DATA) $$i "$(GENERIC_INCLUDE_INSTALL_DIR)"; \ ++ done; ++ @for i in $(UNIX_DIR)/*.h ; \ ++ do \ ++ $(INSTALL_DATA) $$i "$(UNIX_INCLUDE_INSTALL_DIR)"; \ ++ done; ++ @for i in tcl.h tclDecls.h tclPlatDecls.h ; \ + do \ +- $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \ ++ cd "$(INCLUDE_INSTALL_DIR)" && ln -sf tcl/generic/$$i $$i; \ + done; + @echo "Installing library files to $(SCRIPT_INSTALL_DIR)"; + @for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex \ +@@ -774,22 +793,24 @@ install-libraries: libraries $(INSTALL_T + do \ + $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \ + done; +- @echo "Installing package http 2.7.9 as a Tcl Module"; +- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.9.tm; + @echo "Installing library opt0.4 directory"; + @for i in $(TOP_DIR)/library/opt/*.tcl ; \ + do \ + $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/opt0.4; \ + done; + @echo "Installing package msgcat 1.4.5 as a Tcl Module"; +- @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.4.5.tm; ++ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat1.4/msgcat.tcl; ++ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat1.4/pkgIndex.tcl; + @echo "Installing package tcltest 2.3.4 as a Tcl Module"; +- @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.4.tm; ++ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest2.3/tcltest.tcl; ++ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest2.3/pkgIndex.tcl; + + @echo "Installing package platform 1.0.10 as a Tcl Module"; +- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.10.tm; ++ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/platform1.0/platform.tcl; ++ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/platform1.0/pkgIndex.tcl; + @echo "Installing package platform::shell 1.1.4 as a Tcl Module"; +- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform/shell-1.1.4.tm; ++ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/shell1.1/shell.tcl ++ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/shell1.1/pkgIndex.tcl + + @echo "Installing library encoding directory"; + @for i in $(TOP_DIR)/library/encoding/*.enc ; do \ diff --git a/lang/tcl/patches/patch-unix_configure b/lang/tcl/patches/patch-unix_configure new file mode 100644 index 00000000000..784f956b0bd --- /dev/null +++ b/lang/tcl/patches/patch-unix_configure @@ -0,0 +1,168 @@ +$NetBSD: patch-unix_configure,v 1.1 2012/08/21 21:31:47 marino Exp $ + +--- unix/configure.orig 2012-07-25 16:45:05.000000000 +0000 ++++ unix/configure +@@ -6630,6 +6630,7 @@ fi + # Step 3: set configuration options based on system name and version. + + do64bit_ok=no ++ TCL_LIB_SPEC_RPATH="" + # default to '{$LIBS}' and set to "" on per-platform necessary basis + SHLIB_LD_LIBS='${LIBS}' + LDFLAGS_ORIG="$LDFLAGS" +@@ -7631,7 +7632,7 @@ fi + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' + TCL_LIB_VERSIONS_OK=nodots + ;; +- OpenBSD-*) ++ OpenBSD-*|MirBSD-*) + arch=`arch -s` + case "$arch" in + m88k|vax) +@@ -7749,11 +7750,10 @@ fi + ;; + esac + ;; +- FreeBSD-*) ++ FreeBSD-*|DragonFly-*) + # This configuration from FreeBSD Ports. + SHLIB_CFLAGS="-fPIC" + SHLIB_LD="${CC} -shared" +- TCL_SHLIB_LD_EXTRAS="-soname \$@" + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="" +@@ -8953,7 +8953,7 @@ fi + BSD/OS*) ;; + CYGWIN_*|MINGW32_*) ;; + IRIX*) ;; +- NetBSD-*|FreeBSD-*|OpenBSD-*) ;; ++ NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*|MirBSD-*) ;; + Darwin-*) ;; + SCO_SV-3.2*) ;; + *) SHLIB_CFLAGS="-fPIC" ;; +@@ -8984,7 +8984,7 @@ fi + + else + +- INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)"' ++ INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)$(SHLIB_VERSION)"' + + fi + +@@ -9018,7 +9018,7 @@ fi + else + + MAKE_STUB_LIB='${STLIB_LD} $@ ${STUB_LIB_OBJS} ; ${RANLIB} $@' +- INSTALL_STUB_LIB='$(INSTALL_LIBRARY) $(STUB_LIB_FILE) "$(LIB_INSTALL_DIR)/$(STUB_LIB_FILE)" ; (cd "$(LIB_INSTALL_DIR)" ; $(RANLIB) $(STUB_LIB_FILE))' ++ INSTALL_STUB_LIB='$(INSTALL_DATA) $(STUB_LIB_FILE) "$(LIB_INSTALL_DIR)/$(STUB_LIB_FILE)" ; (cd "$(LIB_INSTALL_DIR)" ; $(RANLIB) $(STUB_LIB_FILE))' + + fi + +@@ -18893,9 +18893,9 @@ fi + # building libtcl as a shared library instead of a static library. + #-------------------------------------------------------------------- + +-TCL_UNSHARED_LIB_SUFFIX=${UNSHARED_LIB_SUFFIX} +-TCL_SHARED_LIB_SUFFIX=${SHARED_LIB_SUFFIX} +-eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" ++TCL_UNSHARED_LIB_SUFFIX=${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}.a ++TCL_SHARED_LIB_SUFFIX=${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}.so ++eval "TCL_LIB_FILE=libtcl${TCL_SHARED_LIB_SUFFIX}" + + # tclConfig.sh needs a version of the _LIB_SUFFIX that has been eval'ed + # since on some platforms TCL_LIB_FILE contains shell escapes. +@@ -19000,11 +19000,7 @@ _ACEOF + else + # libdir must be a fully qualified path and not ${exec_prefix}/lib + eval libdir="$libdir" +- if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then +- TCL_LIB_FLAG="-ltcl${TCL_VERSION}" +- else +- TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`" +- fi ++ TCL_LIB_FLAG="-ltcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}" + TCL_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TCL_LIB_FLAG}" + TCL_LIB_SPEC="-L${libdir} ${TCL_LIB_FLAG}" + fi +@@ -19025,12 +19021,11 @@ if test "$FRAMEWORK_BUILD" = "1" ; then + TCL_PACKAGE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl ~/Library/Frameworks /Library/Frameworks /System/Library/Frameworks" + test -z "$TCL_MODULE_PATH" && \ + TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl" +-elif test "$prefix/lib" != "$libdir"; then +- TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}" + else +- TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}" ++ TCL_PACKAGE_PATH="${prefix}/lib/tcl ${prefix}/lib" + fi + ++ + #-------------------------------------------------------------------- + # The statements below define various symbols relating to Tcl + # stub support. +@@ -19043,12 +19038,7 @@ eval "TCL_STUB_LIB_FILE=libtclstub${TCL_ + eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\"" + eval "TCL_STUB_LIB_DIR=${libdir}" + +-if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then +- TCL_STUB_LIB_FLAG="-ltclstub${TCL_VERSION}" +-else +- TCL_STUB_LIB_FLAG="-ltclstub`echo ${TCL_VERSION} | tr -d .`" +-fi +- ++TCL_STUB_LIB_FLAG="-ltclstub${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}" + TCL_BUILD_STUB_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TCL_STUB_LIB_FLAG}" + TCL_STUB_LIB_SPEC="-L${TCL_STUB_LIB_DIR} ${TCL_STUB_LIB_FLAG}" + TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}" +@@ -19200,34 +19190,15 @@ fi + # Transform confdefs.h into DEFS. + # Protect against shell expansion while executing Makefile rules. + # Protect against Makefile macro expansion. +-# +-# If the first sed substitution is executed (which looks for macros that +-# take arguments), then we branch to the quote section. Otherwise, +-# look for a macro that doesn't take arguments. +-cat >confdef2opt.sed <<\_ACEOF +-t clear +-: clear +-s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g +-t quote +-s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g +-t quote +-d +-: quote +-s,[ `~#$^&*(){}\\|;'"<>?],\\&,g +-s,\[,\\&,g +-s,\],\\&,g +-s,\$,$$,g +-p +-_ACEOF +-# We use echo to avoid assuming a particular line-breaking character. +-# The extra dot is to prevent the shell from consuming trailing +-# line-breaks from the sub-command output. A line-break within +-# single-quotes doesn't work because, if this script is created in a +-# platform that uses two characters for line-breaks (e.g., DOS), tr +-# would break. +-ac_LF_and_DOT=`echo; echo .` +-DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` +-rm -f confdef2opt.sed ++cat > conftest.defs <<\EOF ++s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g ++s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g ++s%\[%\\&%g ++s%\]%\\&%g ++s%\$%$$%g ++EOF ++DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` ++rm -f conftest.defs + + + +@@ -19848,6 +19819,7 @@ s,@EXTRA_BUILD_HTML@,$EXTRA_BUILD_HTML,; + s,@EXTRA_TCLSH_LIBS@,$EXTRA_TCLSH_LIBS,;t t + s,@DLTEST_LD@,$DLTEST_LD,;t t + s,@DLTEST_SUFFIX@,$DLTEST_SUFFIX,;t t ++s,@SHLIB_VERSION@,$SHLIB_VERSION,;t t + CEOF + + _ACEOF diff --git a/lang/tcl/patches/patch-unix_tclConfig.sh.in b/lang/tcl/patches/patch-unix_tclConfig.sh.in new file mode 100644 index 00000000000..07d35099379 --- /dev/null +++ b/lang/tcl/patches/patch-unix_tclConfig.sh.in @@ -0,0 +1,23 @@ +$NetBSD: patch-unix_tclConfig.sh.in,v 1.1 2012/08/21 21:31:47 marino Exp $ + +--- unix/tclConfig.sh.in.orig 2012-07-25 16:45:05.000000000 +0000 ++++ unix/tclConfig.sh.in +@@ -9,6 +9,8 @@ + # + # The information in this file is specific to a single platform. + ++if [ -z "${_TCL_NOTHREAD}" ]; then ++ + # Tcl's version number. + TCL_VERSION='@TCL_VERSION@' + TCL_MAJOR_VERSION='@TCL_MAJOR_VERSION@' +@@ -167,3 +169,9 @@ TCL_STUB_LIB_PATH='@TCL_STUB_LIB_PATH@' + + # Flag, 1: we built Tcl with threads enables, 0 we didn't + TCL_THREADS=@TCL_THREADS@ ++ ++else ++ ++. @prefix@/lib/tclConfig-nothread.sh ++ ++fi diff --git a/lang/tcl/patches/patch-ah b/lang/tcl/patches/patch-unix_tclUnixFCmd.c index e1b22571e5f..294b7ced8ed 100644 --- a/lang/tcl/patches/patch-ah +++ b/lang/tcl/patches/patch-unix_tclUnixFCmd.c @@ -1,8 +1,10 @@ -$NetBSD: patch-ah,v 1.4 2007/05/31 13:01:54 adam Exp $ +$NetBSD: patch-unix_tclUnixFCmd.c,v 1.1 2012/08/21 21:31:47 marino Exp $ ---- unix/tclUnixFCmd.c.orig 2007-04-29 04:19:51.000000000 +0200 +Carried over from TCL 8.4 + +--- unix/tclUnixFCmd.c.orig 2012-07-16 11:57:06.000000000 +0000 +++ unix/tclUnixFCmd.c -@@ -631,6 +631,14 @@ TclpDeleteFile(path) +@@ -660,6 +660,14 @@ TclpDeleteFile( *--------------------------------------------------------------------------- */ @@ -14,6 +16,6 @@ $NetBSD: patch-ah,v 1.4 2007/05/31 13:01:54 adam Exp $ + return DoCreateDirectory(path); +} + - int - TclpObjCreateDirectory(pathPtr) - Tcl_Obj *pathPtr; + int + TclpObjCreateDirectory( + Tcl_Obj *pathPtr) diff --git a/lang/tcl/patches/patch-ac b/lang/tcl/patches/patch-unix_tclUnixInit.c index 18399a5bf3f..a3082231122 100644 --- a/lang/tcl/patches/patch-ac +++ b/lang/tcl/patches/patch-unix_tclUnixInit.c @@ -1,17 +1,19 @@ -$NetBSD: patch-ac,v 1.11 2007/05/31 13:01:53 adam Exp $ +$NetBSD: patch-unix_tclUnixInit.c,v 1.1 2012/08/21 21:31:47 marino Exp $ ---- unix/tclUnixInit.c.orig 2007-04-29 04:19:51.000000000 +0200 +Carried over from TCL 8.4 + +--- unix/tclUnixInit.c.orig 2012-07-16 11:57:06.000000000 +0000 +++ unix/tclUnixInit.c -@@ -26,7 +26,7 @@ - # endif +@@ -22,7 +22,7 @@ # endif #endif + #include <sys/resource.h> -#if defined(__FreeBSD__) && defined(__GNUC__) +#if (defined(__FreeBSD__) || defined(__DragonFly__)) && defined(__GNUC__) # include <floatingpoint.h> #endif #if defined(__bsdi__) -@@ -35,6 +35,11 @@ +@@ -31,6 +31,12 @@ # include <dlfcn.h> # endif #endif @@ -20,10 +22,11 @@ $NetBSD: patch-ac,v 1.11 2007/05/31 13:01:53 adam Exp $ +#include <sys/sysctl.h> +#include <sys/utsname.h> +#endif ++ - /* - * The Init script (common to Windows and Unix platforms) is -@@ -223,7 +228,7 @@ TclpInitPlatform() + #ifdef __CYGWIN__ + DLLIMPORT extern __stdcall unsigned char GetVersionExA(void *); +@@ -448,7 +454,7 @@ TclpInitPlatform(void) (void) signal(SIGPIPE, SIG_IGN); #endif /* SIGPIPE */ @@ -32,9 +35,9 @@ $NetBSD: patch-ac,v 1.11 2007/05/31 13:01:53 adam Exp $ /* * Adjust the rounding mode to be more conventional. Note that FreeBSD * only provides the __fpsetreg() used by the following two for the GNU -@@ -781,6 +786,11 @@ TclpSetVariables(interp) +@@ -818,6 +824,11 @@ TclpSetVariables( + #endif int unameOK; - CONST char *user; Tcl_DString ds; +#if defined(__NetBSD__) + char machine_arch[SYS_NMLN]; @@ -44,20 +47,17 @@ $NetBSD: patch-ac,v 1.11 2007/05/31 13:01:53 adam Exp $ #ifdef HAVE_COREFOUNDATION char tclLibPath[MAXPATHLEN + 1]; -@@ -907,8 +917,16 @@ TclpSetVariables(interp) - Tcl_SetVar2(interp, "tcl_platform", "osVersion", name.release, - TCL_GLOBAL_ONLY|TCL_APPEND_VALUE); - } +@@ -915,7 +926,12 @@ TclpSetVariables( + Tcl_SetVar(interp, "tcl_pkgPath", pkgPath, TCL_GLOBAL_ONLY); + } + +-#ifdef DJGPP +#if defined(__NetBSD__) + if (sysctl(mib, sizeof(mib) / sizeof(int), machine_arch, &len, NULL, 0) < 0) + unameOK = 0; + else -+ Tcl_SetVar2(interp, "tcl_platform", "machine", machine_arch, -+ TCL_GLOBAL_ONLY); -+#else - Tcl_SetVar2(interp, "tcl_platform", "machine", name.machine, - TCL_GLOBAL_ONLY); -+#endif - } - #endif - if (!unameOK) { ++ Tcl_SetVar2(interp, "tcl_platform", "platform", "unix", TCL_GLOBAL_ONLY); ++#elif defined(DJGPP) + Tcl_SetVar2(interp, "tcl_platform", "platform", "dos", TCL_GLOBAL_ONLY); + #else + Tcl_SetVar2(interp, "tcl_platform", "platform", "unix", TCL_GLOBAL_ONLY); diff --git a/lang/tcl/patches/patch-unix_tclUnixPort.h b/lang/tcl/patches/patch-unix_tclUnixPort.h new file mode 100644 index 00000000000..db939689f6f --- /dev/null +++ b/lang/tcl/patches/patch-unix_tclUnixPort.h @@ -0,0 +1,43 @@ +$NetBSD: patch-unix_tclUnixPort.h,v 1.1 2012/08/21 21:31:47 marino Exp $ + +--- unix/tclUnixPort.h.orig 2012-07-16 11:57:06.000000000 +0000 ++++ unix/tclUnixPort.h +@@ -45,15 +45,7 @@ + # include <sys/param.h> + #endif + #include <sys/types.h> +-#ifdef USE_DIRENT2_H +-# include "../compat/dirent2.h" +-#else +-#ifdef NO_DIRENT_H +-# include "../compat/dirent.h" +-#else +-# include <dirent.h> +-#endif +-#endif ++#include <dirent.h> + + /* + *--------------------------------------------------------------------------- +@@ -135,19 +127,11 @@ typedef off_t Tcl_SeekOffset; + #if HAVE_INTTYPES_H + # include <inttypes.h> + #endif +-#ifdef NO_LIMITS_H +-# include "../compat/limits.h" +-#else +-# include <limits.h> +-#endif ++#include <limits.h> + #if HAVE_STDINT_H + # include <stdint.h> + #endif +-#ifdef HAVE_UNISTD_H +-# include <unistd.h> +-#else +-# include "../compat/unistd.h" +-#endif ++#include <unistd.h> + + MODULE_SCOPE int TclUnixSetBlockingMode(int fd, int mode); + |