tcl-expect; Munge COMMIT_MSG, somewhat into patches

[Greg Troxel <gdt%lexort.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Sun Jun 19 19:18:59 2022 -0400
Changeset:	c30584884dc973f3e0272da79f27b709a86b29de

Modified Files:
	tcl-expect/COMMIT_MSG
	tcl-expect/distinfo
	tcl-expect/patches/patch-Makefile.in
	tcl-expect/patches/patch-retoglob.c
	tcl-expect/patches/patch-tclconfig_tcl.m4

Log Message:
tcl-expect; Munge COMMIT_MSG, somewhat into patches

Adjust COMMIT_MSG, and move explanatory content about new patches into
the patches, merging with existing content.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c30584884dc973f3e0272da79f27b709a86b29de

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 tcl-expect/COMMIT_MSG                     | 49 ++++++++-----------------------
 tcl-expect/distinfo                       |  6 ++--
 tcl-expect/patches/patch-Makefile.in      | 16 +++++-----
 tcl-expect/patches/patch-retoglob.c       |  7 +++--
 tcl-expect/patches/patch-tclconfig_tcl.m4 | 17 ++++-------
 5 files changed, 33 insertions(+), 62 deletions(-)

diffs:
diff --git a/tcl-expect/COMMIT_MSG b/tcl-expect/COMMIT_MSG
index d109b0e9f8..8fb4bfd58f 100644
--- a/tcl-expect/COMMIT_MSG
+++ b/tcl-expect/COMMIT_MSG
@@ -1,19 +1,6 @@
-Update tcl-expect to expect5.45.4 from expect5.45.0
+lang/tcl-expect:  Update to 5.45.4
 
-Expect is a tool for automating interactive applications such as telnet, ftp, passwd, 
-fsck, rlogin, tip, etc. Expect really makes this stuff trivial. Expect is also useful 
-for testing these same applications.
-
-See: https://core.tcl-lang.org/expect/index
-
-Note: Many of the links on the above do not work.
-
-There is a bug tracker:
-
-    https://core.tcl-lang.org/expect/rptview?rn=1
-
-Emails were sent to them but on notes were added to the bug tracking system, no 
-activity on fixing bugs is reported since the release.  
+Packaging changes:
 
 Open issues
 3d63349f14 	2019-03-29 18:12:38 	Code_Defect 	Open 	  	 
@@ -32,28 +19,16 @@ ee5c5aad7d 	2020-11-30 19:47:01 	Code_Defect 	Open 	  	interact does not work un
 
 be7d99dcc2 	2022-06-16 15:05:31 	Code_Defect 	Open 	  	core dump while generating glob-gate for expanded syntax with trailing whitespace 
 
+Upstream used to export SHLIB_VERSION from configure into
+config.status, and thus it was usable in our patched Makefile so that
+the install rules would work if SHLIB_VERSION changed.  Instead,
+\todo.
+  Rather than teaching PLIST about .@SHLIB_VERSION@ in which many said "felt wrong"
+  a patch-Makefile.in has .1.0 hard-coded instead of the previous .@SHLIB_VERSION@.
 
-patch-Makefile.in from expect5.45.0 needed to be modified to define a @SHLIB_VERSION@.
-
-Rather than teaching PLIST about .@SHLIB_VERSION@ in which many said "felt wrong"
-a patch-Makefile.in has .1.0 hard-coded instead of the previous .@SHLIB_VERSION@.
-
-In patch-configure:
-
-We are patching configure and not generarting it.
-
-The patches to add MirBSD and DragonFly are not in upstream.  They don't appear 
-to have not been applied upstream...
-
-patch-tclconfig_tcl.m4
-
-Added support for UnixWare/svr5 to tclconfig/tcl.m4
-
-SCO OpenServer 5 needs linking done with gcc, gcc is use to link because there is 
-no gnu ld.  The native compiler uses ld which comes with OS and doesn't work with
-gcc.
-   
-patch-retoglob.c
+Add patch to tclconfig/tcl.m4 for UnixWare/SVR5.  \todo Explain how
+this is effective if configure is not regenerated.
 
-SVR5/UnixWare has a name space clash
+Upstream NEWS:
 
+\todo
diff --git a/tcl-expect/distinfo b/tcl-expect/distinfo
index 16a139dbab..4fb055753d 100644
--- a/tcl-expect/distinfo
+++ b/tcl-expect/distinfo
@@ -3,8 +3,8 @@ $NetBSD: distinfo,v 1.25 2022/06/19 14:43:28 gdt Exp $
 BLAKE2s (expect5.45.4.tar.gz) = 41310882c3658679f60911aca1a3cf9c353784f164410abf919ce7adefdc73e0
 SHA512 (expect5.45.4.tar.gz) = a8dc25e8175f67e029e15cbcfca1705165c1c4cb2dd37eaaaebffb61e3ba132d9519cd73ca5add4c3358a2b0b7a91e878279e8d0b72143ff2c287fce07e4659a
 Size (expect5.45.4.tar.gz) = 632363 bytes
-SHA1 (patch-Makefile.in) = da70955bf923e1cd1074a4988a52452400072796
+SHA1 (patch-Makefile.in) = 1a5b0bc539429117490dded93b9efa1a218a21e7
 SHA1 (patch-configure) = da593f94063bfed178dbc45233fbe0ac3bf0f59c
 SHA1 (patch-exp__chan.c) = 8dbb1b1abea73858cc9eba05d4662976edf664f5
-SHA1 (patch-retoglob.c) = 4406f9e5d7622f393e35e7a1f70a700a98d6e981
-SHA1 (patch-tclconfig_tcl.m4) = 8da471800dcc5f110858dd0af36ad5e924232976
+SHA1 (patch-retoglob.c) = 41bb63f893dcf6e1d1c768986bffc9e59206d17a
+SHA1 (patch-tclconfig_tcl.m4) = fb468fb941261dba4f5b5d39ee045283134a0de4
diff --git a/tcl-expect/patches/patch-Makefile.in b/tcl-expect/patches/patch-Makefile.in
index 960e97b5d8..d7fd635560 100644
--- a/tcl-expect/patches/patch-Makefile.in
+++ b/tcl-expect/patches/patch-Makefile.in
@@ -16,9 +16,9 @@ Include LDFLAGS when linking (for RELRO).
 
 \todo File changes upstream (but upstream is not functioning).
 
---- Makefile.in.orig	2018-02-02 12:15:52.000000000 -0700
-+++ Makefile.in	2022-06-09 06:35:29.261652426 -0600
-@@ -99,7 +99,10 @@
+--- Makefile.in.orig	2018-02-02 19:15:52.000000000 +0000
++++ Makefile.in
+@@ -99,7 +99,10 @@ PKG_HEADERS	= @PKG_HEADERS@
  # configuration options) composed of the named objects.
  #========================================================================
  
@@ -29,7 +29,7 @@ Include LDFLAGS when linking (for RELRO).
  PKG_STUB_LIB_FILE = @PKG_STUB_LIB_FILE@
  
  lib_BINARIES	= $(PKG_LIB_FILE)
-@@ -121,9 +124,9 @@
+@@ -121,9 +124,9 @@ includedir	= @includedir@
  DESTDIR		=
  
  PKG_DIR		= $(PACKAGE_NAME)$(PACKAGE_VERSION)
@@ -42,7 +42,7 @@ Include LDFLAGS when linking (for RELRO).
  
  top_builddir	= .
  
-@@ -149,7 +152,7 @@
+@@ -149,7 +152,7 @@ RANLIB		= @RANLIB@
  RANLIB_STUB	= @RANLIB_STUB@
  SHLIB_CFLAGS	= @SHLIB_CFLAGS@
  SHLIB_LD	= @SHLIB_LD@
@@ -51,7 +51,7 @@ Include LDFLAGS when linking (for RELRO).
  STLIB_LD	= @STLIB_LD@
  TCL_DEFS	= @TCL_DEFS@
  TCL_BIN_DIR	= @TCL_BIN_DIR@
-@@ -214,10 +217,15 @@
+@@ -214,10 +217,15 @@ all: binaries libraries doc
  # of the Makefile, in the "BINARIES" variable.
  #========================================================================
  
@@ -68,7 +68,7 @@ Include LDFLAGS when linking (for RELRO).
  doc:
  
  install: all install-binaries install-libraries install-doc
-@@ -547,6 +555,9 @@
+@@ -547,6 +555,9 @@ install-lib-binaries:
  	    fi; \
  	  fi; \
  	done
@@ -78,7 +78,7 @@ Include LDFLAGS when linking (for RELRO).
  	@list='$(PKG_TCL_SOURCES)'; for p in $$list; do \
  	  if test -f $(srcdir)/$$p; then \
  	    destp=`basename $$p`; \
-@@ -554,9 +565,11 @@
+@@ -554,9 +565,11 @@ install-lib-binaries:
  	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/$$destp; \
  	  fi; \
  	done
diff --git a/tcl-expect/patches/patch-retoglob.c b/tcl-expect/patches/patch-retoglob.c
index f597ba5618..f2ddff8989 100644
--- a/tcl-expect/patches/patch-retoglob.c
+++ b/tcl-expect/patches/patch-retoglob.c
@@ -1,9 +1,10 @@
 $NetBSD$
 
-#       retoglob.c
-#       SVR5 name space clash
+Upsteam uses identifiers that shadow the standard library (e.g. open).
+This causes a build failure on SVR5.  Because it's more surprising
+that such usage builds anywhere, just rename the identifiers.
 
-# emailed Upstream Swtempber 2019
+Sent upstream by email September 2019.
 
 --- retoglob.c.orig	2018-02-02 19:15:52.000000000 +0000
 +++ retoglob.c	2019-08-26 05:28:32.206672005 +0000
diff --git a/tcl-expect/patches/patch-tclconfig_tcl.m4 b/tcl-expect/patches/patch-tclconfig_tcl.m4
index 983b1e71e5..16862bf2b1 100644
--- a/tcl-expect/patches/patch-tclconfig_tcl.m4
+++ b/tcl-expect/patches/patch-tclconfig_tcl.m4
@@ -1,9 +1,12 @@
 $NetBSD$
 
-#       tclconfig/tcl.m4
-#       add support for svr5
+On OpenServer 5, when compiling with gcc, also use gcc to link,
+because the system ld is not GNU ld.
 
-# Emailed Upstream September 2019
+Add support for Unixware and SCO_SV-5, and add them to the list of
+systems needing -fPIC.
+
+Sent upstream by email September 2019.
 
 --- tclconfig/tcl.m4.orig	2018-02-04 06:55:43.000000000 +0000
 +++ tclconfig/tcl.m4	2022-06-07 08:37:43.412809932 -0600
@@ -59,14 +62,6 @@ $NetBSD$
  	SunOS-5.[[0-6]])
  	    # Careful to not let 5.10+ fall into this case
  
-@@ -1961,6 +1992,7 @@
-     # If we're running gcc, then change the C flags for compiling shared
-     # libraries to the right flags for gcc, instead of those for the
-     # standard manufacturer compiler.
-+    # Add UnixWare to the list of $systems needing -fPIC
- 
-     AS_IF([test "$GCC" = yes], [
- 	case $system in
 @@ -1971,6 +2003,7 @@
  	    NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
  	    Darwin-*) ;;