Received: by mail.netbsd.org (Postfix, from userid 605) id 225F084E7B; Thu, 23 Jun 2022 09:05:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 5AA6384E5B for ; Thu, 23 Jun 2022 09:05:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id FZoD6oXWa-2f for ; Thu, 23 Jun 2022 09:05:01 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 7472584D84 for ; Thu, 23 Jun 2022 09:05:01 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 1D5E2FB1A; Thu, 23 Jun 2022 09:07:02 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1655975222155410" MIME-Version: 1.0 Date: Thu, 23 Jun 2022 09:07:02 +0000 From: "Dr. Thomas Orgis" Subject: CVS commit: pkgsrc/lang/tcl To: pkgsrc-changes@NetBSD.org Reply-To: thor@netbsd.org X-Mailer: log_accum Message-Id: <20220623090702.1D5E2FB1A@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1655975222155410 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: thor Date: Thu Jun 23 09:07:02 UTC 2022 Modified Files: pkgsrc/lang/tcl: Makefile PLIST distinfo pkgsrc/lang/tcl/patches: patch-unix_Makefile.in Log Message: lang/tcl: install modules like upstream wants, fixing pkg/56696 We carried a patch that changed the installation of the standard Tcl modules, to some old style with names that apparently made PLIST generation easier. Now, we got some more fixed version numbers that will change on updates, but the upside is that R does not enter an endless loop anymore on installing R-tcltk2 when DISPLAY is empty, see pkg/56696, which should be fixed now. Take care with PLIST when updating and please don't re-introduce the bug. A better fix might be to fix the endless loop in Tcl as called by R, but just messing around with upstream installation is not a good starting point. To generate a diff of this commit: cvs rdiff -u -r1.119 -r1.120 pkgsrc/lang/tcl/Makefile cvs rdiff -u -r1.29 -r1.30 pkgsrc/lang/tcl/PLIST cvs rdiff -u -r1.82 -r1.83 pkgsrc/lang/tcl/distinfo cvs rdiff -u -r1.18 -r1.19 pkgsrc/lang/tcl/patches/patch-unix_Makefile.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1655975222155410 Content-Disposition: inline Content-Length: 6505 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/tcl/Makefile diff -u pkgsrc/lang/tcl/Makefile:1.119 pkgsrc/lang/tcl/Makefile:1.120 --- pkgsrc/lang/tcl/Makefile:1.119 Mon Apr 18 19:11:31 2022 +++ pkgsrc/lang/tcl/Makefile Thu Jun 23 09:07:01 2022 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.119 2022/04/18 19:11:31 adam Exp $ +# $NetBSD: Makefile,v 1.120 2022/06/23 09:07:01 thor Exp $ DISTNAME= tcl${TCL_VERSION}-src PKGNAME= tcl-${TCL_VERSION} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/} Index: pkgsrc/lang/tcl/PLIST diff -u pkgsrc/lang/tcl/PLIST:1.29 pkgsrc/lang/tcl/PLIST:1.30 --- pkgsrc/lang/tcl/PLIST:1.29 Tue Nov 16 16:24:39 2021 +++ pkgsrc/lang/tcl/PLIST Thu Jun 23 09:07:01 2022 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.29 2021/11/16 16:24:39 adam Exp $ +@comment $NetBSD: PLIST,v 1.30 2022/06/23 09:07:01 thor Exp $ bin/sqlite3_analyzer bin/tclsh bin/tclsh${BASEVER} @@ -149,13 +149,11 @@ 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}/http/http.tcl -lib/tcl${BASEVER}/http/pkgIndex.tcl +lib/tcl8/8.6/http-2.9.5.tm lib/tcl${BASEVER}/http1.0/http.tcl lib/tcl${BASEVER}/http1.0/pkgIndex.tcl lib/tcl${BASEVER}/init.tcl -lib/tcl${BASEVER}/msgcat1.6/msgcat.tcl -lib/tcl${BASEVER}/msgcat1.6/pkgIndex.tcl +lib/tcl8/8.5/msgcat-1.6.1.tm lib/tcl${BASEVER}/msgs/af.msg lib/tcl${BASEVER}/msgs/af_za.msg lib/tcl${BASEVER}/msgs/ar.msg @@ -287,15 +285,12 @@ 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/tcl8/8.4/platform-1.0.18.tm +lib/tcl8/8.4/platform/shell-1.1.4.tm lib/tcl${BASEVER}/safe.tcl -lib/tcl${BASEVER}/shell1.1/pkgIndex.tcl -lib/tcl${BASEVER}/shell1.1/platform/shell.tcl lib/tcl${BASEVER}/tclAppInit.c lib/tcl${BASEVER}/tclIndex -lib/tcl${BASEVER}/tcltest2.5/pkgIndex.tcl -lib/tcl${BASEVER}/tcltest2.5/tcltest.tcl +lib/tcl8/8.5/tcltest-2.5.3.tm lib/tcl${BASEVER}/tm.tcl lib/tcl${BASEVER}/word.tcl lib/tcl8/${BASEVER}/tdbc/sqlite3-${TDBC_VERSION}.tm Index: pkgsrc/lang/tcl/distinfo diff -u pkgsrc/lang/tcl/distinfo:1.82 pkgsrc/lang/tcl/distinfo:1.83 --- pkgsrc/lang/tcl/distinfo:1.82 Tue Nov 16 16:24:39 2021 +++ pkgsrc/lang/tcl/distinfo Thu Jun 23 09:07:01 2022 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.82 2021/11/16 16:24:39 adam Exp $ +$NetBSD: distinfo,v 1.83 2022/06/23 09:07:01 thor Exp $ BLAKE2s (tcl8.6.12-src.tar.gz) = 1a0cbb0fcc1914b43f8b10cc0127fd3e86ae62f4bb449171664ade5621579461 SHA512 (tcl8.6.12-src.tar.gz) = 15def824484309fff6831b436e33d91ab1c6b095178f427d1f58b9a04e5e676b18dfdf1d225c6ab9ec15dc233358c40789edc7daf91c5908a1837e9f337feb60 @@ -16,7 +16,7 @@ SHA1 (patch-pkgs_tdbcpostgres1.1.3_confi SHA1 (patch-pkgs_thread2.8.7_configure) = 972e926b03505bc4d4f354f7e170e9fdbf84d478 SHA1 (patch-tests_load.test) = 438695ab76e01646e49aadc01c44344a5495eabb SHA1 (patch-tests_pkgMkIndex.test) = 70d1042c1f4743052c5fa191fa7c4732a08e28a2 -SHA1 (patch-unix_Makefile.in) = a0c50c39118ec777fe61fa381cb53b71c69f1e02 +SHA1 (patch-unix_Makefile.in) = 7ba89b10a11010772e9c52094bc4a7f004c612a4 SHA1 (patch-unix_configure) = 2f3fae506031092cd5934b41b81c62e3d52e8576 SHA1 (patch-unix_tclConfig.sh.in) = 341ac4f1bbfb29551dea87ade98b3b7b59652a31 SHA1 (patch-unix_tclUnixCompat.c) = c5c124b5ccd240cbd34a83fd165c3dea208381cd Index: pkgsrc/lang/tcl/patches/patch-unix_Makefile.in diff -u pkgsrc/lang/tcl/patches/patch-unix_Makefile.in:1.18 pkgsrc/lang/tcl/patches/patch-unix_Makefile.in:1.19 --- pkgsrc/lang/tcl/patches/patch-unix_Makefile.in:1.18 Tue Nov 16 16:24:40 2021 +++ pkgsrc/lang/tcl/patches/patch-unix_Makefile.in Thu Jun 23 09:07:01 2022 @@ -1,4 +1,4 @@ -$NetBSD: patch-unix_Makefile.in,v 1.18 2021/11/16 16:24:40 adam Exp $ +$NetBSD: patch-unix_Makefile.in,v 1.19 2022/06/23 09:07:01 thor Exp $ Honour LDFLAGS. @@ -95,44 +95,6 @@ Honour LDFLAGS. @echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/" @$(INSTALL_DATA) tclConfig.sh "$(CONFIG_INSTALL_DIR)/tclConfig.sh" @echo "Installing tclooConfig.sh to $(CONFIG_INSTALL_DIR)/" -@@ -947,23 +963,32 @@ install-libraries: libraries - $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)/http1.0"; \ - done - @echo "Installing package http 2.9.5 as a Tcl Module"; -- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(MODULE_INSTALL_DIR)/8.6/http-2.9.5.tm" -+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)/http/http.tcl" -+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)/http/pkgIndex.tcl"; - @echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/"; - @for i in $(TOP_DIR)/library/opt/*.tcl; do \ - $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)/opt0.4"; \ - done - @echo "Installing package msgcat 1.6.1 as a Tcl Module" - @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl \ -- "$(MODULE_INSTALL_DIR)/8.5/msgcat-1.6.1.tm" -+ "$(SCRIPT_INSTALL_DIR)/msgcat1.6/msgcat.tcl" -+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/pkgIndex.tcl \ -+ "$(SCRIPT_INSTALL_DIR)/msgcat1.6/pkgIndex.tcl"; - @echo "Installing package tcltest 2.5.3 as a Tcl Module" - @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl \ -- "$(MODULE_INSTALL_DIR)/8.5/tcltest-2.5.3.tm" -+ "$(SCRIPT_INSTALL_DIR)/tcltest2.5/tcltest.tcl" -+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/pkgIndex.tcl \ -+ "$(SCRIPT_INSTALL_DIR)/tcltest2.5/pkgIndex.tcl"; - @echo "Installing package platform 1.0.18 as a Tcl Module" - @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl \ -- "$(MODULE_INSTALL_DIR)/8.4/platform-1.0.18.tm" -+ "$(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 \ -- "$(MODULE_INSTALL_DIR)/8.4/platform/shell-1.1.4.tm" -+ "$(SCRIPT_INSTALL_DIR)/shell1.1/platform/shell.tcl" -+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/pkgIndex.tcl \ -+ "$(SCRIPT_INSTALL_DIR)/shell1.1/pkgIndex.tcl"; - @echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/" - @for i in $(TOP_DIR)/library/encoding/*.enc; do \ - $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)/encoding"; \ @@ -1039,20 +1064,24 @@ install-doc: doc done --_----------=_1655975222155410--