Re: Un-breaking lang/tcl? (Re: 2022Q2 freeze has started)

To: Greg Troxel <gdt%lexort.com@localhost>
Subject: Re: Un-breaking lang/tcl? (Re: 2022Q2 freeze has started)
From: "Dr. Thomas Orgis" <thomas.orgis%uni-hamburg.de@localhost>
Date: Mon, 20 Jun 2022 10:36:47 +0200

Am Mon, 20 Jun 2022 09:50:27 +0200
schrieb "Dr. Thomas Orgis" <thomas.orgis%uni-hamburg.de@localhost>: 

> I diagnosed it down (during lots of wasted hours … why, I ask myself)
> to this patching we do to unix/Makefile.in:

The change that I am proposing is attached. I was able to build
R-tcltk2 (with DISPLAY=) after that. Of course with disabling the
BROKEN line, which I'd also like to see gone.

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/R-tcltk2/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile	28 Mar 2022 15:51:46 -0000	1.5
+++ Makefile	20 Jun 2022 08:37:50 -0000
@@ -9,7 +9,7 @@
 COMMENT=	Tcl/Tk additions
 LICENSE=	gnu-lgpl-v3	# + file LICENSE
 
-BROKEN=		"Infinite loop during build, see pkg/56696"
+#BROKEN=		"Infinite loop during build, see pkg/56696"
 
 USE_LANGUAGES=	# none


An opinion from someone close to Tcl would be good. Was the
only reason for the changes the simpler writing of PLIST?


Alrighty then,

Thomas

-- 
Dr. Thomas Orgis
HPC @ Universität Hamburg

? work
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/tcl/Makefile,v
retrieving revision 1.119
diff -u -r1.119 Makefile
--- Makefile	18 Apr 2022 19:11:31 -0000	1.119
+++ Makefile	20 Jun 2022 08:35:04 -0000
@@ -2,7 +2,7 @@
 
 DISTNAME=	tcl${TCL_VERSION}-src
 PKGNAME=	tcl-${TCL_VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tcl/}
 
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/lang/tcl/PLIST,v
retrieving revision 1.29
diff -u -r1.29 PLIST
--- PLIST	16 Nov 2021 16:24:39 -0000	1.29
+++ PLIST	20 Jun 2022 08:35:04 -0000
@@ -149,13 +149,11 @@
 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/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: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/lang/tcl/distinfo,v
retrieving revision 1.82
diff -u -r1.82 distinfo
--- distinfo	16 Nov 2021 16:24:39 -0000	1.82
+++ distinfo	20 Jun 2022 08:35:04 -0000
@@ -16,7 +16,7 @@
 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: patches/patch-unix_Makefile.in
===================================================================
RCS file: /cvsroot/pkgsrc/lang/tcl/patches/patch-unix_Makefile.in,v
retrieving revision 1.18
diff -u -r1.18 patch-unix_Makefile.in
--- patches/patch-unix_Makefile.in	16 Nov 2021 16:24:40 -0000	1.18
+++ patches/patch-unix_Makefile.in	20 Jun 2022 08:35:04 -0000
@@ -95,44 +95,6 @@
  	@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

Follow-Ups:
- Re: Un-breaking lang/tcl? (Re: 2022Q2 freeze has started)
  - From: Greg Troxel

References:
- 2022Q2 freeze has started
  - From: Greg Troxel
- Un-breaking lang/tcl? (Re: 2022Q2 freeze has started)
  - From: Dr. Thomas Orgis

Prev by Date: Un-breaking lang/tcl? (Re: 2022Q2 freeze has started)
Next by Date: Re: per-topic patches
Previous by Thread: Un-breaking lang/tcl? (Re: 2022Q2 freeze has started)
Next by Thread: Re: Un-breaking lang/tcl? (Re: 2022Q2 freeze has started)
Indexes:

Home | Main Index | Thread Index | Old Index